diff --git a/.gitignore b/.gitignore index 3b07d0c..b0a161a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,11 +33,10 @@ jspm_packages/ .env.test build/app +build/platform-tools build-electron -!build-electron/*.jsc .idea .vscode -platform-tools dist /app desktop-app/sources/*.json diff --git a/build-electron/app.jsc b/build-electron/app.jsc deleted file mode 100644 index f13389a..0000000 Binary files a/build-electron/app.jsc and /dev/null differ diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index c1a97cc..86b9000 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -347,7 +347,7 @@ export class AdbClientService { } async setupAdb() { if (!this.isAdbDownloaded()) { - await this.downloadTools(); + this.appService.seedPlatformTools(); } this.appService.electron.ipcRenderer.on('adb-command', (event, arg: any) => { if (this.adbResolves[arg.uuid]) { diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts index c895eb7..21e85ef 100644 --- a/desktop-app/src/app/app.service.ts +++ b/desktop-app/src/app/app.service.ts @@ -225,13 +225,19 @@ export class AppService { break; } } - seedSources() { - if (!this.fs.existsSync(this.path.join(this.appData, 'sources.txt'))) { - let sourcesPath = this.path.join(__dirname, 'assets', 'sources.txt'); + seedPlatformTools() { + if (!this.fs.existsSync(this.path.join(this.appData, 'platform-tools'))) { + let sourcesPath = this.path.join(__dirname, 'platform-tools'); if (!this.fs.existsSync(sourcesPath)) { - sourcesPath = this.path.join(process.cwd(), 'desktop-app', 'src', 'assets', 'sources.txt'); + sourcesPath = this.path.join(process.cwd(), 'build', 'platform-tools'); } - this.fs.createReadStream(sourcesPath).pipe(this.fs.createWriteStream(this.path.join(this.appData, 'sources.txt'))); + this.fs.readdir(sourcesPath, (err, files) => { + files.forEach(file => { + this.fs + .createReadStream(this.path.join(sourcesPath, file)) + .pipe(this.fs.createWriteStream(this.path.join(this.appData, file))); + }); + }); } } makeFolders() { diff --git a/desktop-app/src/app/safe-side.service.ts b/desktop-app/src/app/safe-side.service.ts index 09b5b2f..849f755 100644 --- a/desktop-app/src/app/safe-side.service.ts +++ b/desktop-app/src/app/safe-side.service.ts @@ -1,9 +1,5 @@ import { Injectable } from '@angular/core'; -interface CheckSubmissionResponse { - found: boolean; -} - @Injectable({ providedIn: 'root', }) diff --git a/electron/boot.ts b/electron/boot.ts index 2124737..c455133 100644 --- a/electron/boot.ts +++ b/electron/boot.ts @@ -9,5 +9,8 @@ v8.setFlagsFromString('--no-lazy'); if (!fs.existsSync(__dirname + '/app.jsc') || process.env.NODE_ENV === 'dev') { bytenode.compileFile(__dirname + '/app.js', __dirname + '/app.jsc'); } - -require('./app.jsc'); +if (process.argv.indexOf('gen-code') > -1) { + require('electron').app.quit(); +} else { + require('./app.jsc'); +} diff --git a/electron/download.ts b/electron/download.ts index c4aaaaa..7e00a46 100644 --- a/electron/download.ts +++ b/electron/download.ts @@ -1,5 +1,6 @@ const https = require('https'); const http = require('http'); +const _fs = require('fs'); const { basename } = require('path'); const Url = require('url'); @@ -10,7 +11,7 @@ module.exports = function(url, path, progress) { if (!path) { path = basename(uri.path); } - const file = fs.createWriteStream(path); + const file = _fs.createWriteStream(path); function get(url, callback) { let request = (uri.protocol === 'https:' ? https : http).get(url, function(response) { diff --git a/electron/platform-tools.ts b/electron/platform-tools.ts new file mode 100644 index 0000000..9e35df1 --- /dev/null +++ b/electron/platform-tools.ts @@ -0,0 +1,60 @@ +const os = require('os'); +const path = require('path'); +const __fs = require('fs'); +const extract = require('extract-zip'); +const download = require('./download'); +const url = 'https://dl.google.com/android/repository/platform-tools-latest-'; +let downloadUrl; +switch (os.platform()) { + case 'win32': + downloadUrl = url + 'windows.zip'; + break; + case 'darwin': + downloadUrl = url + 'darwin.zip'; + break; + case 'linux': + downloadUrl = url + 'linux.zip'; + break; +} +console.log('Platform: ' + os.platform()); +let outputPath = path.join(__dirname, '..', 'build', 'platform-tools'); +if (!__fs.existsSync(outputPath)) { + __fs.mkdir(outputPath, { recursive: true }, err => { + if (err) console.log(err); + }); + console.log('Downloading platform tools...'); + download(downloadUrl, path.join(__dirname, 'platform-tools.zip'), stats => { + // console.log(stats); + }) + .then(() => { + console.log('Downloaded platform tools.'); + console.log('Extracting platform tools...'); + extract( + path.join(__dirname, 'platform-tools.zip'), + { + dir: __dirname, + onEntry: entry => { + let stats = entry.fileName; + // console.log(stats); + }, + }, + err => { + if (err) console.log(err); + console.log('Extracted platform tools.'); + __fs.readdir(path.join(__dirname, 'platform-tools'), (err, files) => { + files.forEach(file => { + let curPath = path.join(__dirname, 'platform-tools', file); + if (!__fs.lstatSync(curPath).isDirectory()) { + __fs.rename(curPath, path.join(outputPath, file), function(err) { + if (err) console.log(err); + }); + } + }); + }); + } + ); + }) + .catch(e => { + console.log(e); + }); +} diff --git a/package.json b/package.json index e81c3cc..80d5fba 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,13 @@ "concurrently": "concurrently", "start": "concurrently \"yarn electron-build && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev electron .\" \"cd desktop-app && ng serve --port 4205\"", "postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install", - "dist": "yarn electron-build && yarn app-build && electron-builder", + "dist": "yarn platform-tools && yarn electron-gen && yarn electron-build && yarn app-build && electron-builder", "angular": "cd desktop-app && ng serve --port 4205", - "electron-dev": "cross-env NODE_ENV=dev electron .", + "electron-dev": "yarn platform-tools && cross-env NODE_ENV=dev electron .", + "electron-gen": "yarn electron-dev gen-code", "electron": "yarn electron-build && yarn electron-dev", "app-build": "cd desktop-app && ng build --prod --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" },