@orpc/experimental-pino 0.0.0 → 0.0.1

package/dist/index.d.mts

@@ -20,17 +20,18 @@ interface LoggingHandlerPluginOptions<T extends Context> {
      *
      * @default () => crypto.randomUUID()
      */
-    generateId?: (logger: Logger, options: StandardHandlerInterceptorOptions<T>) => string;
+    generateId?: (options: StandardHandlerInterceptorOptions<T>) => string;
     /**
-     * Enables info-level lifecycle logging for each request.
+     * Enables logging for request/response events.
      *
      * @example
      * - request received
      * - request handled
+     * - no matching procedure found
      *
      * @default undefined (disabled)
      */
-    logRequestLifecycle?: boolean;
+    logRequestResponse?: boolean;
     /**
      * Enables logging when requests are aborted.
      *
@@ -41,13 +42,13 @@ interface LoggingHandlerPluginOptions<T extends Context> {
      *
      * @default undefined (disabled)
      */
-    logAbort?: boolean;
+    logRequestAbort?: boolean;
 }
 declare class LoggingHandlerPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     private readonly logger;
     private readonly generateId;
-    private readonly logRequestLifecycle;
-    private readonly logAbort;
+    private readonly logRequestResponse;
+    private readonly logRequestAbort;
     constructor(options?: LoggingHandlerPluginOptions<T>);
     init(options: StandardHandlerOptions<T>): void;
 }

package/dist/index.d.ts

@@ -20,17 +20,18 @@ interface LoggingHandlerPluginOptions<T extends Context> {
      *
      * @default () => crypto.randomUUID()
      */
-    generateId?: (logger: Logger, options: StandardHandlerInterceptorOptions<T>) => string;
+    generateId?: (options: StandardHandlerInterceptorOptions<T>) => string;
     /**
-     * Enables info-level lifecycle logging for each request.
+     * Enables logging for request/response events.
      *
      * @example
      * - request received
      * - request handled
+     * - no matching procedure found
      *
      * @default undefined (disabled)
      */
-    logRequestLifecycle?: boolean;
+    logRequestResponse?: boolean;
     /**
      * Enables logging when requests are aborted.
      *
@@ -41,13 +42,13 @@ interface LoggingHandlerPluginOptions<T extends Context> {
      *
      * @default undefined (disabled)
      */
-    logAbort?: boolean;
+    logRequestAbort?: boolean;
 }
 declare class LoggingHandlerPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     private readonly logger;
     private readonly generateId;
-    private readonly logRequestLifecycle;
-    private readonly logAbort;
+    private readonly logRequestResponse;
+    private readonly logRequestAbort;
     constructor(options?: LoggingHandlerPluginOptions<T>);
     init(options: StandardHandlerOptions<T>): void;
 }

package/dist/index.mjs

@@ -10,58 +10,79 @@ function getLogger(context) {
 class LoggingHandlerPlugin {
   logger;
   generateId;
-  logRequestLifecycle;
-  logAbort;
+  logRequestResponse;
+  logRequestAbort;
   constructor(options = {}) {
     this.logger = options.logger ?? pino();
     this.generateId = options.generateId ?? (() => crypto.randomUUID());
-    this.logRequestLifecycle = options.logRequestLifecycle;
-    this.logAbort = options.logAbort;
+    this.logRequestResponse = options.logRequestResponse;
+    this.logRequestAbort = options.logRequestAbort;
   }
   init(options) {
     options.rootInterceptors ??= [];
     options.interceptors ??= [];
     options.clientInterceptors ??= [];
     options.rootInterceptors.unshift(async (interceptorOptions) => {
-      const logger = (interceptorOptions.context[CONTEXT_LOGGER_SYMBOL] ?? this.logger).child({});
-      const currentBindings = logger.bindings();
-      const extraBindings = {
-        orpc: { ...currentBindings.orpc, id: this.generateId(logger, interceptorOptions) }
-      };
-      if (!currentBindings.req) {
-        extraBindings.req = { url: interceptorOptions.request.url, method: interceptorOptions.request.method };
+      const logger = (interceptorOptions.context[CONTEXT_LOGGER_SYMBOL] ?? this.logger).child({
+        orpc: { id: this.generateId(interceptorOptions) }
+      });
+      if (!logger.bindings().req) {
+        logger.setBindings({
+          req: {
+            url: interceptorOptions.request.url,
+            method: interceptorOptions.request.method,
+            headers: {
+              "content-type": interceptorOptions.request.headers["content-type"],
+              "content-length": interceptorOptions.request.headers["content-length"],
+              "content-disposition": interceptorOptions.request.headers["content-disposition"]
+            }
+          }
+        });
+      }
+      if (this.logRequestAbort) {
+        const signal = interceptorOptions.request.signal;
+        if (signal?.aborted) {
+          logger?.info(`request was aborted before handling (${String(signal.reason)})`);
+        } else {
+          signal?.addEventListener("abort", () => {
+            logger?.info(`request is aborted (${String(signal.reason)})`);
+          }, { once: true });
+        }
       }
-      logger.setBindings(extraBindings);
       try {
-        return await interceptorOptions.next({
+        if (this.logRequestResponse) {
+          logger?.info("request received");
+        }
+        const result = await interceptorOptions.next({
           ...interceptorOptions,
           context: {
             ...interceptorOptions.context,
             [CONTEXT_LOGGER_SYMBOL]: logger
           }
         });
+        if (this.logRequestResponse) {
+          if (result.matched) {
+            logger?.info({
+              msg: "request handled",
+              res: {
+                status: result.response.status
+              }
+            });
+          } else {
+            logger?.info("no matching procedure found");
+          }
+        }
+        return result;
       } catch (error) {
         this.logger.error(error);
         throw error;
       }
     });
     options.interceptors.unshift(async ({ next, context, request }) => {
-      const logger = getLogger(context);
-      if (this.logAbort) {
-        request.signal?.addEventListener("abort", () => {
-          logger?.info(`request is aborted (${String(request.signal?.reason)})`);
-        }, { once: true });
-      }
       try {
-        if (this.logRequestLifecycle) {
-          logger?.info("request received");
-        }
-        const result = await next();
-        if (this.logRequestLifecycle) {
-          logger?.info(result.matched ? "request handled" : "no matching procedure found");
-        }
-        return result;
+        return await next();
       } catch (error) {
+        const logger = getLogger(context);
         if (request.signal?.aborted && request.signal.reason === error) {
           logger?.info(error);
         } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/experimental-pino",
   "type": "module",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -27,9 +27,9 @@
     "pino": ">=10.1.0"
   },
   "dependencies": {
-    "@orpc/client": "1.10.4",
+    "@orpc/server": "1.10.4",
     "@orpc/shared": "1.10.4",
-    "@orpc/server": "1.10.4"
+    "@orpc/client": "1.10.4"
   },
   "devDependencies": {
     "pino": "^10.1.0"