shokupan 0.4.4 → 0.5.0

package/dist/index.js

@@ -14,7 +14,7 @@ import Ajv from "ajv";
 import addFormats from "ajv-formats";
 import { plainToInstance } from "class-transformer";
 import { validateOrReject } from "class-validator";
-import { OpenAPIAnalyzer } from "./openapi-analyzer-BtIaHIfe.js";
+import { OpenAPIAnalyzer } from "./openapi-analyzer-D7y6Qa38.js";
 import { randomUUID, createHmac } from "crypto";
 import { EventEmitter } from "events";
 class ShokupanResponse {
@@ -858,7 +858,7 @@ async function generateOpenApi(rootRouter, options = {}) {
   const defaultTagName = options.defaultTag || "Application";
   let astRoutes = [];
   try {
-    const { OpenAPIAnalyzer: OpenAPIAnalyzer2 } = await import("./openapi-analyzer-BtIaHIfe.js");
+    const { OpenAPIAnalyzer: OpenAPIAnalyzer2 } = await import("./openapi-analyzer-D7y6Qa38.js");
     const analyzer = new OpenAPIAnalyzer2(process.cwd());
     const { applications } = await analyzer.analyze();
     const appMap = /* @__PURE__ */ new Map();
@@ -2071,34 +2071,36 @@ class ShokupanRouter {
         if (ctx.app?.applicationConfig.enableMiddlewareTracking) {
           const duration = performance.now() - startTime;
           const config = ctx.app.applicationConfig;
-          try {
-            const timestamp = Date.now();
-            const key = `${timestamp}-${handler.name || "anonymous"}-${Math.random().toString(36).substring(7)}`;
-            await datastore.set("middleware_tracking", key, {
-              name: handler.name || "anonymous",
-              path: ctx.path,
-              timestamp,
-              duration,
-              file,
-              line,
-              error: error ? String(error) : void 0,
-              metadata: {
-                isBuiltin: handler.isBuiltin,
-                pluginName: handler.pluginName
+          Promise.resolve().then(async () => {
+            try {
+              const timestamp = Date.now();
+              const key = `${timestamp}-${handler.name || "anonymous"}-${Math.random().toString(36).substring(7)}`;
+              await datastore.set("middleware_tracking", key, {
+                name: handler.name || "anonymous",
+                path: ctx.path,
+                timestamp,
+                duration,
+                file,
+                line,
+                error: error ? String(error) : void 0,
+                metadata: {
+                  isBuiltin: handler.isBuiltin,
+                  pluginName: handler.pluginName
+                }
+              });
+              const ttl = config.middlewareTrackingTTL ?? 864e5;
+              const maxCapacity = config.middlewareTrackingMaxCapacity ?? 1e4;
+              const cutoff = Date.now() - ttl;
+              await datastore.query(`DELETE middleware_tracking WHERE timestamp < ${cutoff}`);
+              const results = await datastore.query("SELECT count() FROM middleware_tracking GROUP ALL");
+              if (results && results[0] && results[0].count > maxCapacity) {
+                const toDelete = results[0].count - maxCapacity;
+                await datastore.query(`DELETE middleware_tracking ORDER BY timestamp ASC LIMIT ${toDelete}`);
               }
-            });
-            const ttl = config.middlewareTrackingTTL ?? 864e5;
-            const maxCapacity = config.middlewareTrackingMaxCapacity ?? 1e4;
-            const cutoff = Date.now() - ttl;
-            await datastore.query(`DELETE middleware_tracking WHERE timestamp < ${cutoff}`);
-            const results = await datastore.query("SELECT count() FROM middleware_tracking GROUP ALL");
-            if (results && results[0] && results[0].count > maxCapacity) {
-              const toDelete = results[0].count - maxCapacity;
-              await datastore.query(`DELETE middleware_tracking ORDER BY timestamp ASC LIMIT ${toDelete}`);
+            } catch (datastoreError) {
+              console.error("Failed to store middleware tracking:", datastoreError);
             }
-          } catch (datastoreError) {
-            console.error("Failed to store middleware tracking:", datastoreError);
-          }
+          });
         }
       }
     };
@@ -2451,7 +2453,7 @@ class Shokupan extends ShokupanRouter {
       factory = createHttpServer();
     }
     const server = factory ? await factory(serveOptions) : Bun.serve(serveOptions);
-    console.log(`Shokupan server listening on http://${server.hostname}:${server.port}`);
+    console.log(`Shokupan server listening on http://${serveOptions.hostname}:${serveOptions.port}`);
     return server;
   }
   [$dispatch](req) {
@@ -3257,8 +3259,8 @@ function validate(config) {
       body = await safelyGetBody(ctx);
       dataToValidate.body = body;
     }
-    if (ctx.app?.applicationConfig.hooks?.beforeValidate) {
-      await ctx.app.applicationConfig.hooks.beforeValidate(ctx, dataToValidate);
+    if (ctx.app?.hasHook("beforeValidate")) {
+      await ctx.app.executeHook("beforeValidate", ctx, dataToValidate);
     }
     if (validators.params) {
       ctx.params = await validators.params(ctx.params);
@@ -3283,12 +3285,12 @@ function validate(config) {
       });
       ctx.body = validBody;
     }
-    if (ctx.app?.applicationConfig.hooks?.afterValidate) {
+    if (ctx.app?.hasHook("afterValidate")) {
       const validatedData = { ...dataToValidate };
       if (config.params) validatedData.params = ctx.params;
       if (config.query) validatedData.query = validQuery;
       if (config.body) validatedData.body = validBody;
-      await ctx.app.applicationConfig.hooks.afterValidate(ctx, validatedData);
+      await ctx.app?.executeHook("afterValidate", ctx, validatedData);
     }
     return next();
   };
@@ -3452,7 +3454,8 @@ function enableOpenApiValidation(app) {
 }
 const eta = new Eta();
 class ScalarPlugin extends ShokupanRouter {
-  constructor(pluginOptions) {
+  constructor(pluginOptions = {}) {
+    pluginOptions.config ??= {};
     super();
     this.pluginOptions = pluginOptions;
     this.init();
@@ -3471,8 +3474,7 @@ class ScalarPlugin extends ShokupanRouter {
 
                 <body>
                     <div id="app"></div>
-
-                    <script src="<%= it.path %>scalar.js"><\/script>
+                    <script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference"><\/script>
                     <script>
                         Scalar.createApiReference('#app', [{ ...<%~ JSON.stringify(it.config.baseDocument) %>,
                             url: "<%= it.path %>openapi.json",
@@ -3483,9 +3485,6 @@ class ScalarPlugin extends ShokupanRouter {
 
                 </html>`, { path, config: this.pluginOptions }));
     });
-    this.get("/scalar.js", (ctx) => {
-      return ctx.file(__dirname + "/../../node_modules/@scalar/api-reference/dist/browser/standalone.js");
-    });
     this.get("/openapi.json", async (ctx) => {
       let spec;
       if (this.root.openApiSpec) {