miqro 8.0.1 → 8.0.3

package/build/esm/common/exit.js

@@ -10,22 +10,23 @@ function cleanJSX(app) {
         unlinkSync(getESBuildBinaryPath());
     }
     if (CLEAR_JSX_CACHE) {
-        /*app.logger?.trace("trying to clean up jsx.js installation at [%s]", getJSXJSPath());
-        if (existsSync(getJSXJSPath())) {
-          unlinkSync(getJSXJSPath());
-        }*/
-        const buildParendDir = resolve(JSX_TMP_DIR, String(process.pid));
-        app.logger?.trace("trying to clean up jsx build/import folders at [%s]", buildParendDir);
-        const buildDir = resolve(buildParendDir, "build");
-        const importDir = resolve(buildParendDir, "import");
-        if (existsSync(buildDir)) {
-            rmdirSync(buildDir);
-        }
-        if (existsSync(importDir)) {
-            rmdirSync(importDir);
+        try {
+            const buildParendDir = resolve(JSX_TMP_DIR, String(process.pid));
+            app.logger?.trace("trying to clean up jsx build/import folders at [%s]", buildParendDir);
+            const buildDir = resolve(buildParendDir, "build");
+            const importDir = resolve(buildParendDir, "import");
+            if (existsSync(buildDir)) {
+                rmdirSync(buildDir);
+            }
+            if (existsSync(importDir)) {
+                rmdirSync(importDir);
+            }
+            if (existsSync(buildParendDir)) {
+                rmdirSync(buildParendDir);
+            }
         }
-        if (existsSync(buildParendDir)) {
-            rmdirSync(buildParendDir);
+        catch (e) {
+            app.logger?.error(e);
         }
     }
 }
@@ -35,14 +36,8 @@ export function setupExitHandlers(app) {
         app.logger?.error('Caught exception: ' + err);
         app.logger?.error(err);
         exceptionOccured = true;
-        /*if (app.server) {
-          notifiyServerConfigSync(app, "unload");
-          notifiyServerConfigSync(app, "stop");
-          app.webSocketManager.disconnectAll();
-          app.dbManager.closeAll();
-        }*/
         cleanJSX(app);
-        if (app.server) {
+        if (app.status === "started") {
             await app.stop();
         }
         process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
@@ -52,14 +47,8 @@ export function setupExitHandlers(app) {
             app.logger?.error('Exception occured');
         }
         else {
-            /*if (app.server) {
-              notifiyServerConfigSync(app, "unload");
-              notifiyServerConfigSync(app, "stop");
-              app.webSocketManager.disconnectAll();
-              app.dbManager.closeAll();
-            }*/
             cleanJSX(app);
-            if (app.server) {
+            if (app.status === "started") {
                 app.stop();
             }
         }
@@ -68,21 +57,15 @@ export function setupExitHandlers(app) {
         app.logger?.error('Unhandled rejection:');
         app.logger?.error(reason);
         exceptionOccured = true;
-        /*if (app.server) {
-          notifiyServerConfigSync(app, "unload");
-          notifiyServerConfigSync(app, "stop");
-          app.webSocketManager.disconnectAll();
-          app.dbManager.closeAll();
-        }*/
         cleanJSX(app);
-        if (app.server) {
+        if (app.status === "started") {
             await app.stop();
         }
         process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
     });
     process.on("SIGTERM", async function () {
         app.logger?.info('SIGTERM received');
-        if (app.server) {
+        if (app.status === "started") {
             await Promise.race([
                 app.stop(),
                 new Promise(r => setTimeout(r, 5000))
@@ -92,7 +75,7 @@ export function setupExitHandlers(app) {
     });
     process.on('SIGHUP', async function () {
         app.logger?.info('SIGHUP received');
-        if (app.server) {
+        if (app.status === "started") {
             await Promise.race([
                 app.stop(),
                 new Promise(r => setTimeout(r, 5000))
@@ -106,7 +89,7 @@ export function setupExitHandlers(app) {
     });*/
     process.on('SIGINT', async function () {
         app.logger?.info('SIGINT received');
-        if (app.server) {
+        if (app.status === "started") {
             await Promise.race([
                 app.stop(),
                 new Promise(r => setTimeout(r, 5000))

package/build/lib.cjs

@@ -34,12 +34,19 @@ 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;
+    exports2.parseCookie = parseCookie;
+    exports2.parse = parseCookie;
+    exports2.stringifyCookie = stringifyCookie;
+    exports2.stringifySetCookie = stringifySetCookie;
+    exports2.serialize = stringifySetCookie;
+    exports2.parseSetCookie = parseSetCookie;
+    exports2.stringifySetCookie = stringifySetCookie;
+    exports2.serialize = stringifySetCookie;
     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]*$/;
+    var maxAgeRegExp = /^-?\d+$/;
     var __toString = Object.prototype.toString;
     var NullObject = /* @__PURE__ */ (() => {
       const C = function() {
@@ -47,7 +54,7 @@ var require_dist = __commonJS({
       C.prototype = /* @__PURE__ */ Object.create(null);
       return C;
     })();
-    function parse2(str, options) {
+    function parseCookie(str, options) {
       const obj = new NullObject();
       const len = str.length;
       if (len < 2)
@@ -55,91 +62,87 @@ var require_dist = __commonJS({
       const dec = options?.decode || decode2;
       let index = 0;
       do {
-        const eqIdx = str.indexOf("=", index);
+        const eqIdx = eqIndex(str, index, len);
         if (eqIdx === -1)
           break;
-        const colonIdx = str.indexOf(";", index);
-        const endIdx = colonIdx === -1 ? len : colonIdx;
+        const endIdx = endIndex(str, index, len);
         if (eqIdx > endIdx) {
           index = str.lastIndexOf(";", eqIdx - 1) + 1;
           continue;
         }
-        const keyStartIdx = startIndex(str, index, eqIdx);
-        const keyEndIdx = endIndex(str, eqIdx, keyStartIdx);
-        const key = str.slice(keyStartIdx, keyEndIdx);
+        const key = valueSlice(str, index, eqIdx);
         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;
+          obj[key] = dec(valueSlice(str, eqIdx + 1, endIdx));
         }
         index = endIdx + 1;
       } while (index < len);
       return obj;
     }
-    function startIndex(str, index, max) {
-      do {
-        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) {
-        const code = str.charCodeAt(--index);
-        if (code !== 32 && code !== 9)
-          return index + 1;
+    function stringifyCookie(cookie, options) {
+      const enc = options?.encode || encodeURIComponent;
+      const cookieStrings = [];
+      for (const name of Object.keys(cookie)) {
+        const val = cookie[name];
+        if (val === void 0)
+          continue;
+        if (!cookieNameRegExp.test(name)) {
+          throw new TypeError(`cookie name is invalid: ${name}`);
+        }
+        const value = enc(val);
+        if (!cookieValueRegExp.test(value)) {
+          throw new TypeError(`cookie val is invalid: ${val}`);
+        }
+        cookieStrings.push(`${name}=${value}`);
       }
-      return min;
+      return cookieStrings.join("; ");
     }
-    function serialize2(name, val, options) {
+    function stringifySetCookie(_name, _val, _opts) {
+      const cookie = typeof _name === "object" ? _name : { ..._opts, name: _name, value: String(_val) };
+      const options = typeof _val === "object" ? _val : _opts;
       const enc = options?.encode || encodeURIComponent;
-      if (!cookieNameRegExp.test(name)) {
-        throw new TypeError(`argument name is invalid: ${name}`);
+      if (!cookieNameRegExp.test(cookie.name)) {
+        throw new TypeError(`argument name is invalid: ${cookie.name}`);
       }
-      const value = enc(val);
+      const value = cookie.value ? enc(cookie.value) : "";
       if (!cookieValueRegExp.test(value)) {
-        throw new TypeError(`argument val is invalid: ${val}`);
+        throw new TypeError(`argument val is invalid: ${cookie.value}`);
       }
-      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}`);
+      let str = cookie.name + "=" + value;
+      if (cookie.maxAge !== void 0) {
+        if (!Number.isInteger(cookie.maxAge)) {
+          throw new TypeError(`option maxAge is invalid: ${cookie.maxAge}`);
         }
-        str += "; Max-Age=" + options.maxAge;
+        str += "; Max-Age=" + cookie.maxAge;
       }
-      if (options.domain) {
-        if (!domainValueRegExp.test(options.domain)) {
-          throw new TypeError(`option domain is invalid: ${options.domain}`);
+      if (cookie.domain) {
+        if (!domainValueRegExp.test(cookie.domain)) {
+          throw new TypeError(`option domain is invalid: ${cookie.domain}`);
         }
-        str += "; Domain=" + options.domain;
+        str += "; Domain=" + cookie.domain;
       }
-      if (options.path) {
-        if (!pathValueRegExp.test(options.path)) {
-          throw new TypeError(`option path is invalid: ${options.path}`);
+      if (cookie.path) {
+        if (!pathValueRegExp.test(cookie.path)) {
+          throw new TypeError(`option path is invalid: ${cookie.path}`);
         }
-        str += "; Path=" + options.path;
+        str += "; Path=" + cookie.path;
       }
-      if (options.expires) {
-        if (!isDate(options.expires) || !Number.isFinite(options.expires.valueOf())) {
-          throw new TypeError(`option expires is invalid: ${options.expires}`);
+      if (cookie.expires) {
+        if (!isDate(cookie.expires) || !Number.isFinite(cookie.expires.valueOf())) {
+          throw new TypeError(`option expires is invalid: ${cookie.expires}`);
         }
-        str += "; Expires=" + options.expires.toUTCString();
+        str += "; Expires=" + cookie.expires.toUTCString();
       }
-      if (options.httpOnly) {
+      if (cookie.httpOnly) {
         str += "; HttpOnly";
       }
-      if (options.secure) {
+      if (cookie.secure) {
         str += "; Secure";
       }
-      if (options.partitioned) {
+      if (cookie.partitioned) {
         str += "; Partitioned";
       }
-      if (options.priority) {
-        const priority = typeof options.priority === "string" ? options.priority.toLowerCase() : void 0;
+      if (cookie.priority) {
+        const priority = typeof cookie.priority === "string" ? cookie.priority.toLowerCase() : void 0;
         switch (priority) {
           case "low":
             str += "; Priority=Low";
@@ -151,11 +154,11 @@ var require_dist = __commonJS({
             str += "; Priority=High";
             break;
           default:
-            throw new TypeError(`option priority is invalid: ${options.priority}`);
+            throw new TypeError(`option priority is invalid: ${cookie.priority}`);
         }
       }
-      if (options.sameSite) {
-        const sameSite = typeof options.sameSite === "string" ? options.sameSite.toLowerCase() : options.sameSite;
+      if (cookie.sameSite) {
+        const sameSite = typeof cookie.sameSite === "string" ? cookie.sameSite.toLowerCase() : cookie.sameSite;
         switch (sameSite) {
           case true:
           case "strict":
@@ -168,11 +171,98 @@ var require_dist = __commonJS({
             str += "; SameSite=None";
             break;
           default:
-            throw new TypeError(`option sameSite is invalid: ${options.sameSite}`);
+            throw new TypeError(`option sameSite is invalid: ${cookie.sameSite}`);
         }
       }
       return str;
     }
+    function parseSetCookie(str, options) {
+      const dec = options?.decode || decode2;
+      const len = str.length;
+      const endIdx = endIndex(str, 0, len);
+      const eqIdx = eqIndex(str, 0, endIdx);
+      const setCookie = eqIdx === -1 ? { name: "", value: dec(valueSlice(str, 0, endIdx)) } : {
+        name: valueSlice(str, 0, eqIdx),
+        value: dec(valueSlice(str, eqIdx + 1, endIdx))
+      };
+      let index = endIdx + 1;
+      while (index < len) {
+        const endIdx2 = endIndex(str, index, len);
+        const eqIdx2 = eqIndex(str, index, endIdx2);
+        const attr = eqIdx2 === -1 ? valueSlice(str, index, endIdx2) : valueSlice(str, index, eqIdx2);
+        const val = eqIdx2 === -1 ? void 0 : valueSlice(str, eqIdx2 + 1, endIdx2);
+        switch (attr.toLowerCase()) {
+          case "httponly":
+            setCookie.httpOnly = true;
+            break;
+          case "secure":
+            setCookie.secure = true;
+            break;
+          case "partitioned":
+            setCookie.partitioned = true;
+            break;
+          case "domain":
+            setCookie.domain = val;
+            break;
+          case "path":
+            setCookie.path = val;
+            break;
+          case "max-age":
+            if (val && maxAgeRegExp.test(val))
+              setCookie.maxAge = Number(val);
+            break;
+          case "expires":
+            if (!val)
+              break;
+            const date = new Date(val);
+            if (Number.isFinite(date.valueOf()))
+              setCookie.expires = date;
+            break;
+          case "priority":
+            if (!val)
+              break;
+            const priority = val.toLowerCase();
+            if (priority === "low" || priority === "medium" || priority === "high") {
+              setCookie.priority = priority;
+            }
+            break;
+          case "samesite":
+            if (!val)
+              break;
+            const sameSite = val.toLowerCase();
+            if (sameSite === "lax" || sameSite === "strict" || sameSite === "none") {
+              setCookie.sameSite = sameSite;
+            }
+            break;
+        }
+        index = endIdx2 + 1;
+      }
+      return setCookie;
+    }
+    function endIndex(str, min, len) {
+      const index = str.indexOf(";", min);
+      return index === -1 ? len : index;
+    }
+    function eqIndex(str, min, max) {
+      const index = str.indexOf("=", min);
+      return index < max ? index : -1;
+    }
+    function valueSlice(str, min, max) {
+      let start = min;
+      let end = max;
+      do {
+        const code = str.charCodeAt(start);
+        if (code !== 32 && code !== 9)
+          break;
+      } while (++start < end);
+      while (end > start) {
+        const code = str.charCodeAt(end - 1);
+        if (code !== 32 && code !== 9)
+          break;
+        end--;
+      }
+      return str.slice(start, end);
+    }
     function decode2(str) {
       if (str.indexOf("%") === -1)
         return str;
@@ -2588,7 +2678,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_dist(), 1);
+var import_cookie = __toESM(require_dist(), 1);
 var import_node_crypto = require("node:crypto");
 var import_node_http = require("node:http");
 
@@ -3050,7 +3140,6 @@ function parsePart(req, part, value, args, mode, parser4) {
 }
 
 // node_modules/@miqro/core/build/middleware/session.js
-var import_cookie = __toESM(require_dist(), 1);
 var DEFAULT_TOKEN_LOCATION = "free";
 var DEFAULT_TOKEN_HEADER = "Authorization";
 var DEFAULT_TOKEN_QUERY = "token";
@@ -3438,7 +3527,7 @@ var Request = class extends import_node_http.IncomingMessage {
       set: (v2) => {
         vCookie = v2;
         this.cookies = /* @__PURE__ */ Object.create(null);
-        const cookies = (0, import_cookie2.parse)(vCookie || "");
+        const cookies = (0, import_cookie.parse)(vCookie || "");
         const cookieList = Object.keys(cookies);
         for (const name of cookieList) {
           const value = cookies[name];
@@ -3522,7 +3611,7 @@ var Response = class _Response extends import_node_http.ServerResponse {
     });
   }
   setCookie(name, value, options) {
-    return this.setHeader("Set-Cookie", (0, import_cookie2.serialize)(name, String(value), options));
+    return this.setHeader("Set-Cookie", (0, import_cookie.serialize)(name, String(value), options));
   }
   addVaryHeader(value) {
     const c = this.getHeader("Vary");
@@ -11293,18 +11382,22 @@ function cleanJSX(app) {
     (0, import_node_fs17.unlinkSync)(getESBuildBinaryPath());
   }
   if (CLEAR_JSX_CACHE) {
-    const buildParendDir = (0, import_node_path19.resolve)(JSX_TMP_DIR, String(process.pid));
-    app.logger?.trace("trying to clean up jsx build/import folders at [%s]", buildParendDir);
-    const buildDir = (0, import_node_path19.resolve)(buildParendDir, "build");
-    const importDir = (0, import_node_path19.resolve)(buildParendDir, "import");
-    if ((0, import_node_fs17.existsSync)(buildDir)) {
-      (0, import_node_fs17.rmdirSync)(buildDir);
-    }
-    if ((0, import_node_fs17.existsSync)(importDir)) {
-      (0, import_node_fs17.rmdirSync)(importDir);
-    }
-    if ((0, import_node_fs17.existsSync)(buildParendDir)) {
-      (0, import_node_fs17.rmdirSync)(buildParendDir);
+    try {
+      const buildParendDir = (0, import_node_path19.resolve)(JSX_TMP_DIR, String(process.pid));
+      app.logger?.trace("trying to clean up jsx build/import folders at [%s]", buildParendDir);
+      const buildDir = (0, import_node_path19.resolve)(buildParendDir, "build");
+      const importDir = (0, import_node_path19.resolve)(buildParendDir, "import");
+      if ((0, import_node_fs17.existsSync)(buildDir)) {
+        (0, import_node_fs17.rmdirSync)(buildDir);
+      }
+      if ((0, import_node_fs17.existsSync)(importDir)) {
+        (0, import_node_fs17.rmdirSync)(importDir);
+      }
+      if ((0, import_node_fs17.existsSync)(buildParendDir)) {
+        (0, import_node_fs17.rmdirSync)(buildParendDir);
+      }
+    } catch (e) {
+      app.logger?.error(e);
     }
   }
 }
@@ -11315,7 +11408,7 @@ function setupExitHandlers(app) {
     app.logger?.error(err);
     exceptionOccured = true;
     cleanJSX(app);
-    if (app.server) {
+    if (app.status === "started") {
       await app.stop();
     }
     process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
@@ -11325,7 +11418,7 @@ function setupExitHandlers(app) {
       app.logger?.error("Exception occured");
     } else {
       cleanJSX(app);
-      if (app.server) {
+      if (app.status === "started") {
         app.stop();
       }
     }
@@ -11335,14 +11428,14 @@ function setupExitHandlers(app) {
     app.logger?.error(reason);
     exceptionOccured = true;
     cleanJSX(app);
-    if (app.server) {
+    if (app.status === "started") {
       await app.stop();
     }
     process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
   });
   process.on("SIGTERM", async function() {
     app.logger?.info("SIGTERM received");
-    if (app.server) {
+    if (app.status === "started") {
       await Promise.race([
         app.stop(),
         new Promise((r) => setTimeout(r, 5e3))
@@ -11352,7 +11445,7 @@ function setupExitHandlers(app) {
   });
   process.on("SIGHUP", async function() {
     app.logger?.info("SIGHUP received");
-    if (app.server) {
+    if (app.status === "started") {
       await Promise.race([
         app.stop(),
         new Promise((r) => setTimeout(r, 5e3))
@@ -11362,7 +11455,7 @@ function setupExitHandlers(app) {
   });
   process.on("SIGINT", async function() {
     app.logger?.info("SIGINT received");
-    if (app.server) {
+    if (app.status === "started") {
       await Promise.race([
         app.stop(),
         new Promise((r) => setTimeout(r, 5e3))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "description": "",
   "type": "module",
   "main": "build/esm/lib.js",
@@ -29,7 +29,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@miqro/core": "^5.1.2",
+    "@miqro/core": "^5.1.3",
     "@miqro/jsx": "^1.0.2",
     "@miqro/jsx-dom": "^1.0.6",
     "@miqro/jsx-node": "^1.0.9",