moved hash check and token download to main thread

This commit is contained in:
Shane Harris
2020-08-17 13:31:48 +01:00
committed by Your Name
parent ef163b2335
commit 7aab6ec072
6 changed files with 621 additions and 245 deletions
+63 -49
View File
@@ -65,57 +65,71 @@ export class ElectronService {
}
}
installFromToken(token) {
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;
}
}
}
}
}
async installFromToken(token) {
let res = await this.adbService.adbCommand('installFromToken', { token });
res.forEach((l, i) => {
switch (l.type) {
case 'Mod':
this.beatonService.downloadSong(l.url, this.adbService);
break;
case 'APK':
this.adbService.installAPK(l.url, false, false, i + 1, res.length, false, l.name);
break;
case 'OBB':
this.adbService.installObb(l.url, i + 1, res.length, l.name);
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() {