Browser-compatibility (#2072)

* fs, buffer and bytes for browser

* node version 2.1.1

* Revert "node version 2.1.1"

This reverts commit 45edc08.

Author: giurgiur99

src/config/ConfigHelper.ts

@@ -1,6 +1,5 @@
 // eslint-disable-next-line import/no-named-default
 import { default as DefaultContractsAddresses } from '@oceanprotocol/contracts/addresses/address.json'
-import fs from 'fs'
 import { Config } from '.'
 import { LoggerInstance } from '../utils/Logger.js'
 
@@ -273,14 +272,15 @@ export class ConfigHelper {
       return null
     }
 
-    let addresses
+    let addresses = null
     try {
-      addresses = process.env.ADDRESS_FILE
-        ? JSON.parse(
-            // eslint-disable-next-line security/detect-non-literal-fs-filename
-            fs.readFileSync(process.env.ADDRESS_FILE, 'utf8')
-          )
-        : null
+      if (typeof window === 'undefined' && process.env.ADDRESS_FILE) {
+        // Node.js only: read custom address file from filesystem
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const fs = require('fs')
+        // eslint-disable-next-line security/detect-non-literal-fs-filename
+        addresses = JSON.parse(fs.readFileSync(process.env.ADDRESS_FILE, 'utf8'))
+      }
     } catch (e) {
       console.log(e)
       addresses = null

src/services/providers/P2pProvider.ts

@@ -14,6 +14,7 @@ import { multiaddr, type Multiaddr } from '@multiformats/multiaddr'
 import { Signer } from 'ethers'
 import { sleep } from '../../utils/General.js'
 import { LoggerInstance } from '../../utils/Logger.js'
+import { concatUint8Arrays } from '../../utils/bytes.js'
 import type { Connection, Stream } from '@libp2p/interface'
 import {
   StorageObject,
@@ -209,10 +210,10 @@ export class P2pProvider {
       }
     }
     if (val?.type === 'Buffer' && Array.isArray(val.data)) {
-      return Buffer.from(val.data).toString()
+      return new TextDecoder().decode(new Uint8Array(val.data))
     }
-    if (val instanceof Uint8Array || Buffer.isBuffer(val)) {
-      return Buffer.from(val).toString()
+    if (val instanceof Uint8Array) {
+      return new TextDecoder().decode(val)
     }
     return val
   }
@@ -977,23 +978,23 @@ export class P2pProvider {
     }
 
     // Collect binary file data. If the first frame wasn't a status JSON, it's data.
-    const chunks: Buffer[] = status === null ? [Buffer.from(firstBytes)] : []
+    const chunks: Uint8Array[] = status === null ? [new Uint8Array(firstBytes)] : []
     try {
       while (true) {
         const chunk = await lp.read({
           signal: AbortSignal.timeout(
             this.p2pConfig.dialTimeout ?? DEFAULT_DIAL_TIMEOUT_MS
           )
         })
-        chunks.push(Buffer.from(this.toUint8Array(chunk)))
+        chunks.push(new Uint8Array(this.toUint8Array(chunk)))
       }
     } catch (e) {
       if (!(e instanceof UnexpectedEOFError)) {
         throw e
       }
     }
 
-    const combined = Buffer.concat(chunks)
+    const combined = concatUint8Arrays(chunks)
     return {
       data: combined.buffer.slice(
         combined.byteOffset,

src/utils/Addresses.ts

@@ -1,6 +1,5 @@
 import { ethers, Signer } from 'ethers'
 import { NftFactory } from '../contracts/NFTFactory.js'
-import fs from 'fs'
 // eslint-disable-next-line import/no-named-default
 import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/interfaces/IERC20Template.sol/IERC20Template.json'
 // eslint-disable-next-line import/no-named-default, prettier/prettier
@@ -12,7 +11,10 @@ import { default as Addresses } from '@oceanprotocol/contracts/addresses/address
  */
 export function getOceanArtifactsAddresses(): any {
   try {
-    if (process.env.ADDRESS_FILE) {
+    if (typeof window === 'undefined' && process.env.ADDRESS_FILE) {
+      // Node.js only: read custom address file from filesystem
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
+      const fs = require('fs')
       // eslint-disable-next-line security/detect-non-literal-fs-filename
       const data = fs.readFileSync(process.env.ADDRESS_FILE, 'utf8')
       return JSON.parse(data)

src/utils/Assets.ts

@@ -1,6 +1,6 @@
 import { ethers, hexlify, Signer, toBeHex, toUtf8Bytes } from 'ethers'
 import { ConfigHelper } from '../../src/config/index.js'
-import { createHash } from 'crypto'
+import SHA256 from 'crypto-js/sha256.js'
 import { Aquarius } from '../services/Aquarius.js'
 import { NftFactory } from '../contracts/NFTFactory.js'
 import { Nft } from '../contracts/NFT.js'
@@ -240,9 +240,8 @@ export async function createAsset(
     flags = 2
   } else {
     const stringDDO = JSON.stringify(ddo)
-    const bytes = Buffer.from(stringDDO)
-    metadata = hexlify(bytes)
-    metadataHash = '0x' + createHash('sha256').update(metadata).digest('hex')
+    metadata = hexlify(toUtf8Bytes(stringDDO))
+    metadataHash = '0x' + SHA256(metadata).toString()
     flags = 0
   }
 

src/utils/bytes.ts

@@ -0,0 +1,17 @@
+// no 0x prefix
+export function bytesToHex(bytes: Uint8Array): string {
+  return Array.from(bytes)
+    .map((b) => b.toString(16).padStart(2, '0'))
+    .join('')
+}
+
+export function concatUint8Arrays(arrays: Uint8Array[]): Uint8Array {
+  const totalLength = arrays.reduce((sum, arr) => sum + arr.length, 0)
+  const result = new Uint8Array(totalLength)
+  let offset = 0
+  for (const arr of arrays) {
+    result.set(arr, offset)
+    offset += arr.length
+  }
+  return result
+}

src/utils/eciesencrypt.ts

@@ -1,4 +1,5 @@
 import { encrypt, PublicKey } from 'eciesjs'
+import { bytesToHex } from './bytes.js'
 
 type PublicKeyInput = string | Uint8Array | number[] | Record<number, number>
 
@@ -18,7 +19,7 @@ function normalizePublicKey(publicKey: PublicKeyInput): string {
             .map((key) => publicKey[Number(key)])
         )
 
-  return `0x${Buffer.from(bytes).toString('hex')}`
+  return `0x${bytesToHex(bytes)}`
 }
 
 /**
@@ -31,9 +32,9 @@ function normalizePublicKey(publicKey: PublicKeyInput): string {
 export function eciesencrypt(publicKey: PublicKeyInput, content: string) {
   // Encrypt using ECIES
   const key = PublicKey.fromHex(normalizePublicKey(publicKey))
-  const encrypted = encrypt(key.toHex(), Buffer.from(content))
+  const encrypted = encrypt(key.toHex(), new TextEncoder().encode(content))
 
   // Convert to hex string
-  const encryptedHex = Buffer.from(encrypted).toString('hex')
+  const encryptedHex = bytesToHex(new Uint8Array(encrypted))
   return encryptedHex
 }

src/utils/index.ts

@@ -12,3 +12,4 @@ export * from './ProviderErrors.js'
 export * from './OrderUtils.js'
 export * from './Assets.js'
 export * from './Addresses.js'
+export * from './bytes.js'