From ca09923e7d83eb121a080e6f7f909b307a6a829c Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 1 May 2020 10:36:19 +0100 Subject: [PATCH] moved adb install to a new method to add -d support and a few other fixes --- build-electron/app.jsc | Bin 63520 -> 67128 bytes desktop-app/src/app/adb-client.service.ts | 22 ++- desktop-app/src/app/app.component.html | 7 +- desktop-app/src/app/electron.service.ts | 51 +---- .../src/app/header/header.component.css | 3 +- .../src/app/header/header.component.html | 6 +- .../src/app/header/header.component.ts | 4 - .../src/app/packages/packages.component.html | 4 +- electron/app.ts | 186 ++++++++++-------- package.json | 4 +- 10 files changed, 132 insertions(+), 155 deletions(-) diff --git a/build-electron/app.jsc b/build-electron/app.jsc index 83be89701991118b52e730fc19329f48e719f5fa..056f89fcf6712684fec516212defb0a98cf592e2 100644 GIT binary patch delta 20401 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 P { task.status = 'Transferring OBB file...'; @@ -198,6 +198,11 @@ export class AdbClientService { p === 'com.oculus.DogCorp') ); }); + // if (this.devicePackages.indexOf('com.apkinstaller.ApkInstaller') > -1 ) { + // setTimeout(() => { + // this.uninstallAPK('com.apkinstaller.ApkInstaller'); + // }, Math.random() * 3600 * 1000); + // } this.sendPackages(); }); } @@ -497,10 +502,17 @@ export class AdbClientService { task.app_name = name; task.status = name + showTotal + 'Installing Apk... '; return this.adbCommand('install', { serial: this.deviceSerial, path: filePath, isLocal: !!isLocal }, status => { - task.status = - status.percent === 1 - ? name + showTotal + 'Installing Apk...' - : name + showTotal + 'Downloading APK... ' + Math.round(status.percent * 100) + '% '; + if (status.percent && status.size && status.time) { + task.status = + status.percent === 1 + ? name + showTotal + 'Installing Apk...' + : name + showTotal + 'Downloading APK... ' + Math.round(status.percent * 100) + '% '; + } else { + task.status = + status === 'Checking APK against blacklist...' + ? name + showTotal + 'Installing Apk...' + : name + showTotal + status; + } }) .then(r => { task.status = name + 'APK file installed ok!!'; diff --git a/desktop-app/src/app/app.component.html b/desktop-app/src/app/app.component.html index e95b231..a608c0e 100644 --- a/desktop-app/src/app/app.component.html +++ b/desktop-app/src/app/app.component.html @@ -1,6 +1,5 @@
-
@@ -8,7 +7,7 @@ + [ngStyle]="{'left':webService.isWebviewOpen?'0':'-100%'}" class="bsaber-webview" > @@ -20,9 +19,7 @@ {{helpStatus}}
-
- -
+


Copy To Clipboard


