From 77d1d9ba26dd3e4e17ca196637076c279ae8afc3 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 27 May 2020 18:49:21 +0100 Subject: [PATCH] a few bug fixes and improved on the adb logcat interface --- build-electron/app.jsc | Bin 67104 -> 65192 bytes build/uninstaller.nsh | 14 ++ desktop-app/package.json | 1 + desktop-app/src/app/app.module.ts | 3 +- desktop-app/src/app/drag-and-drop.service.ts | 15 +- .../src/app/header/header.component.css | 10 +- .../src/app/header/header.component.html | 31 ++-- .../src/app/header/header.component.ts | 51 ++++++- .../src/app/packages/packages.component.html | 10 +- desktop-app/yarn.lock | 19 +++ electron/app.ts | 134 ++++++++++++------ package.json | 7 +- 12 files changed, 223 insertions(+), 72 deletions(-) create mode 100644 build/uninstaller.nsh diff --git a/build-electron/app.jsc b/build-electron/app.jsc index 972bde00b66d78fc24a8f6e166228e49a1b5d34d..3241528adcedc3ba5b113ac9f7adccb564a61500 100644 GIT binary patch delta 19937 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 { + this.statusService.showStatus(_e.toString(), true); + }); } + // if (this.appService.path.extname(filepath) === '.apk') { + // await this.adbService.installAPK(filepath, true); + // } else { + // await this.adbService.installLocalObb(filepath); + // } } else { this.statusService.showStatus('Unrecognised File: ' + filepath, true); } diff --git a/desktop-app/src/app/header/header.component.css b/desktop-app/src/app/header/header.component.css index 04fa26e..0bb5c9b 100644 --- a/desktop-app/src/app/header/header.component.css +++ b/desktop-app/src/app/header/header.component.css @@ -67,10 +67,18 @@ height: 90px; position:absolute; top: 55px; - left: 20px; + left: 3.5em; transition: 0.35s; } +virtual-scroller{ + width: 100%; + height: 400px; +} +.child-item{ + min-height: 20px; + width: 100%; +} #nav-mobile{ margin-left: 60px; } diff --git a/desktop-app/src/app/header/header.component.html b/desktop-app/src/app/header/header.component.html index b72c6d4..c8e9b5d 100644 --- a/desktop-app/src/app/header/header.component.html +++ b/desktop-app/src/app/header/header.component.html @@ -353,27 +353,35 @@ - - + + + +

ADB Logcat

Select your options and click start to begin receiving logcat messages. -

+
{{saveLogcatPath ? 'Saving to: ' + appService.path.join(saveLogcatPath,'logcat.log') : ''}} + + +
+
{{isStarted ? 'Waiting for messages...' : 'Click start to begin streaming logcat messages.'}}
-
-
-
{{logcat.date}}: {{priorities[logcat.priority]}}
-
{{logcat.tid}}/{{logcat.pid}} {{logcat.tag}}
-
+ +
+
+
{{logcat.date}}: {{priorities[logcat.priority]}}
+
{{logcat.tid}}/{{logcat.pid}} {{logcat.tag}}
+
+
-
+
@@ -412,7 +420,8 @@ WARNING: We have stopped this install because it may may harm your device.

- If you continue with the install you risk the following:

+ If you think this has happened in error, please contact us on Discord with a link to the apk file.

+ We have protected you from:

