@vnejs/desktop 0.0.37 → 0.0.38

package/package.json

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

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,10 +1,10 @@
 const path = require("path");
 const os = require("os");
 const fastify = require("fastify");
-const getPort = require("get-port").default;
 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 getPrefix = (key) => {
   const dot = key.indexOf(".");
@@ -62,8 +62,15 @@ const pathExists = async (target) => {
   }
 };
 
-const runServer = async ({ rootDir, stateDir, oldApp, achievementLock, achievementUnlock } = {}) => {
-  const port = await getPort();
+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");
@@ -113,14 +120,14 @@ const runServer = async ({ rootDir, stateDir, oldApp, achievementLock, achieveme
     }
   };
 
-  const onAchievementLock = (req, reply) => {
-    typeof achievementLock === "function" && achievementLock(req.body?.id, req.body?.data);
+  const onAchievementLockMiddleware = (req, reply) => {
+    typeof onAchievementLock === "function" && onAchievementLock(req.body?.id, req.body?.data);
 
     return reply.send({ status: "ok" });
   };
 
-  const onAchievementUnlock = (req, reply) => {
-    typeof achievementUnlock === "function" && achievementUnlock(req.body?.id, req.body?.data);
+  const onAchievementUnlockMiddleware = (req, reply) => {
+    typeof onAchievementUnlock === "function" && onAchievementUnlock(req.body?.id, req.body?.data);
 
     return reply.send({ status: "ok" });
   };
@@ -142,8 +149,8 @@ const runServer = async ({ rootDir, stateDir, oldApp, achievementLock, achieveme
 
     app.post("/state/save", onSaveState);
     app.get("/state/get", onGetState);
-    app.post("/achievement/lock", onAchievementLock);
-    app.post("/achievement/unlock", onAchievementUnlock);
+    app.post("/achievement/lock", onAchievementLockMiddleware);
+    app.post("/achievement/unlock", onAchievementUnlockMiddleware);
     app.post("/log", onLog);
 
     const publicDirs = [path.join(rootDir, "dist")];
@@ -165,13 +172,7 @@ const runServer = async ({ rootDir, stateDir, oldApp, achievementLock, achieveme
 
     await app.register(fastifyStatic, { root: publicDirs });
 
-    if (mediaDirs.length) {
-      await app.register(fastifyStatic, {
-        root: mediaDirs,
-        prefix: "/media/",
-        decorateReply: false,
-      });
-    }
+    if (mediaDirs.length) await app.register(fastifyStatic, { root: mediaDirs, prefix: "/media/", decorateReply: false });
 
     return app;
   };
@@ -188,7 +189,7 @@ const runServer = async ({ rootDir, stateDir, oldApp, achievementLock, achieveme
     if (error.code === "EADDRINUSE") {
       console.log("server not started on port: ", port);
 
-      return runServer({ rootDir, stateDir, oldApp: app, achievementLock, achievementUnlock });
+      return runServer({ rootDir, stateDir, oldApp: app, onAchievementLock, onAchievementUnlock });
     }
 
     throw error;

package/src/web.js

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