diff --git a/desktop-app/src/app/app.component.html b/desktop-app/src/app/app.component.html index 2886e7b..1947bd5 100644 --- a/desktop-app/src/app/app.component.html +++ b/desktop-app/src/app/app.component.html @@ -5,7 +5,7 @@ - + diff --git a/desktop-app/src/app/webview.service.ts b/desktop-app/src/app/webview.service.ts index 5837d39..b79075b 100644 --- a/desktop-app/src/app/webview.service.ts +++ b/desktop-app/src/app/webview.service.ts @@ -1,6 +1,7 @@ import { Injectable, isDevMode } from '@angular/core'; import { AppService } from './app.service'; import { environment } from '../environments/environment'; +import { OPEN_IN_SYSTEM_BROWSER_DOMAINS } from '../../../electron/external-urls'; @Injectable({ providedIn: 'root', @@ -45,12 +46,22 @@ export class WebviewService { .bsaber-tooltip.-sidequest-remove::after { content: "Remove Custom Level"; }`; + let ses = this.appService.remote.session.fromPartition('webview-partition'); + ses.webRequest.onBeforeRequest((details, callback) => { + let url = details.url; + const extUrl = new URL(url).host.toLowerCase(); + if (OPEN_IN_SYSTEM_BROWSER_DOMAINS.includes(extUrl)) { + this.appService.electron.shell.openExternal(url); + callback({ cancel: true }); + } else { + callback({}); + } + }); this.webView.addEventListener('did-start-loading', e => { - //this.currentAddress = this.webView.getURL(); this.isWebviewLoading = true; this.webView.insertCSS(customCss); }); - this.webView.addEventListener('did-navigate-in-page', () => { + this.webView.addEventListener('did-navigate-in-page', e => { this.currentAddress = this.webView.getURL(); }); this.webView.addEventListener('did-stop-loading', async e => { diff --git a/electron/app.ts b/electron/app.ts index 2c51d32..95e6ea7 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -16,16 +16,9 @@ const crypto = require('crypto'); const request = require('request'); const progress = require('request-progress'); -const OPEN_IN_SYSTEM_BROWSER_DOMAINS = [ - 'www.oculus.com', - 'oculus.com', - 'facebook.com', - 'www.facebook.com', - 'twitter.com', - 'www.twitter.com', -]; // const Readable = require('stream').Readable; import { SetPropertiesCommand } from './setproperties'; +import { OPEN_IN_SYSTEM_BROWSER_DOMAINS } from './external-urls'; 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 { @@ -533,6 +526,7 @@ function createWindow() { mainWindow.webContents.on('did-fail-load', () => mainWindow.loadURL(mainWindow.webContents.getURL())); addWindowDownloadHandler(mainWindow); const handleOpenWindow: (details: HandlerDetails) => { action: 'allow' } | { action: 'deny' } = e => { + console.log(e); if (!e.postBody) { try { const extUrl = new URL(e.url).host.toLowerCase(); @@ -540,7 +534,10 @@ function createWindow() { shell.openExternal(e.url); return { action: 'deny' }; } - } catch {} + } catch (e) { + console.log(e); + return { action: 'allow' }; + } } return { action: 'allow' }; }; diff --git a/electron/external-urls.ts b/electron/external-urls.ts new file mode 100644 index 0000000..b58d0ce --- /dev/null +++ b/electron/external-urls.ts @@ -0,0 +1,8 @@ +export const OPEN_IN_SYSTEM_BROWSER_DOMAINS = [ + 'www.oculus.com', + 'oculus.com', + 'facebook.com', + 'www.facebook.com', + 'twitter.com', + 'www.twitter.com', +];