miqro 6.0.11 → 6.0.13

package/build/lib.cjs

@@ -32,50 +32,49 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// node_modules/cookie/index.js
-var require_cookie = __commonJS({
-  "node_modules/cookie/index.js"(exports2) {
+// node_modules/cookie/dist/index.js
+var require_dist = __commonJS({
+  "node_modules/cookie/dist/index.js"(exports2) {
     "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parse = parse2;
     exports2.serialize = serialize2;
-    var __toString = Object.prototype.toString;
-    var cookieNameRegExp = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
-    var cookieValueRegExp = /^("?)[\u0021\u0023-\u002B\u002D-\u003A\u003C-\u005B\u005D-\u007E]*\1$/;
+    var cookieNameRegExp = /^[\u0021-\u003A\u003C\u003E-\u007E]+$/;
+    var cookieValueRegExp = /^[\u0021-\u003A\u003C-\u007E]*$/;
     var domainValueRegExp = /^([.]?[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)([.][a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)*$/i;
     var pathValueRegExp = /^[\u0020-\u003A\u003D-\u007E]*$/;
-    function parse2(str, opt) {
-      if (typeof str !== "string") {
-        throw new TypeError("argument str must be a string");
-      }
-      var obj = {};
-      var len = str.length;
-      if (len < 2) return obj;
-      var dec = opt && opt.decode || decode;
-      var index = 0;
-      var eqIdx = 0;
-      var endIdx = 0;
+    var __toString = Object.prototype.toString;
+    var NullObject = /* @__PURE__ */ (() => {
+      const C = function() {
+      };
+      C.prototype = /* @__PURE__ */ Object.create(null);
+      return C;
+    })();
+    function parse2(str, options) {
+      const obj = new NullObject();
+      const len = str.length;
+      if (len < 2)
+        return obj;
+      const dec = options?.decode || decode;
+      let index = 0;
       do {
-        eqIdx = str.indexOf("=", index);
-        if (eqIdx === -1) break;
-        endIdx = str.indexOf(";", index);
-        if (endIdx === -1) {
-          endIdx = len;
-        } else if (eqIdx > endIdx) {
+        const eqIdx = str.indexOf("=", index);
+        if (eqIdx === -1)
+          break;
+        const colonIdx = str.indexOf(";", index);
+        const endIdx = colonIdx === -1 ? len : colonIdx;
+        if (eqIdx > endIdx) {
           index = str.lastIndexOf(";", eqIdx - 1) + 1;
           continue;
         }
-        var keyStartIdx = startIndex(str, index, eqIdx);
-        var keyEndIdx = endIndex(str, eqIdx, keyStartIdx);
-        var key = str.slice(keyStartIdx, keyEndIdx);
-        if (!obj.hasOwnProperty(key)) {
-          var valStartIdx = startIndex(str, eqIdx + 1, endIdx);
-          var valEndIdx = endIndex(str, endIdx, valStartIdx);
-          if (str.charCodeAt(valStartIdx) === 34 && str.charCodeAt(valEndIdx - 1) === 34) {
-            valStartIdx++;
-            valEndIdx--;
-          }
-          var val = str.slice(valStartIdx, valEndIdx);
-          obj[key] = tryDecode(val, dec);
+        const keyStartIdx = startIndex(str, index, eqIdx);
+        const keyEndIdx = endIndex(str, eqIdx, keyStartIdx);
+        const key = str.slice(keyStartIdx, keyEndIdx);
+        if (obj[key] === void 0) {
+          let valStartIdx = startIndex(str, eqIdx + 1, endIdx);
+          let valEndIdx = endIndex(str, endIdx, valStartIdx);
+          const value = dec(str.slice(valStartIdx, valEndIdx));
+          obj[key] = value;
         }
         index = endIdx + 1;
       } while (index < len);
@@ -83,69 +82,67 @@ var require_cookie = __commonJS({
     }
     function startIndex(str, index, max) {
       do {
-        var code = str.charCodeAt(index);
-        if (code !== 32 && code !== 9) return index;
+        const code = str.charCodeAt(index);
+        if (code !== 32 && code !== 9)
+          return index;
       } while (++index < max);
       return max;
     }
     function endIndex(str, index, min) {
       while (index > min) {
-        var code = str.charCodeAt(--index);
-        if (code !== 32 && code !== 9) return index + 1;
+        const code = str.charCodeAt(--index);
+        if (code !== 32 && code !== 9)
+          return index + 1;
       }
       return min;
     }
-    function serialize2(name, val, opt) {
-      var enc = opt && opt.encode || encodeURIComponent;
-      if (typeof enc !== "function") {
-        throw new TypeError("option encode is invalid");
-      }
+    function serialize2(name, val, options) {
+      const enc = options?.encode || encodeURIComponent;
       if (!cookieNameRegExp.test(name)) {
-        throw new TypeError("argument name is invalid");
+        throw new TypeError(`argument name is invalid: ${name}`);
       }
-      var value = enc(val);
+      const value = enc(val);
       if (!cookieValueRegExp.test(value)) {
-        throw new TypeError("argument val is invalid");
+        throw new TypeError(`argument val is invalid: ${val}`);
       }
-      var str = name + "=" + value;
-      if (!opt) return str;
-      if (null != opt.maxAge) {
-        var maxAge = Math.floor(opt.maxAge);
-        if (!isFinite(maxAge)) {
-          throw new TypeError("option maxAge is invalid");
+      let str = name + "=" + value;
+      if (!options)
+        return str;
+      if (options.maxAge !== void 0) {
+        if (!Number.isInteger(options.maxAge)) {
+          throw new TypeError(`option maxAge is invalid: ${options.maxAge}`);
         }
-        str += "; Max-Age=" + maxAge;
+        str += "; Max-Age=" + options.maxAge;
       }
-      if (opt.domain) {
-        if (!domainValueRegExp.test(opt.domain)) {
-          throw new TypeError("option domain is invalid");
+      if (options.domain) {
+        if (!domainValueRegExp.test(options.domain)) {
+          throw new TypeError(`option domain is invalid: ${options.domain}`);
         }
-        str += "; Domain=" + opt.domain;
+        str += "; Domain=" + options.domain;
       }
-      if (opt.path) {
-        if (!pathValueRegExp.test(opt.path)) {
-          throw new TypeError("option path is invalid");
+      if (options.path) {
+        if (!pathValueRegExp.test(options.path)) {
+          throw new TypeError(`option path is invalid: ${options.path}`);
         }
-        str += "; Path=" + opt.path;
+        str += "; Path=" + options.path;
       }
-      if (opt.expires) {
-        var expires = opt.expires;
-        if (!isDate(expires) || isNaN(expires.valueOf())) {
-          throw new TypeError("option expires is invalid");
+      if (options.expires) {
+        if (!isDate(options.expires) || !Number.isFinite(options.expires.valueOf())) {
+          throw new TypeError(`option expires is invalid: ${options.expires}`);
         }
-        str += "; Expires=" + expires.toUTCString();
+        str += "; Expires=" + options.expires.toUTCString();
       }
-      if (opt.httpOnly) {
+      if (options.httpOnly) {
         str += "; HttpOnly";
       }
-      if (opt.secure) {
+      if (options.secure) {
         str += "; Secure";
       }
-      if (opt.partitioned) {
+      if (options.partitioned) {
         str += "; Partitioned";
       }
-      if (opt.priority) {
-        var priority = typeof opt.priority === "string" ? opt.priority.toLowerCase() : opt.priority;
+      if (options.priority) {
+        const priority = typeof options.priority === "string" ? options.priority.toLowerCase() : void 0;
         switch (priority) {
           case "low":
             str += "; Priority=Low";
@@ -157,43 +154,40 @@ var require_cookie = __commonJS({
             str += "; Priority=High";
             break;
           default:
-            throw new TypeError("option priority is invalid");
+            throw new TypeError(`option priority is invalid: ${options.priority}`);
         }
       }
-      if (opt.sameSite) {
-        var sameSite = typeof opt.sameSite === "string" ? opt.sameSite.toLowerCase() : opt.sameSite;
+      if (options.sameSite) {
+        const sameSite = typeof options.sameSite === "string" ? options.sameSite.toLowerCase() : options.sameSite;
         switch (sameSite) {
           case true:
+          case "strict":
             str += "; SameSite=Strict";
             break;
           case "lax":
             str += "; SameSite=Lax";
             break;
-          case "strict":
-            str += "; SameSite=Strict";
-            break;
           case "none":
             str += "; SameSite=None";
             break;
           default:
-            throw new TypeError("option sameSite is invalid");
+            throw new TypeError(`option sameSite is invalid: ${options.sameSite}`);
         }
       }
       return str;
     }
     function decode(str) {
-      return str.indexOf("%") !== -1 ? decodeURIComponent(str) : str;
-    }
-    function isDate(val) {
-      return __toString.call(val) === "[object Date]";
-    }
-    function tryDecode(str, decode2) {
+      if (str.indexOf("%") === -1)
+        return str;
       try {
-        return decode2(str);
+        return decodeURIComponent(str);
       } catch (e) {
         return str;
       }
     }
+    function isDate(val) {
+      return __toString.call(val) === "[object Date]";
+    }
   }
 });
 
@@ -202,7 +196,7 @@ var BASEEDITOR_PATH, LOG_SOCKET_PATH, LOG_WRITE_EVENT, SUPPORTED_LANGUAGES;
 var init_constants = __esm({
   "editor/common/constants.ts"() {
     BASEEDITOR_PATH = "/admin/editor";
-    LOG_SOCKET_PATH = "/admin/socket/";
+    LOG_SOCKET_PATH = "/admin/socket";
     LOG_WRITE_EVENT = "LogWrite";
     SUPPORTED_LANGUAGES = [
       "text",
@@ -4419,7 +4413,7 @@ var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
 
 // node_modules/@miqro/core/build/types.js
-var import_cookie2 = __toESM(require_cookie(), 1);
+var import_cookie2 = __toESM(require_dist(), 1);
 var import_crypto = require("crypto");
 var import_http = require("http");
 
@@ -5368,7 +5362,7 @@ function parsePart(req, part, value, args, mode, parser3) {
 }
 
 // node_modules/@miqro/core/build/middleware/session.js
-var import_cookie = __toESM(require_cookie(), 1);
+var import_cookie = __toESM(require_dist(), 1);
 var DEFAULT_TOKEN_LOCATION = "free";
 var DEFAULT_TOKEN_HEADER = "Authorization";
 var DEFAULT_TOKEN_QUERY = "token";
@@ -6007,11 +6001,7 @@ function normalizePath(path) {
     if (path.charAt(0) !== "/") {
       throw new Error("path doesnt start with /");
     }
-    if (path[path.length - 1] !== "/") {
-      return `${path}/`;
-    } else {
-      return path;
-    }
+    return path;
   } else if (path !== "/") {
     throw new Error("path of length 1 not /");
   } else {
@@ -6304,9 +6294,9 @@ function routerDefaultLoggerFactory(uuid, req) {
   } catch (e) {
     urlParsingError = e;
   }
-  const pathToEnv = path.replace(/\//ig, "_").toUpperCase();
+  const pathToEnv = path.replace(/\//ig, "_").replace(/\./ig, "_").replace(/-/ig, "_").toUpperCase();
   const WORKER_IDENTIFIER = process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}_` : "";
-  const identifier = `${pathToEnv === "_" ? "" : `${pathToEnv.substring(1)}`}${method.toUpperCase()}`;
+  const identifier = `${pathToEnv === "_" ? "" : `${pathToEnv.substring(1)}`}${pathToEnv.charAt(pathToEnv.length - 1) !== "_" ? "_" : ""}${method.toUpperCase()}`;
   const upgrade = req.headers.connection?.indexOf("Upgrade") !== -1;
   const logger = getLogger(`${WORKER_IDENTIFIER}${identifier}`, {
     formatter: (args) => {
@@ -9268,9 +9258,9 @@ var LogProvider = class {
     } catch (e) {
       urlParsingError = e;
     }
-    const pathToEnv = path.replace(/\//ig, "_").toUpperCase();
+    const pathToEnv = path.replace(/\//ig, "_").replace(/\./ig, "_").replace(/-/ig, "_").toUpperCase();
     const WORKER_IDENTIFIER = process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}_` : "";
-    const identifier = `${pathToEnv === "_" ? "" : `${pathToEnv.substring(1)}`}${method.toUpperCase()}`;
+    const identifier = `${pathToEnv === "_" ? "" : `${pathToEnv.substring(1)}`}${pathToEnv.charAt(pathToEnv.length - 1) !== "_" ? "_" : ""}${method.toUpperCase()}`;
     const upgrade = req.headers.connection?.indexOf("Upgrade") !== -1;
     const logger = this.getLogger(
       `${WORKER_IDENTIFIER}${identifier}`,
@@ -12782,6 +12772,7 @@ async function main() {
     localCache,
     logProvider,
     wsManager: webSocketManager,
+    logger: logProvider.getLogger("server"),
     dbManager,
     port: PORT
   });
@@ -12794,7 +12785,7 @@ async function main() {
     onUpgrade: webSocketManager.onUpgrade
   });
   ${SERVERCONFIGLIST ? `
-  await Promise.all([${SERVERCONFIGLIST}].map(config=>config.preload(serverInterface)));
+  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.preload).map(config=>config.preload(serverInterface)));
 ` : ""}
   app.use(ServerRequestHandler(serverInterface));
   app.use(LoggerHandler());
@@ -12810,13 +12801,13 @@ async function main() {
   app.use(await (await import("./${(0, import_node_path12.join)(service, "api-router.js")}")).setupRouter());
   app.use(await (await import("./${(0, import_node_path12.join)(service, "static-router.js")}")).setupRouter())`).join("\n")}
   ${SERVERCONFIGLIST ? `
-  await Promise.all([${SERVERCONFIGLIST}].map(config=>config.load(serverInterface)));
+  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.load).map(config=>config.load(serverInterface)));
 ` : ""}
   
 
   await app.listen(PORT);
   ${SERVERCONFIGLIST ? `
-  await Promise.all([${SERVERCONFIGLIST}].map(config=>config.start(serverInterface)));` : ""}
+  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.start).map(config=>config.start(serverInterface)));` : ""}
 }
 main().catch(e=>console.error(e));
 `
@@ -13062,7 +13053,7 @@ var auth_default = {
 // editor/server.ts
 var ADMIN_EDITOR_BROWSER_OPEN_KEY = "ADMIN_EDITOR_BROWSER_OPEN_KEY$$";
 var server_default = {
-  preload: async (serverInterface, adminInterface) => {
+  preload: (serverInterface, adminInterface) => {
     if (serverInterface?.isPrimaryWorker()) {
       const cache = adminInterface ? adminInterface.getCache() : serverInterface.cache;
       if (!cache.has(ADMIN_EDITOR_AUTH_KEY)) {
@@ -13100,7 +13091,8 @@ var server_default = {
 init_constants();
 async function createEditorRouter(adminInterface) {
   const router = new Router();
-  router.use(async (req, res) => {
+  const innerRouter = new Router();
+  innerRouter.use(async (req, res) => {
     res.setHeader("x-uuid", req.uuid);
     req.editor = adminInterface;
   });
@@ -13116,14 +13108,36 @@ async function createEditorRouter(adminInterface) {
   const reloadAPI = (await Promise.resolve().then(() => (init_reload_api(), reload_api_exports))).default;
   const authHandler = SessionHandler(auth_default);
   const { EditorIndex: EditorIndex2 } = await Promise.resolve().then(() => (init_editor_index(), editor_index_exports));
-  router.post(`${BASEEDITOR_PATH}/api/fs/write`, getHandler(authHandler, writeAPI));
-  router.post(`${BASEEDITOR_PATH}/api/fs/rename`, getHandler(authHandler, renameAPI));
-  router.post(`${BASEEDITOR_PATH}/api/fs/read`, getHandler(authHandler, readAPI));
-  router.post(`${BASEEDITOR_PATH}/api/fs/delete`, getHandler(authHandler, deleteAPI));
-  router.get(`${BASEEDITOR_PATH}/api/fs/scan`, getHandler(authHandler, scanAPI));
-  router.post(`${BASEEDITOR_PATH}/api/server/restart`, getHandler(authHandler, restartAPI));
-  router.post(`${BASEEDITOR_PATH}/api/server/reload`, getHandler(authHandler, reloadAPI));
-  router.get(`${BASEEDITOR_PATH}/font.ttf`, async (_req, res) => {
+  innerRouter.use(authHandler);
+  innerRouter.post(`/api/fs/write`, getHandler(
+    /*authHandler, */
+    writeAPI
+  ));
+  innerRouter.post(`/api/fs/rename`, getHandler(
+    /*authHandler, */
+    renameAPI
+  ));
+  innerRouter.post(`/api/fs/read`, getHandler(
+    /*authHandler, */
+    readAPI
+  ));
+  innerRouter.post(`/api/fs/delete`, getHandler(
+    /*authHandler, */
+    deleteAPI
+  ));
+  innerRouter.get(`/api/fs/scan`, getHandler(
+    /*authHandler, */
+    scanAPI
+  ));
+  innerRouter.post(`/api/server/restart`, getHandler(
+    /*authHandler, */
+    restartAPI
+  ));
+  innerRouter.post(`/api/server/reload`, getHandler(
+    /*authHandler, */
+    reloadAPI
+  ));
+  innerRouter.get(`/font.ttf`, async (_req, res) => {
     return await res.asyncEnd({
       status: 200,
       headers: {
@@ -13132,10 +13146,11 @@ async function createEditorRouter(adminInterface) {
       body: editorFont
     });
   });
-  router.get(BASEEDITOR_PATH, [authHandler, EditorIndex2(editorCSS, editorJS, false)]);
-  router.use(async (req, res) => {
+  innerRouter.get("/", EditorIndex2(editorCSS, editorJS, false));
+  innerRouter.use(async (req, res) => {
     delete req.editor;
   });
+  router.use(innerRouter, BASEEDITOR_PATH);
   return router;
 }
 function getHandlerOptions(router) {
@@ -13147,11 +13162,11 @@ function getHandlerOptions(router) {
     response: router.response
   };
 }
-function getHandler(auth, router) {
-  const ret = new Router();
-  ret.use(auth);
-  ret.use(router.handler, void 0, void 0, getHandlerOptions(router));
-  return ret;
+function getHandler(router) {
+  return {
+    ...getHandlerOptions(router),
+    handler: router.handler
+  };
 }
 
 // src/common/watch.ts
@@ -13385,7 +13400,7 @@ var ServerInterfaceImpl = class {
   constructor(options) {
     this.cache = options.cache;
     this.localCache = options.localCache;
-    this.logger = options.logger;
+    this.logger = options.logger ? options.logger : options.loggerProvider ? options.loggerProvider.getLogger("server") : void 0;
     this.port = options.port;
     const dbManager = options.dbManager;
     const wsManager = options.wsManager;
@@ -13424,6 +13439,12 @@ var ServerInterfaceImpl = class {
       }
     });
   }
+  getWorkerNumber() {
+    return import_node_cluster2.default.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === void 0 ? 0 : parseInt(process.env["CLUSTER_NODE_NUMBER"], 10);
+  }
+  getWorkerCount() {
+    return import_node_cluster2.default.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === void 0 || process.env["CLUSTER_COUNT"] === void 0 ? 1 : parseInt(process.env["CLUSTER_COUNT"], 10);
+  }
   isPrimaryWorker() {
     return import_node_cluster2.default.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0";
   }
@@ -14070,14 +14091,6 @@ async function appendAPIModule(router, dir, filePath, module2) {
 });
 /*! Bundled license information:
 
-cookie/index.js:
-  (*!
-   * cookie
-   * Copyright(c) 2012-2014 Roman Shtylman
-   * Copyright(c) 2015 Douglas Christopher Wilson
-   * MIT Licensed
-   *)
-
 showdown/dist/showdown.js:
   (*! showdown v 2.1.0 - 21-04-2022 *)
 */

package/editor/common/constants.ts

@@ -1,5 +1,5 @@
 export const BASEEDITOR_PATH = "/admin/editor";
-export const LOG_SOCKET_PATH = "/admin/socket/";
+export const LOG_SOCKET_PATH = "/admin/socket";
 export const LOG_WRITE_EVENT = "LogWrite";
 
 export const SUPPORTED_LANGUAGES = [

package/editor/http/admin/editor/style.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: 'EditorFont';
-  src: url('font.ttf');
+  src: url('/admin/editor/font.ttf');
 }
 
 * {

package/editor/server.ts

@@ -10,7 +10,7 @@ import { EditorAdminInterface } from "./common/admin-interface.js";
 const ADMIN_EDITOR_BROWSER_OPEN_KEY = "ADMIN_EDITOR_BROWSER_OPEN_KEY$$";
 
 export default {
-  preload: async (serverInterface: ServerInterface, adminInterface: EditorAdminInterface) => {
+  preload: (serverInterface: ServerInterface, adminInterface: EditorAdminInterface) => {
     //console.dir(server);
     if (serverInterface?.isPrimaryWorker()) {
       const cache = (adminInterface ? adminInterface.getCache() : serverInterface.cache);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "6.0.11",
+  "version": "6.0.13",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",
@@ -34,23 +34,22 @@
     "miqro-cluster": "build/esm/src/cluster.js"
   },
   "devDependencies": {
-    "@types/cookie": "^0.6.0",
     "@types/node": "^22.10.2",
+    "@types/showdown": "2.0.6",
     "postject": "1.0.0-alpha.6",
     "typescript": "^5.7.2",
     "highlight.js": "11.11.1"
   },
   "dependencies": {
-    "@miqro/core": "^5.0.13",
+    "@miqro/core": "^5.0.14",
     "@miqro/jsx": "^1.0.0",
     "@miqro/jsx-dom": "^1.0.3",
-    "@miqro/jsx-node": "^1.0.4",
+    "@miqro/jsx-node": "^1.0.5",
     "@miqro/parser": "^2.0.4",
     "@miqro/query": "^0.0.4",
     "@miqro/runner": "^2.0.1",
     "@miqro/test": "^0.2.9",
     "@miqro/test-http": "^0.1.2",
-    "@types/showdown": "2.0.6",
     "esbuild": "0.25.4",
     "showdown": "2.1.0"
   }