shokupan 0.15.1 → 0.15.2

package/dist/{index-5vGQaaL5.cjs → index-B-bQ7kZy.cjs}

@@ -121,6 +121,11 @@ class BodyParser {
    * Content-Length header.
    */
   static async parseFormData(req, maxBodySize) {
+    if (!req.headers.has("content-length") && req.headers.get("transfer-encoding") !== "chunked") {
+      const err = new Error("Length Required");
+      err.status = 411;
+      throw err;
+    }
     const rawBuffer = await BodyParser.readRawBufferBody(req, maxBodySize);
     const syntheticReq = new Request("http://localhost", {
       method: "POST",
@@ -2827,7 +2832,12 @@ function serveStatic(config, prefix) {
   const normalizedPrefix = prefix.endsWith("/") && prefix !== "/" ? prefix.slice(0, -1) : prefix;
   const isEtag = !!config.etag;
   const extensions = config.extensions || ["html", "htm", "htmx"];
+  const cacheEnabled = config.useCache !== false;
   const FILES = {};
+  let _resolveReady;
+  const _ready = new Promise((resolve2) => {
+    _resolveReady = resolve2;
+  });
   function toHeaders(name, stats, isEtag2) {
     const ctype = mrmime.lookup(name) || "application/octet-stream";
     const headers = {
@@ -2843,7 +2853,7 @@ function serveStatic(config, prefix) {
     }
     return headers;
   }
-  if (!config.useCache) {
+  if (cacheEnabled) {
     async function walk(dir) {
       const entries = await promises$1.readdir(dir, { withFileTypes: true });
       for (const entry of entries) {
@@ -2858,10 +2868,15 @@ function serveStatic(config, prefix) {
         }
       }
     }
-    walk(rootPath).catch(console.error);
+    walk(rootPath).then(_resolveReady).catch((err) => {
+      console.error("[serveStatic] Cache population error:", err);
+      _resolveReady();
+    });
+  } else {
+    _resolveReady();
   }
   const serveStaticMiddleware = async (ctx) => {
-    let reqPath = ctx.path.slice(normalizedPrefix.length);
+    let reqPath = ctx.params?.["*"] ?? ctx.path.slice(normalizedPrefix.length);
     if (!reqPath.startsWith("/")) reqPath = "/" + reqPath;
     try {
       reqPath = decodeURIComponent(reqPath);
@@ -2872,7 +2887,7 @@ function serveStatic(config, prefix) {
       return ctx.json({ error: "Forbidden" }, 403);
     }
     let file;
-    if (!config.useCache) {
+    if (cacheEnabled) {
       file = FILES[reqPath];
       if (!file) {
         for (const ext of extensions) {
@@ -2949,7 +2964,7 @@ function serveStatic(config, prefix) {
                                          <li><a href="../">../</a></li>
                                      <% } %>
                                      <% it.files.forEach(function(f) { %>
-                                         <li><a href="<%= f %>"><%= f %></a></li>
+                                         <li><a href="<%= encodeURIComponent(f) %>"><%= f %></a></li>
                                      <% }) %>
                                  </ul>
                                  </body>
@@ -3007,6 +3022,7 @@ function serveStatic(config, prefix) {
   };
   serveStaticMiddleware.isBuiltin = true;
   serveStaticMiddleware.pluginName = "ServeStatic";
+  serveStaticMiddleware.ready = _ready;
   return serveStaticMiddleware;
 }
 class OpenTelemetryPlugin {
@@ -3721,14 +3737,21 @@ class RouterTrie {
       delete params[node.paramChild.paramName];
     }
     if (node.wildcardChild) {
+      params["*"] = segment;
       const result = this.findNode(node.wildcardChild, segments, index + 1, params);
       if (result) return result;
+      delete params["*"];
     }
     if (node.recursiveChild) {
       const remaining = segments.length - index;
       for (let k = 0; k <= remaining; k++) {
+        const matchedSegments = segments.slice(index, index + k).join("/");
+        params["*"] = matchedSegments;
+        params["**"] = matchedSegments;
         const result = this.findNode(node.recursiveChild, segments, index + k, params);
         if (result) return result;
+        delete params["*"];
+        delete params["**"];
       }
     }
     return null;
@@ -4203,13 +4226,13 @@ class ShokupanRouter {
       }
       return ctx.upgrade({
         open: async (ctx2, ws) => {
+          ctx2[$ws] = ws;
           if (handlers.onOpen) {
             const sessionData = await handlers.onOpen(ctx2, ws);
             if (sessionData !== void 0) {
               ws.data = sessionData;
               ctx2.state = sessionData;
             }
-            ctx2[$ws] = ws;
           }
           if (!ctx2[$wsMessages]) ctx2[$wsMessages] = [];
           const originalSend = ws.send.bind(ws);
@@ -4317,6 +4340,7 @@ class ShokupanRouter {
       }
       return ctx.upgrade({
         open: async (ctx2, ws) => {
+          ctx2[$ws] = ws;
           if (openMethodName) {
             const openMethod = instance[openMethodName];
             if (openMethod) {
@@ -4645,13 +4669,17 @@ class ShokupanRouter {
   find(method, path2) {
     let result = this.trie.search(method, path2);
     if (result) {
-      result.handler = this.wrapHandlerWithMiddleware(result.handler);
+      if (!this[$isApplication]) {
+        result.handler = this.wrapHandlerWithMiddleware(result.handler);
+      }
       return result;
     }
     if (method === "HEAD") {
       result = this.trie.search("GET", path2);
       if (result) {
-        result.handler = this.wrapHandlerWithMiddleware(result.handler);
+        if (!this[$isApplication]) {
+          result.handler = this.wrapHandlerWithMiddleware(result.handler);
+        }
         return result;
       }
     }
@@ -5950,29 +5978,29 @@ class Shokupan extends ShokupanRouter {
     try {
       switch (adapterName) {
         case "sqlite": {
-          const { SqliteAdapter } = await Promise.resolve().then(() => require("./sqlite-DdGPsbUB.cjs"));
+          const { SqliteAdapter } = await Promise.resolve().then(() => require("./sqlite-Bf3Y44PF.cjs"));
           this.datastore = new SqliteAdapter(options);
           break;
         }
         case "level": {
-          const { LevelAdapter } = await Promise.resolve().then(() => require("./level-dUQVvWkh.cjs"));
+          const { LevelAdapter } = await Promise.resolve().then(() => require("./level-C8w1C6JX.cjs"));
           this.datastore = new LevelAdapter(options);
           break;
         }
         case "surrealdb": {
-          const { SurrealAdapter } = await Promise.resolve().then(() => require("./surreal-p1skSyYf.cjs"));
+          const { SurrealAdapter } = await Promise.resolve().then(() => require("./surreal-Ctjsrb6S.cjs"));
           const legacyConfig = this.applicationConfig.surreal || {};
           const effectiveOptions = { ...legacyConfig, ...options };
           this.datastore = new SurrealAdapter(effectiveOptions);
           break;
         }
         case "knex": {
-          const { KnexAdapter } = await Promise.resolve().then(() => require("./knex-CDjnrxdn.cjs"));
+          const { KnexAdapter } = await Promise.resolve().then(() => require("./knex-DYPtgZG5.cjs"));
           this.datastore = new KnexAdapter(options || {});
           break;
         }
         default: {
-          const { SurrealAdapter } = await Promise.resolve().then(() => require("./surreal-p1skSyYf.cjs"));
+          const { SurrealAdapter } = await Promise.resolve().then(() => require("./surreal-Ctjsrb6S.cjs"));
           const legacy = this.applicationConfig.surreal;
           this.datastore = new SurrealAdapter(options || legacy || {});
         }
@@ -6927,7 +6955,7 @@ class ApiExplorerPlugin extends ShokupanRouter {
     }
   }
   static getBasePath() {
-    const dir = path$1.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index-5vGQaaL5.cjs", document.baseURI).href));
+    const dir = path$1.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index-B-bQ7kZy.cjs", document.baseURI).href));
     if (dir.endsWith("dist")) {
       return dir + "/plugins/application/api-explorer";
     }
@@ -7600,7 +7628,7 @@ class AsyncApiPlugin extends ShokupanRouter {
     this.init();
   }
   static getBasePath() {
-    const dir = path$1.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index-5vGQaaL5.cjs", document.baseURI).href));
+    const dir = path$1.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index-B-bQ7kZy.cjs", document.baseURI).href));
     if (dir.endsWith("dist")) {
       return dir + "/plugins/application/asyncapi";
     }
@@ -8242,7 +8270,7 @@ function Card({ title, contentId }) {
     /* @__PURE__ */ jsxRuntime.jsx("div", { id: contentId })
   ] });
 }
-const require$1 = node_module.createRequire(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index-5vGQaaL5.cjs", document.baseURI).href);
+const require$1 = node_module.createRequire(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index-B-bQ7kZy.cjs", document.baseURI).href);
 const http = require$1("node:http");
 const https = require$1("node:https");
 class FetchInterceptor {
@@ -8846,7 +8874,7 @@ class Dashboard {
   }
   // Get base path for dashboard files - works in both dev (src/) and production (dist/)
   static getBasePath() {
-    const dir = path$1.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index-5vGQaaL5.cjs", document.baseURI).href));
+    const dir = path$1.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index-B-bQ7kZy.cjs", document.baseURI).href));
     if (dir.endsWith("dist")) {
       return dir + "/plugins/application/dashboard";
     }
@@ -11255,14 +11283,29 @@ function Compression(options = {}) {
     }
     const acceptEncoding = ctx.headers.get("accept-encoding") || "";
     let method = null;
-    if (acceptEncoding.includes("br")) method = "br";
-    else if (acceptEncoding.includes("zstd")) {
-      if (typeof Bun === "undefined") {
-        throw new Error("zstd compression is only available in Bun runtime. Client requested zstd but server is running on Node.js.");
-      }
-      method = "zstd";
-    } else if (acceptEncoding.includes("gzip")) method = "gzip";
-    else if (acceptEncoding.includes("deflate")) method = "deflate";
+    const encodings = acceptEncoding.split(",");
+    for (let i = 0; i < encodings.length; i++) {
+      const enc = encodings[i].split(";")[0].trim().toLowerCase();
+      if (enc === "br" && allowedAlgorithms.has("br")) {
+        method = "br";
+        break;
+      }
+      if (enc === "zstd" && allowedAlgorithms.has("zstd")) {
+        if (typeof Bun !== "undefined") {
+          method = "zstd";
+          break;
+        }
+        continue;
+      }
+      if (enc === "gzip" && allowedAlgorithms.has("gzip")) {
+        method = "gzip";
+        break;
+      }
+      if (enc === "deflate" && allowedAlgorithms.has("deflate")) {
+        method = "deflate";
+        break;
+      }
+    }
     if (!method) return next();
     if (!allowedAlgorithms.has(method)) {
       return next();
@@ -11639,10 +11682,21 @@ function validate(config) {
     let validQuery;
     if (validators.query && queryObj) {
       validQuery = await validators.query(queryObj);
+      Object.defineProperty(ctx, "query", {
+        value: validQuery,
+        writable: true,
+        configurable: true
+      });
     }
+    let validHeaders;
     if (validators.headers) {
       const headersObj = Object.fromEntries(ctx.req.headers.entries());
-      await validators.headers(headersObj);
+      validHeaders = await validators.headers(headersObj);
+      Object.defineProperty(ctx, "headers", {
+        value: new Headers(validHeaders),
+        writable: true,
+        configurable: true
+      });
     }
     let validBody;
     if (validators.body) {
@@ -11660,6 +11714,7 @@ function validate(config) {
     const validatedData = { ...dataToValidate };
     if (config.params) validatedData.params = ctx.params;
     if (config.query) validatedData.query = validQuery;
+    if (config.headers) validatedData.headers = validHeaders;
     if (config.body) validatedData.body = validBody;
     await ctx.app.runHooks("afterValidate", ctx, validatedData);
     return next();
@@ -11900,7 +11955,7 @@ function Proxy$1(options) {
     if (!["http:", "https:"].includes(url.protocol)) {
       return ctx.text("Invalid protocol in proxied URL", 400);
     }
-    if (!options.allowedHosts?.includes(url.hostname)) {
+    if (options.allowedHosts && !options.allowedHosts.includes(url.hostname)) {
       return ctx.text("Proxied hostname not in allowlist", 403);
     }
     const headers = new Headers(req.headers);
@@ -11997,8 +12052,15 @@ function handleWSDrain(ws) {
 function SecurityHeaders(options = {}) {
   const securityHeadersMiddleware = async function SecurityHeadersMiddleware(ctx, next) {
     const response = await next();
-    if (!(response instanceof Response)) return response;
-    const set = (k, v) => response.headers.set(k, v);
+    const set = (k, v) => {
+      if (response instanceof Response) {
+        try {
+          response.headers.set(k, v);
+        } catch (e) {
+        }
+      }
+      ctx.response.headers.set(k, v);
+    };
     if (options.dnsPrefetchControl !== false) {
       const allow = options.dnsPrefetchControl?.allow;
       set("X-DNS-Prefetch-Control", allow ? "on" : "off");
@@ -12053,7 +12115,13 @@ function SecurityHeaders(options = {}) {
       }
     }
     if (options.hidePoweredBy !== false) {
-      response.headers.delete("X-Powered-By");
+      if (response instanceof Response) {
+        try {
+          response.headers.delete("X-Powered-By");
+        } catch (e) {
+        }
+      }
+      ctx.response.headers.delete("X-Powered-By");
     }
     return response;
   };
@@ -12061,6 +12129,8 @@ function SecurityHeaders(options = {}) {
   securityHeadersMiddleware.pluginName = "SecurityHeaders";
   return securityHeadersMiddleware;
 }
+const $isDirty = /* @__PURE__ */ Symbol("isDirty");
+const $resetDirty = /* @__PURE__ */ Symbol("resetDirty");
 class Cookie {
   maxAge;
   signed;
@@ -12270,7 +12340,25 @@ function Session(options) {
         sessObj.cookie.expires = new Date(Date.now() + (sessObj.cookie.maxAge || 0));
         if (store.touch) store.touch(sessObj.id, sessObj);
       };
-      return sessObj;
+      let _dirty = false;
+      const skippedKeys = /* @__PURE__ */ new Set(["id", "save", "destroy", "regenerate", "reload", "touch"]);
+      const proxy = new Proxy(sessObj, {
+        set(target, prop, value, receiver) {
+          if (typeof prop !== "symbol" && !skippedKeys.has(prop)) {
+            _dirty = true;
+          }
+          return Reflect.set(target, prop, value, receiver);
+        },
+        deleteProperty(target, prop) {
+          if (typeof prop !== "symbol" && !skippedKeys.has(prop)) _dirty = true;
+          return Reflect.deleteProperty(target, prop);
+        }
+      });
+      proxy[$isDirty] = () => _dirty;
+      proxy[$resetDirty] = () => {
+        _dirty = false;
+      };
+      return proxy;
     };
     let sessionData = null;
     if (!isNew && sessionID) {
@@ -12293,17 +12381,15 @@ function Session(options) {
     ctx.session = sess;
     ctx.sessionID = sessionID;
     ctx.sessionStore = store;
-    const originalHash = JSON.stringify(sess);
     const result = await next();
-    const currentHash = JSON.stringify(sess);
-    const isModified = originalHash !== currentHash;
+    const isModified = sess[$isDirty]?.() ?? false;
     if (!sessionID) return result;
     let shouldSave = false;
     if (isModified) {
       shouldSave = true;
     } else if (isNew && saveUninitialized) {
       shouldSave = true;
-    } else if (!isNew && resave) {
+    } else if (!isNew && resave && isModified) {
       shouldSave = true;
     }
     if (shouldSave) {
@@ -12340,6 +12426,7 @@ function Static(options, prefix = "/") {
     try {
       const result = await staticMiddleware(ctx, next);
       if (result instanceof Response && result.status === 404) {
+        ctx.response.status = 200;
         return next();
       }
       return result;
@@ -12491,4 +12578,4 @@ exports.traceMiddleware = traceMiddleware;
 exports.useExpress = useExpress;
 exports.valibot = valibot;
 exports.validate = validate;
-//# sourceMappingURL=index-5vGQaaL5.cjs.map
+//# sourceMappingURL=index-B-bQ7kZy.cjs.map