From 09a9441e6ee006efb5f70d609eb246c71aec7e50 Mon Sep 17 00:00:00 2001 From: Nathanael Anderson Date: Thu, 11 Apr 2024 09:21:27 -0600 Subject: [PATCH] More cleanups for actual distributable builds set to proper environment --- desktop-app/angular.json | 12 +++++----- electron/app.ts | 48 ++++++++++++++++++++-------------------- electron/config.js | 2 ++ electron/env-config.ts | 5 ++++- electron/make-config.js | 9 ++++++++ package.json | 17 +++++++------- 6 files changed, 54 insertions(+), 39 deletions(-) create mode 100644 electron/config.js create mode 100644 electron/make-config.js diff --git a/desktop-app/angular.json b/desktop-app/angular.json index d08a9bc..f2f7aa9 100644 --- a/desktop-app/angular.json +++ b/desktop-app/angular.json @@ -45,7 +45,7 @@ "budgets": [ { "type": "anyComponentStyle", - "maximumWarning": "6kb" + "maximumWarning": "8kb" } ], "fileReplacements": [ @@ -66,7 +66,7 @@ "budgets": [ { "type": "anyComponentStyle", - "maximumWarning": "6kb" + "maximumWarning": "8kb" } ], "fileReplacements": [ @@ -86,7 +86,7 @@ "budgets": [ { "type": "anyComponentStyle", - "maximumWarning": "6kb" + "maximumWarning": "8kb" } ], "fileReplacements": [ @@ -106,7 +106,7 @@ "budgets": [ { "type": "anyComponentStyle", - "maximumWarning": "6kb" + "maximumWarning": "8kb" } ], "fileReplacements": [ @@ -126,7 +126,7 @@ "budgets": [ { "type": "anyComponentStyle", - "maximumWarning": "6kb" + "maximumWarning": "8kb" } ], "fileReplacements": [ @@ -146,7 +146,7 @@ "budgets": [ { "type": "anyComponentStyle", - "maximumWarning": "6kb" + "maximumWarning": "8kb" } ], "fileReplacements": [ diff --git a/electron/app.ts b/electron/app.ts index 78473ee..2c6ccf5 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -13,8 +13,7 @@ const Readable = require('stream').Readable; const Adb = require('@devicefarmer/adbkit').Adb; const fs = require('fs'); const crypto = require('crypto'); -const request = require('request'); -//const progress = require('request-progress'); + //without this, there's a bug in electron that makes facebook pages ruin everything, see https://github.com/electron/electron/issues/25469 app.commandLine.appendSwitch('disable-features', 'CrossOriginOpenerPolicy'); @@ -94,20 +93,19 @@ class ADB { }, rejectUnauthorized: process.env.NODE_ENV !== 'dev', }; - request(url, options, (error, response, body) => { - if (error) { - reject(error); - } else { - try { - const found = JSON.parse(body).found; - if (!found) { - updateStatus('APK is not in the blacklist. Installing...'); - } - resolve(found); - } catch (e) { - reject(e); - } + fetch(url, options).then((response) => { + if (!response.ok || response.body == null) { + console.log(response.statusText, response.status, response.headers); + return reject(response.statusText); } + response.json().then(body => { + let found = body.found; + if (!found) { + updateStatus('APK is not in the blacklist. Installing...'); + } + resolve(found); + + }).catch(reject); }); }); } @@ -150,20 +148,24 @@ class ADB { return `${percentage}%`; } installFromToken(token, cb, ecb) { + let url = `${getEnvCfg().http_url || 'https://api.sidequestvr.com'}/install-from-key`; let options = { - url: `${getEnvCfg().http_url || 'https://api.sidequestvr.com'}/install-from-key`, method: 'POST', headers: { Accept: 'application/json', 'Content-Type': 'application/json', Origin: getEnvCfg().web_url || 'https://sidequestvr.com', }, - rejectUnauthorized: process.env.NODE_ENV !== 'dev', - json: { token: token }, + // rejectUnauthorized: process.env.NODE_ENV !== 'dev', + body: JSON.stringify({ token: token }), }; - console.log("IFT:", options) - request(options.url, options, (error, response, body) => { - if (!error && body.data && body.data.apps && body.data.apps.length) { + console.log("IFT:", url, options) + fetch(url, options).then(response => { + if (!response.ok || response.body == null) { + console.log(response.statusText, response.status, response.headers); + return ecb('Unable to fetch package'); + } + response.json().then(body => { let tasks = []; console.log("IFT Body", body); for (let i = 0; i < body.data.apps.length; i++) { @@ -192,9 +194,7 @@ class ADB { } } cb(tasks); - } else { - ecb(error || 'Nothing to install.'); - } + }).catch(ecb); }); } endLogcat() { diff --git a/electron/config.js b/electron/config.js new file mode 100644 index 0000000..c70dd44 --- /dev/null +++ b/electron/config.js @@ -0,0 +1,2 @@ +// This file is overwritten by the build process + diff --git a/electron/env-config.ts b/electron/env-config.ts index 69e0889..54856aa 100644 --- a/electron/env-config.ts +++ b/electron/env-config.ts @@ -1,6 +1,9 @@ +require('./config'); export function getEnvCfg() { - switch (process.env['SQ_ENV_CFG']) { + const cfg = process.env['SQ_ENV_CFG'] || global.SQ_ENV_CFG; + console.log('SQ_ENV_CFG:', cfg); + switch (cfg) { case 'test': return { web_url: 'https://sidetestvr.com', diff --git a/electron/make-config.js b/electron/make-config.js new file mode 100644 index 0000000..592e107 --- /dev/null +++ b/electron/make-config.js @@ -0,0 +1,9 @@ +const fs = require('node:fs'); +let cfg = "" + +if (process.argv[2]) { + cfg = process.argv[2]; +} + +// Output should be in the build-electron folder +fs.writeFileSync(__dirname + "/../build-electron/config.js", `global.SQ_ENV_CFG = "${cfg}";`) diff --git a/package.json b/package.json index 5289ca6..79c1662 100644 --- a/package.json +++ b/package.json @@ -16,13 +16,13 @@ "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\"", "start:localhost": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=localhost electron .\" \"cd desktop-app && ng serve -c localhost --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", - "build:win": "yarn electron-build && yarn platform-tools && yarn app-build && cross-env NODE_ENV=production electron-builder --win", - "build:linux": "yarn electron-build && yarn platform-tools && yarn app-build && cross-env NODE_ENV=production electron-builder --linux", - "dist-test": "yarn electron-build && yarn platform-tools && yarn app-build-test && cross-env NODE_ENV=production SQ_ENV_CFG=test electron-builder", - "dist-sidetest": "yarn electron-build && yarn platform-tools && yarn app-build-test && cross-env NODE_ENV=production SQ_ENV_CFG=test electron-builder", - "dist-fried": "yarn electron-build && yarn platform-tools && yarn app-build-fried && cross-env NODE_ENV=production SQ_ENV_CFG=fried electron-builder", - "dist-localhost": "yarn electron-build && yarn platform-tools && yarn app-build-localhost && cross-env SQ_ENV_CFG=localhost electron-builder --linux", + "dist": "yarn electron-build && yarn platform-tools && yarn app-build && node build-electron/make-config && env-cmd --silent electron-builder --publish onTagOrDraft", + "build:win": "yarn electron-build && yarn platform-tools && yarn app-build && node build-electron/make-config && cross-env NODE_ENV=production electron-builder --win", + "build:linux": "yarn electron-build && yarn platform-tools && yarn app-build && node build-electron/make-config && cross-env NODE_ENV=production electron-builder --linux", + "dist-test": "yarn electron-build && yarn platform-tools && yarn app-build-test && node build-electron/make-config test && cross-env NODE_ENV=production SQ_ENV_CFG=test electron-builder", + "dist-sidetest": "yarn electron-build && yarn platform-tools && yarn app-build-test && node build-electron/make-config test && cross-env NODE_ENV=production SQ_ENV_CFG=test electron-builder", + "dist-fried": "yarn electron-build && yarn platform-tools && yarn app-build-fried && node build-electron/make-config fried && cross-env NODE_ENV=production SQ_ENV_CFG=fried electron-builder", + "dist-localhost": "yarn electron-build && yarn platform-tools && yarn app-build-localhost && node build-electron/make-config localhost && cross-env SQ_ENV_CFG=localhost electron-builder --linux", "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", @@ -85,7 +85,8 @@ "build-electron/state-storage.js", "build-electron/window.js", "build-electron/env-config.js", - "build-electron/external-urls.js" + "build-electron/external-urls.js", + "build-electron/config.js" ], "asarUnpack": [ "build/**/*"