@udibo/oauth2 0.40.1 → 0.41.0

package/dist/adapters/hono/log.d.ts

@@ -1,8 +1,3 @@
-/**
- * Request logging that removes query values, including OAuth callback credentials.
- *
- * @module hono/log
- */
 import type { MiddlewareHandler } from "hono";
 /**
  * Produces a request target with every query value replaced by `[redacted]`.
@@ -26,14 +21,24 @@ import type { MiddlewareHandler } from "hono";
  */
 export declare function redactedRequestTarget(url: string | URL): string;
 /**
- * Logs Hono requests and responses without any query values. Mount before
- * authentication routes so OAuth callback codes and state stay out of logs.
- * Logs method, redacted target, response status, and elapsed milliseconds;
- * does not log headers or bodies. Paths and parameter names remain visible.
+ * Logs each Hono request as one line, written when the response is ready,
+ * without any query values. Mount before authentication routes so OAuth
+ * callback codes and state stay out of logs. Logs method, redacted target,
+ * response status and elapsed milliseconds; does not log headers or bodies.
+ * Paths and parameter names remain visible. A request whose handler throws
+ * something Hono does not answer (a non-`Error`) is still logged, as `500`.
+ *
+ * A request this middleware sees while it is handling another one (the app
+ * calling its own `fetch` from a handler or a server-rendered page's loader) is
+ * folded into the outer request's line, in brackets, in completion order,
+ * instead of writing its own. One that completes after the outer response was
+ * ready gets its own line, marked `(in-process)`; that includes a request
+ * started later from a timer or promise the outer request created. Each
+ * `requestLogger()` call folds only the requests it sees itself, so a sub-app
+ * with its own logger writes to its own sink.
  *
  * @param print Receives each log line; defaults to `console.log`, resolved per line.
- * @returns Middleware emitting a request line and, after downstream completion,
- * a response line.
+ * @returns Middleware emitting one line per request after downstream completion.
  *
  * @example
  * ```ts
@@ -43,6 +48,7 @@ export declare function redactedRequestTarget(url: string | URL): string;
  * const app = new Hono();
  * app.use(requestLogger());
  * app.get("/", (c) => c.text("Hello"));
+ * // --> GET /?code=[redacted] 200 3ms
  * ```
  */
 export declare function requestLogger(print?: (line: string) => void): MiddlewareHandler;

package/dist/adapters/hono/log.js

@@ -1,3 +1,9 @@
+/**
+ * Request logging that removes query values, including OAuth callback credentials.
+ *
+ * @module hono/log
+ */
+import { AsyncLocalStorage } from "node:async_hooks";
 /**
  * Produces a request target with every query value replaced by `[redacted]`.
  * Keeps the pathname and percent-encoded parameter names, including repeats,
@@ -28,15 +34,28 @@ export function redactedRequestTarget(url) {
         .join("&");
     return `${pathname}?${query}`;
 }
+function summary(method, url, status, started) {
+    return `${method} ${redactedRequestTarget(url)} ${status} ${Date.now() - started}ms`;
+}
 /**
- * Logs Hono requests and responses without any query values. Mount before
- * authentication routes so OAuth callback codes and state stay out of logs.
- * Logs method, redacted target, response status, and elapsed milliseconds;
- * does not log headers or bodies. Paths and parameter names remain visible.
+ * Logs each Hono request as one line, written when the response is ready,
+ * without any query values. Mount before authentication routes so OAuth
+ * callback codes and state stay out of logs. Logs method, redacted target,
+ * response status and elapsed milliseconds; does not log headers or bodies.
+ * Paths and parameter names remain visible. A request whose handler throws
+ * something Hono does not answer (a non-`Error`) is still logged, as `500`.
+ *
+ * A request this middleware sees while it is handling another one (the app
+ * calling its own `fetch` from a handler or a server-rendered page's loader) is
+ * folded into the outer request's line, in brackets, in completion order,
+ * instead of writing its own. One that completes after the outer response was
+ * ready gets its own line, marked `(in-process)`; that includes a request
+ * started later from a timer or promise the outer request created. Each
+ * `requestLogger()` call folds only the requests it sees itself, so a sub-app
+ * with its own logger writes to its own sink.
  *
  * @param print Receives each log line; defaults to `console.log`, resolved per line.
- * @returns Middleware emitting a request line and, after downstream completion,
- * a response line.
+ * @returns Middleware emitting one line per request after downstream completion.
  *
  * @example
  * ```ts
@@ -46,15 +65,39 @@ export function redactedRequestTarget(url) {
  * const app = new Hono();
  * app.use(requestLogger());
  * app.get("/", (c) => c.text("Hello"));
+ * // --> GET /?code=[redacted] 200 3ms
  * ```
  */
 export function requestLogger(print) {
     const emit = print ?? ((line) => console.log(line));
+    const outerRequest = new AsyncLocalStorage();
     return async (c, next) => {
-        const target = redactedRequestTarget(c.req.url);
-        emit(`<-- ${c.req.method} ${target}`);
-        const start = Date.now();
-        await next();
-        emit(`--> ${c.req.method} ${target} ${c.res.status} ${Date.now() - start}ms`);
+        const started = Date.now();
+        const outer = outerRequest.getStore();
+        let status = 500;
+        if (outer) {
+            try {
+                await next();
+                status = c.res.status;
+            }
+            finally {
+                const call = summary(c.req.method, c.req.url, status, started);
+                if (outer.answered)
+                    emit(`--> (in-process) ${call}`);
+                else
+                    outer.calls.push(call);
+            }
+            return;
+        }
+        const request = { calls: [], answered: false };
+        try {
+            await outerRequest.run(request, next);
+            status = c.res.status;
+        }
+        finally {
+            request.answered = true;
+            const calls = request.calls.length === 0 ? "" : ` [${request.calls.join(", ")}]`;
+            emit(`--> ${summary(c.req.method, c.req.url, status, started)}${calls}`);
+        }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@udibo/oauth2",
-  "version": "0.40.1",
+  "version": "0.41.0",
   "description": "A flexible OAuth2 toolkit: framework-agnostic authorization & resource servers, a typed client, Hono adapters (including a backend-for-frontend), and React bindings.",
   "keywords": [
     "authorization-server",