shokupan 0.16.4 → 0.16.6

package/dist/{index-Bb1U2B0-.js → index-DbBJL3MK.js}

@@ -6690,7 +6690,7 @@ class Dashboard {
       }
       this.metrics.logs.push(requestData);
       const idString = `req_${Date.now()}_${nanoid()}`;
-      this.db.upsert("request", idString, {
+      this.db?.upsert("request", idString, {
         ...requestData,
         id: idString
       }).catch((e) => this[$appRoot]?.logger?.error("Dashboard", "Failed to save outbound request", { error: e }));
@@ -9770,6 +9770,7 @@ class Shokupan extends ShokupanRouter {
   startupHooks = [];
   plugins = [];
   specAvailableHooks = [];
+  pluginInitPromises = [];
   get db() {
     return this.datastore;
   }
@@ -9882,24 +9883,24 @@ class Shokupan extends ShokupanRouter {
     try {
       switch (adapterName) {
         case "sqlite": {
-          const { SqliteAdapter } = await import("./sqlite-Db0vf9zn.js");
+          const { SqliteAdapter } = await import("./sqlite-D6NnHuca.js");
           this.datastore = new SqliteAdapter(options);
           break;
         }
         case "level": {
-          const { LevelAdapter } = await import("./level-R8z-VF5o.js");
+          const { LevelAdapter } = await import("./level-BEizp2x6.js");
           this.datastore = new LevelAdapter(options);
           break;
         }
         case "surrealdb": {
-          const { SurrealAdapter } = await import("./surreal-CxhSJpgW.js");
+          const { SurrealAdapter } = await import("./surreal-CNJ26Wpt.js");
           const legacyConfig = this.applicationConfig.surreal || {};
           const effectiveOptions = { ...legacyConfig, ...options };
           this.datastore = new SurrealAdapter(effectiveOptions);
           break;
         }
         default: {
-          const { SurrealAdapter } = await import("./surreal-CxhSJpgW.js");
+          const { SurrealAdapter } = await import("./surreal-CNJ26Wpt.js");
           const legacy = this.applicationConfig.surreal;
           this.datastore = new SurrealAdapter(options || legacy || {});
         }
@@ -9935,11 +9936,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;
@@ -10105,6 +10111,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}`;
@@ -10559,6 +10566,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++) {
@@ -10596,6 +10618,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];
@@ -10619,17 +10642,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);
         }
       });
     }
@@ -10638,7 +10682,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 = {
@@ -13025,4 +13072,4 @@ export {
   OnOpen as y,
   OnEvent as z
 };
-//# sourceMappingURL=index-Bb1U2B0-.js.map
+//# sourceMappingURL=index-DbBJL3MK.js.map