apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-05-01 03:46:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor(desktop): extract deep link handling into modules/deep-links.ts

Browse source
This commit is contained in:
CREDO23 2026-03-20 19:55:44 +02:00
parent 95c4a674be
commit 35da1cf1b4
2 changed files with 74 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

71
surfsense_desktop/src/main.ts
View file

@ -1,16 +1,17 @@
import { app, BrowserWindow, shell, ipcMain, dialog, Menu } from 'electron'; import { app, BrowserWindow, shell, ipcMain, dialog, Menu } from 'electron';
import path from 'path';
import { autoUpdater } from 'electron-updater'; import { autoUpdater } from 'electron-updater';
import { registerGlobalErrorHandlers, showErrorDialog } from './modules/errors'; import { registerGlobalErrorHandlers, showErrorDialog } from './modules/errors';
import { startNextServer, getServerPort } from './modules/server'; import { startNextServer } from './modules/server';
import { createMainWindow, getMainWindow } from './modules/window'; import { createMainWindow } from './modules/window';
import { setupDeepLinks, handlePendingDeepLink } from './modules/deep-links';
registerGlobalErrorHandlers(); registerGlobalErrorHandlers();
const isDev = !app.isPackaged; if (!setupDeepLinks()) {
let deepLinkUrl: string | null = null; app.quit();
}
const PROTOCOL = 'surfsense'; const isDev = !app.isPackaged;
// IPC handlers // IPC handlers
ipcMain.on('open-external', (_event, url: string) => { ipcMain.on('open-external', (_event, url: string) => {
@ -28,58 +29,6 @@ ipcMain.handle('get-app-version', () => {
return app.getVersion(); return app.getVersion();
}); });
// Deep link handling
function handleDeepLink(url: string) {
if (!url.startsWith(`${PROTOCOL}://`)) return;
deepLinkUrl = url;
const win = getMainWindow();
if (!win) return;
const parsed = new URL(url);
if (parsed.hostname === 'auth' && parsed.pathname === '/callback') {
const params = parsed.searchParams.toString();
win.loadURL(`http://localhost:${getServerPort()}/auth/callback?${params}`);
}
win.show();
win.focus();
}
// Single instance lock — second instance passes deep link to first
const gotTheLock = app.requestSingleInstanceLock();
if (!gotTheLock) {
app.quit();
} else {
app.on('second-instance', (_event, argv) => {
// Windows/Linux: deep link URL is in argv
const url = argv.find((arg) => arg.startsWith(`${PROTOCOL}://`));
if (url) handleDeepLink(url);
const win = getMainWindow();
if (win) {
if (win.isMinimized()) win.restore();
win.focus();
}
});
}
// macOS: deep link arrives via open-url event
app.on('open-url', (event, url) => {
event.preventDefault();
handleDeepLink(url);
});
// Register surfsense:// protocol
if (process.defaultApp) {
if (process.argv.length >= 2) {
app.setAsDefaultProtocolClient(PROTOCOL, process.execPath, [path.resolve(process.argv[1])]);
}
} else {
app.setAsDefaultProtocolClient(PROTOCOL);
}
function setupAutoUpdater() { function setupAutoUpdater() {
if (isDev) return; if (isDev) return;
@ -136,11 +85,7 @@ app.whenReady().then(async () => {
createMainWindow(); createMainWindow();
setupAutoUpdater(); setupAutoUpdater();
// If a deep link was received before the window was ready, handle it now handlePendingDeepLink();
if (deepLinkUrl) {
handleDeepLink(deepLinkUrl);
deepLinkUrl = null;
}
app.on('activate', () => { app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) { if (BrowserWindow.getAllWindows().length === 0) {

66
surfsense_desktop/src/modules/deep-links.ts Normal file
View file

@ -0,0 +1,66 @@
import { app } from 'electron';
import path from 'path';
import { getMainWindow } from './window';
import { getServerPort } from './server';
const PROTOCOL = 'surfsense';
let deepLinkUrl: string | null = null;
function handleDeepLink(url: string) {
if (!url.startsWith(`${PROTOCOL}://`)) return;
deepLinkUrl = url;
const win = getMainWindow();
if (!win) return;
const parsed = new URL(url);
if (parsed.hostname === 'auth' && parsed.pathname === '/callback') {
const params = parsed.searchParams.toString();
win.loadURL(`http://localhost:${getServerPort()}/auth/callback?${params}`);
}
win.show();
win.focus();
}
export function setupDeepLinks(): boolean {
const gotTheLock = app.requestSingleInstanceLock();
if (!gotTheLock) {
return false;
}
app.on('second-instance', (_event, argv) => {
const url = argv.find((arg) => arg.startsWith(`${PROTOCOL}://`));
if (url) handleDeepLink(url);
const win = getMainWindow();
if (win) {
if (win.isMinimized()) win.restore();
win.focus();
}
});
app.on('open-url', (event, url) => {
event.preventDefault();
handleDeepLink(url);
});
if (process.defaultApp) {
if (process.argv.length >= 2) {
app.setAsDefaultProtocolClient(PROTOCOL, process.execPath, [path.resolve(process.argv[1])]);
}
} else {
app.setAsDefaultProtocolClient(PROTOCOL);
}
return true;
}
export function handlePendingDeepLink(): void {
if (deepLinkUrl) {
handleDeepLink(deepLinkUrl);
deepLinkUrl = null;
}
}