@vnejs/desktop 0.0.36 → 0.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/desktop",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "Tools to run desktop app of @vnejs",
   "main": "src/index.js",
   "bin": {
@@ -15,13 +15,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "commander": "14.0.3",
-    "express": "4.21.2",
-    "get-port": "7.1.0",
-    "open": "8.2.1"
+    "@fastify/cors": "~11.2.0",
+    "@fastify/static": "~9.1.3",
+    "commander": "~15.0.0",
+    "fastify": "~5.8.5",
+    "get-port": "~7.2.0",
+    "open": "~11.0.0"
   },
   "devDependencies": {
-    "@electron/packager": "19.0.5",
-    "electron": "~40.8.0"
+    "@electron/packager": "~20.0.1",
+    "electron": "~42.3.3"
   }
 }

package/src/cli.js

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

package/src/index.js

@@ -1,4 +1,5 @@
 const { runServer } = require("./server");
 const { runElectron } = require("./electron");
+const runWeb = require("./web");
 
-module.exports = { runElectron, runServer };
+module.exports = { runElectron, runServer, runWeb };

package/src/server.js

@@ -1,85 +1,199 @@
 const path = require("path");
-const express = require("express");
-const getPort = require("get-port").default;
-const bodyParser = require("body-parser");
-const { writeFile, appendFile, readdirSync, existsSync, readFile } = require("fs");
+const os = require("os");
+const fastify = require("fastify");
+const fastifyCors = require("@fastify/cors");
+const fastifyStatic = require("@fastify/static");
+const { readFile, readdir, writeFile, appendFile, mkdir, unlink, access } = require("fs/promises");
+const { default: getPort } = require("get-port");
 
