@vnejs/desktop 0.2.0 → 0.2.1

package/package.json

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

package/src/server.js

@@ -62,18 +62,40 @@ const pathExists = async (target) => {
   }
 };
 
-const readPortPreferred = async (rootDir) => {
+const readPackageVnejs = async (rootDir) => {
   const pkg = JSON.parse(await readFile(path.join(rootDir, "package.json"), "utf8"));
-  const port = Number(pkg.vnejs?.portPreferred);
+
+  return pkg.vnejs || {};
+};
+
+const readPortPreferred = async (rootDir) => {
+  const port = Number((await readPackageVnejs(rootDir)).portPreferred);
 
   return Number.isInteger(port) && port > 0 ? port : undefined;
 };
 
-const runServer = async ({ rootDir, stateDir, oldApp, onAchievementLock, onAchievementUnlock } = {}) => {
+const readDefaultLanguage = async (rootDir) => {
+  const language = (await readPackageVnejs(rootDir)).defaultLanguage;
+
+  return typeof language === "string" && language ? language : "ru";
+};
+
+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");
   const gamePath = path.join(rootDir, "game");
+  const defaultLanguage = await readDefaultLanguage(rootDir);
 
   const ensureStateDir = () => mkdir(resolvedStateDir, { recursive: true });
 
@@ -87,18 +109,44 @@ const runServer = async ({ rootDir, stateDir, oldApp, onAchievementLock, onAchie
     }
   };
 
+  const writeStateToDisk = async (state) => {
+    await ensureStateDir();
+
+    const groups = splitStateByPrefix(state);
+    const activePrefixes = new Set(Object.keys(groups));
+    const stalePrefixes = (await getStateFiles()).map((file) => file.slice(0, -".json".length)).filter((prefix) => !activePrefixes.has(prefix));
+
+    await Promise.all([
+      ...Object.entries(groups).map(([prefix, groupState]) => writeFile(path.join(resolvedStateDir, `${prefix}.json`), JSON.stringify(groupState))),
+      ...stalePrefixes.map((prefix) => unlink(path.join(resolvedStateDir, `${prefix}.json`))),
+    ]);
+  };
+
+  const readStateFromDisk = async () => {
+    const stateFiles = await getStateFiles();
+
+    if (!stateFiles.length) return {};
+
+    const chunks = await Promise.all(stateFiles.map((file) => readFile(path.join(resolvedStateDir, file), "utf8").then(JSON.parse)));
+
+    return Object.assign({}, ...chunks);
+  };
+
+  const resolveConfigLanguage = () => {
+    if (typeof getConfig === "function") {
+      const config = getConfig() || {};
+
+      if (typeof config.language === "string" && config.language) return config.language;
+    }
+
+    return defaultLanguage;
+  };
+
   const onSaveState = async (req, reply) => {
     try {
-      await ensureStateDir();
-
-      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));
+      await writeStateToDisk(req.body);
 
-      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`))),
-      ]);
+      if (typeof onStateSave === "function") onStateSave(req.body);
 
       return reply.send({ status: "ok" });
     } catch {
@@ -107,14 +155,40 @@ const runServer = async ({ rootDir, stateDir, oldApp, onAchievementLock, onAchie
   };
 
   const onGetState = async (req, reply) => {
-    const stateFiles = await getStateFiles();
+    try {
+      let state = null;
+      let fromCloud = false;
+
+      if (typeof onStateGet === "function") {
+        const cloudState = onStateGet();
+
+        if (cloudState && typeof cloudState === "object") {
+          state = cloudState;
+          fromCloud = true;
+        }
+      }
+
+      if (!state) state = await readStateFromDisk();
 
-    if (!stateFiles.length) return reply.send({ status: "ok", state: {} });
+      if (fromCloud) await writeStateToDisk(state);
 
+      return reply.send({ status: "ok", state });
+    } catch {
+      return reply.send({ status: "error" });
+    }
+  };
+
+  const onGetConfig = (req, reply) => reply.send({ language: resolveConfigLanguage() });
+
+  const onClearState = async (req, reply) => {
     try {
-      const chunks = await Promise.all(stateFiles.map((file) => readFile(path.join(resolvedStateDir, file), "utf8").then(JSON.parse)));
+      const stateFiles = await getStateFiles();
+
+      await Promise.all(stateFiles.map((file) => unlink(path.join(resolvedStateDir, file))));
 
-      return reply.send({ status: "ok", state: Object.assign({}, ...chunks) });
+      if (typeof onStateClear === "function") onStateClear();
+
+      return reply.send({ status: "ok" });
     } catch {
       return reply.send({ status: "error" });
     }
@@ -149,6 +223,8 @@ const runServer = async ({ rootDir, stateDir, oldApp, onAchievementLock, onAchie
 
     app.post("/state/save", onSaveState);
     app.get("/state/get", onGetState);
+    app.post("/state/clear", onClearState);
+    app.get("/config", onGetConfig);
     app.post("/achievement/lock", onAchievementLockMiddleware);
     app.post("/achievement/unlock", onAchievementUnlockMiddleware);
     app.post("/log", onLog);
@@ -189,7 +265,17 @@ const runServer = async ({ rootDir, stateDir, oldApp, onAchievementLock, onAchie
     if (error.code === "EADDRINUSE") {
       console.log("server not started on port: ", port);
 
-      return runServer({ rootDir, stateDir, oldApp: app, onAchievementLock, onAchievementUnlock });
+      return runServer({
+        rootDir,
+        stateDir,
+        oldApp: app,
+        onAchievementLock,
+        onAchievementUnlock,
+        onStateSave,
+        onStateGet,
+        onStateClear,
+        getConfig,
+      });
     }
 
     throw error;