@trpc/server 11.0.0-next-alpha.156 → 11.0.0-next-alpha.158

package/dist/adapters/ws.d.ts

@@ -4,12 +4,12 @@
 import type { IncomingMessage } from 'http';
 import type { AnyRouter, inferRouterContext, MaybePromise } from '@trpc/core';
 import type { BaseHandlerOptions } from '@trpc/core/http';
-import type { WebSocket, WebSocketServer } from 'ws';
+import type ws from 'ws';
 import type { NodeHTTPCreateContextFnOptions } from './node-http';
 /**
  * @public
  */
-export type CreateWSSContextFnOptions = Omit<NodeHTTPCreateContextFnOptions<IncomingMessage, WebSocket>, 'info'>;
+export type CreateWSSContextFnOptions = Omit<NodeHTTPCreateContextFnOptions<IncomingMessage, ws.WebSocket>, 'info'>;
 /**
  * @public
  */
@@ -28,7 +28,7 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<TR
      **/
     createContext: CreateWSSContextFn<TRouter>;
 }) & {
-    wss: WebSocketServer;
+    wss: ws.WebSocketServer;
     process?: NodeJS.Process;
 };
 export declare function applyWSSHandler<TRouter extends AnyRouter>(opts: WSSHandlerOptions<TRouter>): {

package/dist/adapters/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAU1D,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,8BAA8B,CAAC,eAAe,EAAE,SAAS,CAAC,EAC1D,MAAM,CACP,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IAAI,kBAAkB,CAC3E,OAAO,EACP,eAAe,CAChB,GACC,CAAC,MAAM,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACvC;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC7C,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC5C,CAAC,GAAG;IACP,GAAG,EAAE,eAAe,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;CAC1B,CAAC;AAEJ,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAwQjC"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAU1D,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,8BAA8B,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,EAC7D,MAAM,CACP,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IAAI,kBAAkB,CAC3E,OAAO,EACP,eAAe,CAChB,GACC,CAAC,MAAM,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACvC;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC7C,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC5C,CAAC,GAAG;IACP,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;CAC1B,CAAC;AAEJ,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAwQjC"}

package/dist/adapters/ws.js

@@ -6,6 +6,10 @@ var core = require('@trpc/core');
 var observable = require('@trpc/core/observable');
 var rpc = require('@trpc/core/rpc');
 
+/**
+ * Importing ws causes a build error
+ * @see https://github.com/trpc/trpc/pull/5279
+ */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
 function applyWSSHandler(opts) {
     const { wss , createContext , router  } = opts;
     const { transformer  } = router._def._config;
@@ -123,7 +127,7 @@ function applyWSSHandler(opts) {
                         });
                     }
                 });
