From ec38b1e1ae2aa7fdf4388e8261f964083a27ba8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 03:47:50 +0000 Subject: [PATCH 01/44] Bump socket.io-parser from 4.0.4 to 4.0.5 in /desktop-app Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/4.0.4...4.0.5) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- desktop-app/yarn.lock | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/desktop-app/yarn.lock b/desktop-app/yarn.lock index 3819ba8..5eb6993 100644 --- a/desktop-app/yarn.lock +++ b/desktop-app/yarn.lock @@ -2373,11 +2373,12 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -debug@*, debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" +debug@*, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3, debug@~4.3.1, debug@~4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: - ms "^2.1.1" + ms "2.1.2" debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: version "2.6.9" @@ -2397,13 +2398,6 @@ debug@^3.0.0, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.3.3, debug@~4.3.1, debug@~4.3.2: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== - dependencies: - ms "2.1.2" - debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -6160,9 +6154,9 @@ socket.io-adapter@~2.3.3: integrity sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ== socket.io-parser@~4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" - integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g== + version "4.0.5" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df" + integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig== dependencies: "@types/component-emitter" "^1.2.10" component-emitter "~1.3.0" From 73757065d1a1f1927b279d5d31bd38ecb7e1f78e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 01:09:39 +0000 Subject: [PATCH 02/44] Bump loader-utils from 1.4.0 to 1.4.2 Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index b84e955..15182c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2724,9 +2724,9 @@ lines-and-columns@^1.1.6: integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= loader-utils@^1.0.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + version "1.4.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" + integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -2954,7 +2954,12 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: +minimist@^1.2.0: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + +minimist@^1.2.3, minimist@^1.2.5: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== From deef9a2260e1989fd3e5e50f31ff8b384f2d3913 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 22:10:22 +0000 Subject: [PATCH 03/44] Bump decode-uri-component from 0.2.0 to 0.2.2 in /desktop-app Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] --- desktop-app/yarn.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop-app/yarn.lock b/desktop-app/yarn.lock index 3819ba8..860a70d 100644 --- a/desktop-app/yarn.lock +++ b/desktop-app/yarn.lock @@ -2413,8 +2413,9 @@ decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== deep-equal@^1.0.1: version "1.1.0" From b4f5ec61ef2e7601155d3a9a1fb21321690aa0e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 22:29:27 +0000 Subject: [PATCH 04/44] Bump qs from 6.5.2 to 6.5.3 in /desktop-app Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3) --- updated-dependencies: - dependency-name: qs dependency-type: indirect ... Signed-off-by: dependabot[bot] --- desktop-app/yarn.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop-app/yarn.lock b/desktop-app/yarn.lock index 3819ba8..b72ca97 100644 --- a/desktop-app/yarn.lock +++ b/desktop-app/yarn.lock @@ -5487,8 +5487,9 @@ qs@6.9.7: integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + version "6.5.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" + integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== query-string@^4.1.0: version "4.3.4" From 864aee81924d6e346644137c013a63bf3d1510a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 13:07:17 +0000 Subject: [PATCH 05/44] Bump qs from 6.5.2 to 6.5.3 Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3) --- updated-dependencies: - dependency-name: qs dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index b84e955..e80b061 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3726,9 +3726,9 @@ qs@6.7.0: integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + version "6.5.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" + integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== range-parser@~1.2.1: version "1.2.1" From 8d05a356bc9be576944b84c0245f70834fe718ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 14:24:36 +0000 Subject: [PATCH 06/44] Bump express from 4.17.1 to 4.17.3 Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.17.3. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.1...4.17.3) --- updated-dependencies: - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 213 ++++++++++++++++++++++++--------------------------- 2 files changed, 103 insertions(+), 112 deletions(-) diff --git a/package.json b/package.json index b903ed8..aba483d 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "cross-env": "^5.2.0", "crypto": "^1.0.1", "electron-updater": "^4.3.7", - "express": "^4.17.1", + "express": "^4.17.3", "extract-zip": "^1.6.7", "md5": "^2.2.1", "mkdirp": "^1.0.3", diff --git a/yarn.lock b/yarn.lock index b84e955..da94244 100644 --- a/yarn.lock +++ b/yarn.lock @@ -291,13 +291,13 @@ JSONStream@^1.3.4: jsonparse "^1.2.0" through ">=2.2.7 <3" -accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== +accepts@~1.3.8: + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" + mime-types "~2.1.34" + negotiator "0.6.3" adbkit-logcat@^1.1.0: version "1.1.0" @@ -646,21 +646,21 @@ bluebird@~2.9.24: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.9.34.tgz#2f7b4ec80216328a9fddebdf69c8d4942feff7d8" integrity sha1-L3tOyAIWMoqf3evfacjUlC/v99g= -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== +body-parser@1.19.2: + version "1.19.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" + integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== dependencies: - bytes "3.1.0" + bytes "3.1.2" content-type "~1.0.4" debug "2.6.9" depd "~1.1.2" - http-errors "1.7.2" + http-errors "1.8.1" iconv-lite "0.4.24" on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" + qs "6.9.7" + raw-body "2.4.3" + type-is "~1.6.18" boolean@^3.0.1: version "3.1.4" @@ -790,10 +790,10 @@ bytenode@^1.1.6: resolved "https://registry.yarnpkg.com/bytenode/-/bytenode-1.3.3.tgz#cec8ef591647baa9ba6e8059c29625f95372fcc3" integrity sha512-N/d5zwUSsl7WbwY3xVmh8TzDjW4PyVxbb0RQdwc80PKs97a99WVfO+k/dfdG49Xr4NQyab8s6lQJd4tdUo7X1Q== -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== cacache@^12.0.0, cacache@^12.0.2: version "12.0.4" @@ -1076,12 +1076,12 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== dependencies: - safe-buffer "5.1.2" + safe-buffer "5.2.1" content-type@~1.0.4: version "1.0.4" @@ -1093,10 +1093,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" + integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== copy-concurrently@^1.0.0: version "1.0.5" @@ -1672,17 +1672,17 @@ expand-template@^2.0.3: resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== -express@^4.17.1: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== +express@^4.17.3: + version "4.17.3" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" + integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== dependencies: - accepts "~1.3.7" + accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" + body-parser "1.19.2" + content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.0" + cookie "0.4.2" cookie-signature "1.0.6" debug "2.6.9" depd "~1.1.2" @@ -1696,13 +1696,13 @@ express@^4.17.1: on-finished "~2.3.0" parseurl "~1.3.3" path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" + proxy-addr "~2.0.7" + qs "6.9.7" range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" + safe-buffer "5.2.1" + send "0.17.2" + serve-static "1.14.2" + setprototypeof "1.2.0" statuses "~1.5.0" type-is "~1.6.18" utils-merge "1.0.1" @@ -2179,27 +2179,16 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== +http-errors@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== dependencies: depd "~1.1.2" inherits "2.0.4" - setprototypeof "1.1.1" + setprototypeof "1.2.0" statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" + toidentifier "1.0.1" http-proxy-agent@^2.1.0: version "2.1.0" @@ -2329,11 +2318,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - ini@1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -2901,6 +2885,11 @@ mime-db@1.50.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.33" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb" @@ -2908,6 +2897,13 @@ mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: dependencies: mime-db "1.50.0" +mime-types@~2.1.34: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + mime@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" @@ -3029,17 +3025,12 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.0.0, ms@^2.1.1: +ms@2.1.3, ms@^2.0.0, ms@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -3069,10 +3060,10 @@ napi-build-utils@^1.0.1: resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +negotiator@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== nice-try@^1.0.4: version "1.0.5" @@ -3647,7 +3638,7 @@ protoduck@^5.0.1: dependencies: genfun "^5.0.0" -proxy-addr@~2.0.5: +proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== @@ -3720,10 +3711,10 @@ q@1.x: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== +qs@6.9.7: + version "6.9.7" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" + integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== qs@~6.5.2: version "6.5.2" @@ -3735,13 +3726,13 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== +raw-body@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" + integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== dependencies: - bytes "3.1.0" - http-errors "1.7.2" + bytes "3.1.2" + http-errors "1.8.1" iconv-lite "0.4.24" unpipe "1.0.0" @@ -3988,16 +3979,16 @@ rxjs@^6.4.0, rxjs@^6.5.2: dependencies: tslib "^1.9.0" -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -4051,10 +4042,10 @@ semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: dependencies: lru-cache "^6.0.0" -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== +send@0.17.2: + version "0.17.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" + integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== dependencies: debug "2.6.9" depd "~1.1.2" @@ -4063,9 +4054,9 @@ send@0.17.1: escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "~1.7.2" + http-errors "1.8.1" mime "1.6.0" - ms "2.1.1" + ms "2.1.3" on-finished "~2.3.0" range-parser "~1.2.1" statuses "~1.5.0" @@ -4077,25 +4068,25 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== +serve-static@1.14.2: + version "1.14.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" + integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.17.1" + send "0.17.2" set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== shebang-command@^1.2.0: version "1.2.0" @@ -4549,10 +4540,10 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== tough-cookie@~2.5.0: version "2.5.0" @@ -4632,7 +4623,7 @@ type-fest@^0.6.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== -type-is@~1.6.17, type-is@~1.6.18: +type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== From 5541b2143454f7f50531841cf719926d300976d8 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Sun, 18 Dec 2022 07:19:55 +0100 Subject: [PATCH 07/44] added cockulus --- desktop-app/src/app/adb-client.service.ts | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index 19f2960..f0821b4 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -388,6 +388,7 @@ export class AdbClientService { } else { device.deviceName = device.type; } + device.deviceName = device.deviceName.replace('Oculus', 'Cockulus'); } async connectedStatus() { diff --git a/package.json b/package.json index b903ed8..628f9c4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "SideQuest", "productName": "SideQuest", - "version": "0.10.33", + "version": "0.10.34", "description": "A open app store for mobile android based VR devices such as the Levovo Mirage, Oculus Go, Oculus Quest, Vive Focus.", "repository": "https://github.com/SideQuestVR/SideQuest.git", "license": "UNLICENCED", From a1c328af0cde3581ec968453501020f9be1632b9 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Sun, 18 Dec 2022 07:26:51 +0100 Subject: [PATCH 08/44] removed cockulus --- desktop-app/src/app/adb-client.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index f0821b4..19f2960 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -388,7 +388,6 @@ export class AdbClientService { } else { device.deviceName = device.type; } - device.deviceName = device.deviceName.replace('Oculus', 'Cockulus'); } async connectedStatus() { From 074eaca49ae054307801796f49736ea7ba4a7764 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 12:19:46 +0000 Subject: [PATCH 09/44] Bump json5 from 1.0.1 to 1.0.2 in /desktop-app Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- desktop-app/yarn.lock | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/desktop-app/yarn.lock b/desktop-app/yarn.lock index 3819ba8..68bdec8 100644 --- a/desktop-app/yarn.lock +++ b/desktop-app/yarn.lock @@ -4125,8 +4125,9 @@ json3@^3.3.2: resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" @@ -4573,9 +4574,9 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: brace-expansion "^1.1.7" minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minimist@~0.0.1: version "0.0.10" From 7ef91221e6bede68d1bf72f93e3b7e675ea236c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 04:57:13 +0000 Subject: [PATCH 10/44] Bump json5 from 1.0.1 to 1.0.2 Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index b84e955..325afaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2648,9 +2648,9 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" @@ -2955,9 +2955,9 @@ minimatch@^5.0.1: brace-expansion "^2.0.1" minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" From c00585d8dcbf9c44f17929118f38e88f0b3c3eb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 13:33:42 +0000 Subject: [PATCH 11/44] Bump ua-parser-js from 0.7.31 to 0.7.33 in /desktop-app Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.31 to 0.7.33. - [Release notes](https://github.com/faisalman/ua-parser-js/releases) - [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md) - [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.33) --- updated-dependencies: - dependency-name: ua-parser-js dependency-type: indirect ... Signed-off-by: dependabot[bot] --- desktop-app/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop-app/yarn.lock b/desktop-app/yarn.lock index 3819ba8..1a6edf2 100644 --- a/desktop-app/yarn.lock +++ b/desktop-app/yarn.lock @@ -6809,9 +6809,9 @@ typescript@>=2.8.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da" ua-parser-js@^0.7.30: - version "0.7.31" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6" - integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ== + version "0.7.33" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" + integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== uglify-js@^3.1.4: version "3.13.5" From 5ac79f81b9a5ed621a5276451fa5ea034e0ce801 Mon Sep 17 00:00:00 2001 From: brian91292 <8050523+brian91292@users.noreply.github.com> Date: Tue, 23 May 2023 11:47:48 -0500 Subject: [PATCH 12/44] update scrcpy --- desktop-app/src/app/app.service.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts index 870ca36..90ab526 100644 --- a/desktop-app/src/app/app.service.ts +++ b/desktop-app/src/app/app.service.ts @@ -454,8 +454,9 @@ export class AppService { this.spinnerService.showLoader(); let task = { status: 'Downloading/Extracting ScrCpy...' }; this.spinnerService.setMessage('', task); - let url = 'https://github.com/Genymobile/scrcpy/releases/download/v1.11/scrcpy-win64-v1.11.zip'; - let downloadPath = this.path.join(this.appData, 'scrcpy', 'scrcpy.exe'); + let url = 'https://github.com/Genymobile/scrcpy/releases/download/v2.0/scrcpy-win64-v2.0.zip'; + let folderName = 'scrcpy-win64-v2.0'; + let downloadPath = this.path.join(this.appData, folderName, 'scrcpy.exe'); if (this.doesFileExist(downloadPath)) { this.scrcpyBinaryPath = downloadPath; this.spinnerService.hideLoader(); @@ -480,7 +481,7 @@ export class AppService { }); }; - this.extract(path, { dir: this.path.join(this.appData, 'scrcpy') }, callback); + this.extract(path, { dir: this.path.join(this.appData) }, callback); this.scrcpyBinaryPath = downloadPath; }); }); From aa16c290ad91eba635694c6c4415b1f4d294cf77 Mon Sep 17 00:00:00 2001 From: brian91292 <8050523+brian91292@users.noreply.github.com> Date: Tue, 23 May 2023 13:51:32 -0500 Subject: [PATCH 13/44] make custom protocol handler work in dev mode --- electron/app.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/electron/app.ts b/electron/app.ts index 7256700..759d08f 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -621,7 +621,19 @@ function setupApp() { app.on('activate', function() { if (mainWindow === null) createWindow(); }); - app.setAsDefaultProtocolClient('sidequest'); + // remove so we can register each time as we run the app. + app.removeAsDefaultProtocolClient('sidequest'); + + // If we are running a non-packaged version of the app && on windows + if (process.env.NODE_ENV === 'dev' && process.platform === 'win32') { + console.log('Running in dev mode'); + // Set the path of electron.exe and your app. + // These two additional parameters are only available on windows. + app.setAsDefaultProtocolClient('sidequest', process.execPath, [path.resolve(process.argv[1])]); + } else { + console.log('Running in production'); + app.setAsDefaultProtocolClient('sidequest'); + } app.on('open-url', function(event, url) { event.preventDefault(); }); From 6505202f97b3cc374d6314afdbbce2ed7533df67 Mon Sep 17 00:00:00 2001 From: brian91292 <8050523+brian91292@users.noreply.github.com> Date: Tue, 23 May 2023 14:30:15 -0500 Subject: [PATCH 14/44] fix custom protocol when app is already open --- electron/app.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/electron/app.ts b/electron/app.ts index 759d08f..9e3ecd7 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -419,8 +419,11 @@ if (app.requestSingleInstanceLock()) { function parseOpenUrl(argv: string[]) { //fs.writeFileSync(path.join(app.getPath('appData'), 'SideQuest', 'test_output_loaded.txt'), JSON.stringify(argv)); - if (argv[1] && argv[1].length && argv[1].substr(0, 12) === 'sidequest://') { - setTimeout(() => mainWindow.webContents.send('open-url', argv[1].toString()), 5000); + for (let arg of argv) { + if (arg && arg.length && arg.substr(0, 12) === 'sidequest://') { + console.log('opening url ' + arg.toString()); + setTimeout(() => mainWindow.webContents.send('open-url', arg.toString()), 5000); + } } } function addWindowDownloadHandler(window) { From 3693a9656593397fc47d0e59d5a8146db2545080 Mon Sep 17 00:00:00 2001 From: brian91292 <8050523+brian91292@users.noreply.github.com> Date: Wed, 24 May 2023 08:08:22 -0500 Subject: [PATCH 15/44] escape url in /w --- desktop-app/src/app/electron.service.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-app/src/app/electron.service.ts b/desktop-app/src/app/electron.service.ts index c8447a8..cd44692 100644 --- a/desktop-app/src/app/electron.service.ts +++ b/desktop-app/src/app/electron.service.ts @@ -126,7 +126,10 @@ export class ElectronService { switch (url[0]) { case 'sidequest://w/': this.adbService - .runAdbCommand('adb shell am start -a android.intent.action.VIEW -d ' + url[1], true) + .runAdbCommand( + 'adb shell am start -a android.intent.action.VIEW -d \'"' + new URL(url[1]).toString() + '"\'', + true + ) .then(() => { this.statusService.showStatus('Launching WebXR in browser...', false, true); }); From 684523ad9cf2f43030466b57b38a222c55ec6215 Mon Sep 17 00:00:00 2001 From: brian91292 <8050523+brian91292@users.noreply.github.com> Date: Mon, 29 May 2023 10:55:10 -0500 Subject: [PATCH 16/44] Update app.ts --- electron/app.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/electron/app.ts b/electron/app.ts index 9e3ecd7..a6a76fa 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -423,6 +423,7 @@ function parseOpenUrl(argv: string[]) { if (arg && arg.length && arg.substr(0, 12) === 'sidequest://') { console.log('opening url ' + arg.toString()); setTimeout(() => mainWindow.webContents.send('open-url', arg.toString()), 5000); + break; } } } From 43680a3ab7c87c45d531642ee7ac9dc2ef4b539c Mon Sep 17 00:00:00 2001 From: brian91292 <8050523+brian91292@users.noreply.github.com> Date: Mon, 29 May 2023 11:56:11 -0500 Subject: [PATCH 17/44] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 628f9c4..3e660c0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "SideQuest", "productName": "SideQuest", - "version": "0.10.34", + "version": "0.10.35", "description": "A open app store for mobile android based VR devices such as the Levovo Mirage, Oculus Go, Oculus Quest, Vive Focus.", "repository": "https://github.com/SideQuestVR/SideQuest.git", "license": "UNLICENCED", From aad73410673e003671b0e98805902ade3ef640ae Mon Sep 17 00:00:00 2001 From: SideQuest Date: Mon, 29 May 2023 19:35:12 +0200 Subject: [PATCH 18/44] Update package.json updated electron-builder for mac version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e660c0..4ce7904 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "devDependencies": { "@angular/cli": "^8.0.3", "electron": "13.5.1", - "electron-builder": "22.10.5", + "electron-builder": "23.0.2", "electron-notarize": "^0.1.1", "husky": "^2.3.0", "prettier": "1.17.1", From 44f6fd42d6e425013011976cdffb5e2d68d993d2 Mon Sep 17 00:00:00 2001 From: SideQuest Date: Mon, 29 May 2023 20:03:01 +0200 Subject: [PATCH 19/44] Update package.json ooops put it back!!! --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ce7904..3e660c0 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "devDependencies": { "@angular/cli": "^8.0.3", "electron": "13.5.1", - "electron-builder": "23.0.2", + "electron-builder": "22.10.5", "electron-notarize": "^0.1.1", "husky": "^2.3.0", "prettier": "1.17.1", From 6943bb8e15f20baa6ae032cf5085b478a0022bb1 Mon Sep 17 00:00:00 2001 From: SideQuest Date: Mon, 29 May 2023 20:29:35 +0200 Subject: [PATCH 20/44] Update master.yml fix mac builds --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1ee6e62..75d5c07 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -32,4 +32,4 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} - run: yarn dist \ No newline at end of file + run: PYTHON_PATH=$(which python) yarn dist From d4af4ee290ef022a3c4bf67e9b1565bf69c6cb92 Mon Sep 17 00:00:00 2001 From: SideQuest Date: Mon, 29 May 2023 20:37:57 +0200 Subject: [PATCH 21/44] Update master.yml maybe fix mac? --- .github/workflows/master.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 75d5c07..f39dd26 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -15,6 +15,7 @@ jobs: node-version: '16.14.2' - name: "Install build deps on linux" run: | + echo $RUNNER_OS; if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get install libusb-1.0-0-dev sudo apt-get install libudev-dev @@ -32,4 +33,8 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} - run: PYTHON_PATH=$(which python) yarn dist + run: | + if [ "$RUNNER_OS" == "Windows" ]; then + PYTHON_PATH=$(which python) + fi + yarn dist From 2988e9929863907ae5d7393a71b842381449b32b Mon Sep 17 00:00:00 2001 From: SideQuest Date: Mon, 29 May 2023 20:44:10 +0200 Subject: [PATCH 22/44] Update master.yml maybe broke everything? --- .github/workflows/master.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index f39dd26..1b97f4a 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -34,7 +34,8 @@ jobs: WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} run: | - if [ "$RUNNER_OS" == "Windows" ]; then + if [ "$RUNNER_OS" == "macOS" ]; then PYTHON_PATH=$(which python) fi yarn dist + shell: bash From b0bd8ebd731edec578ae6b79119eea8e0ccd6467 Mon Sep 17 00:00:00 2001 From: SideQuest Date: Mon, 29 May 2023 20:58:37 +0200 Subject: [PATCH 23/44] Update master.yml please!! --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1b97f4a..14e7a70 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -35,7 +35,7 @@ jobs: WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} run: | if [ "$RUNNER_OS" == "macOS" ]; then - PYTHON_PATH=$(which python) + PYTHON_PATH=$(which python3) fi yarn dist shell: bash From 9b1aa2f0d5a432b950d7db68caa45a7d3c6581fb Mon Sep 17 00:00:00 2001 From: SideQuest Date: Mon, 29 May 2023 21:14:32 +0200 Subject: [PATCH 24/44] Update master.yml dgsghsgsg --- .github/workflows/master.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 14e7a70..fa3321f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -5,7 +5,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [ubuntu-latest, windows-latest, macOS-11] steps: - uses: actions/checkout@v2 with: @@ -33,9 +33,4 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} - run: | - if [ "$RUNNER_OS" == "macOS" ]; then - PYTHON_PATH=$(which python3) - fi - yarn dist - shell: bash + run: yarn dist From 84086a115ad1d0b133e9eefdd5e3be1f2fe54d7f Mon Sep 17 00:00:00 2001 From: metashamone Date: Tue, 30 May 2023 18:57:18 +0200 Subject: [PATCH 25/44] added disable proximity option to the streaming screen, added more copy and set the defaults to Quest 2 --- .../stream-options/stream-options.component.html | 8 ++++++-- .../app/stream-options/stream-options.component.ts | 13 ++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/desktop-app/src/app/stream-options/stream-options.component.html b/desktop-app/src/app/stream-options/stream-options.component.html index a93f382..9bb1211 100644 --- a/desktop-app/src/app/stream-options/stream-options.component.html +++ b/desktop-app/src/app/stream-options/stream-options.component.html @@ -3,6 +3,7 @@
Start Stream
Oculus Casting
+
Disable Proximity Sensor
@@ -37,14 +38,17 @@ Crop
Crop the device screen on the server. The values are expressed in the device natural orientation (typically, - portrait for a phone, landscape for a tablet). Any MaxSize value is computed on the cropped size. + portrait for a phone, landscape for a tablet). Any MaxSize value is computed on the cropped size. The format is width:height:left:top.
-
Quest 1 Crop
Quest 2 Crop
+
Quest 1 Crop
+
+ Please note the Quest Pro uses two slightly angled screens and therefore there isn't a crop setting that works out of the box, since the video would need to be corrected after the fact. +
Fullscreen diff --git a/desktop-app/src/app/stream-options/stream-options.component.ts b/desktop-app/src/app/stream-options/stream-options.component.ts index 11fbaad..40b6957 100644 --- a/desktop-app/src/app/stream-options/stream-options.component.ts +++ b/desktop-app/src/app/stream-options/stream-options.component.ts @@ -12,7 +12,7 @@ export class StreamOptionsComponent implements OnInit { scrcpy_options: any = { always_on_top: false, bit_rate: '8000000', - crop: '1280:720:1500:350', + crop: '1600:900:2017:510', no_control: true, fullscreen: false, max_size: '0', @@ -35,4 +35,15 @@ export class StreamOptionsComponent implements OnInit { .then(() => this.statusService.showStatus('Stream closed.')) .catch(e => this.statusService.showStatus('ScrCpy Error: ' + JSON.stringify(e), true)); } + + disableProximity(shouldEnable) { + this.runAdbCommand('am broadcast -a com.oculus.vrpowermanager.' + (shouldEnable ? 'automation_disable' : 'prox_close')) + .then(() => { + this.statusService.showStatus((shouldEnable ? 'Enable' : 'Disable') + ' proximity message sent OK!!'); + }) + .catch(e => this.statusService.showStatus(e, true)); + } + runAdbCommand(command: string) { + return this.adbService.adbCommand('shell', { command, serial: this.adbService.deviceSerial }); + } } From 24e7a1dc3d0d2c23c946eced1d19595a073e85c1 Mon Sep 17 00:00:00 2001 From: SideQuest Date: Wed, 31 May 2023 15:00:35 +0200 Subject: [PATCH 26/44] Update README.md kicking build --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c8dba7d..228927a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # SideQuest Below is the documentation of SideQuest with instructions for building and signing then application. -## Build Steps +### Build Steps Clone the repo From e1fb1cead4f1e49f452c68fd7aeffee97091d324 Mon Sep 17 00:00:00 2001 From: brian91292 <8050523+brian91292@users.noreply.github.com> Date: Thu, 1 Jun 2023 11:39:18 -0500 Subject: [PATCH 27/44] test build stuff --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index 3e660c0..0a26a10 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "start:local": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .\" \"cd desktop-app && ng serve -c local --port 4205\"", "postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install", "dist": "yarn electron-build && yarn platform-tools && yarn app-build && electron-builder", + "dist-test": "yarn electron-build && yarn platform-tools && yarn app-build-test && cross-env SQ_ENV_CFG=test electron-builder", "angular": "cd desktop-app && ng serve --port 4205", "angular:test": "cd desktop-app && ng serve -c test --port 4205", "angular:test2": "cd desktop-app && ng serve -c test2 --port 4205", @@ -25,6 +26,7 @@ "electron-dev:local": "yarn platform-tools && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .", "electron": "yarn electron-build && yarn electron-dev", "app-build": "cd desktop-app && ng build --prod --aot && cd ..", + "app-build-test": "cd desktop-app && ng build -c test --aot && cd ..", "platform-tools": "node build-electron/platform-tools.js", "electron-build": "tsc", "reset": "rm -rf node_modules && rm -rf desktop-app/node_modules && yarn install && cd desktop-app && yarn install" From 943b24837aa1a46b061718256b96f531235cbe58 Mon Sep 17 00:00:00 2001 From: metashamone Date: Mon, 5 Jun 2023 15:24:34 +0200 Subject: [PATCH 28/44] added status and removed log line --- desktop-app/src/app/adb-client.service.ts | 3 +++ desktop-app/src/app/app.service.ts | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index 19f2960..a88582a 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -1026,6 +1026,9 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u name = name || packageId; const showTotal = number && total ? '(' + number + '/' + total + ') ' : ''; if (!task) this.spinnerService.showLoader(); + if (task) { + task.status = name + ': Transferring...'; + } let p: any = this.runAdbCommand('adb push "' + filepath + '" /sdcard/Android/obb/' + packageId + '/' + filename, true); if (cb) { cb(); diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts index 90ab526..2cb1ba6 100644 --- a/desktop-app/src/app/app.service.ts +++ b/desktop-app/src/app/app.service.ts @@ -126,7 +126,6 @@ export class AppService { } }); this.electron.ipcRenderer.on('download-progress', (event, data) => { - console.log('download-url-progress'); if (!!this.downloadResolves[data.token]) { this.downloadResolves[data.token].scb(data.stats); } From eb15af95264600739f581f7b6c6b0046b40186fa Mon Sep 17 00:00:00 2001 From: metashamone Date: Mon, 5 Jun 2023 15:25:40 +0200 Subject: [PATCH 29/44] added status and removed log line --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a26a10..0803929 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "SideQuest", "productName": "SideQuest", - "version": "0.10.35", + "version": "0.10.36", "description": "A open app store for mobile android based VR devices such as the Levovo Mirage, Oculus Go, Oculus Quest, Vive Focus.", "repository": "https://github.com/SideQuestVR/SideQuest.git", "license": "UNLICENCED", From 594ffd8f7981dd2900e1fa164f89d830cfd99be6 Mon Sep 17 00:00:00 2001 From: UnbelievableFlavour Date: Tue, 13 Jun 2023 11:16:00 +0000 Subject: [PATCH 30/44] Updated battle talent shortcut to full version path --- desktop-app/src/app/header/header.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-app/src/app/header/header.component.ts b/desktop-app/src/app/header/header.component.ts index 1fc0b91..f2d3a06 100644 --- a/desktop-app/src/app/header/header.component.ts +++ b/desktop-app/src/app/header/header.component.ts @@ -148,7 +148,7 @@ export class HeaderComponent implements OnInit { {"name":"Audica", "uri": "/sdcard/Audica/", "icon": "https://i.imgur.com/40sUjye.png"}, {"name":"Audio Trip", "uri": "/sdcard/Android/data/com.KinemotikStudios.AudioTripQuest/files/Songs/", "icon": "https://i.imgur.com/5EgzxTl.png"}, {"name":"OhShape", "uri": "/sdcard/OhShape/Songs/", "icon": "https://i.imgur.com/yIu0sSQ.png"}, - {"name":"Battle Talent", "uri": "/sdcard/Android/data/com.CrossLink.SAO/files/Mods/", "icon": "https://i.imgur.com/MFdfn9J.png"}, + {"name":"Battle Talent", "uri": "/sdcard/Android/data/com.CyDream.BattleTalent/files/Mods/", "icon": "https://i.imgur.com/MFdfn9J.png"}, {"name":"Blade and Sorcery", "uri": "/sdcard/Android/data/com.Warpfrog.BladeAndSorcery/files/Mods/", "icon": "https://i.imgur.com/lxK5bny.png"}, {"name":"Oculus", "uri": "/sdcard/Oculus/", "icon": "https://i.imgur.com/LORDvYK.png"} ]`; From fafd02b97a643f1335d7c6e43485f80a6333b2a5 Mon Sep 17 00:00:00 2001 From: metashamone Date: Mon, 26 Jun 2023 10:23:38 +0200 Subject: [PATCH 31/44] removing nsis stuff for windows build so it can be done locally for new code signing --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0803929..1461d2b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "SideQuest", "productName": "SideQuest", - "version": "0.10.36", + "version": "0.10.37", "description": "A open app store for mobile android based VR devices such as the Levovo Mirage, Oculus Go, Oculus Quest, Vive Focus.", "repository": "https://github.com/SideQuestVR/SideQuest.git", "license": "UNLICENCED", @@ -47,7 +47,7 @@ "win": { "artifactName": "${productName}-${version}-${arch}-${os}.${ext}", "target": [ - "nsis" + "zip" ] }, "linux": { From ac38de59ac27de24162e455d7e9aab20fea98175 Mon Sep 17 00:00:00 2001 From: metashamone Date: Mon, 26 Jun 2023 11:26:24 +0200 Subject: [PATCH 32/44] moving windows build to local entirely, hopefully with github release upload included! --- .github/workflows/master.yml | 2 +- .gitignore | 1 + package.json | 5 ++-- windows-codesign.js | 54 ++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 windows-codesign.js diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index fa3321f..46b79a0 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -5,7 +5,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-11] + os: [ubuntu-latest, macOS-11] steps: - uses: actions/checkout@v2 with: diff --git a/.gitignore b/.gitignore index b0a161a..77667e1 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ desktop-app/sources/*.json tmp .DS_Store **/.DS_Store + diff --git a/package.json b/package.json index 1461d2b..73336fc 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "start:test2": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=test2 electron .\" \"cd desktop-app && ng serve -c test2 --port 4205\"", "start:local": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .\" \"cd desktop-app && ng serve -c local --port 4205\"", "postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install", - "dist": "yarn electron-build && yarn platform-tools && yarn app-build && electron-builder", + "dist": "yarn electron-build && yarn platform-tools && yarn app-build && env-cmd -f ./.env.test electron-builder", "dist-test": "yarn electron-build && yarn platform-tools && yarn app-build-test && cross-env SQ_ENV_CFG=test electron-builder", "angular": "cd desktop-app && ng serve --port 4205", "angular:test": "cd desktop-app && ng serve -c test --port 4205", @@ -46,8 +46,9 @@ }, "win": { "artifactName": "${productName}-${version}-${arch}-${os}.${ext}", + "sign": "./build/windows-codesign.js", "target": [ - "zip" + "nsis" ] }, "linux": { diff --git a/windows-codesign.js b/windows-codesign.js new file mode 100644 index 0000000..ba383fb --- /dev/null +++ b/windows-codesign.js @@ -0,0 +1,54 @@ +'use strict'; + +const util = require('util'); +const exec = util.promisify(require('child_process').exec); +const chalk = require('chalk'); + +const OwnerName = process.env.CERT_OWNERNAME || `"SideQuest LTD"`; +const TimeStampServer = process.env.CERT_TIMESTAMPSERVER || 'http://time.certum.pl/'; +const Verbose = (process.env.CERT_VERBOSE && process.env.CERT_VERBOSE === 'true') || false; +const Debug = (process.env.CERT_DEBUG && process.env.CERT_DEBUG === 'true') || false; +const Skip = (process.env.CERT_SKIP && process.env.CERT_SKIP === 'true') || false; + +async function doSign(file, hash, owner) { + const sha256 = hash === 'sha256'; + const appendCert = sha256 ? '/as' : null; + const timestamp = sha256 ? '/tr' : '/t'; + const appendTd = sha256 ? '/td sha256' : null; + const debug = Debug ? '/debug' : null; + + let args = [ + 'signtool', + 'sign', + debug, + '/n', + owner, + '/a', + appendCert, + '/fd', + hash, + timestamp, + TimeStampServer, + appendTd, + '/v', + `"${file}"`, + ]; + + try { + const { stdout } = await exec(args.join(' ')); + if (Verbose) { + console.log(stdout); + } + } catch (error) { + throw error; + } +} + +exports.default = async function(config) { + if (!Skip) { + console.info( + `Signing ${chalk.green.bold(config.path)} with ${chalk.magenta(config.hash)} to ${chalk.cyan.bold(OwnerName)}` + ); + await doSign(config.path, config.hash, OwnerName); + } +}; From 9435b56c9c122c1212bb9e0641dca59f5ab81983 Mon Sep 17 00:00:00 2001 From: metashamone Date: Mon, 26 Jun 2023 12:06:57 +0200 Subject: [PATCH 33/44] new siging! spoiler: its just local! --- .gitignore | 2 +- README.md | 4 ++++ windows-codesign.js => build/windows-codesign.js | 3 +++ package.json | 4 +++- yarn.lock | 15 ++++++++++++++- 5 files changed, 25 insertions(+), 3 deletions(-) rename windows-codesign.js => build/windows-codesign.js (92%) diff --git a/.gitignore b/.gitignore index 77667e1..6161be5 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ jspm_packages/ # dotenv environment variables file .env -.env.test +.env build/app build/platform-tools diff --git a/README.md b/README.md index 228927a..1ecfb6c 100644 --- a/README.md +++ b/README.md @@ -76,3 +76,7 @@ GH_TOKEN - The github personal access token used to upload releases WIN_CSC_LINK - The base64 encoded .p12 file ( Windows Code Signing Cert ). as a string. Do not include the `-----BEGIN CERTIFICATE-----` or `-----END CERTIFICATE-----` parts just the base64 string. WIN_CSC_KEY_PASSWORD - The passphrase used when generating the .p12 file for windows. + +Edit: Windows signing no longer works without a usb dongle because fuck the signing industry. + +You'll need this on the path to build for windows locally: C:\Users\USER\AppData\Local\electron-builder\Cache\winCodeSign\winCodeSign-2.6.0\windows-10\x64 diff --git a/windows-codesign.js b/build/windows-codesign.js similarity index 92% rename from windows-codesign.js rename to build/windows-codesign.js index ba383fb..84d5048 100644 --- a/windows-codesign.js +++ b/build/windows-codesign.js @@ -18,6 +18,9 @@ async function doSign(file, hash, owner) { const debug = Debug ? '/debug' : null; let args = [ + 'cd', + '%LOCALAPPDATA%\\electron-builder\\cache\\winCodeSign\\winCodeSign-2.6.0\\windows-10\\x64\\', + '&&', 'signtool', 'sign', debug, diff --git a/package.json b/package.json index 73336fc..2747fe3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "start:test2": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=test2 electron .\" \"cd desktop-app && ng serve -c test2 --port 4205\"", "start:local": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .\" \"cd desktop-app && ng serve -c local --port 4205\"", "postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install", - "dist": "yarn electron-build && yarn platform-tools && yarn app-build && env-cmd -f ./.env.test electron-builder", + "dist": "yarn electron-build && yarn platform-tools && yarn app-build && env-cmd electron-builder --publish onTagOrDraft", "dist-test": "yarn electron-build && yarn platform-tools && yarn app-build-test && cross-env SQ_ENV_CFG=test electron-builder", "angular": "cd desktop-app && ng serve --port 4205", "angular:test": "cd desktop-app && ng serve -c test --port 4205", @@ -47,6 +47,7 @@ "win": { "artifactName": "${productName}-${version}-${arch}-${os}.${ext}", "sign": "./build/windows-codesign.js", + "publish": ["github"], "target": [ "nsis" ] @@ -105,6 +106,7 @@ "cross-env": "^5.2.0", "crypto": "^1.0.1", "electron-updater": "^4.3.7", + "env-cmd": "^10.1.0", "express": "^4.17.1", "extract-zip": "^1.6.7", "md5": "^2.2.1", diff --git a/yarn.lock b/yarn.lock index b84e955..c67a40f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1016,6 +1016,11 @@ commander@^2.3.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + commander@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" @@ -1174,7 +1179,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.1: +cross-spawn@^7.0.0, cross-spawn@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1525,6 +1530,14 @@ enhanced-resolve@^4.0.0: memory-fs "^0.5.0" tapable "^1.0.0" +env-cmd@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/env-cmd/-/env-cmd-10.1.0.tgz#c7f5d3b550c9519f137fdac4dd8fb6866a8c8c4b" + integrity sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA== + dependencies: + commander "^4.0.0" + cross-spawn "^7.0.0" + env-paths@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" From c9a7dd1754b97ad4738958cdcec5d52503bfa6d8 Mon Sep 17 00:00:00 2001 From: metashamone Date: Mon, 26 Jun 2023 12:13:17 +0200 Subject: [PATCH 34/44] added silent to the env-cmd --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2747fe3..9cad68f 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "start:test2": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=test2 electron .\" \"cd desktop-app && ng serve -c test2 --port 4205\"", "start:local": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .\" \"cd desktop-app && ng serve -c local --port 4205\"", "postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install", - "dist": "yarn electron-build && yarn platform-tools && yarn app-build && env-cmd electron-builder --publish onTagOrDraft", + "dist": "yarn electron-build && yarn platform-tools && yarn app-build && env-cmd --silent electron-builder --publish onTagOrDraft", "dist-test": "yarn electron-build && yarn platform-tools && yarn app-build-test && cross-env SQ_ENV_CFG=test electron-builder", "angular": "cd desktop-app && ng serve --port 4205", "angular:test": "cd desktop-app && ng serve -c test --port 4205", From 01520134a47245deea415a16b4e4a9bca7c29a15 Mon Sep 17 00:00:00 2001 From: metashamone Date: Mon, 26 Jun 2023 12:17:53 +0200 Subject: [PATCH 35/44] added githook to build windows on post commit hook --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9cad68f..7ba5840 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "husky": { "hooks": { "pre-commit": "pretty-quick --staged --pattern \"**/*.*(js|jsx|ts|tsx)\"", - "post-commit": "git update-index -g" + "post-commit": "git update-index -g && yarn dist" } }, "prettier": { From 539b86044124b6ff734c0ae4c33b63e44dbb21a8 Mon Sep 17 00:00:00 2001 From: metashamone Date: Mon, 26 Jun 2023 12:24:24 +0200 Subject: [PATCH 36/44] added githook to build windows on post commit hook --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 7ba5840..55440cd 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,8 @@ "husky": { "hooks": { "pre-commit": "pretty-quick --staged --pattern \"**/*.*(js|jsx|ts|tsx)\"", - "post-commit": "git update-index -g && yarn dist" + "post-commit": "git update-index -g", + "pre-push": "yarn dist" } }, "prettier": { From f4f7206c5dbc4031c128e47ee4fa63cca8a9ae51 Mon Sep 17 00:00:00 2001 From: metashamone Date: Mon, 26 Jun 2023 12:31:19 +0200 Subject: [PATCH 37/44] kicking the build to see if we havea working flow now --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 55440cd..fa3dce7 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ }, "linux": { "target": [ - "tar.xz" + "tar.xz" ] }, "nsis": { From b4a442a367cec6b830e128f9a1a602df157c31d0 Mon Sep 17 00:00:00 2001 From: metashamone Date: Thu, 29 Jun 2023 17:50:54 +0200 Subject: [PATCH 38/44] added windows build back in! --- package.json | 2 - package.json-new | 138 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 package.json-new diff --git a/package.json b/package.json index fa3dce7..664fc51 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,6 @@ }, "win": { "artifactName": "${productName}-${version}-${arch}-${os}.${ext}", - "sign": "./build/windows-codesign.js", - "publish": ["github"], "target": [ "nsis" ] diff --git a/package.json-new b/package.json-new new file mode 100644 index 0000000..fa3dce7 --- /dev/null +++ b/package.json-new @@ -0,0 +1,138 @@ +{ + "name": "SideQuest", + "productName": "SideQuest", + "version": "0.10.37", + "description": "A open app store for mobile android based VR devices such as the Levovo Mirage, Oculus Go, Oculus Quest, Vive Focus.", + "repository": "https://github.com/SideQuestVR/SideQuest.git", + "license": "UNLICENCED", + "author": "Shane Harris", + "main": "build-electron/app.js", + "scripts": { + "concurrently": "concurrently", + "start": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev electron .\" \"cd desktop-app && ng serve --port 4205\"", + "start:test": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=test electron .\" \"cd desktop-app && ng serve -c test --port 4205\"", + "start:test2": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=test2 electron .\" \"cd desktop-app && ng serve -c test2 --port 4205\"", + "start:local": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .\" \"cd desktop-app && ng serve -c local --port 4205\"", + "postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install", + "dist": "yarn electron-build && yarn platform-tools && yarn app-build && env-cmd --silent electron-builder --publish onTagOrDraft", + "dist-test": "yarn electron-build && yarn platform-tools && yarn app-build-test && cross-env SQ_ENV_CFG=test electron-builder", + "angular": "cd desktop-app && ng serve --port 4205", + "angular:test": "cd desktop-app && ng serve -c test --port 4205", + "angular:test2": "cd desktop-app && ng serve -c test2 --port 4205", + "angular:local": "cd desktop-app && ng serve -c local --port 4205", + "electron-dev": "yarn platform-tools && cross-env NODE_ENV=dev electron .", + "electron-dev:test": "yarn platform-tools && cross-env NODE_ENV=dev SQ_ENV_CFG=test electron .", + "electron-dev:test2": "yarn platform-tools && cross-env NODE_ENV=dev SQ_ENV_CFG=test2 electron .", + "electron-dev:local": "yarn platform-tools && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .", + "electron": "yarn electron-build && yarn electron-dev", + "app-build": "cd desktop-app && ng build --prod --aot && cd ..", + "app-build-test": "cd desktop-app && ng build -c test --aot && cd ..", + "platform-tools": "node build-electron/platform-tools.js", + "electron-build": "tsc", + "reset": "rm -rf node_modules && rm -rf desktop-app/node_modules && yarn install && cd desktop-app && yarn install" + }, + "build": { + "productName": "SideQuest", + "appId": "com.sidequestvr.app", + "mac": { + "category": "public.app-category.utilities", + "target": { + "target": "dmg", + "arch": [ + "arm64", + "x64" + ] + } + }, + "win": { + "artifactName": "${productName}-${version}-${arch}-${os}.${ext}", + "sign": "./build/windows-codesign.js", + "publish": ["github"], + "target": [ + "nsis" + ] + }, + "linux": { + "target": [ + "tar.xz" + ] + }, + "nsis": { + "artifactName": "${productName} Setup ${version}-x64-${os}.${ext}", + "oneClick": false, + "allowToChangeInstallationDirectory": true, + "include": "build/uninstaller.nsh" + }, + "files": [ + "build/**/*", + "node_modules/**/*", + "package.json", + "build-electron/app.js", + "build-electron/download.js", + "build-electron/setproperties.js", + "build-electron/state-storage.js", + "build-electron/window.js", + "build-electron/env-config.js", + "build-electron/external-urls.js" + ], + "asarUnpack": [ + "build/**/*" + ], + "afterSign": "build/notarize.js" + }, + "husky": { + "hooks": { + "pre-commit": "pretty-quick --staged --pattern \"**/*.*(js|jsx|ts|tsx)\"", + "post-commit": "git update-index -g", + "pre-push": "yarn dist" + } + }, + "prettier": { + "tabWidth": 4, + "printWidth": 132, + "semi": true, + "jsxBracketSameLine": true, + "parser": "typescript", + "singleQuote": true, + "useTabs": false, + "trailingComma": "es5" + }, + "dependencies": { + "@electron/remote": "^2.0.1", + "@types/electron": "^1.6.10", + "adbkit": "^2.11.1", + "adm-zip": "^0.4.14", + "bytenode": "^1.1.6", + "concurrently": "^4.1.0", + "cross-env": "^5.2.0", + "crypto": "^1.0.1", + "electron-updater": "^4.3.7", + "env-cmd": "^10.1.0", + "express": "^4.17.1", + "extract-zip": "^1.6.7", + "md5": "^2.2.1", + "mkdirp": "^1.0.3", + "node-fetch": "2.6.7", + "node-stream-zip": "^1.9.1", + "opn": "^6.0.0", + "ping": "^0.2.2", + "request": "^2.88.0", + "request-progress": "^3.0.0", + "semver": "^6.0.0", + "targz": "^1.0.1", + "usb-detection2": "git+https://github.com/SideQuestVR/node-usb-detection.git", + "wait-on": "^3.2.0", + "yauzl": "^2.10.0" + }, + "devDependencies": { + "@angular/cli": "^8.0.3", + "electron": "13.5.1", + "electron-builder": "22.10.5", + "electron-notarize": "^0.1.1", + "husky": "^2.3.0", + "prettier": "1.17.1", + "pretty-quick": "^1.11.0", + "ts-loader": "^6.2.1", + "typescript": "^3.8.3" + } +} From da8fe808654110a73d0e6d0c414320b6e1686b8b Mon Sep 17 00:00:00 2001 From: metashamone Date: Thu, 29 Jun 2023 17:51:13 +0200 Subject: [PATCH 39/44] added windows build back in2! --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 46b79a0..fa3321f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -5,7 +5,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macOS-11] + os: [ubuntu-latest, windows-latest, macOS-11] steps: - uses: actions/checkout@v2 with: From 2d8b245f33364c7b5cf0550d94489df37de08d2c Mon Sep 17 00:00:00 2001 From: metashamone Date: Thu, 29 Jun 2023 17:51:55 +0200 Subject: [PATCH 40/44] added windows build back in2! --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 664fc51..48f7387 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,7 @@ "husky": { "hooks": { "pre-commit": "pretty-quick --staged --pattern \"**/*.*(js|jsx|ts|tsx)\"", - "post-commit": "git update-index -g", - "pre-push": "yarn dist" + "post-commit": "git update-index -g" } }, "prettier": { From e84d66be4a8ac05de3278f0d974059b7373c314d Mon Sep 17 00:00:00 2001 From: brian91292 <8050523+brian91292@users.noreply.github.com> Date: Thu, 29 Jun 2023 11:45:38 -0500 Subject: [PATCH 41/44] file redirect fix --- electron/app.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/electron/app.ts b/electron/app.ts index a6a76fa..75dd7ac 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -602,6 +602,14 @@ function setupApp() { mainWindow.focus(); } }); + app.on('web-contents-created', (e, webContents) => { + webContents.on('will-redirect', (e, url) => { + if (/^file:/.test(url)) { + console.warn('Prevented redirect to ' + url); + e.preventDefault(); + } + }); + }); app.on('certificate-error', (event, webContents, url, error, certificate, callback) => { if (process.env.NODE_ENV === 'dev') { // Verification logic. From bde2b8bc971aeca843f777c427c1fa8ddb1e4a15 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Mon, 14 Aug 2023 17:42:25 +0200 Subject: [PATCH 42/44] working local install now --- .github/workflows/master.yml | 2 +- package.json | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index fa3321f..46b79a0 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -5,7 +5,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-11] + os: [ubuntu-latest, macOS-11] steps: - uses: actions/checkout@v2 with: diff --git a/package.json b/package.json index 48f7387..fa3dce7 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,8 @@ }, "win": { "artifactName": "${productName}-${version}-${arch}-${os}.${ext}", + "sign": "./build/windows-codesign.js", + "publish": ["github"], "target": [ "nsis" ] @@ -81,7 +83,8 @@ "husky": { "hooks": { "pre-commit": "pretty-quick --staged --pattern \"**/*.*(js|jsx|ts|tsx)\"", - "post-commit": "git update-index -g" + "post-commit": "git update-index -g", + "pre-push": "yarn dist" } }, "prettier": { From c62adf3ed3a30289093db008dc2deede0c199368 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 07:09:07 +0000 Subject: [PATCH 43/44] Bump semver from 6.3.0 to 6.3.1 Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v6.3.1) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fa3dce7..e14574c 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "ping": "^0.2.2", "request": "^2.88.0", "request-progress": "^3.0.0", - "semver": "^6.0.0", + "semver": "^6.3.1", "targz": "^1.0.1", "usb-detection2": "git+https://github.com/SideQuestVR/node-usb-detection.git", "wait-on": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index c67a40f..729d927 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4052,11 +4052,16 @@ semver-intersect@1.4.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@6.3.0, semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" From 712ff86248b67568a42bdfdb19fcbd573719f651 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 07:09:33 +0000 Subject: [PATCH 44/44] Bump semver from 5.7.0 to 5.7.2 in /desktop-app Bumps [semver](https://github.com/npm/node-semver) from 5.7.0 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.0...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] --- desktop-app/yarn.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/desktop-app/yarn.lock b/desktop-app/yarn.lock index 5eb6993..60e9b12 100644 --- a/desktop-app/yarn.lock +++ b/desktop-app/yarn.lock @@ -5988,25 +5988,25 @@ semver-intersect@1.4.0: dependencies: semver "^5.0.0" -"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" +"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65" + integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ== -semver@6.3.0, semver@^6.3.0: +semver@6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^5.3.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - -semver@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b" +semver@^6.0.0, semver@^6.3.0: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== send@0.17.1: version "0.17.1"