@vnejs/desktop 0.0.5 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/desktop",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Tools to run desktop app of @vnejs",
   "source": "src/index.js",
   "main": "dist/index.js",
@@ -19,6 +19,7 @@
     "commander": "13.1.0",
     "express": "4.21.2",
     "get-port": "5.1.1",
+    "electron": "30.3.1",
     "open": "10.1.0"
   }
 }

package/src/electron.entry.js

@@ -0,0 +1 @@
+require("./electron")();

package/src/electron.js

@@ -1,24 +1,11 @@
-const { app, BrowserWindow } = require("electron");
+const electron = require("electron");
+const proc = require("node:child_process");
 
 const { runServer } = require("./server");
-let mainWindow;
+const { runElectron } = require("./electron.utils");
 
-const isProd = process.env.NODE_ENV === "production";
+module.exports = () => {
+  proc.spawn(electron);
 
-const createWindow = (options) => {
-  mainWindow = new BrowserWindow({ autoHideMenuBar: isProd, fullscreen: true, frame: true });
-
-  if (options.port) mainWindow.loadURL(`http://localhost:${options.port}/`);
-  if (options.file) mainWindow.loadFile(options.file);
-
-  mainWindow.on("closed", () => (mainWindow = null));
-  isProd ? mainWindow.removeMenu() : mainWindow.webContents.openDevTools();
+  return runServer({ rootDir: process.env.PWD }).then((port) => runElectron({ port }));
 };
-
-const runElectron = (options) => {
-  app.whenReady().then(() => createWindow(options));
-  app.on("window-all-closed", () => process.platform !== "darwin" && app.quit());
-  app.on("activate", () => mainWindow === null && createWindow(options));
-};
-
-runServer().then((port) => runElectron({ port }));

package/src/electron.utils.js

@@ -0,0 +1,23 @@
+const { app, BrowserWindow } = require("electron");
+
+let mainWindow;
+
+const isProd = process.env.NODE_ENV === "production";
+
+const createWindow = (options) => {
+  mainWindow = new BrowserWindow({ autoHideMenuBar: isProd, fullscreen: true, frame: true });
+
+  if (options.port) mainWindow.loadURL(`http://localhost:${options.port}/`);
+  if (options.file) mainWindow.loadFile(options.file);
+
+  mainWindow.on("closed", () => (mainWindow = null));
+  isProd ? mainWindow.removeMenu() : mainWindow.webContents.openDevTools();
+};
+
+const runElectron = (options) => {
+  app.whenReady().then(() => createWindow(options));
+  app.on("window-all-closed", () => process.platform !== "darwin" && app.quit());
+  app.on("activate", () => mainWindow === null && createWindow(options));
+};
+
+module.exports = { runElectron };

package/src/server.js

@@ -1,32 +1,32 @@
 const path = require("path");
 const express = require("express");
-const getPort = require("get-port").default;
+const getPort = require("get-port");
 const bodyParser = require("body-parser");
 const { writeFile, appendFile, readdirSync, existsSync, readFile } = require("fs");
 
-const rootDir = process.env.PWD;
-const stateJson = path.join(rootDir, "state.json");
-const gamePath = path.join(rootDir, "game");
+const runServer = async ({ rootDir, oldApp } = {}) => {
+  const port = await getPort();
 
-const onSaveState = (req, res) =>
-  writeFile(stateJson, JSON.stringify(req.body), (err) =>
-    err ? res.json({ status: "error" }) : res.json({ status: "ok" })
-  );
+  const stateJson = path.join(rootDir, "state.json");
+  const gamePath = path.join(rootDir, "game");
 
-const onGetState = (req, res) =>
-  readFile(stateJson, (err, data) => {
-    if (err) return writeFile(stateJson, "{}", () => res.json({ status: "ok", state: {} }));
-    return res.json({ status: "ok", state: JSON.parse(data.toString()) });
-  });
+  const onSaveState = (req, res) =>
+    writeFile(stateJson, JSON.stringify(req.body), (err) =>
+      err ? res.json({ status: "error" }) : res.json({ status: "ok" })
+    );
 
-const onLog = (req, res) => {
-  res.end("ok");
+  const onGetState = (req, res) =>
+    readFile(stateJson, (err, data) =>
+      err
+        ? writeFile(stateJson, "{}", () => res.json({ status: "ok", state: {} }))
+        : res.json({ status: "ok", state: JSON.parse(data.toString()) })
+    );
 
-  appendFile(path.join(rootDir, "log.txt"), `${req.body.log}\n`);
-};
+  const onLog = (req, res) => {
+    res.end("ok");
 
-const runServer = async ({ oldApp } = {}) => {
-  const port = await getPort();
+    appendFile(path.join(rootDir, "log.txt"), `${req.body.log}\n`);
+  };
 
   console.log("server will try to start on localhost: ", port);
 
@@ -59,7 +59,7 @@ const runServer = async ({ oldApp } = {}) => {
       if (error.code === "EADDRINUSE") {
         console.log("server not started on port: ", port);
 
-        await runServer({ oldApp: app });
+        await runServer({ rootDir, oldApp: app });
 
         resolve(port);
       }

package/src/web.js

@@ -1,4 +1,4 @@
 const open = require("open").default;
 const { runServer } = require("./server");
 
-runServer().then((port) => open(`http://localhost:${port}`));
+module.exports = () => runServer({ rootDir: process.env.PWD }).then((port) => open(`http://localhost:${port}`));