shokupan 0.16.4 → 0.16.5

package/dist/{index-BLdx5fql.cjs → index-Cx60P13T.cjs}

@@ -4888,7 +4888,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-BLdx5fql.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-Cx60P13T.cjs", document.baseURI).href));
     if (dir.endsWith("dist")) {
       return dir + "/plugins/application/api-explorer";
     }
@@ -5692,7 +5692,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-BLdx5fql.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-Cx60P13T.cjs", document.baseURI).href));
     if (dir.endsWith("dist")) {
       return dir + "/plugins/application/asyncapi";
     }
@@ -6216,7 +6216,7 @@ function createHTTPLogger() {
     return result;
   };
 }
-const require$1 = node_module.createRequire(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("index-BLdx5fql.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-Cx60P13T.cjs", document.baseURI).href);
 const http = require$1("node:http");
 const https = require$1("node:https");
 class FetchInterceptor {
@@ -6823,7 +6823,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-BLdx5fql.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-Cx60P13T.cjs", document.baseURI).href));
     if (dir.endsWith("dist")) {
       return dir + "/plugins/application/dashboard";
     }
@@ -9814,6 +9814,7 @@ class Shokupan extends ShokupanRouter {
   startupHooks = [];
   plugins = [];
   specAvailableHooks = [];
+  pluginInitPromises = [];
   get db() {
     return this.datastore;
   }
@@ -9926,24 +9927,24 @@ class Shokupan extends ShokupanRouter {
     try {
       switch (adapterName) {
         case "sqlite": {
-          const { SqliteAdapter } = await Promise.resolve().then(() => require("./sqlite-Tbm9zDxt.cjs"));
+          const { SqliteAdapter } = await Promise.resolve().then(() => require("./sqlite-CvoMrQNx.cjs"));
           this.datastore = new SqliteAdapter(options);
           break;
         }
         case "level": {
-          const { LevelAdapter } = await Promise.resolve().then(() => require("./level-ySRat4Qf.cjs"));
+          const { LevelAdapter } = await Promise.resolve().then(() => require("./level-DzWOqk9S.cjs"));
           this.datastore = new LevelAdapter(options);
           break;
         }
         case "surrealdb": {
-          const { SurrealAdapter } = await Promise.resolve().then(() => require("./surreal-DGDSgKuP.cjs"));
+          const { SurrealAdapter } = await Promise.resolve().then(() => require("./surreal-DOJpgKP7.cjs"));
           const legacyConfig = this.applicationConfig.surreal || {};
           const effectiveOptions = { ...legacyConfig, ...options };
           this.datastore = new SurrealAdapter(effectiveOptions);
           break;
         }
         default: {
-          const { SurrealAdapter } = await Promise.resolve().then(() => require("./surreal-DGDSgKuP.cjs"));
+          const { SurrealAdapter } = await Promise.resolve().then(() => require("./surreal-DOJpgKP7.cjs"));
           const legacy = this.applicationConfig.surreal;
           this.datastore = new SurrealAdapter(options || legacy || {});
         }
@@ -9979,11 +9980,16 @@ class Shokupan extends ShokupanRouter {
   }
   /**
    * Registers a plugin.
+   * This returns a promise that resolves when the plugin is initialized. You do not 
+   * need to await it unless you want to run code specifically after the plugin is initialized.
+   * Shokupan automatically awaits plugin initialization promises when calling listen().
    */
   async register(plugin, options) {
     this.plugins.push(plugin);
     try {
-      await plugin.onInit(this, options);
+      const promise = plugin.onInit(this, options);
+      this.pluginInitPromises.push(promise);
+      await promise;
     } catch (err) {
       this.logger?.error("Shokupan", "Failed to initialize plugin", { error: err });
       throw err;
@@ -10149,6 +10155,7 @@ class Shokupan extends ShokupanRouter {
    */
   async listen(port, callback) {
     this.httpServer = new ShokupanServer(this);
+    await Promise.allSettled(this.pluginInitPromises);
     this.server = await this.httpServer.listen(port);
     const protocol = this.applicationConfig.tls || this.applicationConfig.development ? "https" : "http";
     const url = `${protocol}://${this.applicationConfig.hostname}:${this.applicationConfig.port}`;
@@ -10603,6 +10610,21 @@ class AuthPlugin extends ShokupanRouter {
     return jwt;
   }
   init() {
+    this.get("/auth/me", async (ctx) => {
+      const cookieHeader = ctx.req.headers.get("Cookie");
+      const token = cookieHeader?.match(/auth_token=([^;]+)/)?.[1];
+      if (!token) return ctx.json({ error: "Unauthenticated" }, 401);
+      try {
+        const { payload } = await this.jose.jwtVerify(token, this.secret);
+        return ctx.json(payload);
+      } catch {
+        return ctx.json({ error: "Invalid or expired token" }, 401);
+      }
+    });
+    this.post("/auth/logout", (ctx) => {
+      ctx.set("Set-Cookie", "auth_token=; Path=/; HttpOnly; Max-Age=0; SameSite=Lax");
+      return ctx.json({ ok: true });
+    });
     const { generateState, generateCodeVerifier, GitHub, Google, MicrosoftEntraId, Apple, Auth0, Okta, OAuth2Client } = this.arctic;
     const providerEntries = Object.entries(this.authConfig.providers);
     for (let i = 0; i < providerEntries.length; i++) {
@@ -10640,6 +10662,7 @@ class AuthPlugin extends ShokupanRouter {
         const url = new URL(ctx.req.url);
         const code = url.searchParams.get("code");
         const state = url.searchParams.get("state");
+        console.log("== OAuth Callback Hit ==", { providerName, code, state });
         const cookieHeader = ctx.req.headers.get("Cookie");
         const storedState = cookieHeader?.match(/oauth_state=([^;]+)/)?.[1];
         const storedVerifier = cookieHeader?.match(/oauth_verifier=([^;]+)/)?.[1];
@@ -10663,17 +10686,38 @@ class AuthPlugin extends ShokupanRouter {
             if (!providerConfig.tokenUrl) return ctx.text("Config error: tokenUrl required for oauth2", 500);
             tokens = await provider.validateAuthorizationCode(providerConfig.tokenUrl, code, null);
           }
-          const accessToken = tokens.accessToken || tokens.access_token;
+          const accessToken = typeof tokens.accessToken === "function" ? tokens.accessToken() : tokens.accessToken || tokens.access_token;
+          try {
+            if (typeof tokens.idToken === "function") {
+              idToken = tokens.idToken();
+            } else if (tokens.idToken) {
+              idToken = tokens.idToken;
+            }
+          } catch (e) {
+          }
           const user = await this.fetchUser(providerName, accessToken, providerConfig, idToken);
           if (this.authConfig.onSuccess) {
             const res = await this.authConfig.onSuccess(user, ctx);
             if (res) return res;
           }
           const jwt = await this.createSession(user, ctx);
+          if (this.authConfig.successRedirect) {
+            return ctx.redirect(this.authConfig.successRedirect);
+          }
           return ctx.json({ token: jwt, user });
         } catch (e) {
+          console.error("Auth Exception:", e);
+          let extradata = "";
+          try {
+            if (e && e.response) extradata = " | Body: " + await e.response.text();
+          } catch {
+          }
           ctx.app?.logger?.error("Auth", "Authentication failed", e);
-          return ctx.text("Authentication failed. Please try again.", 500);
+          return ctx.text(`Authentication failed.
+Error: ${e?.message ?? String(e)}${extradata}
+
+Stack:
+${e?.stack}`, 500);
         }
       });
     }
@@ -10682,7 +10726,10 @@ class AuthPlugin extends ShokupanRouter {
     let user = { id: "unknown", provider };
     if (provider === "github") {
       const res = await fetch("https://api.github.com/user", {
-        headers: { Authorization: `Bearer ${token}` }
+        headers: {
+          Authorization: `Bearer ${token}`,
+          "User-Agent": "Shokupan-Auth/1.0"
+        }
       });
       const data = await res.json();
       user = {
@@ -13067,4 +13114,4 @@ exports.traceMiddleware = traceMiddleware;
 exports.useExpress = useExpress;
 exports.valibot = valibot;
 exports.validate = validate;
-//# sourceMappingURL=index-BLdx5fql.cjs.map
+//# sourceMappingURL=index-Cx60P13T.cjs.map