From 5b2c3596866c6638fbb806e19e0e6245330e4511 Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Fri, 25 Mar 2022 13:36:31 -0400 Subject: [PATCH] fix: workaround for pdfs not loading over hyper://, also solve stopwatch undefined when opening those pdfs Add volta to sub projects, extends the top level. Pdf workaround is there till https://github.com/electron/electron/issues/24859 is resolved or another option is available. --- app/bg/web-apis/bg/peersockets.js | 10 ++++--- app/main.js | 2 ++ app/package-lock.json | 43 ++++++++++++++++--------------- app/package.json | 3 +++ scripts/package.json | 5 +++- 5 files changed, 37 insertions(+), 26 deletions(-) diff --git a/app/bg/web-apis/bg/peersockets.js b/app/bg/web-apis/bg/peersockets.js index eaa6be5cdb..df71bac971 100644 --- a/app/bg/web-apis/bg/peersockets.js +++ b/app/bg/web-apis/bg/peersockets.js @@ -53,19 +53,21 @@ export default { }, async watch() { - var drive = await getSenderDrive(this.sender); + const drive = await getSenderDrive(this.sender); const aliases = getAliases(this.sender); - var stream = new Readable(); - var stopwatch = getClient().peers.watchPeers(drive.key, { + const stream = new Readable(); + const stopWatch = await getClient().peers.watchPeers(drive.key, { onjoin: async (peer) => stream.push(['join', { peerId: createAliasForPeer(aliases, peer) }]), onleave: (peer) => stream.push(['leave', { peerId: createAliasForPeer(aliases, peer) }]), }); + stream.on('close', () => { releaseAliases(this.sender, aliases); - stopwatch(); + stopWatch(); }); + return stream; }, }; diff --git a/app/main.js b/app/main.js index c8ead38569..628ae26921 100644 --- a/app/main.js +++ b/app/main.js @@ -90,6 +90,8 @@ protocol.registerSchemesAsPrivileged([ supportFetchAPI: true, corsEnabled: true, stream: true, + // TODO: remove once https://github.com/electron/electron/issues/24859 is resolved + bypassCSP: true, }, }, { diff --git a/app/package-lock.json b/app/package-lock.json index 0abdfa6d55..5a9fdf44b3 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -314,9 +314,9 @@ "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==" }, "@types/keyv": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz", - "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", + "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", "requires": { "@types/node": "*" } @@ -387,9 +387,9 @@ }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "optional": true, "requires": { "ms": "2.1.2" @@ -415,9 +415,9 @@ }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "optional": true, "requires": { "ms": "2.1.2" @@ -707,7 +707,8 @@ }, "beaker-index": { "version": "0.0.12", - "resolved": "github:andrewosh/beaker-index#22d19d5ca79fa294c76108fc4286d2fcdfa48588", + "resolved": "https://registry.npmjs.org/beaker-index/-/beaker-index-0.0.12.tgz", + "integrity": "sha512-x+M4xPye13iPmtDzRpQI9tp4MBRkvRQVdKrRorr2YA8LkASl8+uFveQG4b7OdF9XIC0o+jdqsqmJl0rypaWNyA==", "requires": { "@corestore/networker": "^1.0.3", "corestore": "^5.7.3", @@ -2978,9 +2979,9 @@ }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "optional": true, "requires": { "ms": "2.1.2" @@ -3024,9 +3025,9 @@ }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "optional": true, "requires": { "ms": "2.1.2" @@ -6553,9 +6554,9 @@ }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "optional": true, "requires": { "ms": "2.1.2" @@ -7585,8 +7586,8 @@ "integrity": "sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs=" }, "winston": { - "version": "github:winstonjs/winston#b4ced895b3e1ead8a616590189b003cfd9d7acca", - "from": "github:winstonjs/winston#b4ced895b3e1ead8a616590189b003cfd9d7acca", + "version": "git+ssh://git@github.com/winstonjs/winston.git#b4ced895b3e1ead8a616590189b003cfd9d7acca", + "from": "winston@github:winstonjs/winston#b4ced895b3e1ead8a616590189b003cfd9d7acca", "requires": { "async": "^2.6.1", "diagnostics": "^1.1.1", diff --git a/app/package.json b/app/package.json index ca7f2f033f..adeaff618b 100644 --- a/app/package.json +++ b/app/package.json @@ -98,5 +98,8 @@ "winston": "github:winstonjs/winston#b4ced895b3e1ead8a616590189b003cfd9d7acca", "yazl": "^2.5.1", "yo-yo": "^1.4.0" + }, + "volta": { + "extends": "../package.json" } } diff --git a/scripts/package.json b/scripts/package.json index 46f92b15b2..d2973b3c08 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -108,5 +108,8 @@ "bugs": { "url": "https://github.com/knownasilya/nomad/issues" }, - "dependencies": {} + "dependencies": {}, + "volta": { + "extends": "../package.json" + } }