- Causing physical damage to your headset.
- Having your personal information stolen ( including tracking your movments in VR )
- Being banned from the Oculus platform.
diff --git a/desktop-app/src/app/header/header.component.ts b/desktop-app/src/app/header/header.component.ts index e8a242b..6645e67 100644 --- a/desktop-app/src/app/header/header.component.ts +++ b/desktop-app/src/app/header/header.component.ts @@ -44,6 +44,7 @@ export class HeaderComponent implements OnInit { replaceText: ReplaceText[] = []; adbCommandToRun: string; osPlatform: string; + saveLogcatPath: string; favourites: { browserFavourites: FavouriteItem[]; fileFavourites: FavouriteItem[]; @@ -192,16 +193,62 @@ export class HeaderComponent implements OnInit { if (this.logcatSearch) { if (!!~stats.message.indexOf(this.logcatSearch) || !!~stats.tag.indexOf(this.logcatSearch)) { this.currentLogCat.unshift(stats); + this.attemptToSaveLogcat(stats); } } else { this.currentLogCat.unshift(stats); + this.attemptToSaveLogcat(stats); } - if (this.currentLogCat.length > 200) { - this.currentLogCat.length = 200; + if (this.currentLogCat.length > 4000) { + this.currentLogCat.length = 4000; } } ); } + cancelLogcatOutput() { + this.saveLogcatPath = null; + } + selectLogcatOutput() { + this.appService.electron.remote.dialog.showOpenDialog( + { + properties: ['openDirectory'], + defaultPath: this.adbService.savePath, + }, + files => { + files.forEach(filepath => { + this.saveLogcatPath = filepath; + }); + } + ); + } + clearLogcatFile() { + if (this.saveLogcatPath) { + if (this.appService.fs.existsSync(this.saveLogcatPath)) { + this.appService.fs.writeFile(this.appService.path.join(this.saveLogcatPath, 'logcat.log'), '', () => {}); + } + } + } + attemptToSaveLogcat(logcat) { + if (this.saveLogcatPath) { + if (this.appService.fs.existsSync(this.saveLogcatPath)) { + this.appService.fs.appendFile( + this.appService.path.join(this.saveLogcatPath, 'logcat.log'), + logcat.date + + ':' + + this.priorities[logcat.priority] + + logcat.tid + + '/' + + logcat.pid + + ' ' + + logcat.tag + + '\n' + + logcat.message + + '\n', + () => {} + ); + } + } + } stopLogcat() { this.adbService.adbCommand('endLogcat'); diff --git a/desktop-app/src/app/packages/packages.component.html b/desktop-app/src/app/packages/packages.component.html index 2affa90..8d1fa6a 100644 --- a/desktop-app/src/app/packages/packages.component.html +++ b/desktop-app/src/app/packages/packages.component.html @@ -59,7 +59,7 @@
Version: {{currentPackage.versionCode}}


Game Data Backups

- Backup data files from your SD Card for this app/game.

+ Backup data files from your SD Card for this app/game. This will attempt to save game data and OBB files for the game from the SD Card and not the internal storage. Does not work for all games.

Backup Game Data

@@ -79,9 +79,7 @@

APK Backups

Backup your APK file from your device.

Backup APK File - Open Backups

+ (click)="backupApk(currentPackage.package.packageName)">Backup APK File

Force Close App

Clear App Data

Uninstall App

+ Open Backups -

+



Permissions

diff --git a/desktop-app/yarn.lock b/desktop-app/yarn.lock index 85ea4ac..9de3179 100644 --- a/desktop-app/yarn.lock +++ b/desktop-app/yarn.lock @@ -824,6 +824,11 @@ version "1.4.2" resolved "https://registry.yarnpkg.com/@simonwep/pickr/-/pickr-1.4.2.tgz#ed702a52c5b643fe61f5beddb3c68faa86eaeaa9" +"@tweenjs/tween.js@17.4.0": + version "17.4.0" + resolved "https://registry.yarnpkg.com/@tweenjs/tween.js/-/tween.js-17.4.0.tgz#2e9ab3f2111906b30dfe1ef3259a9781dd211d35" + integrity sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg== + "@types/dragula@^2.1.34": version "2.1.34" resolved "https://registry.yarnpkg.com/@types/dragula/-/dragula-2.1.34.tgz#48ecf8627860e6179efc222dd5390b37dbd42d9d" @@ -895,6 +900,11 @@ version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" +"@types/tween.js@17.2.0": + version "17.2.0" + resolved "https://registry.yarnpkg.com/@types/tween.js/-/tween.js-17.2.0.tgz#25f98311daecb165ab91ee2cd7f17a9b1e6cc30c" + integrity sha512-mOsqurEtFEzwgkVc/jDVE2XrjZBYTbrmDUyCr9GXmnfc6q5otokxFtKvSY/B21zgz9LVRIvRTawKczjKi57wrA== + "@types/webpack-sources@^0.1.5": version "0.1.5" resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92" @@ -4656,6 +4666,15 @@ ngx-materialize@^6.1.3: materialize-css "^0.100.2" tslib "^1.9.0" +ngx-virtual-scroller@3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/ngx-virtual-scroller/-/ngx-virtual-scroller-3.0.3.tgz#904b2f0d9cddc5574518ddbe3ffbb5ba91d3d81d" + integrity sha512-00au5zpcPMzbci9VmM9QlOT6ZQ+NqgpWaXsM2Y7dg6SSlCDcFMW8nMxoMsogP2b2mrBLpIIEB91nVtwLnwWs4A== + dependencies: + "@tweenjs/tween.js" "17.4.0" + "@types/tween.js" "17.2.0" + tslib "^1.9.0" + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" diff --git a/electron/app.ts b/electron/app.ts index f4138f3..d85c0c9 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -6,6 +6,7 @@ const { autoUpdater } = require('electron-updater'); const download = require('./download'); const extract = require('extract-zip'); +const Readable = require('stream').Readable; const adb = require('adbkit'); const fs = require('fs'); const exec = require('child_process').exec; @@ -167,8 +168,6 @@ class ADB { } async install(serial, apkpath, isLocal, cb, scb, ecb) { if (!this.client) return ecb('Not connected.'); - let outpath = isLocal ? apkpath : path.join(app.getPath('appData'), 'SideQuest', new Date().getTime() + '.apk'); - let promise; if (isLocal) { let found; try { @@ -180,52 +179,95 @@ class ADB { return ecb('SAFESIDE'); } } - promise = isLocal - ? Promise.resolve() - : new Promise(resolve => { - progress(request(apkpath), { - throttle: 60, - }) - .on('progress', state => { - scb(state); + let stream; + try { + stream = isLocal + ? fs.createReadStream(apkpath) + : new Readable().wrap( + progress(request(apkpath), { + throttle: 60, }) - .on('end', () => { - scb({ - percent: 1, - size: 1, - time: 1, - }); - resolve(); - }) - .on('error', () => { - ecb('Download error! Please try again!'); - }) - .pipe(fs.createWriteStream(outpath)); - }); - promise - .then( - () => - new Promise((resolve, reject) => { - console.log('"' + this.adbPath + '" -s ' + serial + ' install -r -d "' + outpath + '"'); - exec( - '"' + this.adbPath + '" -s ' + serial + ' install -r -d "' + outpath + '"', - {}, - (error, stdout, stderr) => { - if (error) { - reject(error.message ? error.message : error.toString()); - } else { - resolve(); - } - } - ); - }) - ) - .then(() => (isLocal ? null : fs.unlinkSync(outpath))) + .on('progress', state => { + scb(state); + }) + .on('end', () => { + scb({ + percent: 1, + }); + }) + ); + } catch (e) { + const isInvalidURI = e && typeof e.message === 'string' && e.message.startsWith('Invalid URI "'); + if (isInvalidURI) { + return ecb("Can't download file. Invalid URL:"); + } else { + throw e; + } + } + this.client + .install(serial, stream) .then(cb) - .catch(e => { - if (!isLocal) fs.unlinkSync(outpath); - ecb(e); - }); + .catch(e => ecb(e)); + + // let outpath = isLocal ? apkpath : path.join(app.getPath('appData'), 'SideQuest', new Date().getTime() + '.apk'); + // let promise; + // if (isLocal) { + // let found; + // try { + // found = await this.checkAPK(scb, apkpath); + // } catch (e) { + // return ecb(e); + // } + // if (found) { + // return ecb('SAFESIDE'); + // } + // } + // promise = isLocal + // ? Promise.resolve() + // : new Promise(resolve => { + // progress(request(apkpath), { + // throttle: 60, + // }) + // .on('progress', state => { + // scb(state); + // }) + // .on('end', () => { + // scb({ + // percent: 1, + // size: 1, + // time: 1, + // }); + // resolve(); + // }) + // .on('error', () => { + // ecb('Download error! Please try again!'); + // }) + // .pipe(fs.createWriteStream(outpath)); + // }); + // promise + // .then( + // () => + // new Promise((resolve, reject) => { + // console.log('"' + this.adbPath + '" -s ' + serial + ' install -r -d "' + outpath + '"'); + // exec( + // '"' + this.adbPath + '" -s ' + serial + ' install -r -d "' + outpath + '"', + // {}, + // (error, stdout, stderr) => { + // if (error) { + // reject(error.message ? error.message : error.toString()); + // } else { + // resolve(); + // } + // } + // ); + // }) + // ) + // .then(() => (isLocal ? null : fs.unlinkSync(outpath))) + // .then(cb) + // .catch(e => { + // if (!isLocal) fs.unlinkSync(outpath); + // ecb(e); + // }); } uninstall(serial, packageName, cb, ecb) { if (!this.client) return ecb('Not connected.'); diff --git a/package.json b/package.json index 82bf39e..0fddcb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "SideQuest", - "version": "0.10.7", + "productName": "SideQuest", + "version": "0.10.8", "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/the-expanse/SideQuest.git", "license": "UNLICENCED", @@ -21,6 +22,7 @@ "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", @@ -48,7 +50,8 @@ "nsis": { "artifactName": "${productName} Setup ${version}-x64-${os}.${ext}", "oneClick": false, - "allowToChangeInstallationDirectory": true + "allowToChangeInstallationDirectory": true, + "include": "build/uninstaller.nsh" }, "files": [ "build/**/*",