fix: node 20 support (#141)

* fdp-play fx, works well with node 20 * Update package-lock.json
fairDataSociety · Jun 13, 2024 · d615c01 · d615c01
1 parent 147d41d
commit d615c01
Show file tree

Hide file tree

Showing 5 changed files with 166 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ docs
 .vscode
 
 generator/build
+yarn.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "dockerode": "^4.0.2",
     "ethers": "^5.7.2",
     "furious-commander": "^1.7.1",
-    "node-fetch": "3.0.0-beta.9",
+    "node-fetch": "3.3.2",
     "ora": "^5.3.0"
   },
   "devDependencies": {

diff --git a/src/shim/crypto.ts b/src/shim/crypto.ts
@@ -21,5 +21,11 @@ const getRandomValuesNode = <T extends ArrayBufferView | null>(array: T): T => {
 }
 
 if (isNode && globalThis) {
-  globalThis.crypto = { ...globalThis.crypto, getRandomValues: getRandomValuesNode }
+  if (!globalThis.crypto) {
+    globalThis.crypto = {} as Crypto;
+  }
+
+  if (!globalThis.crypto.getRandomValues) {
+    globalThis.crypto.getRandomValues = getRandomValuesNode;
+  }
 }
diff --git a/src/utils/wait.ts b/src/utils/wait.ts
@@ -1,4 +1,4 @@
-import fetch, { FetchError } from 'node-fetch'
+import { default as __fetch, FetchError } from 'node-fetch'
 import { sleep } from './index'
 import { TimeoutError } from './error'
 import { BeeDebug } from '@ethersphere/bee-js'
@@ -40,7 +40,7 @@ function isAllowedError(e: FetchError): boolean {
 export async function waitForBlockchain(waitingIterations = 30): Promise<void> {
   for (let i = 0; i < waitingIterations; i++) {
     try {
-      const request = await fetch('http://127.0.0.1:9545', {
+      const request = await __fetch('http://127.0.0.1:9545', {
         method: 'POST',
         body: BLOCKCHAIN_BODY_REQUEST,
         headers: { 'Content-Type': 'application/json' },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,3 +32,4 @@ docs
		.vscode

		generator/build
		yarn.lock