@orpc/evlog 2.0.0-beta.30 → 2.0.0-beta.32

package/README.md

@@ -4,7 +4,7 @@
   <a href="https://codecov.io/gh/middleapi/orpc">
     <img alt="codecov" src="https://codecov.io/gh/middleapi/orpc/branch/main/graph/badge.svg">
   </a>
-  <a href="https://npmx.dev/package/@orpc/evlog">
+  <a href="https://www.npmjs.com/package/@orpc/evlog">
     <img alt="weekly downloads" src="https://img.shields.io/npm/dw/%40orpc%2Fevlog?logo=npm" />
   </a>
   <a href="https://app.codspeed.io/middleapi/orpc?utm_source=badge">
@@ -29,44 +29,44 @@ You can read the documentation [here](https://orpc.dev).
 
 **Core**
 
-- [@orpc/contract](https://npmx.dev/package/@orpc/contract): Define API contract as the single source of truth.
-- [@orpc/server](https://npmx.dev/package/@orpc/server): Build APIs or implement contracts.
-- [@orpc/client](https://npmx.dev/package/@orpc/client): Consume APIs with end-to-end type safety.
-- [@orpc/openapi](https://npmx.dev/package/@orpc/openapi): Add OpenAPI compatibility to APIs.
+- [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Define API contract as the single source of truth.
+- [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build APIs or implement contracts.
+- [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume APIs with end-to-end type safety.
+- [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Add OpenAPI compatibility to APIs.
 
 **Schema validation**
 
-- [@orpc/zod](https://npmx.dev/package/@orpc/zod): Integrate with [Zod](https://zod.dev/).
-- [@orpc/valibot](https://npmx.dev/package/@orpc/valibot): Integrate with [Valibot](https://valibot.dev/).
-- [@orpc/arktype](https://npmx.dev/package/@orpc/arktype): Integrate with [ArkType](https://arktype.io/).
+- [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): Integrate with [Zod](https://zod.dev/).
+- [@orpc/valibot](https://www.npmjs.com/package/@orpc/valibot): Integrate with [Valibot](https://valibot.dev/).
+- [@orpc/arktype](https://www.npmjs.com/package/@orpc/arktype): Integrate with [ArkType](https://arktype.io/).
 
 **Built-in features**
 
-- [@orpc/publisher](https://npmx.dev/package/@orpc/publisher): Pub/Sub with memory, Redis, and Upstash adapters.
-- [@orpc/ratelimit](https://npmx.dev/package/@orpc/ratelimit): Rate limiting with memory, Redis, and Upstash adapters.
-- [@orpc/hibernation](https://npmx.dev/package/@orpc/hibernation): Leverage Hibernation APIs like [Cloudflare's Hibernation WebSocket](https://developers.cloudflare.com/durable-objects/best-practices/websockets/#durable-objects-hibernation-websocket-api).
-- [@orpc/json-schema](https://npmx.dev/package/@orpc/json-schema): Smart coercion for OpenAPI requests.
+- [@orpc/publisher](https://www.npmjs.com/package/@orpc/publisher): Pub/Sub with memory, Redis, and Upstash adapters.
+- [@orpc/ratelimit](https://www.npmjs.com/package/@orpc/ratelimit): Rate limiting with memory, Redis, and Upstash adapters.
+- [@orpc/hibernation](https://www.npmjs.com/package/@orpc/hibernation): Leverage Hibernation APIs like [Cloudflare's Hibernation WebSocket](https://developers.cloudflare.com/durable-objects/best-practices/websockets/#durable-objects-hibernation-websocket-api).
+- [@orpc/json-schema](https://www.npmjs.com/package/@orpc/json-schema): Smart coercion for OpenAPI requests.
 
 **Framework & ecosystem integrations**
 
-- [@orpc/next](https://npmx.dev/package/@orpc/next): Integrate with [Next.js Server Functions](https://nextjs.org/docs/app/getting-started/mutating-data).
-- [@orpc/ai-sdk](https://npmx.dev/package/@orpc/ai-sdk): Turn contracts and procedures into [AI SDK](https://ai-sdk.dev/) tools.
-- [@orpc/tanstack-query](https://npmx.dev/package/@orpc/tanstack-query): Integrate with [TanStack Query](https://tanstack.com/query/latest).
-- [@orpc/pinia-colada](https://npmx.dev/package/@orpc/pinia-colada): Integrate with [Pinia Colada](https://pinia-colada.esm.dev/).
-- [@orpc/swr](https://npmx.dev/package/@orpc/swr): Integrate with [SWR](https://swr.vercel.app/).
-- [@orpc/experimental-msw](https://npmx.dev/package/@orpc/experimental-msw): Mock procedures with [Mock Service Worker](https://mswjs.io/).
-- [@orpc/experimental-effect](https://npmx.dev/package/@orpc/experimental-effect): Integrate with [Effect](https://effect.website/).
-- [@orpc/nest](https://npmx.dev/package/@orpc/nest): Implement your contract with [NestJS](https://nestjs.com/).
-- [@orpc/node](https://npmx.dev/package/@orpc/node): [Node.js](https://nodejs.org/) plugins for static file serving and large uploads.
-- [@orpc/bun](https://npmx.dev/package/@orpc/bun): Adapters for [Bun's Redis](https://bun.sh/).
-- [@orpc/cloudflare](https://npmx.dev/package/@orpc/cloudflare): Adapters for [Cloudflare's RateLimit and Durable Objects](https://developers.cloudflare.com/workers/).
-- [@orpc/trpc](https://npmx.dev/package/@orpc/trpc): Reuse existing [tRPC](https://trpc.io/) routers within oRPC.
+- [@orpc/next](https://www.npmjs.com/package/@orpc/next): Integrate with [Next.js Server Functions](https://nextjs.org/docs/app/getting-started/mutating-data).
+- [@orpc/ai-sdk](https://www.npmjs.com/package/@orpc/ai-sdk): Turn contracts and procedures into [AI SDK](https://ai-sdk.dev/) tools.
+- [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): Integrate with [TanStack Query](https://tanstack.com/query/latest).
+- [@orpc/pinia-colada](https://www.npmjs.com/package/@orpc/pinia-colada): Integrate with [Pinia Colada](https://pinia-colada.esm.dev/).
+- [@orpc/swr](https://www.npmjs.com/package/@orpc/swr): Integrate with [SWR](https://swr.vercel.app/).
+- [@orpc/experimental-msw](https://www.npmjs.com/package/@orpc/experimental-msw): Mock procedures with [Mock Service Worker](https://mswjs.io/).
+- [@orpc/experimental-effect](https://www.npmjs.com/package/@orpc/experimental-effect): Integrate with [Effect](https://effect.website/).
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Implement your contract with [NestJS](https://nestjs.com/).
+- [@orpc/node](https://www.npmjs.com/package/@orpc/node): [Node.js](https://nodejs.org/) plugins for static file serving and large uploads.
+- [@orpc/bun](https://www.npmjs.com/package/@orpc/bun): Adapters for [Bun's Redis](https://bun.sh/).
+- [@orpc/cloudflare](https://www.npmjs.com/package/@orpc/cloudflare): Adapters for [Cloudflare's RateLimit and Durable Objects](https://developers.cloudflare.com/workers/).
+- [@orpc/trpc](https://www.npmjs.com/package/@orpc/trpc): Reuse existing [tRPC](https://trpc.io/) routers within oRPC.
 
 **Observability**
 
-- [@orpc/opentelemetry](https://npmx.dev/package/@orpc/opentelemetry): Integrate with [OpenTelemetry](https://opentelemetry.io/) for distributed tracing.
-- [@orpc/pino](https://npmx.dev/package/@orpc/pino): Integrate with [Pino](https://getpino.io/) for logging.
-- [@orpc/evlog](https://npmx.dev/package/@orpc/evlog): Integrate with [Evlog](https://evlog.dev/) for logging.
+- [@orpc/opentelemetry](https://www.npmjs.com/package/@orpc/opentelemetry): Integrate with [OpenTelemetry](https://opentelemetry.io/) for distributed tracing.
+- [@orpc/pino](https://www.npmjs.com/package/@orpc/pino): Integrate with [Pino](https://getpino.io/) for logging.
+- [@orpc/evlog](https://www.npmjs.com/package/@orpc/evlog): Integrate with [Evlog](https://evlog.dev/) for logging.
 
 ## Sponsors
 
@@ -113,6 +113,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://github.com/itigoore01?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="shota"><img src="https://avatars.githubusercontent.com/u/11831107?u=c976a6dc7e055eb026304c46c99100ed22b0c8e0&amp;v=4" width="139" alt="shota"/><br />shota</a></td>
    <td align="center"><a href="https://github.com/ellis-driscoll?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ellis Driscoll"><img src="https://avatars.githubusercontent.com/u/70685966?u=c5f95bc33b5991d9744abe00052542e4a2ed3cb9&amp;v=4" width="139" alt="Ellis Driscoll"/><br />Ellis Driscoll</a></td>
    <td align="center"><a href="https://github.com/hoangbn?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Hoang Nguyen"><img src="https://avatars.githubusercontent.com/u/38968280?u=c90084c6de65c56facabab7ba13a72a49ddbc3e4&amp;v=4" width="139" alt="Hoang Nguyen"/><br />Hoang Nguyen</a></td>
+   <td align="center"><a href="https://opencollective.com/guest-ac41de3b?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Orestis Ioannou"><img src="https://images.opencollective.com/guest-ac41de3b/avatar/460.png" width="139" alt="Orestis Ioannou"/><br />Orestis Ioannou</a></td>
   </tr>
 </table>
 
@@ -135,7 +136,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://rigtch.fm/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Igor Makowski"><img src="https://avatars.githubusercontent.com/u/56691628?u=ee8c879478f7c151b9156aef6c74243fa3e247a8&amp;v=4" width="119" alt="Igor Makowski"/><br />Igor Makowski</a></td>
    <td align="center"><a href="https://blog.cwang.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="hanayashiki"><img src="https://avatars.githubusercontent.com/u/26056783?u=06c3b9205a16fd41a871e82da1cc2a09306d53f5&amp;v=4" width="119" alt="hanayashiki"/><br />hanayashiki</a></td>
    <td align="center"><a href="https://dubinets.io/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Lev Dubinets"><img src="https://avatars.githubusercontent.com/u/3114081?u=f547f5d5012cab54851f1b1ad72d10e537f78fc2&amp;v=4" width="119" alt="Lev Dubinets"/><br />Lev Dubinets</a></td>
-   <td align="center"><a href="https://bika.ai/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&amp;v=4" width="119" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
+   <td align="center"><a href="https://kellychan.im/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&amp;v=4" width="119" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
   </tr>
   <tr>
    <td align="center"><a href="https://guyariely.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Guy Ariely"><img src="https://avatars.githubusercontent.com/u/42813496?u=edb6b7f563bf28e160a290832e7da57c0506f8ca&amp;v=4" width="119" alt="Guy Ariely"/><br />Guy Ariely</a></td>

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { RequestLogger } from 'evlog';
+import { RequestLogger, LogLevel } from 'evlog';
 import { Context } from '@orpc/server';
 import { StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { StandardRequest } from '@standardserver/core';
@@ -33,6 +33,15 @@ interface EvlogHandlerPluginOptions<_T extends Context> extends BaseEvlogOptions
      * @default false
      */
     logAbort?: boolean;
+    /**
+     * Customizes the log level for errors thrown from procedures;
+     * internal handler failures are always logged at error level.
+     * Receives the level applied by default; return it to keep the default behavior:
+     * 'info' for abort errors, 'warn' for ORPCError except INTERNAL_SERVER_ERROR, 'error' otherwise.
+     *
+     * @default (error, level) => level
+     */
+    procedureErrorLevel?: (error: unknown, level: LogLevel) => LogLevel;
 }
 /**
  * Instruments an oRPC handler with Evlog structured logging, request tracking,
@@ -50,9 +59,10 @@ declare class EvlogHandlerPlugin<T extends Context> implements StandardHandlerPl
      */
     before: string[];
     private readonly logAbort;
+    private readonly procedureErrorLevel;
     private readonly integration;
     private readonly evlogOptions;
-    constructor({ storage, logAbort, ...evlogOptions }?: EvlogHandlerPluginOptions<T>);
+    constructor({ storage, logAbort, procedureErrorLevel, ...evlogOptions }?: EvlogHandlerPluginOptions<T>);
     init(options: StandardHandlerOptions<T>): StandardHandlerOptions<T>;
 }
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { RequestLogger } from 'evlog';
+import { RequestLogger, LogLevel } from 'evlog';
 import { Context } from '@orpc/server';
 import { StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { StandardRequest } from '@standardserver/core';
@@ -33,6 +33,15 @@ interface EvlogHandlerPluginOptions<_T extends Context> extends BaseEvlogOptions
      * @default false
      */
     logAbort?: boolean;
+    /**
+     * Customizes the log level for errors thrown from procedures;
+     * internal handler failures are always logged at error level.
+     * Receives the level applied by default; return it to keep the default behavior:
+     * 'info' for abort errors, 'warn' for ORPCError except INTERNAL_SERVER_ERROR, 'error' otherwise.
+     *
+     * @default (error, level) => level
+     */
+    procedureErrorLevel?: (error: unknown, level: LogLevel) => LogLevel;
 }
 /**
  * Instruments an oRPC handler with Evlog structured logging, request tracking,
@@ -50,9 +59,10 @@ declare class EvlogHandlerPlugin<T extends Context> implements StandardHandlerPl
      */
     before: string[];
     private readonly logAbort;
+    private readonly procedureErrorLevel;
     private readonly integration;
     private readonly evlogOptions;
-    constructor({ storage, logAbort, ...evlogOptions }?: EvlogHandlerPluginOptions<T>);
+    constructor({ storage, logAbort, procedureErrorLevel, ...evlogOptions }?: EvlogHandlerPluginOptions<T>);
     init(options: StandardHandlerOptions<T>): StandardHandlerOptions<T>;
 }
 

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { wrapAsyncIteratorPreservingEventMeta, ORPCError } from '@orpc/client';
 import { ORPC_NAME, toArray, isAsyncIteratorObject, override, sleep, wrapReadableStream, isAbortError } from '@orpc/shared';
-import { parseStandardUrl, flattenStandardHeader } from '@standardserver/core';
+import { parseStandardUrl, flattenStandardHeader, ErrorEvent } from '@standardserver/core';
 import { defineFrameworkIntegration } from 'evlog/toolkit';
 
 const LOGGER_CONTEXT_SYMBOL = Symbol.for("ORPC_EVLOG_LOGGER_CONTEXT");
@@ -18,11 +18,13 @@ class EvlogHandlerPlugin {
    */
   before = ["~opentelemetry", "~batch", "~hibernation"];
   logAbort;
+  procedureErrorLevel;
   integration;
   evlogOptions;
-  constructor({ storage, logAbort, ...evlogOptions } = {}) {
+  constructor({ storage, logAbort, procedureErrorLevel, ...evlogOptions } = {}) {
     this.evlogOptions = evlogOptions;
     this.logAbort = logAbort ?? false;
+    this.procedureErrorLevel = procedureErrorLevel ?? ((_, level) => level);
     this.integration = defineFrameworkIntegration({
       name: ORPC_NAME,
       storage,
@@ -66,7 +68,9 @@ class EvlogHandlerPlugin {
                 body: override(result.response.body, wrapAsyncIteratorPreservingEventMeta(result.response.body, {
                   runWith,
                   onError: (error) => {
-                    logger.error(toErrorOrString(error));
+                    if (!(error instanceof ErrorEvent)) {
+                      logger.error(toErrorOrString(error));
+                    }
                   },
                   onFinish: async () => {
                     await sleep(0);
@@ -135,7 +139,7 @@ class EvlogHandlerPlugin {
       try {
         return await next();
       } catch (error) {
-        logBusinessLogicError(logger, error);
+        logProcedureError(logger, error, this.procedureErrorLevel);
         throw error;
       }
     };
@@ -145,14 +149,14 @@ class EvlogHandlerPlugin {
       if (isAsyncIteratorObject(output)) {
         return override(output, wrapAsyncIteratorPreservingEventMeta(output, {
           onError: (error) => {
-            logBusinessLogicError(logger, error);
+            logProcedureError(logger, error, this.procedureErrorLevel);
           }
         }));
       }
       if (output instanceof ReadableStream) {
         return override(output, wrapReadableStream(output, {
           onError: (error) => {
-            logBusinessLogicError(logger, error);
+            logProcedureError(logger, error, this.procedureErrorLevel);
           }
         }));
       }
@@ -181,13 +185,24 @@ function toErrorOrString(error) {
   }
   return String(error);
 }
-function logBusinessLogicError(logger, error) {
-  logger?.error(toErrorOrString(error));
+function logProcedureError(logger, error, procedureErrorLevel) {
+  if (!logger) {
+    return;
+  }
+  logger.error(toErrorOrString(error));
+  const level = procedureErrorLevel(error, defaultProcedureErrorLevel(error));
+  if (level !== "error") {
+    logger.setLevel(level);
+  }
+}
+function defaultProcedureErrorLevel(error) {
   if (isAbortError(error)) {
-    logger?.setLevel("info");
-  } else if (error instanceof ORPCError) {
-    logger?.setLevel("warn");
+    return "info";
+  }
+  if (error instanceof ORPCError && error.code !== "INTERNAL_SERVER_ERROR") {
+    return "warn";
   }
+  return "error";
 }
 
 export { EvlogHandlerPlugin, LOGGER_CONTEXT_SYMBOL, getLogger };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/evlog",
   "type": "module",
-  "version": "2.0.0-beta.30",
+  "version": "2.0.0-beta.32",
   "description": "Evlog integration for oRPC: wide-event logging for typesafe APIs",
   "license": "MIT",
   "funding": [
@@ -43,10 +43,10 @@
     "evlog": ">=2.18.1"
   },
   "dependencies": {
-    "@standardserver/core": "^0.8.0",
-    "@orpc/client": "2.0.0-beta.30",
-    "@orpc/shared": "2.0.0-beta.30",
-    "@orpc/server": "2.0.0-beta.30"
+    "@orpc/client": "2.0.0-beta.32",
+    "@orpc/server": "2.0.0-beta.32",
+    "@orpc/shared": "2.0.0-beta.32",
+    "@standardserver/core": "^0.8.2"
   },
   "devDependencies": {
     "evlog": "^2.26.0"