shokupan 0.3.0 → 0.4.5

package/dist/index.js

@@ -1376,6 +1376,7 @@ const ready = db.connect(engine, { namespace: "vendor", database: "shokupan" }).
         DEFINE TABLE OVERWRITE users SCHEMALESS COMMENT "Created by Shokupan";
         DEFINE TABLE OVERWRITE idempotency_keys SCHEMALESS COMMENT "Created by Shokupan";
         DEFINE TABLE OVERWRITE middleware_tracking SCHEMALESS COMMENT "Created by Shokupan";
+        DEFINE TABLE OVERWRITE requests SCHEMALESS COMMENT "Created by Shokupan";
     `);
 });
 const datastore = {
@@ -1485,17 +1486,28 @@ class ShokupanRouter {
   currentGuards = [];
   // Registry Accessor
   getComponentRegistry() {
-    const routes = this[$routes].map((r) => ({
-      type: "route",
-      path: r.path,
-      method: r.method,
-      metadata: r.metadata,
-      handlerName: r.handler.name,
-      tags: r.handlerSpec?.tags,
-      order: r.order,
-      _fn: r.handler
-      // Expose handler for debugging instrumentation
-    }));
+    const controllerRoutesMap = /* @__PURE__ */ new Map();
+    const localRoutes = [];
+    for (const r of this[$routes]) {
+      const entry = {
+        type: "route",
+        path: r.path,
+        method: r.method,
+        metadata: r.metadata,
+        handlerName: r.handler.name,
+        tags: r.handlerSpec?.tags,
+        order: r.order,
+        _fn: r.handler
+      };
+      if (r.controller) {
+        if (!controllerRoutesMap.has(r.controller)) {
+          controllerRoutesMap.set(r.controller, []);
+        }
+        controllerRoutesMap.get(r.controller).push(entry);
+      } else {
+        localRoutes.push(entry);
+      }
+    }
     const mw = this.middleware;
     const middleware = mw ? mw.map((m) => ({
       name: m.name || "middleware",
@@ -1511,18 +1523,19 @@ class ShokupanRouter {
       children: r.getComponentRegistry()
     }));
     const controllers = this[$childControllers].map((c) => {
+      const routes = controllerRoutesMap.get(c) || [];
       return {
         type: "controller",
         path: c[$mountPath] || "/",
         name: c.constructor.name,
-        metadata: c.metadata
-        // Check if we can store this
+        metadata: c.metadata,
+        children: { routes }
       };
     });
     return {
       metadata: this.metadata,
       middleware,
-      routes,
+      routes: localRoutes,
       routers,
       controllers
     };
@@ -1612,7 +1625,7 @@ class ShokupanRouter {
       const decoratedArgs = instance[$routeArgs] || proto && proto[$routeArgs];
       const methodMiddlewareMap = instance[$middleware] || proto && proto[$middleware];
       let routesAttached = 0;
-      for (const name of methods) {
+      for (const name of Array.from(methods)) {
         if (name === "constructor") continue;
         if (["arguments", "caller", "callee"].includes(name)) continue;
         const originalHandler = instance[name];
@@ -1746,7 +1759,7 @@ class ShokupanRouter {
           const decoratedSpecs = instance[$routeSpec] || proto && proto[$routeSpec];
           const userSpec = decoratedSpecs && decoratedSpecs.get(name);
           const spec = { tags: [tagName], ...userSpec };
-          this.add({ method, path: normalizedPath, handler: finalHandler, spec });
+          this.add({ method, path: normalizedPath, handler: finalHandler, spec, controller: instance });
         }
       }
       if (routesAttached === 0) {
@@ -1967,8 +1980,23 @@ class ShokupanRouter {
    * @param handler - Route handler function
    * @param requestTimeout - Timeout for this route in milliseconds
    */
-  add({ method, path, spec, handler, regex: customRegex, group, requestTimeout, renderer }) {
+  add({ method, path, spec, handler, regex: customRegex, group, requestTimeout, renderer, controller }) {
     const { regex, keys } = customRegex ? { regex: customRegex, keys: [] } : this.parsePath(path);
+    if (this.currentGuards.length > 0) {
+      spec = spec || {};
+      for (const guard of this.currentGuards) {
+        if (guard.spec) {
+          if (guard.spec.responses) {
+            spec.responses = spec.responses || {};
+            Object.assign(spec.responses, guard.spec.responses);
+          }
+          if (guard.spec.security) {
+            spec.security = spec.security || [];
+            spec.security.push(...guard.spec.security);
+          }
+        }
+      }
+    }
     let wrappedHandler = handler;
     const routeGuards = [...this.currentGuards];
     const effectiveTimeout = requestTimeout ?? this.requestTimeout ?? this.rootConfig?.requestTimeout;
@@ -2094,7 +2122,8 @@ class ShokupanRouter {
       metadata: {
         file,
         line
-      }
+      },
+      controller
     });
     this.trie.insert(method, path, bakedHandler);
     return this;
@@ -2328,12 +2357,21 @@ class Shokupan extends ShokupanRouter {
       const c = ctx;
       if (c.handlerStack && c.app?.applicationConfig.enableMiddlewareTracking) {
         const metadata = middleware.metadata || {};
-        c.handlerStack.push({
+        const start = performance.now();
+        const item = {
           name: metadata.pluginName ? `${metadata.pluginName} (${metadata.name})` : metadata.name || middleware.name || "middleware",
           file: metadata.file || file,
           line: metadata.line || line,
-          isBuiltin: metadata.isBuiltin
-        });
+          isBuiltin: metadata.isBuiltin,
+          startTime: start,
+          duration: -1
+        };
+        c.handlerStack.push(item);
+        try {
+          return await middleware(ctx, next);
+        } finally {
+          item.duration = performance.now() - start;
+        }
       }
       return middleware(ctx, next);
     };
@@ -2874,14 +2912,14 @@ function Compression(options = {}) {
       if (ctx._rawBody !== void 0) {
         if (typeof ctx._rawBody === "string") {
           const encoded = new TextEncoder().encode(ctx._rawBody);
-          body = encoded.buffer;
+          body = encoded;
           bodySize = encoded.byteLength;
         } else if (ctx._rawBody instanceof Uint8Array) {
-          body = ctx._rawBody.buffer;
+          body = ctx._rawBody;
           bodySize = ctx._rawBody.byteLength;
         } else {
           body = ctx._rawBody;
-          bodySize = ctx._rawBody.byteLength;
+          bodySize = body.byteLength;
         }
       } else {
         body = await response.arrayBuffer();
@@ -2891,7 +2929,7 @@ function Compression(options = {}) {
         return new Response(body, {
           status: response.status,
           statusText: response.statusText,
-          headers: response.headers
+          headers: new Headers(response.headers)
         });
       }
       let compressed;
@@ -3414,7 +3452,8 @@ function enableOpenApiValidation(app) {
 }
 const eta = new Eta();
 class ScalarPlugin extends ShokupanRouter {
-  constructor(pluginOptions) {
+  constructor(pluginOptions = {}) {
+    pluginOptions.config ??= {};
     super();
     this.pluginOptions = pluginOptions;
     this.init();