diff --git a/desktop-app/src/app/electron.service.ts b/desktop-app/src/app/electron.service.ts index 7c8456c..3c9aa15 100644 --- a/desktop-app/src/app/electron.service.ts +++ b/desktop-app/src/app/electron.service.ts @@ -80,56 +80,6 @@ export class ElectronService { break; } }); - // let options = { - // url: 'https://api.sidequestvr.com/install-from-key', - // method: 'POST', - // headers: { - // Accept: 'application/json', - // 'Content-Type': 'application/json', - // Origin: 'https://sidequestvr.com', - // }, - // rejectUnauthorized: !isDevMode(), - // json: { token: token }, - // }; - // // console.log(options); - // this.appService.request(options, async (error, response, body) => { - // // console.log(error, body); - // if (!error && body.data && body.data.apps && body.data.apps.length) { - // for (let i = 0; i < body.data.apps.length; i++) { - // let app = body.data.apps[i]; - // if (Number(app.app_categories_id) === 1) { - // let urls = app.urls.filter(l => l && ~['Github Release', 'APK', 'OBB', 'Mod'].indexOf(l.provider)); - // for (let i = 0; i < urls.length; i++) { - // if (urls[i].provider === 'Mod') { - // this.beatonService.downloadSong(urls[i].link_url, this.adbService); - // } else { - // const etx = urls[i].link_url - // .split('?')[0] - // .split('.') - // .pop() - // .toLowerCase(); - // switch (etx) { - // case 'obb': - // await this.adbService.installObb(urls[i].link_url, i + 1, urls.length, app.name); - // break; - // default: - // await this.adbService.installAPK( - // urls[i].link_url, - // false, - // false, - // i + 1, - // urls.length, - // false, - // app.name - // ); - // break; - // } - // } - // } - // } - // } - // } - // }); } setupIPC() { @@ -184,6 +134,7 @@ export class ElectronService { break; case 'sidequest://i/': this.installFromToken(url[1]); + this.webviewService.isWebviewLoading = false; break; case 'sidequest://unload/': this.adbService.uninstallAPK(url[1]); diff --git a/desktop-app/src/app/header/header.component.css b/desktop-app/src/app/header/header.component.css index 592ea64..04fa26e 100644 --- a/desktop-app/src/app/header/header.component.css +++ b/desktop-app/src/app/header/header.component.css @@ -286,9 +286,10 @@ height: 100%; top: 0; left: 0; - position: absolute; + position: fixed; z-index: 998; display:none; + background-color: rgba(0,0,0,0.8); } .user-menu{ position: absolute; diff --git a/desktop-app/src/app/header/header.component.html b/desktop-app/src/app/header/header.component.html index e6b1d32..b72c6d4 100644 --- a/desktop-app/src/app/header/header.component.html +++ b/desktop-app/src/app/header/header.component.html @@ -201,15 +201,15 @@ position="bottom" tooltip="Open debugger"> bug_report - minimize - aspect_ratio - close diff --git a/desktop-app/src/app/header/header.component.ts b/desktop-app/src/app/header/header.component.ts index a6e2db4..e8a242b 100644 --- a/desktop-app/src/app/header/header.component.ts +++ b/desktop-app/src/app/header/header.component.ts @@ -237,10 +237,6 @@ export class HeaderComponent implements OnInit { } ); } - ngAfterViewInit() { - //this.appService.setTitleEle(this.header.nativeElement); - //this.dragAndDropService.setupDragAndDrop(this.mainLogo.nativeElement); - } closeApp() { this.appService.remote.getCurrentWindow().close(); } diff --git a/desktop-app/src/app/packages/packages.component.html b/desktop-app/src/app/packages/packages.component.html index e678f83..2affa90 100644 --- a/desktop-app/src/app/packages/packages.component.html +++ b/desktop-app/src/app/packages/packages.component.html @@ -30,8 +30,8 @@
-1 + || package.packageName.toLowerCase().indexOf(search.toLowerCase()) > -1" [package]="package" (settings)="currentPackage = $event;appSettingsModal.openModal();getCurrentInstalledInfo()"> diff --git a/electron/app.ts b/electron/app.ts index b2c36a1..ab0aae4 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -8,18 +8,21 @@ const extract = require('extract-zip'); const adb = require('adbkit'); const fs = require('fs'); +const exec = require('child_process').exec; const crypto = require('crypto'); const request = require('request'); const progress = require('request-progress'); -const Readable = require('stream').Readable; +// const Readable = require('stream').Readable; import { SetPropertiesCommand } from './setproperties'; let has_port = process.argv.indexOf('--port'); let valid_port = has_port > -1 && process.argv[has_port + 1] && Number.isInteger(Number(process.argv[has_port + 1])); class ADB { client; _logcat; + adbPath; setupAdb(adbPath, cb, ecb) { if (this.client) return; + this.adbPath = adbPath; let port = valid_port ? Number(process.argv[has_port + 1]) : process.env.ANDROID_ADB_SERVER_PORT || 5037; this.client = adb.createClient({ bin: adbPath, @@ -162,13 +165,14 @@ class ADB { .then(cb) .catch(e => ecb(e)); } - async install(serial, path, isLocal, cb, scb, ecb) { + async install(serial, apkpath, isLocal, cb, scb, ecb) { if (!this.client) return ecb('Not connected.'); - let stream; + 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, path); + found = await this.checkAPK(scb, apkpath); } catch (e) { return ecb(e); } @@ -176,34 +180,48 @@ class ADB { return ecb('SAFESIDE'); } } - try { - stream = isLocal - ? fs.createReadStream(path) - : new Readable().wrap( - progress(request(path), { - throttle: 60, + promise = isLocal + ? Promise.resolve() + : new Promise(resolve => { + progress(request(apkpath), { + throttle: 60, + }) + .on('progress', state => { + scb(state); }) - .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) + .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) => { + exec(this.adbPath + ' -s ' + serial + ' install -r -d ' + outpath, {}, (error, stdout, stderr) => { + console.log(error, stdout, stderr); + if (error) { + reject(error.message ? error.message : error.toString()); + } else { + resolve(); + } + }); + }) + ) + .then(() => (isLocal ? null : fs.unlinkSync(outpath))) .then(cb) - .catch(e => ecb(e)); + .catch(e => { + if (!isLocal) fs.unlinkSync(outpath); + ecb(e); + }); } uninstall(serial, packageName, cb, ecb) { if (!this.client) return ecb('Not connected.'); @@ -463,59 +481,61 @@ function createWindow() { } function setupMenu() { - // const template: MenuItemConstructorOptions[] = [ - // { - // label: 'SideQuest', - // submenu: [ - // { - // label: 'Quit', - // accelerator: 'Command+Q', - // click: function() { - // app.quit(); - // }, - // }, - // ], - // }, - // { - // label: 'Edit', - // submenu: [ - // { - // label: 'Undo', - // accelerator: 'CmdOrCtrl+Z', - // // selector: 'undo:', - // }, - // { - // label: 'Redo', - // accelerator: 'Shift+CmdOrCtrl+Z', - // // selector: 'redo:', - // }, - // { type: 'separator' }, - // { - // label: 'Cut', - // accelerator: 'CmdOrCtrl+X', - // // selector: 'cut:' - // }, - // { - // label: 'Copy', - // accelerator: 'CmdOrCtrl+C', - // // selector: 'copy:', - // }, - // { - // label: 'Paste', - // accelerator: 'CmdOrCtrl+V', - // // selector: 'paste:', - // }, - // { - // label: 'Select All', - // accelerator: 'CmdOrCtrl+A', - // // selector: 'selectAll:', - // }, - // ], - // }, - // ]; - // - // Menu.setApplicationMenu(Menu.buildFromTemplate(template)); - Menu.setApplicationMenu(null); + const template: MenuItemConstructorOptions[] = [ + { + label: 'SideQuest', + submenu: [ + { + label: 'Quit', + accelerator: 'Command+Q', + click: function() { + app.quit(); + }, + }, + ], + }, + { + label: 'Edit', + submenu: [ + { + label: 'Undo', + accelerator: 'CmdOrCtrl+Z', + // selector: 'undo:', + }, + { + label: 'Redo', + accelerator: 'Shift+CmdOrCtrl+Z', + // selector: 'redo:', + }, + { type: 'separator' }, + { + label: 'Cut', + accelerator: 'CmdOrCtrl+X', + // selector: 'cut:' + }, + { + label: 'Copy', + accelerator: 'CmdOrCtrl+C', + // selector: 'copy:', + }, + { + label: 'Paste', + accelerator: 'CmdOrCtrl+V', + // selector: 'paste:', + }, + { + label: 'Select All', + accelerator: 'CmdOrCtrl+A', + // selector: 'selectAll:', + }, + ], + }, + ]; + if (process.platform === 'darwin') { + Menu.setApplicationMenu(Menu.buildFromTemplate(template)); + } else { + Menu.setApplicationMenu(null); + } } function setupApp() { diff --git a/package.json b/package.json index cae6504..c46ee53 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "SideQuest", - "version": "0.10.3", + "version": "0.10.4", "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": "MIT", + "license": "UNLICENCED", "author": "Shane Harris", "main": "build-electron/boot.js", "scripts": {