-                /* istanbul ignore next -- @preserve */ if (client.readyState !== client.OPEN) {
+                /* istanbul ignore next -- @preserve */ if (client.readyState !== WEBSOCKET_OPEN) {
                     // if the client got disconnected whilst initializing the subscription
                     // no need to send stopped message if the client is disconnected
                     sub1.unsubscribe();
@@ -260,7 +264,7 @@ function applyWSSHandler(opts) {
             };
             const data = JSON.stringify(response);
             for (const client of wss.clients){
-                if (client.readyState === 1 /* ws.OPEN */ ) {
+                if (client.readyState === WEBSOCKET_OPEN) {
                     client.send(data);
                 }
             }

package/dist/adapters/ws.mjs

@@ -2,6 +2,10 @@ import { TRPCError, getErrorShape, getTRPCErrorFromUnknown, transformTRPCRespons
 import { isObservable } from '@trpc/core/observable';
 import { parseTRPCMessage } from '@trpc/core/rpc';
 
+/**
+ * Importing ws causes a build error
+ * @see https://github.com/trpc/trpc/pull/5279
+ */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
 function applyWSSHandler(opts) {
     const { wss , createContext , router  } = opts;
     const { transformer  } = router._def._config;
@@ -119,7 +123,7 @@ function applyWSSHandler(opts) {
                         });
                     }
                 });
-                /* istanbul ignore next -- @preserve */ if (client.readyState !== client.OPEN) {
+                /* istanbul ignore next -- @preserve */ if (client.readyState !== WEBSOCKET_OPEN) {
                     // if the client got disconnected whilst initializing the subscription
                     // no need to send stopped message if the client is disconnected
                     sub1.unsubscribe();
@@ -256,7 +260,7 @@ function applyWSSHandler(opts) {
             };
             const data = JSON.stringify(response);
             for (const client of wss.clients){
-                if (client.readyState === 1 /* ws.OPEN */ ) {
+                if (client.readyState === WEBSOCKET_OPEN) {
                     client.send(data);
                 }
             }

package/dist/bundle-analysis.json

@@ -1,12 +1,12 @@
 {
-  "bundleSize": 52010,
-  "bundleOrigSize": 72424,
-  "bundleReduction": 28.19,
+  "bundleSize": 52154,
+  "bundleOrigSize": 72547,
+  "bundleReduction": 28.11,
   "modules": [
     {
       "id": "/src/adapters/ws.ts",
-      "size": 9593,
-      "origSize": 8904,
+      "size": 9737,
+      "origSize": 9027,
       "renderedExports": [
         "applyWSSHandler"
       ],
@@ -14,7 +14,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 18.44,
+      "percent": 18.67,
       "reduction": 0
     },
     {
@@ -30,7 +30,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/form-data/index.ts"
       ],
-      "percent": 11.31,
+      "percent": 11.27,
       "reduction": 7.43
     },
     {
@@ -46,7 +46,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/form-data/index.ts"
       ],
-      "percent": 9.5,
+      "percent": 9.47,
       "reduction": 37.24
     },
     {
@@ -70,7 +70,7 @@
       "dependents": [
         "/home/runner/work/trpc/trpc/node_modules/.pnpm/@web3-storage+multipart-parser@1.0.0/node_modules/@web3-storage/multipart-parser/esm/src/index.js"
       ],
-      "percent": 8.56,
+      "percent": 8.54,
       "reduction": 35.63
     },
     {
@@ -84,7 +84,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 8.37,
+      "percent": 8.35,
       "reduction": 34.87
     },
     {
@@ -98,7 +98,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 6.8,
+      "percent": 6.79,
       "reduction": 14.29
     },
     {
@@ -112,7 +112,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 6.12,
+      "percent": 6.1,
       "reduction": 10.19
     },
     {
@@ -131,7 +131,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 5.69,
+      "percent": 5.68,
       "reduction": 38.44
     },
     {
@@ -146,7 +146,7 @@
         "/src/adapters/fastify/fastifyTRPCPlugin.ts",
         "/src/adapters/fastify/index.ts"
       ],
-      "percent": 4.92,
+      "percent": 4.91,
       "reduction": 29.48
     },
     {
@@ -158,7 +158,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 4.12,
+      "percent": 4.11,
       "reduction": 35.24
     },
     {
@@ -172,7 +172,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/form-data/fileUploadHandler.ts"
       ],
-      "percent": 2.68,
+      "percent": 2.67,
       "reduction": 0
     },
     {
@@ -184,7 +184,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 2.41,
+      "percent": 2.4,
       "reduction": 28.88
     },
     {
@@ -198,7 +198,7 @@
       "dependents": [
         "/src/adapters/fastify/index.ts"
       ],
-      "percent": 2.3,
+      "percent": 2.29,
       "reduction": 38.13
     },
     {
@@ -212,7 +212,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/json/index.ts"
       ],
-      "percent": 2.11,
+      "percent": 2.1,
       "reduction": 0.99
     },
     {
@@ -232,7 +232,7 @@
         "/src/adapters/node-http/content-type/form-data/memoryUploadHandler.ts",
         "/src/adapters/node-http/content-type/form-data/index.ts"
       ],
-      "percent": 1.4,
+      "percent": 1.39,
       "reduction": 67.5
     },
     {
@@ -264,7 +264,7 @@
       "dependents": [
         "/src/adapters/node-http/content-type/form-data/index.ts"
       ],
-      "percent": 1.32,
+      "percent": 1.31,
       "reduction": 71.78
     },
     {
@@ -277,7 +277,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.27,
+      "percent": 1.26,
       "reduction": 51.15
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-next-alpha.156+d1eaced0f",
+  "version": "11.0.0-next-alpha.158+880f891f9",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -131,7 +131,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@trpc/core": "11.0.0-next-alpha.156+d1eaced0f"
+    "@trpc/core": "11.0.0-next-alpha.158+880f891f9"
   },
   "devDependencies": {
     "@fastify/websocket": "^7.1.2",
@@ -170,5 +170,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "d1eaced0f7c2a876739a2a0b568d887989230a4d"
+  "gitHead": "880f891f9c1a138765d4ae26fbb6f9fad5a7bdd2"
 }

package/src/adapters/ws.ts

@@ -17,14 +17,20 @@ import type {
   TRPCResponseMessage,
 } from '@trpc/core/rpc';
 import { parseTRPCMessage } from '@trpc/core/rpc';
-import type { WebSocket, WebSocketServer } from 'ws';
+import type ws from 'ws';
 import type { NodeHTTPCreateContextFnOptions } from './node-http';
 
+/**
+ * Importing ws causes a build error
+ * @see https://github.com/trpc/trpc/pull/5279
+ */
+const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */
+
 /**
  * @public
  */
 export type CreateWSSContextFnOptions = Omit<
-  NodeHTTPCreateContextFnOptions<IncomingMessage, WebSocket>,
+  NodeHTTPCreateContextFnOptions<IncomingMessage, ws.WebSocket>,
   'info'
 >;
 
@@ -55,7 +61,7 @@ export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<
          **/
         createContext: CreateWSSContextFn<TRouter>;
       }) & {
-    wss: WebSocketServer;
+    wss: ws.WebSocketServer;
     process?: NodeJS.Process;
   };
 
@@ -183,7 +189,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
           },
         });
         /* istanbul ignore next -- @preserve */
-        if (client.readyState !== client.OPEN) {
+        if (client.readyState !== WEBSOCKET_OPEN) {
           // if the client got disconnected whilst initializing the subscription
           // no need to send stopped message if the client is disconnected
           sub.unsubscribe();
@@ -318,7 +324,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
       };
       const data = JSON.stringify(response);
       for (const client of wss.clients) {
-        if (client.readyState === 1 /* ws.OPEN */) {
+        if (client.readyState === WEBSOCKET_OPEN) {
           client.send(data);
         }
       }