Skip to content
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.

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

fix: handle loadURL() failures correctly #1093

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions scripts/build/build.mts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ await Promise.all([
outfile: "dist/js/preload.js",
footer: { js: "//# sourceURL=VCDPreload" }
}),
createContext({
...NodeCommonOpts,
entryPoints: ["src/preload/splash.ts"],
outfile: "dist/js/splash_preload.js"
}),
createContext({
...CommonOpts,
globalName: "Vesktop",
Expand Down
27 changes: 24 additions & 3 deletions src/main/mainWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import {
import { darwinURL } from "./index";
import { sendRendererCommand } from "./ipcCommands";
import { Settings, State, VencordSettings } from "./settings";
import { createSplashWindow } from "./splash";
import { createSplashWindow, updateSplashMessage } from "./splash";
import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
import { applyDeckKeyboardFix, askToApplySteamLayout, isDeckGameMode } from "./utils/steamOS";
import { downloadVencordFiles, ensureVencordFiles } from "./utils/vencordLoader";
Expand Down Expand Up @@ -475,17 +475,36 @@ function createMainWindow() {
win.webContents.setUserAgent(BrowserUserAgent);

// if the open-url event is fired (in index.ts) while starting up, darwinURL will be set. If not fall back to checking the process args (which Windows and Linux use for URI calling.)
// win.webContents.session.clearCache().then(() => {
loadUrl(darwinURL || process.argv.find(arg => arg.startsWith("discord://")));
// });

return win;
}

const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDesktopMain.js")));

import { EventEmitter } from "events";
const eventCar = new EventEmitter();

export function loadUrl(uri: string | undefined) {
const branch = Settings.store.discordBranch;
const subdomain = branch === "canary" || branch === "ptb" ? `${branch}.` : "";
mainWin.loadURL(`https://${subdomain}discord.com/${uri ? new URL(uri).pathname.slice(1) || "app" : "app"}`);

// we do not rely on 'did-finish-load' because it fires even if loadURL fails which triggers early detruction of the splash
mainWin
.loadURL(`https://${subdomain}discord.com/${uri ? new URL(uri).pathname.slice(1) || "app" : "app"}`)
.then(() => eventCar.emit("app-loaded"))
.catch(error => retryUrl(error.url, error.code));
}

const retryDelay = 1000;
function retryUrl(url: string, description: string) {
console.log(`retrying in ${retryDelay}ms`);
updateSplashMessage(description);
setTimeout(() => {
loadUrl(url);
}, retryDelay);
}

export async function createWindows() {
Expand All @@ -504,7 +523,7 @@ export async function createWindows() {

mainWin = createMainWindow();

mainWin.webContents.on("did-finish-load", () => {
eventCar.on("app-loaded", () => {
splash?.destroy();

if (!startMinimized) {
Expand All @@ -527,6 +546,8 @@ export async function createWindows() {
});

mainWin.webContents.on("did-navigate", (_, url: string, responseCode: number) => {
if (!splash?.isDestroyed()) updateSplashMessage(""); // clear the message

// check url to ensure app doesn't loop
if (responseCode >= 300 && new URL(url).pathname !== `/app`) {
loadUrl(undefined);
Expand Down
11 changes: 9 additions & 2 deletions src/main/splash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ import { ICON_PATH, VIEW_DIR } from "shared/paths";

import { Settings } from "./settings";

let splash: BrowserWindow | undefined;

export function createSplashWindow(startMinimized = false) {
const splash = new BrowserWindow({
splash = new BrowserWindow({
...SplashProps,
icon: ICON_PATH,
show: !startMinimized
show: !startMinimized,
webPreferences: { preload: join(__dirname, "splash_preload.js") }
});

splash.loadFile(join(VIEW_DIR, "splash.html"));
Expand All @@ -37,3 +40,7 @@ export function createSplashWindow(startMinimized = false) {

return splash;
}

export function updateSplashMessage(message: string) {
if (splash && !splash.isDestroyed()) splash.webContents.send("update-splash-message", message);
}
11 changes: 11 additions & 0 deletions src/preload/splash.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* Vesktop, a desktop app aiming to give you a snappier Discord Experience
* Copyright (c) 2025 Vendicated and Vesktop contributors
* SPDX-License-Identifier: GPL-3.0-or-later
*/

const { contextBridge, ipcRenderer } = require("electron/renderer");

contextBridge.exposeInMainWorld("electronAPI", {
onUpdateMessage: callback => ipcRenderer.on("update-splash-message", (_event, message: string) => callback(message))
});
20 changes: 19 additions & 1 deletion static/views/splash.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
background: var(--bg);
}

.message {
top: 70%;
word-break: break-word;
padding: 0 16px;
position: absolute;
font-size: 14px
}

p {
text-align: center;
}
Expand All @@ -32,7 +40,7 @@
</style>
</head>

<body>
<body style="overflow: hidden;">
<div class="wrapper">
<img
draggable="false"
Expand All @@ -41,5 +49,15 @@
role="presentation"
/>
<p>Loading Vesktop...</p>
<p class="message"></p>
</div>
</body>

<script>
window.onload = () => {
const messageElement = document.querySelector('.message');
window.electronAPI.onUpdateMessage((message) => {
messageElement.textContent = message;
})
};
</script>
Loading