From e28f9416ad3569b3ce53062382aa46c8817c9970 Mon Sep 17 00:00:00 2001 From: DieMyst Date: Wed, 22 Feb 2023 14:57:08 +0400 Subject: [PATCH] delete `build` step, update js-client, improvements in jest config, increase timeouts --- .github/workflows/tests.yml | 1 - jest.config.cjs | 26 +++++----- package-lock.json | 98 ++++++++++++++++++----------------- package.json | 5 +- src/__test__/examples.spec.ts | 7 ++- src/examples/viaCall.ts | 4 +- 6 files changed, 71 insertions(+), 70 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b4835ca..536cfec 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,6 @@ jobs: run: rm -rf aqua-playground/src/compiled/examples/* - run: npm run compile-aqua -- -c "UNIQUE_CONST = 1" -c "ANOTHER_CONST = \"ab\"" - - run: npm run build - run: npm run test - name: Setup dasel diff --git a/jest.config.cjs b/jest.config.cjs index 6358a9c..c0fb1db 100644 --- a/jest.config.cjs +++ b/jest.config.cjs @@ -1,16 +1,18 @@ +/** @type {import('ts-jest').JestConfigWithTsJest} */ module.exports = { - testEnvironment: 'node', extensionsToTreatAsEsm: ['.ts'], - transform: { - '^.+\\.tsx?$': [ - 'ts-jest', + "preset": "ts-jest/presets/default-esm", + "moduleNameMapper": { + "^(\\.{1,2}/.*)\\.js$": "$1" + }, + "transform": { + "^.+\\.tsx?$": [ + "ts-jest", { - useESM: true, - }, - ], - }, - testPathIgnorePatterns: ['dist'], - moduleNameMapper: { - '^(\\.{1,2}/.*)\\.js$': '$1', - }, + "useESM": true + } + ] + } + }; + diff --git a/package-lock.json b/package-lock.json index 2a052bc..7e599b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,9 @@ "version": "0.3.9", "license": "MIT", "dependencies": { - "@fluencelabs/fluence-network-environment": "1.0.13", + "@fluencelabs/fluence-network-environment": "1.0.14", "@fluencelabs/js-client.api": "0.11.3", - "@fluencelabs/js-client.node": "0.6.4", + "@fluencelabs/js-client.node": "0.6.5", "deep-equal": "2.2.0" }, "devDependencies": { @@ -862,6 +862,12 @@ "integrity": "sha512-ifjtCM93KO3LhzPkMxqmXhwLmrg/scjOiyTihEVg7ns5N+BVzaK1eWzdOdqGdl9ZVoah43pdlQUepEo7VdRmsw==", "dev": true }, + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence-network-environment": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.13.tgz", + "integrity": "sha512-2pci3T0sUHE08jwEs1r/vHKVT4XUh/A3j/QJ0eIhddsxyIjEksjdn05X7DF6STD14CF8GgBVOJEPgav8qaUMpA==", + "dev": true + }, "node_modules/@fluencelabs/avm": { "version": "0.35.3", "resolved": "https://npm.fluence.dev/@fluencelabs%2favm/-/avm-0.35.3.tgz", @@ -927,9 +933,9 @@ } }, "node_modules/@fluencelabs/fluence-network-environment": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.13.tgz", - "integrity": "sha512-2pci3T0sUHE08jwEs1r/vHKVT4XUh/A3j/QJ0eIhddsxyIjEksjdn05X7DF6STD14CF8GgBVOJEPgav8qaUMpA==" + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.14.tgz", + "integrity": "sha512-lMiH+7obmJW2Q+PMUR/vNAuX6TcVqlKmsWAHvnBogH7s8IeMT+UGN8qrweILWmE57G7MfauB302dIFQowR9tug==" }, "node_modules/@fluencelabs/fluence/node_modules/async": { "version": "3.2.4", @@ -988,12 +994,12 @@ } }, "node_modules/@fluencelabs/js-client.node": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/js-client.node/-/js-client.node-0.6.4.tgz", - "integrity": "sha512-wwVj7cPxOEmAgd2d8bfDuZQUUT5/s59KHX8EqlNc+DV5hdk0D3fhlkNuXMoiE5Nxl/XQsfcKky+l1+Nd760IVw==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/@fluencelabs/js-client.node/-/js-client.node-0.6.5.tgz", + "integrity": "sha512-PVthcR46dC+zYyrjxPFrvPDjI0pLTZcG4Fv2yBcxXZrQ0Fxp/0YEoc9Bt7yUf/fhnda7DBBuRmr/u4NhhZY++w==", "dependencies": { "@fluencelabs/avm": "0.35.4", - "@fluencelabs/js-peer": "0.8.3", + "@fluencelabs/js-peer": "0.8.4", "@fluencelabs/marine-js": "0.3.45", "platform": "1.3.6" }, @@ -1018,9 +1024,9 @@ } }, "node_modules/@fluencelabs/js-peer": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/@fluencelabs/js-peer/-/js-peer-0.8.3.tgz", - "integrity": "sha512-H+lOegVidJ+/JmTvAJ6pw6YhB6eCLx8maGN7eYfVV0SfnQEEHTb6WdQRQkaKWJElLtLgJvKCzk7SQ5FdPdeJpA==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/js-peer/-/js-peer-0.8.4.tgz", + "integrity": "sha512-/3M1OpKQi+kTHGoK+MYhAphvU6r7btDFD1h5Or6j0/QAEp2bH7KeYF4U8OYR3ATgyE/0QVS2LvdcXidWRtGpJQ==", "dependencies": { "@chainsafe/libp2p-noise": "11.0.0", "@fluencelabs/avm": "0.35.4", @@ -1042,7 +1048,7 @@ "it-length-prefixed": "8.0.4", "it-map": "2.0.0", "it-pipe": "2.0.5", - "js-base64": "3.7.2", + "js-base64": "3.7.5", "libp2p": "0.42.2", "loglevel": "1.8.1", "multiformats": "11.0.1", @@ -1360,11 +1366,6 @@ "npm": ">=7.0.0" } }, - "node_modules/@fluencelabs/js-peer/node_modules/js-base64": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz", - "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==" - }, "node_modules/@fluencelabs/js-peer/node_modules/libp2p": { "version": "0.42.2", "resolved": "https://registry.npmjs.org/libp2p/-/libp2p-0.42.2.tgz", @@ -9667,10 +9668,9 @@ } }, "node_modules/js-base64": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz", - "integrity": "sha512-wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ==", - "dev": true + "version": "3.7.5", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz", + "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==" }, "node_modules/js-sha3": { "version": "0.8.0", @@ -12409,9 +12409,9 @@ } }, "node_modules/undici": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.19.1.tgz", - "integrity": "sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==", + "version": "5.20.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.20.0.tgz", + "integrity": "sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==", "dependencies": { "busboy": "^1.6.0" }, @@ -13510,6 +13510,14 @@ "@fluencelabs/fluence": "0.28.0", "@fluencelabs/fluence-network-environment": "1.0.13", "ipfs-http-client": "50.1.2" + }, + "dependencies": { + "@fluencelabs/fluence-network-environment": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.13.tgz", + "integrity": "sha512-2pci3T0sUHE08jwEs1r/vHKVT4XUh/A3j/QJ0eIhddsxyIjEksjdn05X7DF6STD14CF8GgBVOJEPgav8qaUMpA==", + "dev": true + } } }, "@fluencelabs/aqua-dht": { @@ -13626,9 +13634,9 @@ } }, "@fluencelabs/fluence-network-environment": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.13.tgz", - "integrity": "sha512-2pci3T0sUHE08jwEs1r/vHKVT4XUh/A3j/QJ0eIhddsxyIjEksjdn05X7DF6STD14CF8GgBVOJEPgav8qaUMpA==" + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.14.tgz", + "integrity": "sha512-lMiH+7obmJW2Q+PMUR/vNAuX6TcVqlKmsWAHvnBogH7s8IeMT+UGN8qrweILWmE57G7MfauB302dIFQowR9tug==" }, "@fluencelabs/interfaces": { "version": "0.1.0", @@ -13652,12 +13660,12 @@ } }, "@fluencelabs/js-client.node": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/js-client.node/-/js-client.node-0.6.4.tgz", - "integrity": "sha512-wwVj7cPxOEmAgd2d8bfDuZQUUT5/s59KHX8EqlNc+DV5hdk0D3fhlkNuXMoiE5Nxl/XQsfcKky+l1+Nd760IVw==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/@fluencelabs/js-client.node/-/js-client.node-0.6.5.tgz", + "integrity": "sha512-PVthcR46dC+zYyrjxPFrvPDjI0pLTZcG4Fv2yBcxXZrQ0Fxp/0YEoc9Bt7yUf/fhnda7DBBuRmr/u4NhhZY++w==", "requires": { "@fluencelabs/avm": "0.35.4", - "@fluencelabs/js-peer": "0.8.3", + "@fluencelabs/js-peer": "0.8.4", "@fluencelabs/marine-js": "0.3.45", "platform": "1.3.6" }, @@ -13680,9 +13688,9 @@ } }, "@fluencelabs/js-peer": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/@fluencelabs/js-peer/-/js-peer-0.8.3.tgz", - "integrity": "sha512-H+lOegVidJ+/JmTvAJ6pw6YhB6eCLx8maGN7eYfVV0SfnQEEHTb6WdQRQkaKWJElLtLgJvKCzk7SQ5FdPdeJpA==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/js-peer/-/js-peer-0.8.4.tgz", + "integrity": "sha512-/3M1OpKQi+kTHGoK+MYhAphvU6r7btDFD1h5Or6j0/QAEp2bH7KeYF4U8OYR3ATgyE/0QVS2LvdcXidWRtGpJQ==", "requires": { "@chainsafe/libp2p-noise": "11.0.0", "@fluencelabs/avm": "0.35.4", @@ -13704,7 +13712,7 @@ "it-length-prefixed": "8.0.4", "it-map": "2.0.0", "it-pipe": "2.0.5", - "js-base64": "3.7.2", + "js-base64": "3.7.5", "libp2p": "0.42.2", "loglevel": "1.8.1", "multiformats": "11.0.1", @@ -13932,11 +13940,6 @@ "resolved": "https://registry.npmjs.org/it-take/-/it-take-2.0.0.tgz", "integrity": "sha512-lN3diSTomOvYBk2K0LHAgrQ52DlQfvq8tH/+HLAFpX8Q3JwBkr/BPJEi3Z3Lf8jMmN1KOCBXvt5sXa3eW9vUmg==" }, - "js-base64": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz", - "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==" - }, "libp2p": { "version": "0.42.2", "resolved": "https://registry.npmjs.org/libp2p/-/libp2p-0.42.2.tgz", @@ -20432,10 +20435,9 @@ } }, "js-base64": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz", - "integrity": "sha512-wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ==", - "dev": true + "version": "3.7.5", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz", + "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==" }, "js-sha3": { "version": "0.8.0", @@ -22605,9 +22607,9 @@ } }, "undici": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.19.1.tgz", - "integrity": "sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==", + "version": "5.20.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.20.0.tgz", + "integrity": "sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==", "requires": { "busboy": "^1.6.0" } diff --git a/package.json b/package.json index d3881b7..df3ce32 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,7 @@ ], "scripts": { "build": "tsc", - "test": "node --loader ts-node/esm ./src/__test__/examples.spec.ts", - "test:jest": "NODE_OPTIONS=--experimental-vm-modules npx jest --detectOpenHandles", + "test": "NODE_OPTIONS=--experimental-vm-modules npx jest --detectOpenHandles", "examples": "jest", "pubsub": "node -r ts-node/register src/pubsub.ts", "exec": "npm run compile-aqua && npm run prettify-compiled && node -r ts-node/register src/index.ts", @@ -40,7 +39,7 @@ "typescript": "4.9.5" }, "dependencies": { - "@fluencelabs/js-client.node": "0.6.4", + "@fluencelabs/js-client.node": "0.6.5", "@fluencelabs/js-client.api": "0.11.3", "@fluencelabs/fluence-network-environment": "1.0.14", "deep-equal": "2.2.0" diff --git a/src/__test__/examples.spec.ts b/src/__test__/examples.spec.ts index d7ed0f6..815a409 100644 --- a/src/__test__/examples.spec.ts +++ b/src/__test__/examples.spec.ts @@ -69,7 +69,6 @@ const relayPeerId2 = relay2.peerId // setLogLevel('debug'); async function start() { - // await Fluence.start({ connectTo: config.relays[0]}); console.log("CONNECTING TO FIRST:") Fluence.onConnectionStateChange((s) => { console.log(s) @@ -449,7 +448,7 @@ describe('Testing examples', () => { // expect(res).toEqual("ok") // }); - /*it('assignment.aqua', async () => { + it('assignment.aqua', async () => { let assignmentResult = await assignmentCall(); expect(assignmentResult).toEqual(['abc', 'hello']); }); @@ -457,7 +456,7 @@ describe('Testing examples', () => { it('tryOtherwise.aqua', async () => { let tryOtherwiseResult = await tryOtherwiseCall(relayPeerId1); expect(tryOtherwiseResult).toBe('error'); - }); + }, 10000); it('tryCatch.aqua', async () => { let tryCatchResult = await tryCatchCall(relayPeerId1); @@ -534,5 +533,5 @@ describe('Testing examples', () => { it('option_gen.aqua emptyString', async () => { let optionGenResult = await genOptionsEmptyString(); expect(optionGenResult).toEqual(null); - });*/ + }); }); diff --git a/src/examples/viaCall.ts b/src/examples/viaCall.ts index 159888f..186b723 100644 --- a/src/examples/viaCall.ts +++ b/src/examples/viaCall.ts @@ -18,14 +18,14 @@ export async function viaOptCall(relayPeerId: string): Promise { export async function viaOptNullCall(relayPeerId: string): Promise { - let res3 = await viaOpt(relayPeerId, relays[4].peerId, relays[2].peerId || null); + let res3 = await viaOpt(relayPeerId, relays[4].peerId, relays[2].peerId || null, {ttl: 10000}); return res3.external_addresses; } export async function viaStreamCall(relayPeerId: string): Promise { - let res4 = await viaStream(relays[4].peerId, [relays[2].peerId, relays[1].peerId]); + let res4 = await viaStream(relays[4].peerId, [relays[2].peerId, relays[1].peerId], {ttl: 10000}); return res4.external_addresses; }