-const runServer = async ({ rootDir, oldApp, achievementLock, achievementUnlock } = {}) => {
-  const port = await getPort();
+const getPrefix = (key) => {
+  const dot = key.indexOf(".");
 
-  const stateJson = path.join(rootDir, "state.json");
+  return dot === -1 ? key : key.slice(0, dot);
+};
+
+const splitStateByPrefix = (state) =>
+  Object.entries(state).reduce((groups, [key, value]) => {
+    const prefix = getPrefix(key);
+
+    groups[prefix] ??= {};
+    groups[prefix][key] = value;
+
+    return groups;
+  }, {});
+
+const isIPv4 = (family) => family === "IPv4" || family === 4;
+
+const getServerUrls = (port) => {
+  const local = [`http://localhost:${port}/`, `http://127.0.0.1:${port}/`];
+  const network = new Set();
+
+  for (const interfaces of Object.values(os.networkInterfaces())) {
+    for (const iface of interfaces) {
+      if (isIPv4(iface.family) && !iface.internal) network.add(`http://${iface.address}:${port}/`);
+    }
+  }
+
+  return { local, network: [...network] };
+};
+
+const logServerAddresses = (port) => {
+  const { local, network } = getServerUrls(port);
+
+  console.log("server started:");
+  console.log("  locally:");
+  local.forEach((url) => console.log(`    ${url}`));
+
+  if (network.length) {
+    console.log("  on local network (wifi):");
+    network.forEach((url) => console.log(`    ${url}`));
+  } else {
+    console.log("  on local network (wifi): not available");
+  }
+};
+
+const pathExists = async (target) => {
+  try {
+    await access(target);
+
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const readPortPreferred = async (rootDir) => {
+  const pkg = JSON.parse(await readFile(path.join(rootDir, "package.json"), "utf8"));
+  const port = Number(pkg.vnejs?.portPreferred);
+
+  return Number.isInteger(port) && port > 0 ? port : undefined;
+};
+
+const runServer = async ({ rootDir, stateDir, oldApp, onAchievementLock, onAchievementUnlock } = {}) => {
+  const port = await getPort({ port: await readPortPreferred(rootDir) });
+
+  const resolvedStateDir = stateDir || path.join(rootDir, "state");
   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 ensureStateDir = () => mkdir(resolvedStateDir, { recursive: true });
+
+  const getStateFiles = async () => {
+    try {
+      const files = await readdir(resolvedStateDir);
+
+      return files.filter((file) => file.endsWith(".json"));
+    } catch {
+      return [];
+    }
+  };
+
+  const onSaveState = async (req, reply) => {
+    try {
+      await ensureStateDir();
 
-  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 groups = splitStateByPrefix(req.body);
+      const activePrefixes = new Set(Object.keys(groups));
+      const stalePrefixes = (await getStateFiles()).map((file) => file.slice(0, -".json".length)).filter((prefix) => !activePrefixes.has(prefix));
 
-  const onAchievementLock = (req, res) => {
-    typeof achievementLock === "function" && achievementLock(req.body?.id, req.body?.data);
+      await Promise.all([
+        ...Object.entries(groups).map(([prefix, state]) => writeFile(path.join(resolvedStateDir, `${prefix}.json`), JSON.stringify(state))),
+        ...stalePrefixes.map((prefix) => unlink(path.join(resolvedStateDir, `${prefix}.json`))),
+      ]);
 
-    return res.json({ status: "ok" });
+      return reply.send({ status: "ok" });
+    } catch {
+      return reply.send({ status: "error" });
+    }
   };
-  const onAchievementUnlock = (req, res) => {
-    typeof achievementUnlock === "function" && achievementUnlock(req.body?.id, req.body?.data);
 
-    return res.json({ status: "ok" });
+  const onGetState = async (req, reply) => {
+    const stateFiles = await getStateFiles();
+
+    if (!stateFiles.length) return reply.send({ status: "ok", state: {} });
+
+    try {
+      const chunks = await Promise.all(stateFiles.map((file) => readFile(path.join(resolvedStateDir, file), "utf8").then(JSON.parse)));
+
+      return reply.send({ status: "ok", state: Object.assign({}, ...chunks) });
+    } catch {
+      return reply.send({ status: "error" });
+    }
   };
 
-  const onLog = (req, res) => {
-    res.end("ok");
+  const onAchievementLockMiddleware = (req, reply) => {
+    typeof onAchievementLock === "function" && onAchievementLock(req.body?.id, req.body?.data);
+
+    return reply.send({ status: "ok" });
+  };
+
+  const onAchievementUnlockMiddleware = (req, reply) => {
+    typeof onAchievementUnlock === "function" && onAchievementUnlock(req.body?.id, req.body?.data);
+
+    return reply.send({ status: "ok" });
+  };
+
+  const onLog = (req, reply) => {
+    reply.send("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((req, res, next) => {
-        res.header("Access-Control-Allow-Origin", "*");
-        res.header("Access-Control-Allow-Methods", "GET,POST,PUT,PATCH,DELETE,OPTIONS");
-        res.header("Access-Control-Allow-Headers", "Content-Type, Authorization");
-
-        next();
-      })
-      .use(bodyParser.json({ limit: "50mb" }))
-      .use(express.static(path.join(rootDir, "dist")))
-      .use("/state/save", onSaveState)
-      .use("/state/get", onGetState)
-      .use("/achievement/lock", onAchievementLock)
-      .use("/achievement/unlock", onAchievementUnlock)
-      .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);
+  const createApp = async () => {
+    const app = fastify({ bodyLimit: 50 * 1024 * 1024 });
+
+    await app.register(fastifyCors, {
+      origin: "*",
+      methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
+      allowedHeaders: ["Content-Type", "Authorization"],
     });
-    server.on("error", async (error) => {
-      if (error.code === "EADDRINUSE") {
-        console.log("server not started on port: ", port);
 
-        await runServer({ rootDir, oldApp: app, achievementLock, achievementUnlock });
+    app.post("/state/save", onSaveState);
+    app.get("/state/get", onGetState);
+    app.post("/achievement/lock", onAchievementLockMiddleware);
+    app.post("/achievement/unlock", onAchievementUnlockMiddleware);
+    app.post("/log", onLog);
 
-        resolve(port);
-      }
-    });
-  });
+    const publicDirs = [path.join(rootDir, "dist")];
+    const mediaDirs = [];
+
+    let modDirs = [];
+
+    try {
+      modDirs = await readdir(gamePath);
+    } catch {}
+
+    for (const modDir of modDirs) {
+      const mediaDir = path.join(gamePath, modDir, "media");
+      const publicDir = path.join(gamePath, modDir, "public");
+
+      if (await pathExists(mediaDir)) mediaDirs.push(mediaDir);
+      if (await pathExists(publicDir)) publicDirs.push(publicDir);
+    }
+
+    await app.register(fastifyStatic, { root: publicDirs });
+
+    if (mediaDirs.length) await app.register(fastifyStatic, { root: mediaDirs, prefix: "/media/", decorateReply: false });
+
+    return app;
+  };
+
+  const app = oldApp || (await createApp());
+
+  try {
+    await app.listen({ port, host: "0.0.0.0" });
+
+    logServerAddresses(port);
+
+    return port;
+  } catch (error) {
+    if (error.code === "EADDRINUSE") {
+      console.log("server not started on port: ", port);
+
+      return runServer({ rootDir, stateDir, oldApp: app, onAchievementLock, onAchievementUnlock });
+    }
+
+    throw error;
+  }
 };
 
 module.exports = { runServer };

package/src/web.js

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