Skip to content

enhance: open external links in the default browser #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2024
Merged

enhance: open external links in the default browser #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions electron/main.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { app, BrowserWindow } from 'electron';
import { app, shell, BrowserWindow } from 'electron';
import { getPort } from 'get-port-please';
import { startAppServer } from '../server/app.mjs';
import { join, dirname } from 'path';
Expand All @@ -22,7 +22,9 @@ function ensureDirExists(dir) {
}

async function startServer(isPackaged) {
const port = isPackaged ? await getPort({ portRange: [30000, 40000] }) : process.env.PORT || 3000;
const port = isPackaged
? await getPort({ portRange: [30000, 40000] })
: process.env.PORT || 3000;
const gptscriptBin = join(
isPackaged ? join(resourcesDir, 'app.asar.unpacked') : '',
'node_modules',
Expand Down Expand Up @@ -85,10 +87,24 @@ function createWindow(url) {
win.setWindowButtonVisibility(true);
}

// Open the NextJS app
win.loadURL(url);

win.webContents.on('did-fail-load', () =>
win.webContents.reloadIgnoringCache()
);

// Open all external links in the default system browser
win.webContents.setWindowOpenHandler(({ url }) => {
// Check if the URL is external
if (url.startsWith('http') && !url.includes('localhost')) {
shell.openExternal(url);
return { action: 'deny' }; // Prevent Electron from opening the link in the app
}

// Allow navigation for internal URLs
return { action: 'allow' };
});
}

app.on('ready', () => {
Expand Down