@trpc/server 9.26.2 → 9.27.2

package/dist/{resolveHTTPResponse-ddb56677.esm.js → resolveHTTPResponse-fcf14f5a.esm.js}

@@ -1,4 +1,4 @@
-import { T as TRPCError, c as callProcedure, g as getErrorFromUnknown, t as transformTRPCResponse } from './transformTRPCResponse-45c225c3.esm.js';
+import { T as TRPCError, c as callProcedure, a as getErrorFromUnknown, t as transformTRPCResponse } from './transformTRPCResponse-56464e52.esm.js';
 import { i as invert, T as TRPC_ERROR_CODES_BY_KEY } from './codes-5678cc97.esm.js';
 
 /* istanbul ignore file */

package/dist/{router-93491dae.esm.js → router-a3fe3182.esm.js}

@@ -1,5 +1,5 @@
-import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-ddb56677.esm.js';
-import { T as TRPCError, g as getErrorFromUnknown } from './transformTRPCResponse-45c225c3.esm.js';
+import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-fcf14f5a.esm.js';
+import { T as TRPCError, a as getErrorFromUnknown } from './transformTRPCResponse-56464e52.esm.js';
 import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-5678cc97.esm.js';
 
 assertNotBrowser();

package/dist/{router-459409c8.cjs.prod.js → router-aaecbe82.cjs.prod.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-02e61299.cjs.prod.js');
-var transformTRPCResponse = require('./transformTRPCResponse-1e125b28.cjs.prod.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-9812e803.cjs.prod.js');
+var transformTRPCResponse = require('./transformTRPCResponse-077b7539.cjs.prod.js');
 var codes = require('./codes-aff770a3.cjs.prod.js');
 
 resolveHTTPResponse.assertNotBrowser();

package/dist/{router-2f54c292.cjs.dev.js → router-ee876044.cjs.dev.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-55b2c9bd.cjs.dev.js');
-var transformTRPCResponse = require('./transformTRPCResponse-c654ea92.cjs.dev.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-ab01e4b9.cjs.dev.js');
+var transformTRPCResponse = require('./transformTRPCResponse-36a41418.cjs.dev.js');
 var codes = require('./codes-130e62df.cjs.dev.js');
 
 resolveHTTPResponse.assertNotBrowser();

package/dist/{subscription-f03bec71.cjs.prod.js → subscription-54d50ff1.cjs.prod.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var events = require('events');
-var transformTRPCResponse = require('./transformTRPCResponse-1e125b28.cjs.prod.js');
+var transformTRPCResponse = require('./transformTRPCResponse-077b7539.cjs.prod.js');
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 class SubscriptionEventEmitter extends events.EventEmitter {}

package/dist/{subscription-7de48383.cjs.dev.js → subscription-8bf61685.cjs.dev.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var events = require('events');
-var transformTRPCResponse = require('./transformTRPCResponse-c654ea92.cjs.dev.js');
+var transformTRPCResponse = require('./transformTRPCResponse-36a41418.cjs.dev.js');
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 class SubscriptionEventEmitter extends events.EventEmitter {}

package/dist/{subscription-2ea469a3.esm.js → subscription-a5c83df4.esm.js}

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import { g as getErrorFromUnknown } from './transformTRPCResponse-45c225c3.esm.js';
+import { a as getErrorFromUnknown } from './transformTRPCResponse-56464e52.esm.js';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 class SubscriptionEventEmitter extends EventEmitter {}

package/dist/{transformTRPCResponse-1e125b28.cjs.prod.js → transformTRPCResponse-077b7539.cjs.prod.js}

@@ -1,33 +1,29 @@
 'use strict';
 
-function getMessageFromUnkownError(err, fallback) {
-  if (typeof err === 'string') {
-    return err;
-  }
+async function callProcedure(opts) {
+  const {
+    type,
+    path,
+    input
+  } = opts;
+  const caller = opts.router.createCaller(opts.ctx);
 
-  if (err instanceof Error && typeof err.message === 'string') {
-    return err.message;
+  if (type === 'query') {
+    return caller.query(path, input);
   }
 
-  return fallback;
-}
-function getErrorFromUnknown(cause) {
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (cause instanceof Error && cause.name === 'TRPCError') {
-    return cause;
+  if (type === 'mutation') {
+    return caller.mutation(path, input);
   }
 
-  const err = new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    cause
-  }); // take stack trace from cause
-
-  if (cause instanceof Error) {
-    err.stack = cause.stack;
+  if (type === 'subscription') {
+    const sub = await caller.subscription(path, input);
+    return sub;
   }
+  /* istanbul ignore next */
 
-  return err;
+
+  throw new Error(`Unknown procedure type ${type}`);
 }
 
 class TRPCError extends Error {
@@ -56,30 +52,35 @@ class TRPCError extends Error {
 
 }
 
-async function callProcedure(opts) {
-  const {
-    type,
-    path,
-    input
-  } = opts;
-  const caller = opts.router.createCaller(opts.ctx);
-
-  if (type === 'query') {
-    return caller.query(path, input);
+function getMessageFromUnkownError(err, fallback) {
+  if (typeof err === 'string') {
+    return err;
   }
 
-  if (type === 'mutation') {
-    return caller.mutation(path, input);
+  if (err instanceof Error && typeof err.message === 'string') {
+    return err.message;
   }
 
-  if (type === 'subscription') {
-    const sub = await caller.subscription(path, input);
-    return sub;
+  return fallback;
+}
+function getErrorFromUnknown(cause) {
+  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
+  // ref https://github.com/trpc/trpc/issues/331
+  if (cause instanceof Error && cause.name === 'TRPCError') {
+    return cause;
   }
-  /* istanbul ignore next */
 
+  const err = new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    cause
+  }); // take stack trace from cause
 
-  throw new Error(`Unknown procedure type ${type}`);
+  if (cause instanceof Error) {
+    err.stack = cause.stack;
+    err.message = cause.message;
+  }
+
+  return err;
 }
 
 function transformTRPCResponseItem(router, item) {
@@ -111,4 +112,5 @@ function transformTRPCResponse(router, itemOrItems) {
 exports.TRPCError = TRPCError;
 exports.callProcedure = callProcedure;
 exports.getErrorFromUnknown = getErrorFromUnknown;
+exports.getMessageFromUnkownError = getMessageFromUnkownError;
 exports.transformTRPCResponse = transformTRPCResponse;

package/dist/{transformTRPCResponse-c654ea92.cjs.dev.js → transformTRPCResponse-36a41418.cjs.dev.js}

@@ -1,33 +1,29 @@
 'use strict';
 
-function getMessageFromUnkownError(err, fallback) {
-  if (typeof err === 'string') {
-    return err;
-  }
+async function callProcedure(opts) {
+  const {
+    type,
+    path,
+    input
+  } = opts;
+  const caller = opts.router.createCaller(opts.ctx);
 
-  if (err instanceof Error && typeof err.message === 'string') {
-    return err.message;
+  if (type === 'query') {
+    return caller.query(path, input);
   }
 
-  return fallback;
-}
-function getErrorFromUnknown(cause) {
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (cause instanceof Error && cause.name === 'TRPCError') {
-    return cause;
+  if (type === 'mutation') {
+    return caller.mutation(path, input);
   }
 
-  const err = new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    cause
-  }); // take stack trace from cause
-
-  if (cause instanceof Error) {
-    err.stack = cause.stack;
+  if (type === 'subscription') {
+    const sub = await caller.subscription(path, input);
+    return sub;
   }
+  /* istanbul ignore next */
 
-  return err;
+
+  throw new Error(`Unknown procedure type ${type}`);
 }
 
 class TRPCError extends Error {
@@ -56,30 +52,35 @@ class TRPCError extends Error {
 
 }
 
-async function callProcedure(opts) {
-  const {
-    type,
-    path,
-    input
-  } = opts;
-  const caller = opts.router.createCaller(opts.ctx);
-
-  if (type === 'query') {
-    return caller.query(path, input);
+function getMessageFromUnkownError(err, fallback) {
+  if (typeof err === 'string') {
+    return err;
   }
 
-  if (type === 'mutation') {
-    return caller.mutation(path, input);
+  if (err instanceof Error && typeof err.message === 'string') {
+    return err.message;
   }
 
-  if (type === 'subscription') {
-    const sub = await caller.subscription(path, input);
-    return sub;
+  return fallback;
+}
+function getErrorFromUnknown(cause) {
+  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
+  // ref https://github.com/trpc/trpc/issues/331
+  if (cause instanceof Error && cause.name === 'TRPCError') {
+    return cause;
   }
-  /* istanbul ignore next */
 
+  const err = new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    cause
+  }); // take stack trace from cause
 
-  throw new Error(`Unknown procedure type ${type}`);
+  if (cause instanceof Error) {
+    err.stack = cause.stack;
+    err.message = cause.message;
+  }
+
+  return err;
 }
 
 function transformTRPCResponseItem(router, item) {
@@ -111,4 +112,5 @@ function transformTRPCResponse(router, itemOrItems) {
 exports.TRPCError = TRPCError;
 exports.callProcedure = callProcedure;
 exports.getErrorFromUnknown = getErrorFromUnknown;
+exports.getMessageFromUnkownError = getMessageFromUnkownError;
 exports.transformTRPCResponse = transformTRPCResponse;

package/dist/{transformTRPCResponse-45c225c3.esm.js → transformTRPCResponse-56464e52.esm.js}

@@ -1,31 +1,27 @@
-function getMessageFromUnkownError(err, fallback) {
-  if (typeof err === 'string') {
-    return err;
-  }
+async function callProcedure(opts) {
+  const {
+    type,
+    path,
+    input
+  } = opts;
+  const caller = opts.router.createCaller(opts.ctx);
 
-  if (err instanceof Error && typeof err.message === 'string') {
-    return err.message;
+  if (type === 'query') {
+    return caller.query(path, input);
   }
 
-  return fallback;
-}
-function getErrorFromUnknown(cause) {
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (cause instanceof Error && cause.name === 'TRPCError') {
-    return cause;
+  if (type === 'mutation') {
+    return caller.mutation(path, input);
   }
 
-  const err = new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    cause
-  }); // take stack trace from cause
-
-  if (cause instanceof Error) {
-    err.stack = cause.stack;
+  if (type === 'subscription') {
+    const sub = await caller.subscription(path, input);
+    return sub;
   }
+  /* istanbul ignore next */
 
-  return err;
+
+  throw new Error(`Unknown procedure type ${type}`);
 }
 
 class TRPCError extends Error {
@@ -54,30 +50,35 @@ class TRPCError extends Error {
 
 }
 
-async function callProcedure(opts) {
-  const {
-    type,
-    path,
-    input
-  } = opts;
-  const caller = opts.router.createCaller(opts.ctx);
-
-  if (type === 'query') {
-    return caller.query(path, input);
+function getMessageFromUnkownError(err, fallback) {
+  if (typeof err === 'string') {
+    return err;
   }
 
-  if (type === 'mutation') {
-    return caller.mutation(path, input);
+  if (err instanceof Error && typeof err.message === 'string') {
+    return err.message;
   }
 
-  if (type === 'subscription') {
-    const sub = await caller.subscription(path, input);
-    return sub;
+  return fallback;
+}
+function getErrorFromUnknown(cause) {
+  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
+  // ref https://github.com/trpc/trpc/issues/331
+  if (cause instanceof Error && cause.name === 'TRPCError') {
+    return cause;
   }
-  /* istanbul ignore next */
 
+  const err = new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    cause
+  }); // take stack trace from cause
 
-  throw new Error(`Unknown procedure type ${type}`);
+  if (cause instanceof Error) {
+    err.stack = cause.stack;
+    err.message = cause.message;
+  }
+
+  return err;
 }
 
 function transformTRPCResponseItem(router, item) {
@@ -106,4 +107,4 @@ function transformTRPCResponse(router, itemOrItems) {
   return Array.isArray(itemOrItems) ? itemOrItems.map(item => transformTRPCResponseItem(router, item)) : transformTRPCResponseItem(router, itemOrItems);
 }
 
-export { TRPCError as T, callProcedure as c, getErrorFromUnknown as g, transformTRPCResponse as t };
+export { TRPCError as T, getErrorFromUnknown as a, callProcedure as c, getMessageFromUnkownError as g, transformTRPCResponse as t };

package/dist/trpc-server.cjs.dev.js

@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-55b2c9bd.cjs.dev.js');
-var router = require('./router-2f54c292.cjs.dev.js');
-var subscription = require('./subscription-7de48383.cjs.dev.js');
-var transformTRPCResponse = require('./transformTRPCResponse-c654ea92.cjs.dev.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-ab01e4b9.cjs.dev.js');
+var transformTRPCResponse = require('./transformTRPCResponse-36a41418.cjs.dev.js');
+var router = require('./router-ee876044.cjs.dev.js');
+var subscription = require('./subscription-8bf61685.cjs.dev.js');
 var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.dev.js');
-var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-36ddaba2.cjs.dev.js');
+var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-9a93c255.cjs.dev.js');
 require('./codes-130e62df.cjs.dev.js');
 require('events');
 require('http');
@@ -39,12 +39,16 @@ const requestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
 
 exports.assertNotBrowser = resolveHTTPResponse.assertNotBrowser;
 exports.resolveHTTPResponse = resolveHTTPResponse.resolveHTTPResponse;
+exports.TRPCError = transformTRPCResponse.TRPCError;
+exports.callProcedure = transformTRPCResponse.callProcedure;
+exports.getErrorFromUnknown = transformTRPCResponse.getErrorFromUnknown;
+exports.getMessageFromUnkownError = transformTRPCResponse.getMessageFromUnkownError;
+exports.transformTRPCResponse = transformTRPCResponse.transformTRPCResponse;
 exports.LegacyRouter = router.LegacyRouter;
 exports.Router = router.LegacyRouter;
 exports.router = router.router;
 exports.Subscription = subscription.Subscription;
 exports.subscriptionPullFactory = subscription.subscriptionPullFactory;
-exports.TRPCError = transformTRPCResponse.TRPCError;
 exports.createHttpHandler = createHttpHandler;
 exports.createHttpServer = createHttpServer;
 exports.requestHandler = requestHandler;

package/dist/trpc-server.cjs.prod.js

@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-02e61299.cjs.prod.js');
-var router = require('./router-459409c8.cjs.prod.js');
-var subscription = require('./subscription-f03bec71.cjs.prod.js');
-var transformTRPCResponse = require('./transformTRPCResponse-1e125b28.cjs.prod.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-9812e803.cjs.prod.js');
+var transformTRPCResponse = require('./transformTRPCResponse-077b7539.cjs.prod.js');
+var router = require('./router-aaecbe82.cjs.prod.js');
+var subscription = require('./subscription-54d50ff1.cjs.prod.js');
 var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.prod.js');
-var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-91e7ca3d.cjs.prod.js');
+var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-21707788.cjs.prod.js');
 require('./codes-aff770a3.cjs.prod.js');
 require('events');
 require('http');
@@ -39,12 +39,16 @@ const requestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
 
 exports.assertNotBrowser = resolveHTTPResponse.assertNotBrowser;
 exports.resolveHTTPResponse = resolveHTTPResponse.resolveHTTPResponse;
+exports.TRPCError = transformTRPCResponse.TRPCError;
+exports.callProcedure = transformTRPCResponse.callProcedure;
+exports.getErrorFromUnknown = transformTRPCResponse.getErrorFromUnknown;
+exports.getMessageFromUnkownError = transformTRPCResponse.getMessageFromUnkownError;
+exports.transformTRPCResponse = transformTRPCResponse.transformTRPCResponse;
 exports.LegacyRouter = router.LegacyRouter;
 exports.Router = router.LegacyRouter;
 exports.router = router.router;
 exports.Subscription = subscription.Subscription;
 exports.subscriptionPullFactory = subscription.subscriptionPullFactory;
-exports.TRPCError = transformTRPCResponse.TRPCError;
 exports.createHttpHandler = createHttpHandler;
 exports.createHttpServer = createHttpServer;
 exports.requestHandler = requestHandler;

package/dist/trpc-server.esm.js

@@ -1,9 +1,9 @@
-export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-ddb56677.esm.js';
-export { L as LegacyRouter, L as Router, r as router } from './router-93491dae.esm.js';
-export { S as Subscription, s as subscriptionPullFactory } from './subscription-2ea469a3.esm.js';
-export { T as TRPCError } from './transformTRPCResponse-45c225c3.esm.js';
+export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-fcf14f5a.esm.js';
+export { T as TRPCError, c as callProcedure, a as getErrorFromUnknown, g as getMessageFromUnkownError, t as transformTRPCResponse } from './transformTRPCResponse-56464e52.esm.js';
+export { L as LegacyRouter, L as Router, r as router } from './router-a3fe3182.esm.js';
+export { S as Subscription, s as subscriptionPullFactory } from './subscription-a5c83df4.esm.js';
 import { createHTTPServer, createHTTPHandler } from '../adapters/standalone/dist/trpc-server-adapters-standalone.esm.js';
-import { n as nodeHTTPRequestHandler } from './nodeHTTPRequestHandler-372a4a4f.esm.js';
+import { n as nodeHTTPRequestHandler } from './nodeHTTPRequestHandler-4e09fc4c.esm.js';
 import './codes-5678cc97.esm.js';
 import 'events';
 import 'http';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "9.26.2",
+  "version": "9.27.2",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -70,5 +70,5 @@
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "08f3ac714bd19f7f7cac7935b3f2dbe5386b4a90"
+  "gitHead": "1015c8bf78978beab05818226d7a077d4125c0f3"
 }

package/src/TRPCError.ts

@@ -1,4 +1,4 @@
-import { getMessageFromUnkownError } from './internals/errors';
+import { getMessageFromUnkownError } from './core/errors';
 import { TRPC_ERROR_CODE_KEY } from './rpc/codes';
 
 export class TRPCError extends Error {

package/src/adapters/ws.ts

@@ -1,10 +1,10 @@
 import http from 'http';
 import ws from 'ws';
 import { TRPCError } from '../TRPCError';
+import { callProcedure } from '../core/callProcedure';
+import { getErrorFromUnknown } from '../core/errors';
+import { transformTRPCResponse } from '../core/transformTRPCResponse';
 import { BaseHandlerOptions } from '../internals/baseHandlerOptions';
-import { callProcedure } from '../internals/callProcedure';
-import { getErrorFromUnknown } from '../internals/errors';
-import { transformTRPCResponse } from '../internals/transformTRPCResponse';
 import { AnyRouter, ProcedureType, inferRouterContext } from '../router';
 import {
   TRPCErrorResponse,
@@ -248,6 +248,21 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
       }
     });
 
+    // WebSocket errors should be handled, as otherwise unhandled exceptions will crash Node.js.
+    // This line was introduced after the following error brought down production systems:
+    // "RangeError: Invalid WebSocket frame: RSV2 and RSV3 must be clear"
+    // Here is the relevant discussion: https://github.com/websockets/ws/issues/1354#issuecomment-774616962
+    client.on('error', (cause) => {
+      opts.onError?.({
+        ctx,
+        error: getErrorFromUnknown(cause),
+        input: undefined,
+        path: undefined,
+        type: 'unknown',
+        req,
+      });
+    });
+
     client.once('close', () => {
       for (const sub of clientSubscriptions.values()) {
         sub.destroy();

package/src/{internals → core}/errors.ts

@@ -28,6 +28,7 @@ export function getErrorFromUnknown(cause: unknown): TRPCError {
   // take stack trace from cause
   if (cause instanceof Error) {
     err.stack = cause.stack;
+    err.message = cause.message;
   }
   return err;
 }

package/src/core/index.ts

@@ -0,0 +1,3 @@
+export * from './callProcedure';
+export * from './errors';
+export * from './transformTRPCResponse';