@vnejs/desktop 0.2.4 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/desktop",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Tools to run desktop app of @vnejs",
   "main": "src/index.js",
   "bin": {

package/src/electron.js

@@ -6,6 +6,15 @@ let mainWindow;
 
 protocol.registerSchemesAsPrivileged([{ scheme: "vnejs", privileges: { standard: true, secure: true, supportFetchAPI: true, corsEnabled: true } }]);
 
+const withSteamDeckQuery = (url) => {
+  if (process.env.STEAM_DECK !== "1") return url;
+
+  const parsed = new URL(url);
+  parsed.searchParams.set("steamDeck", "1");
+
+  return parsed.toString();
+};
+
 const createWindow = (options) => {
   mainWindow = new BrowserWindow({
     autoHideMenuBar: options.isProd,
@@ -14,8 +23,8 @@ const createWindow = (options) => {
     webPreferences: { contextIsolation: true, nodeIntegration: false },
   });
 
-  if (options.port) mainWindow.loadURL(`http://localhost:${options.port}/`);
-  if (options.file) mainWindow.loadURL(`vnejs://${options.file}`);
+  if (options.port) mainWindow.loadURL(withSteamDeckQuery(`http://localhost:${options.port}/`));
+  if (options.file) mainWindow.loadURL(withSteamDeckQuery(`vnejs://${options.file}`));
 
   mainWindow.on("closed", () => (mainWindow = null));
   options.isProd ? mainWindow.removeMenu() : mainWindow.webContents.openDevTools();
@@ -26,10 +35,29 @@ const createWindow = (options) => {
   });
 };
 
+const QUIT_EXIT_FALLBACK_MS = 2000;
+
 const runElectron = (options) => {
   // Allow unmuted <video> autoplay in packaged builds (Steam / Electron).
   app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
 
+  let isShuttingDown = false;
+
+  const shutdown = async () => {
+    if (isShuttingDown) return;
+
+    isShuttingDown = true;
+    setTimeout(() => app.exit(0), QUIT_EXIT_FALLBACK_MS);
+
+    try {
+      await options.onBeforeQuit?.();
+    } catch (error) {
+      console.log("Desktop shutdown failed", error);
+    }
+
+    app.quit();
+  };
+
   app.whenReady().then(() => {
     protocol.handle("vnejs", (request) => {
       const url = new URL(request.url);
@@ -44,8 +72,13 @@ const runElectron = (options) => {
     });
     createWindow(options);
   });
-  app.on("window-all-closed", () => process.platform !== "darwin" && app.quit());
-  app.on("activate", () => mainWindow === null && createWindow(options));
+  app.on("window-all-closed", shutdown);
+  app.on("before-quit", (event) => {
+    if (isShuttingDown) return;
+
+    event.preventDefault();
+    shutdown();
+  });
 };
 
 module.exports = { runElectron };

package/src/server.js

@@ -320,7 +320,7 @@ const runServer = async ({
 
     logServerAddresses(port);
 
-    return port;
+    return { port, close: () => app.close() };
   } catch (error) {
     if (error.code === "EADDRINUSE") {
       console.log("server not started on port: ", port);

package/src/web.js

@@ -4,7 +4,7 @@ const { runServer } = require("./server");
 const getRootDir = () => process.env.PWD || process.env.INIT_CWD;
 
 const runWeb = async ({ rootDir = getRootDir() } = {}) => {
-  const port = await runServer({ rootDir });
+  const { port } = await runServer({ rootDir });
 
   return open(`http://localhost:${port}/?port=${port}`);
 };