diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1ee6e62..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-latest] + os: [ubuntu-latest, macOS-11] steps: - uses: actions/checkout@v2 with: @@ -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,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: yarn dist diff --git a/.gitignore b/.gitignore index b0a161a..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 @@ -43,3 +43,4 @@ desktop-app/sources/*.json tmp .DS_Store **/.DS_Store + diff --git a/README.md b/README.md index c8dba7d..1ecfb6c 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 @@ -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/build/windows-codesign.js b/build/windows-codesign.js new file mode 100644 index 0000000..84d5048 --- /dev/null +++ b/build/windows-codesign.js @@ -0,0 +1,57 @@ +'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 = [ + 'cd', + '%LOCALAPPDATA%\\electron-builder\\cache\\winCodeSign\\winCodeSign-2.6.0\\windows-10\\x64\\', + '&&', + '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); + } +}; 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 870ca36..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); } @@ -454,8 +453,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 +480,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; }); }); 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); }); 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"} ]`; 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 }); + } } diff --git a/desktop-app/yarn.lock b/desktop-app/yarn.lock index 3819ba8..dffa025 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" @@ -2413,8 +2407,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" @@ -4125,8 +4120,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 +4569,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" @@ -5487,8 +5483,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" @@ -5994,25 +5991,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" @@ -6160,9 +6157,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" @@ -6809,9 +6806,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" diff --git a/electron/app.ts b/electron/app.ts index 7256700..75dd7ac 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -419,8 +419,12 @@ 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); + break; + } } } function addWindowDownloadHandler(window) { @@ -598,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. @@ -621,7 +633,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(); }); diff --git a/package.json b/package.json index aba483d..d122e03 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "SideQuest", "productName": "SideQuest", - "version": "0.10.33", + "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", @@ -14,7 +14,8 @@ "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 --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", @@ -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" @@ -44,13 +46,15 @@ }, "win": { "artifactName": "${productName}-${version}-${arch}-${os}.${ext}", + "sign": "./build/windows-codesign.js", + "publish": ["github"], "target": [ "nsis" ] }, "linux": { "target": [ - "tar.xz" + "tar.xz" ] }, "nsis": { @@ -79,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": { @@ -103,6 +108,7 @@ "crypto": "^1.0.1", "electron-updater": "^4.3.7", "express": "^4.17.3", + "env-cmd": "^10.1.0", "extract-zip": "^1.6.7", "md5": "^2.2.1", "mkdirp": "^1.0.3", @@ -112,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/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" + } +} diff --git a/yarn.lock b/yarn.lock index da94244..5297814 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" @@ -2632,9 +2645,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" @@ -2708,9 +2721,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" @@ -2950,7 +2963,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== @@ -3717,9 +3735,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" - 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" @@ -4030,11 +4048,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"