revamp of most screens complete, status bar still needs to be completed

This commit is contained in:
Shane Harris
2022-07-30 10:07:26 +01:00
parent 6dc9b11368
commit 7e438b63c8
48 changed files with 1471 additions and 663 deletions
@@ -0,0 +1,184 @@
import { Component, OnInit } from '@angular/core';
import { AppService } from '../app.service';
import { AdbClientService } from '../adb-client.service';
const ADBErrors = {
INSTALL_FAILED_INSUFFICIENT_STORAGE: `Your headset does not have enough storage to install this app. Try removing some apps and trying again.`,
INSTALL_FAILED_USER_RESTRICTED: `The install was cancelled, please try again.`,
INSTALL_FAILED_NO_MATCHING_ABIS: `The install failed because the app is not compatible with this device, is this a supported VR headset?`,
INSTALL_FAILED_VERSION_DOWNGRADE: `The installed failed because the app is already installed and the installed version is newer than this version.`,
INSTALL_FAILED_VERIFICATION_FAILURE: `The installed failed because the app is possibly corrupt. Try restarting your headset just in-case.`,
INSTALL_FAILED_UPDATE_INCOMPATIBLE: `The installed failed because the new version is signed differently. Try uninstalling first.`,
INSTALL_FAILED_OLDER_SDK: `The installed failed because the app is intended for a newer version of Android than is on the headset.`,
INSTALL_FAILED_TEST_ONLY: `The installed failed because I'm a teapot.`,
INSTALL_FAILED_CONFLICTING_PROVIDER: `The installed failed for an unknown reason: CONFLICTING_PROVIDER`,
};
@Component({
selector: 'app-header-banner',
templateUrl: './header-banner.component.html',
styleUrls: ['./header-banner.component.scss'],
})
export class HeaderBannerComponent implements OnInit {
apkDownloadPath: string;
isLoading: boolean;
isOutOfDate: boolean;
// the latest available version of the in-headset app
private latestAppVersion: string | null = null;
constructor(private appService: AppService, public adb: AdbClientService) {}
ngOnInit() {
setInterval(() => {
this.getLatestApk();
}, 120000);
this.getLatestApk();
}
setOutOfDate() {
// any time we don't know the currently installed app version or we don't know the latest available version, treat it as up to date
if (this.latestAppVersion !== null && this.adb.appVersionCode !== null && this.adb.appVersionCode !== undefined) {
if (Number(this.adb.appVersionCode) < Number(this.latestAppVersion)) {
this.isOutOfDate = true;
return;
}
}
this.isOutOfDate = false;
}
async getLatestApk() {
const { apk, version } = await this.getExperimentalAPK();
if (apk.length) {
this.latestAppVersion = version;
this.setOutOfDate();
this.apkDownloadPath = apk[0].browser_download_url;
}
}
async getExperimentalAPK() {
const json = await fetch('https://api.github.com/repos/SideQuestVR/Lite/releases/latest');
const r = await json.json();
r.assets.reverse();
const apk = r.assets.filter(a => a.name.split('.').pop() === 'apk');
const versionFile = r.assets.filter(a => a.name.split('.').pop() === 'versionCode');
let version;
if (versionFile.length > 0) {
version = versionFile[0].name.split('.')[0];
}
return { apk, version };
}
async downloadExperimentalAPK() {
if (!this.apkDownloadPath) {
return Promise.reject('Could not download latest apk, please try again!');
}
console.log('downloadExperimentalAPK', this.apkDownloadPath);
return new Promise<void>((resolve, reject) => {
const requestOptions = {
timeout: 30000,
'User-Agent': this.appService.getUserAgent(),
};
this.appService
.request(this.apkDownloadPath, requestOptions)
.on('error', error => {
console.log(`Request Error ${error}`);
reject(error);
})
.on('progress', state => {})
.on('end', () => {
return resolve();
})
.pipe(this.appService.fs.createWriteStream(this.appService.path.join(this.appService.appData, 'experimental.apk')));
});
}
useBundledAPK() {
const sourcesPath = this.appService.getPlatformToolsSeedPath().replace('platform-tools', 'experimental.apk');
console.log(sourcesPath);
if (sourcesPath == null) {
console.error('Unable to locate experimental apk! Try reinstalling sidequest.');
throw new Error(`Unable to locate experimental apk! Try reinstalling sidequest.`);
}
this.appService.fs.copyFileSync(
this.appService.path.join(sourcesPath),
this.appService.path.join(this.appService.appData, 'experimental.apk')
);
}
async install() {
try {
const oldVersion = this.adb.appVersionCode || null;
let telemEvent;
if (this.isOutOfDate) {
telemEvent = 'upgrade';
} else if (this.adb.notInstalled) {
telemEvent = 'new';
} else {
telemEvent = 'reinstall';
}
// this.telemetry.telemetry({ event: 'install-sidequest-apk', installType: telemEvent, oldVersion });
this.isLoading = true;
try {
await this.getLatestApk();
await this.downloadExperimentalAPK();
} catch (e) {
// this.toast.show('Failed to download updated SQ apk, falling back to bundled apk. Are you online?', true);
console.warn(e);
this.useBundledAPK();
}
await this.adb.runAdbCommand('push "' + this.appService.apkPath + '" /data/local/tmp/sq.apk');
await this.adb.runAdbCommand('shell pm install -r /data/local/tmp/sq.apk');
// this.toast.show('SideQuest installed to headset!');
// this.showConfetti = true;
this.adb.appVersionCode = await this.adb.getAppVersion(true);
// this.telemetry.telemetry({ event: 'install-sidequest-apk-success',
// installType: telemEvent, oldVersion, newVersion: this.adb.appVersionCode || null});
// setTimeout(() => {
// this.showConfetti = false;
// }, 8000);
} catch (e) {
console.log(e);
await this.handleInstallError(e);
} finally {
this.isLoading = false;
}
}
async handleInstallError(e) {
let err;
for (const error of Object.keys(ADBErrors)) {
if (e.toString().includes(error)) {
err = error;
}
}
if (err) {
if (err === 'INSTALL_FAILED_VERSION_DOWNGRADE') {
await this.uninstall();
await this.install();
} else if (err === 'INSTALL_FAILED_UPDATE_INCOMPATIBLE') {
// TODO need to show a better error here and confirm with the user to uninstall first.
await this.uninstall();
await this.install();
} else {
// this.telemetry.telemetry({event: 'install-error-adb', errorMessage: ADBErrors[err]});
// this.toast.show(ADBErrors[err], true);
}
} else {
// this.telemetry.telemetry({event: 'install-error-unhandled', errorMessage: e.toString()});
// this.toast.show(e, true);
}
}
async uninstall() {
await this.adb.runAdbCommand('uninstall ' + this.adb.VR_APP_PACKAGE);
}
async userUninstall() {
try {
// await this.telemetry.telemetry({event: 'user-uninstall'});
await this.uninstall();
// await this.telemetry.telemetry({event: 'user-uninstall-success'});
} catch (e) {
// await this.telemetry.telemetry({event: 'user-uninstall-failed', error: e.toString()});
// this.toast.show(e, true);
}
}
}