@vnejs/desktop 0.0.13 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/desktop",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "Tools to run desktop app of @vnejs",
   "source": "src/index.js",
   "main": "dist/index.js",
@@ -16,10 +16,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "commander": "13.1.0",
-    "express": "4.21.2",
-    "get-port": "5.1.1",
-    "electron": "30.3.1",
-    "open": "8.2.1"
+    "@vnejs/server": "0.0.2",
+    "commander": "13.1.0"
   }
 }

package/src/index.js

@@ -2,7 +2,6 @@
 
 const { Command } = require("commander");
 
-const electronAction = require("./electron");
 const webAction = require("./web");
 
 const packageJson = require("../package.json");
@@ -11,7 +10,6 @@ const program = new Command();
 
 program.name(packageJson.name).description(packageJson.description).version(packageJson.version);
 
-program.command("electron").action(electronAction);
 program.command("web").action(webAction);
 
 program.parse();

package/src/web.js

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

package/src/electron.entry.js

@@ -1,6 +0,0 @@
-require("./electron")();
-
-const { runServer } = require("./server");
-const { runElectron } = require("./electron.utils");
-
-runServer({ rootDir: process.env.PWD }).then((port) => runElectron({ port }));

package/src/electron.js

@@ -1,10 +0,0 @@
-const electron = require("electron");
-const proc = require("node:child_process");
-
-module.exports = () => {
-  console.log(11111111111, electron);
-
-  proc.spawn(`${electron} ${__dirname}/electron.entry.js --trace-warnings`);
-
-  console.log(22222222222, electron);
-};

package/src/electron.utils.js

@@ -1,23 +0,0 @@
-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,70 +0,0 @@
-const path = require("path");
-const express = require("express");
-const getPort = require("get-port");
-const bodyParser = require("body-parser");
-const { writeFile, appendFile, readdirSync, existsSync, readFile } = require("fs");
-
-const runServer = async ({ rootDir, oldApp } = {}) => {
-  const port = await getPort();
-
-  const stateJson = path.join(rootDir, "state.json");
-  const gamePath = path.join(rootDir, "game");
-
-  const onSaveState = (req, res) =>
-    writeFile(stateJson, JSON.stringify(req.body), (err) =>
-      err ? res.json({ status: "error" }) : res.json({ status: "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()) })
-    );
-
-  const onLog = (req, res) => {
-    res.end("ok");
-
-    appendFile(path.join(rootDir, "log.txt"), `${req.body.log}\n`);
-  };
-
-  console.log("server will try to start on localhost: ", port);
-
-  const app =
-    oldApp ||
-    express()
-      .use(bodyParser.json({ limit: "50mb" }))
-      .use(express.static(path.join(rootDir, "dist")))
-      .use("/state/save", onSaveState)
-      .use("/state/get", onGetState)
-      .use("/log", onLog);
-
-  readdirSync(gamePath).forEach((modDir) => {
-    const mediaDir = path.join(gamePath, modDir, "media");
-    const publicDir = path.join(gamePath, modDir, "public");
-
-    existsSync(mediaDir) && app.use("/media", express.static(mediaDir));
-    existsSync(publicDir) && app.use(express.static(publicDir));
-  });
-
-  return new Promise(async (resolve) => {
-    const server = app.listen(port);
-
-    server.on("listening", () => {
-      console.log("server started on port: ", port);
-
-      resolve(port);
-    });
-    server.on("error", async (error) => {
-      if (error.code === "EADDRINUSE") {
-        console.log("server not started on port: ", port);
-
-        await runServer({ rootDir, oldApp: app });
-
-        resolve(port);
-      }
-    });
-  });
-};
-
-module.exports = { runServer };