@vnejs/desktop 0.2.5 → 0.2.7

package/package.json

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

package/src/cli.js

@@ -10,9 +10,6 @@ const program = new Command();
 
 program.name(packageJson.name).description(packageJson.description).version(packageJson.version);
 
-program
-  .command("web")
-  .option("--port-preferred <port>", "preferred port number (overrides package.json vnejs.portPreferred)")
-  .action(webAction);
+program.command("web").option("--port-preferred <port>", "preferred port number (overrides package.json vnejs.portPreferred)").action(webAction);
 
 program.parse();

package/src/electron.js

@@ -35,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);
@@ -53,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

@@ -96,17 +96,7 @@ const readDefaultLanguage = async (rootDir) => {
   return typeof language === "string" && language ? language : "ru";
 };
 
-const runServer = async ({
-  rootDir,
-  stateDir,
-  oldApp,
-  onAchievementLock,
-  onAchievementUnlock,
-  onStateSave,
-  onStateGet,
-  onStateClear,
-  getConfig,
-} = {}) => {
+const runServer = async ({ rootDir, stateDir, oldApp, onAchievementLock, onAchievementUnlock, onStateSave, onStateGet, onStateClear, getConfig } = {}) => {
   const port = await getPort({ port: await readPortPreferred(rootDir) });
 
   const resolvedStateDir = stateDir || path.join(rootDir, "state");
@@ -320,7 +310,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

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