weifuwu 0.22.0 → 0.22.2

package/dist/index.js

@@ -1703,6 +1703,12 @@ var TestResponseImpl = class {
   async text() {
     return this.response.text();
   }
+  async bytes() {
+    return this.response.bytes();
+  }
+  async arrayBuffer() {
+    return this.response.arrayBuffer();
+  }
 };
 var TestRequest = class {
   headers = {};
@@ -1783,29 +1789,29 @@ var TestApp = class {
     this.router.use(mw);
     return this;
   }
-  /** Register a GET route */
-  get(path2, handler) {
-    this.router.get(path2, handler);
+  /** Register a GET route — supports route-level middleware via spread args. */
+  get(path2, ...args) {
+    this.router.get(path2, ...args);
     return this;
   }
-  /** Register a POST route */
-  post(path2, handler) {
-    this.router.post(path2, handler);
+  /** Register a POST route. */
+  post(path2, ...args) {
+    this.router.post(path2, ...args);
     return this;
   }
-  /** Register a PUT route */
-  put(path2, handler) {
-    this.router.put(path2, handler);
+  /** Register a PUT route. */
+  put(path2, ...args) {
+    this.router.put(path2, ...args);
     return this;
   }
-  /** Register a PATCH route */
-  patch(path2, handler) {
-    this.router.patch(path2, handler);
+  /** Register a PATCH route. */
+  patch(path2, ...args) {
+    this.router.patch(path2, ...args);
     return this;
   }
-  /** Register a DELETE route */
-  delete(path2, handler) {
-    this.router.delete(path2, handler);
+  /** Register a DELETE route. */
+  delete(path2, ...args) {
+    this.router.delete(path2, ...args);
     return this;
   }
   /** Start building a GET request */
@@ -3428,17 +3434,30 @@ function user(options) {
   }
   function middleware() {
     return async (req, ctx, next) => {
-      const header = req.headers.get("Authorization");
-      if (!header?.startsWith("Bearer ")) {
-        return new Response("Unauthorized", { status: 401, headers: { "WWW-Authenticate": "Bearer" } });
+      const sessionUserId = ctx.session?.userId;
+      if (sessionUserId) {
+        const row = await findById(sessionUserId);
+        if (row) {
+          ctx.user = stripPassword(row);
+          return next(req, ctx);
+        }
+        if (typeof ctx.session?.destroy === "function") {
+          ;
+          ctx.session.destroy();
+        } else {
+          delete ctx.session?.userId;
+        }
       }
-      const token = header.slice(7);
-      const userData = await verify(token);
-      if (!userData) {
-        return new Response("Unauthorized", { status: 401, headers: { "WWW-Authenticate": "Bearer" } });
+      const header = req.headers.get("Authorization");
+      const token = header?.startsWith("Bearer ") ? header.slice(7) : null;
+      if (token) {
+        const userData = await verify(token);
+        if (userData) {
+          ctx.user = userData;
+          return next(req, ctx);
+        }
       }
-      ctx.user = userData;
-      return next(req, ctx);
+      return new Response("Unauthorized", { status: 401, headers: { "WWW-Authenticate": "Bearer" } });
     };
   }
   function router() {
@@ -3456,12 +3475,19 @@ function user(options) {
         return Response.json({ error: err.message }, { status });
       }
     });
-    r2.post("/login", async (req) => {
+    r2.post("/login", async (req, ctx) => {
       try {
         const body = await req.json();
         const result = await login(body);
+        if (ctx.session) {
+          ;
+          ctx.session.userId = result.user.id;
+          ctx.session.role = result.user.role;
+        }
         const res = Response.json(result);
-        res.headers.set("Set-Cookie", `session=${result.token}; HttpOnly; SameSite=Lax; Path=/`);
+        if (!ctx.session) {
+          res.headers.set("Set-Cookie", `session=${result.token}; HttpOnly; SameSite=Lax; Path=/`);
+        }
         return res;
       } catch (err) {
         if (err instanceof z2.ZodError) {

package/dist/test-utils.d.ts

@@ -38,16 +38,16 @@ export declare class TestApp {
     constructor();
     /** Add global middleware */
     use(mw: any): this;
-    /** Register a GET route */
-    get(path: string, handler: Handler): this;
-    /** Register a POST route */
-    post(path: string, handler: Handler): this;
-    /** Register a PUT route */
-    put(path: string, handler: Handler): this;
-    /** Register a PATCH route */
-    patch(path: string, handler: Handler): this;
-    /** Register a DELETE route */
-    delete(path: string, handler: Handler): this;
+    /** Register a GET route — supports route-level middleware via spread args. */
+    get(path: string, ...args: any[]): this;
+    /** Register a POST route. */
+    post(path: string, ...args: any[]): this;
+    /** Register a PUT route. */
+    put(path: string, ...args: any[]): this;
+    /** Register a PATCH route. */
+    patch(path: string, ...args: any[]): this;
+    /** Register a DELETE route. */
+    delete(path: string, ...args: any[]): this;
     /** Start building a GET request */
     getReq(path: string): TestRequest;
     /** Start building a POST request */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weifuwu",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "Web-standard HTTP framework for Node.js — (req, ctx) => Response",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",