diff --git a/.gitignore b/.gitignore index ea7e0b2a18..26f6769174 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,4 @@ c4/workspace.json .vscode packages/.DS_Store .idea -*.log -packages/backend-bundle/deps/node_datachannel.node +*.log \ No newline at end of file diff --git a/packages/backend/node_datachannel.cjs b/packages/backend/node_datachannel.cjs deleted file mode 100644 index c7820176a1..0000000000 --- a/packages/backend/node_datachannel.cjs +++ /dev/null @@ -1,20 +0,0 @@ -import { createRequire } from 'node:module' -import path from 'path' -import fs from 'fs' - -const require = createRequire(import.meta.url) - -let bindings = null - -let binaryPath = path.normalize(path.join(__dirname, '/deps', 'node_datachannel.node')) -let exists = fs.existsSync(binaryPath) - -if (!exists) { - throw new Error( - `You must copy node_datachannel.node from the built verson of node-datachannel in node_modules before running webpack! Rerun bootstrap!` - ) -} - -bindings = require(binaryPath) - -export default bindings diff --git a/packages/backend/webpack.config.js b/packages/backend/webpack.config.js index 29d447ae30..27f55a888b 100644 --- a/packages/backend/webpack.config.js +++ b/packages/backend/webpack.config.js @@ -79,10 +79,6 @@ const webpackConfig = (env) => { /node_modules[\/\\]classic-level[\/\\]binding.js/, root('classic_level.cjs') ), - new webpack.NormalModuleReplacementPlugin( - /node_modules[\/\\]node-datachannel[\/\\]dist[\/\\]cjs[\/\\]lib[\/\\]node-datachannel.cjs/, - root('node_datachannel.cjs') - ), new webpack.NormalModuleReplacementPlugin( /node_modules[\/\\]ipfs-utils[\/\\]src[\/\\]http[\/\\]fetch.js/, 'fetch.node.js' diff --git a/packages/e2e-tests/src/tests/multipleClients.test.ts b/packages/e2e-tests/src/tests/multipleClients.test.ts index 4ab3442190..1f4807f530 100644 --- a/packages/e2e-tests/src/tests/multipleClients.test.ts +++ b/packages/e2e-tests/src/tests/multipleClients.test.ts @@ -137,9 +137,7 @@ describe('Multiple Clients', () => { await settingsModal.switchTab('invite') await sleep(2000) const invitationLinkElement = await settingsModal.invitationLink() - await sleep(2000) invitationLink = await invitationLinkElement.getText() - await sleep(2000) expect(invitationLink).not.toBeUndefined() logger.info('Received invitation link:', invitationLink) logger.warn('closing invite tab') diff --git a/packages/mobile/nodejs-assets/deps/android/arm64/node-datachannel/node_datachannel.node b/packages/mobile/nodejs-assets/deps/android/arm64/node-datachannel/node_datachannel.node deleted file mode 100755 index 57004dc69a..0000000000 Binary files a/packages/mobile/nodejs-assets/deps/android/arm64/node-datachannel/node_datachannel.node and /dev/null differ