miqro 7.2.0 → 7.2.2

package/editor/auth.ts

@@ -1,3 +1,4 @@
+import { timingSafeEqual } from "node:crypto";
 import { AuthConfig, ServerRequest } from "../src/types.js";
 import { AdminRequest } from "./common/admin-interface.js";
 
@@ -27,7 +28,7 @@ export default {
       //console.log("\n\nqueryToken[%s] cookieToken[%s] KEY[%s]\n\n", queryToken, cookieToken, KEY);
 
       if (queryToken) {
-        if (queryToken === KEY) {
+        if (typeof queryToken === "string" && timingSafeEqual(Buffer.from(queryToken), Buffer.from(KEY))) {
           args.res.setCookie(ADMIN_EDITOR_AUTH_COOKIE, KEY, {
             expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 31 * 12 * 500),
             httpOnly: true,

package/editor/http/admin/editor/api/fs/read.api.tsx

@@ -1,5 +1,5 @@
 import { APIRoute, JSONParser } from "@miqro/core";
-import { readFileSync } from "node:fs";
+import { readFileSync, realpathSync } from "node:fs";
 import { SUPPORTED_LANGUAGES } from "../../../../../common/constants.js";
 import { relative, resolve } from "node:path";
 import { getLanguage } from "./scan.api.js";
@@ -45,7 +45,7 @@ export function readFile(path: string) {
 }
 
 export function getPath(path: string) {
-  const realPath = resolve(BASE_PATH, path);
+  const realPath = realpathSync(resolve(BASE_PATH, path));
 
   if (relative(BASE_PATH, realPath).startsWith("..")) {
     throw new Error("invalid path! [" + path + "]");

package/editor/ws.ts

@@ -10,6 +10,6 @@ export default {
     
     const KEY = cache.get("AUTH_KEY");
     const cookieToken = req.cookies["auth"];
-    return cookieToken === KEY ? true : false;
+    return cookieToken && KEY && cookieToken === KEY ? true : false;
   },
 } as WSConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "7.2.0",
+  "version": "7.2.2",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",
@@ -41,17 +41,17 @@
   },
   "dependencies": {
     "postject": "1.0.0-alpha.6",
-    "@miqro/core": "^5.0.16",
+    "@miqro/core": "^5.0.17",
     "@miqro/jsx": "^1.0.1",
     "@miqro/jsx-dom": "^1.0.4",
     "@miqro/jsx-node": "^1.0.6",
-    "@miqro/parser": "^2.0.4",
-    "@miqro/query": "^0.0.4",
-    "@miqro/runner": "^2.0.1",
+    "@miqro/parser": "^2.0.5",
+    "@miqro/query": "^0.0.7",
+    "@miqro/runner": "^2.0.2",
     "@miqro/test": "^0.2.9",
-    "@miqro/test-http": "^0.1.2",
-    "esbuild": "0.25.11",
-    "jose": "6.1.0",
+    "@miqro/test-http": "^0.1.3",
+    "esbuild": "0.28.0",
+    "jose": "6.2.1",
     "showdown": "2.1.0"
   }
 }

package/sea/install-esbuild.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 TARGET="${PWD}/sea/deps/esbuild"
-VERSION="0.25.11"
+VERSION="0.28.0"
 
 if [ -d "$TARGET" ]; then
   echo "$TARGET already exists exist."

package/sea/install-nodejs.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 TARGET="${PWD}/sea/deps/nodejs"
-VERSION="25.0.0"
+VERSION="25.9.0"
 
 if [ -d "$TARGET" ]; then
   echo "$TARGET already exists exist."

package/sea/node.version.tag

@@ -1 +1 @@
-25.0.0
+25.9.0

package/src/common/esbuild.ts

@@ -73,7 +73,7 @@ export async function esBuild(options: {
     try {
       //const logger = getLogger(`${SERVER_IDENTIFIER}_ESBUILD`);
       const valid = await validateESBuild(logger);
-      const esBuildCMD = `${getESBuildBinaryPath()} "${options.entryPoints[0]}" ${(options.external ? options.external : NODEJS_EXTERNAL).map(e => `--external:${e}`).join(" ")} --loader:.js=jsx --jsx-factory=${options.jsxFactory} --jsx-fragment=${options.jsxFragment} ${options.bundle ? " --bundle" : ""}${options.minify ? " --minify" : ""}${options.outfile ? ` --outfile="${options.outfile}"` : ""}${options.platform ? ` --platform=${options.platform}` : ""}${options.mainFields ? ` --main-fields=${options.mainFields}` : ""}${options.keepNames ? ` --keep-names` : ""}`;
+      const esBuildCMD = `${getESBuildBinaryPath()} "${options.entryPoints[0]}" ${(options.external ? options.external : NODEJS_EXTERNAL).map(e => `--external:"${e}"`).join(" ")} --loader:.js=jsx --jsx-factory=${options.jsxFactory} --jsx-fragment=${options.jsxFragment} ${options.bundle ? " --bundle" : ""}${options.minify ? " --minify" : ""}${options.outfile ? ` --outfile="${options.outfile}"` : ""}${options.platform ? ` --platform=${options.platform}` : ""}${options.mainFields ? ` --main-fields=${options.mainFields}` : ""}${options.keepNames ? ` --keep-names` : ""}`;
       logger?.trace(esBuildCMD);
       if (!valid) {
         const err = new Error(`esbuild installation at [${getESBuildBinaryPath()}] tampered`);

package/src/inflate/inflate-sea.ts

@@ -212,7 +212,7 @@ async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.map(file => {
     const name = `${file.substring(0, file.length - extname(file).length)}`;
-    return `  await migration.up.module(db, "${file}", (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default)`;
+    return `  await migration.up.module(db, (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default.name ?? "${file}", (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default)`;
   }).join("\n")}
 }
 module.exports = {
@@ -224,7 +224,7 @@ async function runMigrations(db) {
   await migration.init(db);
 ${serviceMigrations.reverse().map(file => {
     const name = `${file.substring(0, file.length - extname(file).length)}`;
-    return `  await migration.down.module(db, "${file}", (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default)`;
+    return `  await migration.down.module(db, (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default.name ?? "${file}", (await require("../${relative(service, "")}/${service}/migration/${name}.cjs")).default)`;
   }).join("\n")}
 }
 module.exports = {

package/src/services/app.ts

@@ -133,8 +133,8 @@ export class Miqro {
           msg &&
           msg.action &&
           msg.type === MiqroApplicationMessageType &&
-          msg.target === this.options.name,
-          msg.fromPID !== process.pid,
+          msg.target === this.options.name &&
+          msg.fromPID !== process.pid &&
           (msg.action === "reload" || msg.action === "restart")) {
           this.logger?.debug("remote server message from [%s] [%s]", msg.fromPID, msg.action);
           switch (msg.action) {
@@ -145,7 +145,7 @@ export class Miqro {
               await this.restart(true);
               break;
             default:
-              throw new Error("unsopported message for ApplicaitonServer");
+              throw new Error("unsupported message for ApplicationServer");
           }
         }
       } catch (e) {

package/src/services/utils/cluster-cache.ts

@@ -6,7 +6,7 @@ const ClusterCacheType = "$$$$$$$$$$$ClusterCacheType$$$$$$$$$$$";
 interface ClusterCacheMessage {
   type: typeof ClusterCacheType;
   target: string;
-  action: "set" | "unset" | "set_add" | "set_delete" | "array_push";
+  action: "set" | "unset" | "set_add" | "set_delete" | "array_push" | "set_clear" | "array_clear";
   fromPID: number;
   key: string;
   value?: string;
@@ -28,11 +28,29 @@ export class ClusterCache implements CacheInterface {
           msg.key &&
           msg.action &&
           msg.type === ClusterCacheType &&
-          msg.fromPID !== process.pid,
-          (msg.action === "set_add" || msg.action === "set" || msg.action === "unset" || msg.action === "set_delete" || msg.action === "array_push") &&
+          msg.fromPID !== process.pid &&
+          (msg.action === "set_clear" || msg.action === "array_clear" || msg.action === "set_add" || msg.action === "set" || msg.action === "unset" || msg.action === "set_delete" || msg.action === "array_push") &&
           msg.target === this.name) {
           this.logger?.debug("remote cluster cache message from [%s] [%s] [%s] [%s]", msg.fromPID, msg.target, msg.action, msg.key);
           switch (msg.action) {
+            case "set_clear": {
+              const list = this.localCache.has(msg.key) ? this.localCache.get(msg.key) : new Set<string>();
+              if (!(list instanceof Set)) {
+                throw new Error("cannot apply clear on non set");
+              }
+              list.clear();
+              this.localCache.set(msg.key, list);
+              break;
+            }
+            case "array_clear": {
+              //this.localCache.set(msg.key, msg.value);
+              const list = this.localCache.has(msg.key) ? this.localCache.get(msg.key) : [];
+              if (!(list instanceof Array)) {
+                throw new Error("cannot apply clear on non array");
+              }
+              this.localCache.set(msg.key, []);
+              break;
+            }
             case "unset":
               this.localCache.delete(msg.key);
               break;
@@ -43,7 +61,7 @@ export class ClusterCache implements CacheInterface {
               //this.localCache.set(msg.key, msg.value);
               const list = this.localCache.has(msg.key) ? this.localCache.get(msg.key) : new Set<string>();
               if (!(list instanceof Set)) {
-                throw new Error("cannot apply push on non array");
+                throw new Error("cannot apply add on non set");
               }
               if (!list.has(msg.value)) {
                 list.add(msg.value);
@@ -55,7 +73,7 @@ export class ClusterCache implements CacheInterface {
               //this.localCache.set(msg.key, msg.value);
               const list = this.localCache.has(msg.key) ? this.localCache.get(msg.key) : new Set<string>();
               if (!(list instanceof Set)) {
-                throw new Error("cannot apply push on non array");
+                throw new Error("cannot apply delete on non set");
               }
               if (list.has(msg.value)) {
                 list.delete(msg.value);
@@ -100,33 +118,25 @@ export class ClusterCache implements CacheInterface {
   set(key: string, value: unknown): void {
     this.localCache.set(key, value);
     this.logger?.trace("set(%s, ...)", key);
-    if (process.send) {
-      setTimeout(() => {
-        process.send({
-          type: ClusterCacheType,
-          action: "set",
-          target: this.name,
-          fromPID: process.pid,
-          key,
-          value
-        } as ClusterCacheMessage);
-      }, 10);
-    }
+    sendTimeout({
+      type: ClusterCacheType,
+      action: "set",
+      target: this.name,
+      fromPID: process.pid,
+      key,
+      value
+    } as ClusterCacheMessage);
   }
   unset(key: string): void {
     this.logger?.trace("unset(%s)", key);
     this.localCache.delete(key);
-    if (process.send) {
-      setTimeout(() => {
-        process.send({
-          type: ClusterCacheType,
-          target: this.name,
-          action: "unset",
-          fromPID: process.pid,
-          key
-        } as ClusterCacheMessage);
-      }, 10);
-    }
+    sendTimeout({
+      type: ClusterCacheType,
+      target: this.name,
+      action: "unset",
+      fromPID: process.pid,
+      key
+    } as ClusterCacheMessage);
   }
   has(key: string): boolean {
     this.logger?.trace("has(%s)", key);
@@ -143,19 +153,14 @@ export class ClusterCache implements CacheInterface {
       list.add(value);
     }
     this.localCache.set(key, list);
-
-    if (process.send) {
-      setTimeout(() => {
-        process.send({
-          type: ClusterCacheType,
-          target: this.name,
-          action: "set_add",
-          fromPID: process.pid,
-          key,
-          value
-        } as ClusterCacheMessage);
-      }, 10);
-    }
+    sendTimeout({
+      type: ClusterCacheType,
+      target: this.name,
+      action: "set_add",
+      fromPID: process.pid,
+      key,
+      value
+    } as ClusterCacheMessage);
   }
   set_delete(key: string, value: unknown): void {
     this.logger?.trace("delete(%s)", key);
@@ -167,18 +172,14 @@ export class ClusterCache implements CacheInterface {
       list.delete(value);
     }
     this.localCache.set(key, list);
-    if (process.send) {
-      setTimeout(() => {
-        process.send({
-          type: ClusterCacheType,
-          target: this.name,
-          action: "set_delete",
-          fromPID: process.pid,
-          key,
-          value
-        } as ClusterCacheMessage);
-      }, 10);
-    }
+    sendTimeout({
+      type: ClusterCacheType,
+      target: this.name,
+      action: "set_delete",
+      fromPID: process.pid,
+      key,
+      value
+    } as ClusterCacheMessage);
   }
   set_has(key: string, value: unknown): boolean {
     this.logger?.trace("set_has(%s)", key);
@@ -198,6 +199,13 @@ export class ClusterCache implements CacheInterface {
     }
     list.clear();
     this.localCache.set(key, list);
+    sendTimeout({
+      type: ClusterCacheType,
+      target: this.name,
+      action: "set_clear",
+      fromPID: process.pid,
+      key
+    } as ClusterCacheMessage);
   }
   array_push(key: string, value: unknown): void {
     this.logger?.trace("array_push(%s)", key);
@@ -207,18 +215,14 @@ export class ClusterCache implements CacheInterface {
     }
     list.push(value);
     this.localCache.set(key, list);
-    if (process.send) {
-      setTimeout(() => {
-        process.send({
-          type: ClusterCacheType,
-          target: this.name,
-          action: "array_push",
-          fromPID: process.pid,
-          key,
-          value
-        } as ClusterCacheMessage);
-      }, 10);
-    }
+    sendTimeout({
+      type: ClusterCacheType,
+      target: this.name,
+      action: "array_push",
+      fromPID: process.pid,
+      key,
+      value
+    } as ClusterCacheMessage);
   }
   array_clear(key: string): void {
     this.logger?.trace("array_clear(%s)", key);
@@ -226,5 +230,26 @@ export class ClusterCache implements CacheInterface {
       throw new Error("cannot apply on non Array");
     }
     this.localCache.set(key, []);
+    sendTimeout({
+      type: ClusterCacheType,
+      target: this.name,
+      action: "array_clear",
+      fromPID: process.pid,
+      key
+    } as ClusterCacheMessage);
   }
 }
+
+function sendTimeout(msg: ClusterCacheMessage) {
+  if (process.send) {
+    setTimeout(() => {
+      try {
+        if (process.send) {
+          process.send(msg);
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }, 10);
+  }
+}

package/src/services/utils/cluster-ws.ts

@@ -58,7 +58,7 @@ export class ClusterWebSocketServer2 extends WebSocketServer {
             clientUUID: req.uuid
           } as ClusterWebSocketServer2Message);
         }
-        this.logger?.log("[%s] new web socket connection from (%s)", req.uuid, req.req.socket.remoteAddress);
+        this.logger?.debug("[%s] new web socket connection from (%s)", req.uuid, req.req.socket.remoteAddress);
         if (options.onConnection) {
           options.onConnection(req);
         }
@@ -73,7 +73,7 @@ export class ClusterWebSocketServer2 extends WebSocketServer {
             clientUUID: req.uuid
           } as ClusterWebSocketServer2Message);
         }
-        this.logger?.log("[%s] [%s] web socket disconnection from (%s)", req.uuid, this.path, req.req.socket.remoteAddress);
+        this.logger?.debug("[%s] [%s] web socket disconnection from (%s)", req.uuid, this.path, req.req.socket.remoteAddress);
         if (options.onDisconnect) {
           options.onDisconnect(req);
         }

package/src/services/utils/websocketmanager.ts

@@ -28,7 +28,8 @@ export class WebSocketManager {
   public deleteWS(path: string) {
     const ws = this.runningGlobalWSMap.get(path);
     this.disconnectAllFrom(path);
-    ws.dispose();
+    if (ws)
+      ws.dispose();
     this.runningGlobalWSMap.delete(path);
   }