@trpc/server 10.0.0-alpha.4 → 10.0.0-alpha.42

package/dist/adapters/node-http/internals/getPostBody.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPostBody.d.ts","sourceRoot":"","sources":["../../../../src/adapters/node-http/internals/getPostBody.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAsB,WAAW,CAAC,EAChC,GAAG,EACH,WAAW,GACZ,EAAE;IACD,GAAG,EAAE,eAAe,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;QAES,IAAI;UAAQ,OAAO;;QAAW,KAAK;WAAS,SAAS;GA0B9D"}
+{"version":3,"file":"getPostBody.d.ts","sourceRoot":"","sources":["../../../../src/adapters/node-http/internals/getPostBody.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAsB,WAAW,CAAC,EAChC,GAAG,EACH,WAAW,GACZ,EAAE;IACD,GAAG,EAAE,eAAe,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;QAES,IAAI;UAAQ,OAAO;;QAAW,KAAK;WAAS,SAAS;GA0B9D"}

package/dist/adapters/node-http/nodeHTTPRequestHandler.d.ts

@@ -1,5 +1,5 @@
-import { NodeHTTPRequest, NodeHTTPResponse, NodeHTTPHandlerOptions } from './types';
-import { AnyRouter } from '../../router';
+import { AnyRouter } from '../../core';
+import { NodeHTTPHandlerOptions, NodeHTTPRequest, NodeHTTPResponse } from './types';
 declare type NodeHTTPRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = {
     req: TRequest;
     res: TResponse;

package/dist/adapters/node-http/nodeHTTPRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,SAAS,EAAsB,MAAM,cAAc,CAAC;AAO7D,aAAK,6BAA6B,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC;IACF,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAEzD,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBA+ClE"}
+{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAKvC,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAIjB,aAAK,6BAA6B,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC;IACF,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAEzD,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBA+ClE"}

package/dist/adapters/node-http/types.d.ts

@@ -1,15 +1,16 @@
 /// <reference types="node" />
-import http from 'http';
-import qs from 'qs';
-import { inferRouterContext } from '../..';
+import { IncomingMessage, ServerResponse } from 'http';
+import { AnyRouter, inferRouterContext } from '../../core';
+import { inferRouterDef } from '../../core';
 import { HTTPBaseHandlerOptions } from '../../http/internals/types';
-import { AnyRouter } from '../../router';
-export declare type NodeHTTPRequest = http.IncomingMessage & {
-    method?: string;
-    query?: qs.ParsedQs;
+interface ParsedQs {
+    [key: string]: undefined | string | string[] | ParsedQs | ParsedQs[];
+}
+export declare type NodeHTTPRequest = IncomingMessage & {
+    query?: ParsedQs;
     body?: unknown;
 };
-export declare type NodeHTTPResponse = http.ServerResponse;
+export declare type NodeHTTPResponse = ServerResponse;
 export declare type NodeHTTPCreateContextOption<TRouter extends AnyRouter, TRequest, TResponse> = unknown extends inferRouterContext<TRouter> ? {
     /**
      * @link https://trpc.io/docs/context
@@ -29,5 +30,6 @@ export declare type NodeHTTPCreateContextFnOptions<TRequest, TResponse> = {
     req: TRequest;
     res: TResponse;
 };
-export declare type NodeHTTPCreateContextFn<TRouter extends AnyRouter, TRequest, TResponse> = (opts: NodeHTTPCreateContextFnOptions<TRequest, TResponse>) => inferRouterContext<TRouter> | Promise<inferRouterContext<TRouter>>;
+export declare type NodeHTTPCreateContextFn<TRouter extends AnyRouter, TRequest, TResponse> = (opts: NodeHTTPCreateContextFnOptions<TRequest, TResponse>) => inferRouterDef<TRouter>['_ctx'] | Promise<inferRouterDef<TRouter>['_ctx']>;
+export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/adapters/node-http/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/types.ts"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,oBAAY,eAAe,GAAG,IAAI,CAAC,eAAe,GAAG;IACnD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,oBAAY,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC;AAEnD,oBAAY,2BAA2B,CACrC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,OAAO,SAAS,kBAAkB,CAAC,OAAO,CAAC,GAC3C;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACvE,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACtE,CAAC;AAEN,oBAAY,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG;IAC9C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE9D,oBAAY,8BAA8B,CAAC,QAAQ,EAAE,SAAS,IAAI;IAChE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AACF,oBAAY,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,CACF,IAAI,EAAE,8BAA8B,CAAC,QAAQ,EAAE,SAAS,CAAC,KACtD,kBAAkB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,UAAU,QAAQ;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAAC;CACtE;AAED,oBAAY,eAAe,GAAG,eAAe,GAAG;IAC9C,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,oBAAY,gBAAgB,GAAG,cAAc,CAAC;AAE9C,oBAAY,2BAA2B,CACrC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,OAAO,SAAS,kBAAkB,CAAC,OAAO,CAAC,GAC3C;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACvE,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACtE,CAAC;AAEN,oBAAY,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG;IAC9C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE9D,oBAAY,8BAA8B,CAAC,QAAQ,EAAE,SAAS,IAAI;IAChE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AACF,oBAAY,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,CACF,IAAI,EAAE,8BAA8B,CAAC,QAAQ,EAAE,SAAS,CAAC,KACtD,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC"}

package/dist/adapters/standalone.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="node" />
 import http from 'http';
-import { AnyRouter } from '../router';
+import { AnyRouter } from '../core';
 import { NodeHTTPCreateContextFnOptions, NodeHTTPHandlerOptions } from './node-http';
 export declare type CreateHTTPHandlerOptions<TRouter extends AnyRouter> = NodeHTTPHandlerOptions<TRouter, http.IncomingMessage, http.ServerResponse>;
 export declare type CreateHTTPContextOptions = NodeHTTPCreateContextFnOptions<http.IncomingMessage, http.ServerResponse>;
 export declare function createHTTPHandler<TRouter extends AnyRouter>(opts: CreateHTTPHandlerOptions<TRouter>): (req: http.IncomingMessage, res: http.ServerResponse) => Promise<void>;
 export declare function createHTTPServer<TRouter extends AnyRouter>(opts: CreateHTTPHandlerOptions<TRouter>): {
     server: http.Server;
-    listen(port?: number | undefined): {
+    listen(port?: number): {
         port: number | undefined;
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"standalone.d.ts","sourceRoot":"","sources":["../../src/adapters/standalone.ts"],"names":[],"mappings":";AAEA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,EAEvB,MAAM,aAAa,CAAC;AAErB,oBAAY,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE7E,oBAAY,wBAAwB,GAAG,8BAA8B,CACnE,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,SAEpB,KAAK,eAAe,OAAO,KAAK,cAAc,mBASlE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC;;;;;EAiBxC"}
+{"version":3,"file":"standalone.d.ts","sourceRoot":"","sources":["../../src/adapters/standalone.ts"],"names":[],"mappings":";AAGA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,EAEvB,MAAM,aAAa,CAAC;AAErB,oBAAY,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE7E,oBAAY,wBAAwB,GAAG,8BAA8B,CACnE,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,SAEpB,KAAK,eAAe,OAAO,KAAK,cAAc,mBAiBlE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC;;kBAOvB,MAAM;;;EAUvB"}

package/dist/adapters/standalone.js

@@ -3,24 +3,28 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var http = require('http');
-var url = require('url');
-var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-d7c307d3.js');
-require('../transformTRPCResponse-bd24f548.js');
-require('../codes-7f46544e.js');
+var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-6b7c8622.js');
+require('../resolveHTTPResponse-fcc8f644.js');
+require('../TRPCError-9050a68d.js');
+require('../transformTRPCResponse-0c261655.js');
+require('../envelopes-b6dd0367.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
-var url__default = /*#__PURE__*/_interopDefaultLegacy(url);
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 function createHTTPHandler(opts) {
   return async (req, res) => {
-    const endpoint = url__default["default"].parse(req.url).pathname.substr(1);
+    // if no hostname, set a dummy one
+    const href = req.url.startsWith('/') ? `http://127.0.0.1${req.url}` : req.url; // get procedure path and remove the leading slash
+    // /procedure -> procedure
+
+    const path = new URL(href).pathname.slice(1);
     await nodeHTTPRequestHandler.nodeHTTPRequestHandler({ ...opts,
       req,
       res,
-      path: endpoint
+      path
     });
   };
 }

package/dist/adapters/standalone.mjs

@@ -1,17 +1,22 @@
 import http from 'http';
-import url from 'url';
-import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-10e6d2f9.mjs';
-import '../transformTRPCResponse-76e0c91e.mjs';
-import '../codes-7a3d4f65.mjs';
+import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-65cf2218.mjs';
+import '../resolveHTTPResponse-95634936.mjs';
+import '../TRPCError-97212592.mjs';
+import '../transformTRPCResponse-747b9a68.mjs';
+import '../envelopes-af8c2959.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 function createHTTPHandler(opts) {
   return async (req, res) => {
-    const endpoint = url.parse(req.url).pathname.substr(1);
+    // if no hostname, set a dummy one
+    const href = req.url.startsWith('/') ? `http://127.0.0.1${req.url}` : req.url; // get procedure path and remove the leading slash
+    // /procedure -> procedure
+
+    const path = new URL(href).pathname.slice(1);
     await nodeHTTPRequestHandler({ ...opts,
       req,
       res,
-      path: endpoint
+      path
     });
   };
 }

package/dist/adapters/ws.d.ts

@@ -1,16 +1,18 @@
 /// <reference types="node" />
-import http from 'http';
+/// <reference types="node" />
+import { IncomingMessage } from 'http';
 import ws from 'ws';
-import { BaseHandlerOptions } from '../internals/BaseHandlerOptions';
-import { AnyRouter } from '../router';
-import { NodeHTTPCreateContextOption } from './node-http';
+import { AnyRouter } from '../core';
+import { BaseHandlerOptions } from '../internals/types';
+import { NodeHTTPCreateContextFnOptions, NodeHTTPCreateContextOption } from './node-http';
 /**
  * Web socket server handler
  */
-export declare type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<TRouter, http.IncomingMessage> & {
+export declare type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<TRouter, IncomingMessage> & {
     wss: ws.Server;
     process?: NodeJS.Process;
-} & NodeHTTPCreateContextOption<TRouter, http.IncomingMessage, ws>;
+} & NodeHTTPCreateContextOption<TRouter, IncomingMessage, ws>;
+export declare type CreateWSSContextFnOptions = NodeHTTPCreateContextFnOptions<IncomingMessage, ws>;
 export declare function applyWSSHandler<TRouter extends AnyRouter>(opts: WSSHandlerOptions<TRouter>): {
     broadcastReconnectNotification: () => void;
 };

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,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAIrE,OAAO,EAAE,SAAS,EAAqC,MAAM,WAAW,CAAC;AAUzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAiE1D;;GAEG;AACH,oBAAY,iBAAiB,CAAC,OAAO,SAAS,SAAS,IAAI,kBAAkB,CAC3E,OAAO,EACP,IAAI,CAAC,eAAe,CACrB,GAAG;IACF,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;CAC1B,GAAG,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;AAEnE,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAgNjC"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,SAAS,EAAqC,MAAM,SAAS,CAAC;AAIvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AASxD,OAAO,EACL,8BAA8B,EAC9B,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AAyErB;;GAEG;AACH,oBAAY,iBAAiB,CAAC,OAAO,SAAS,SAAS,IAAI,kBAAkB,CAC3E,OAAO,EACP,eAAe,CAChB,GAAG;IACF,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;CAC1B,GAAG,2BAA2B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;AAE9D,oBAAY,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CACH,CAAC;AAEF,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA6OjC"}

package/dist/adapters/ws.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var transformTRPCResponse = require('../transformTRPCResponse-bd24f548.js');
-var subscription = require('../subscription-5b7e1eba.js');
-require('events');
+var TRPCError = require('../TRPCError-9050a68d.js');
+var transformTRPCResponse = require('../transformTRPCResponse-0c261655.js');
+var observable = require('../observable-341a0506.js');
 
 /* istanbul ignore next */
 function assertIsObject(obj) {
@@ -59,8 +59,8 @@ function parseMessage(obj, transformer) {
   if (method === 'subscription.stop') {
     return {
       id,
-      method,
-      params: undefined
+      jsonrpc,
+      method
     };
   }
 
@@ -73,8 +73,8 @@ function parseMessage(obj, transformer) {
   assertIsString(path);
   const input = transformer.input.deserialize(rawInput);
   return {
-    jsonrpc,
     id,
+    jsonrpc,
     method,
     params: {
       input,
@@ -96,13 +96,27 @@ function applyWSSHandler(opts) {
   const {
     transformer
   } = router._def;
-  wss.on('connection', (client, req) => {
+  wss.on('connection', async (client, req) => {
     const clientSubscriptions = new Map();
 
     function respond(untransformedJSON) {
       client.send(JSON.stringify(transformTRPCResponse.transformTRPCResponse(router, untransformedJSON)));
     }
 
+    function stopSubscription(subscription, {
+      id,
+      jsonrpc
+    }) {
+      subscription.unsubscribe();
+      respond({
+        id,
+        jsonrpc,
+        result: {
+          type: 'stopped'
+        }
+      });
+    }
+
     const ctxPromise = createContext === null || createContext === void 0 ? void 0 : createContext({
       req,
       res: client
@@ -111,12 +125,13 @@ function applyWSSHandler(opts) {
 
     async function handleRequest(msg) {
       const {
-        id
+        id,
+        jsonrpc
       } = msg;
       /* istanbul ignore next */
 
       if (id === null) {
-        throw new transformTRPCResponse.TRPCError({
+        throw new TRPCError.TRPCError({
           code: 'BAD_REQUEST',
           message: '`id` is required'
         });
@@ -126,7 +141,10 @@ function applyWSSHandler(opts) {
         const sub = clientSubscriptions.get(id);
 
         if (sub) {
-          sub.destroy();
+          stopSubscription(sub, {
+            id,
+            jsonrpc
+          });
         }
 
         clientSubscriptions.delete(id);
@@ -142,17 +160,21 @@ function applyWSSHandler(opts) {
       try {
         await ctxPromise; // asserts context has been set
 
-        const result = await transformTRPCResponse.callProcedure({
-          path,
-          input,
-          type,
-          router,
-          ctx
-        });
+        const caller = router.createCaller(ctx);
+        const result = await caller[type](path, input);
 
-        if (!(result instanceof subscription.Subscription)) {
+        if (type === 'subscription') {
+          if (!observable.isObservable(result)) {
+            throw new TRPCError.TRPCError({
+              message: `Subscription ${path} did not return an observable`,
+              code: 'INTERNAL_SERVER_ERROR'
+            });
+          }
+        } else {
+          // send the value as data if the method is not a subscription
           respond({
             id,
+            jsonrpc,
             result: {
               type: 'data',
               data: result
@@ -161,12 +183,61 @@ function applyWSSHandler(opts) {
           return;
         }
 
-        const sub = result;
+        const observable$1 = result;
+        const sub = observable$1.subscribe({
+          next(data) {
+            respond({
+              id,
+              jsonrpc,
+              result: {
+                type: 'data',
+                data
+              }
+            });
+          },
+
+          error(err) {
+            var _opts$onError;
+
+            const error = TRPCError.getErrorFromUnknown(err);
+            (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, {
+              error,
+              path,
+              type,
+              ctx,
+              req,
+              input
+            });
+            respond({
+              id,
+              jsonrpc,
+              error: router.getErrorShape({
+                error,
+                type,
+                path,
+                input,
+                ctx
+              })
+            });
+          },
+
+          complete() {
+            respond({
+              id,
+              jsonrpc,
+              result: {
+                type: 'stopped'
+              }
+            });
+          }
+
+        });
         /* istanbul ignore next */
 
         if (client.readyState !== client.OPEN) {
           // if the client got disconnected whilst initializing the subscription
-          sub.destroy();
+          // no need to send stopped message if the client is disconnected
+          sub.unsubscribe();
           return;
         }
         /* istanbul ignore next */
@@ -174,76 +245,31 @@ function applyWSSHandler(opts) {
 
         if (clientSubscriptions.has(id)) {
           // duplicate request ids for client
-          sub.destroy();
-          throw new transformTRPCResponse.TRPCError({
+          stopSubscription(sub, {
+            id,
+            jsonrpc
+          });
+          throw new TRPCError.TRPCError({
             message: `Duplicate id ${id}`,
             code: 'BAD_REQUEST'
           });
         }
 
         clientSubscriptions.set(id, sub);
-        sub.on('data', data => {
-          respond({
-            id,
-            result: {
-              type: 'data',
-              data
-            }
-          });
-        });
-        sub.on('error', _error => {
-          var _opts$onError;
-
-          const error = transformTRPCResponse.getErrorFromUnknown(_error);
-          const json = {
-            id,
-            error: router.getErrorShape({
-              error,
-              type,
-              path,
-              input,
-              ctx
-            })
-          };
-          (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, {
-            error,
-            path,
-            type,
-            ctx,
-            req,
-            input
-          });
-          respond(json);
-        });
-        sub.on('destroy', () => {
-          respond({
-            id,
-            result: {
-              type: 'stopped'
-            }
-          });
-        });
         respond({
           id,
+          jsonrpc,
           result: {
             type: 'started'
           }
         });
-        await sub.start();
       } catch (cause)
       /* istanbul ignore next */
       {
         var _opts$onError2;
 
         // procedure threw an error
-        const error = transformTRPCResponse.getErrorFromUnknown(cause);
-        const json = router.getErrorShape({
-          error,
-          type,
-          path,
-          input,
-          ctx
-        });
+        const error = TRPCError.getErrorFromUnknown(cause);
         (_opts$onError2 = opts.onError) === null || _opts$onError2 === void 0 ? void 0 : _opts$onError2.call(opts, {
           error,
           path,
@@ -254,7 +280,14 @@ function applyWSSHandler(opts) {
         });
         respond({
           id,
-          error: json
+          jsonrpc,
+          error: router.getErrorShape({
+            error,
+            type,
+            path,
+            input,
+            ctx
+          })
         });
       }
     }
@@ -263,11 +296,12 @@ function applyWSSHandler(opts) {
       try {
         const msgJSON = JSON.parse(message.toString());
         const msgs = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
-        msgs.map(raw => parseMessage(raw, transformer)).map(handleRequest);
+        const promises = msgs.map(raw => parseMessage(raw, transformer)).map(handleRequest);
+        await Promise.all(promises);
       } catch (cause) {
-        const error = new transformTRPCResponse.TRPCError({
+        const error = new TRPCError.TRPCError({
           code: 'PARSE_ERROR',
-          cause
+          cause: TRPCError.getCauseFromUnknown(cause)
         });
         respond({
           id: null,
@@ -283,7 +317,7 @@ function applyWSSHandler(opts) {
     });
     client.once('close', () => {
       for (const sub of clientSubscriptions.values()) {
-        sub.destroy();
+        sub.unsubscribe();
       }
 
       clientSubscriptions.clear();
@@ -295,17 +329,7 @@ function applyWSSHandler(opts) {
       } catch (cause) {
         var _opts$onError3, _global$setImmediate;
 
-        const error = transformTRPCResponse.getErrorFromUnknown(cause);
-        const json = {
-          id: null,
-          error: router.getErrorShape({
-            error,
-            type: 'unknown',
-            path: undefined,
-            input: undefined,
-            ctx
-          })
-        };
+        const error = TRPCError.getErrorFromUnknown(cause);
         (_opts$onError3 = opts.onError) === null || _opts$onError3 === void 0 ? void 0 : _opts$onError3.call(opts, {
           error,
           path: undefined,
@@ -314,7 +338,16 @@ function applyWSSHandler(opts) {
           req,
           input: undefined
         });
-        respond(json); // close in next tick
+        respond({
+          id: null,
+          error: router.getErrorShape({
+            error,
+            type: 'unknown',
+            path: undefined,
+            input: undefined,
+            ctx
+          })
+        }); // close in next tick
 
         ((_global$setImmediate = global.setImmediate) !== null && _global$setImmediate !== void 0 ? _global$setImmediate : global.setTimeout)(() => {
           client.close();
@@ -322,7 +355,7 @@ function applyWSSHandler(opts) {
       }
     }
 
-    createContextAsync();
+    await createContextAsync();
   });
   return {
     broadcastReconnectNotification: () => {