@trpc/server 11.0.0-alpha-tmp-12-06-react.674 → 11.0.0-alpha-tmp-issues-6374.696

package/dist/adapters/fastify/fastifyRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAEL,KAAK,sBAAsB,EAE5B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAGL,KAAK,2BAA2B,EACjC,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE5D,KAAK,4BAA4B,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IACxD,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,EAC9B,IAAI,EAAE,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBAkCjE"}
+{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAEL,KAAK,sBAAsB,EAE5B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAEL,KAAK,2BAA2B,EAEjC,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE5D,KAAK,4BAA4B,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IACxD,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,EAC9B,IAAI,EAAE,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBAkCjE"}

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

@@ -1,15 +1,22 @@
 import type * as http from 'http';
-export interface IncomingMessageWithBody extends http.IncomingMessage {
+export interface UniversalIncomingMessage extends Omit<http.IncomingMessage, 'socket'> {
     /**
      * Many adapters will add a `body` property to the incoming message and pre-parse the body
      */
     body?: unknown;
+    /**
+     * Socket is not always available in all deployments, so we need to make it optional
+     * @see https://github.com/trpc/trpc/issues/6341
+     * The socket object provided in the request does not fully implement the expected Node.js Socket interface.
+     * @see https://github.com/trpc/trpc/pull/6358
+     */
+    socket?: Partial<http.IncomingMessage['socket']>;
 }
-export declare function createURL(req: http.IncomingMessage): URL;
+export declare function createURL(req: UniversalIncomingMessage): URL;
 /**
  * Convert an [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
  */
-export declare function incomingMessageToRequest(req: http.IncomingMessage, res: http.ServerResponse, opts: {
+export declare function incomingMessageToRequest(req: UniversalIncomingMessage, res: http.ServerResponse, opts: {
     /**
      * Max body size in bytes. If the body is larger than this, the request will be aborted
      */

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

@@ -1 +1 @@
-{"version":3,"file":"incomingMessageToRequest.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/incomingMessageToRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,MAAM,CAAC;AAGlC,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,eAAe;IACnE;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAiED,wBAAgB,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,GAAG,GAAG,CAkBxD;AAwBD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,IAAI,EAAE;IACJ;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GACA,OAAO,CAqCT"}
+{"version":3,"file":"incomingMessageToRequest.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/incomingMessageToRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,MAAM,CAAC;AAGlC,MAAM,WAAW,wBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC;IAC5C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;CAClD;AAiED,wBAAgB,SAAS,CAAC,GAAG,EAAE,wBAAwB,GAAG,GAAG,CAkB5D;AAwBD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,wBAAwB,EAC7B,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,IAAI,EAAE;IACJ;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GACA,OAAO,CAqCT"}

package/dist/adapters/node-http/incomingMessageToRequest.js

@@ -8,14 +8,16 @@ require('../../unstable-core-do-not-import/rootConfig.js');
 function createBody(req, opts) {
     // Some adapters will pre-parse the body and add it to the request object
     if ('body' in req) {
+        if (req.body === undefined) {
+            // If body property exists but is undefined, return undefined
+            return undefined;
+        }
         // If the body is already a string, return it directly
         if (typeof req.body === 'string') {
             return req.body;
-        } else if (req.body !== undefined) {
-            return JSON.stringify(req.body);
         }
-        // If body property exists but is undefined, return undefined
-        return undefined;
+        // If body exists but isn't a string, stringify it as JSON
+        return JSON.stringify(req.body);
     }
     let size = 0;
     let hasClosed = false;
@@ -88,12 +90,12 @@ function createHeaders(incoming) {
     const ac = new AbortController();
     const onAbort = ()=>{
         res.off('close', onAbort);
-        req.socket.off('end', onAbort);
+        req.socket?.off?.('end', onAbort);
         // abort the request
         ac.abort();
     };
     res.once('close', onAbort);
-    req.socket.once('end', onAbort);
+    req.socket?.once?.('end', onAbort);
     // Get host from either regular header or HTTP/2 pseudo-header
     const url = createURL(req);
     const init = {

package/dist/adapters/node-http/incomingMessageToRequest.mjs

@@ -6,14 +6,16 @@ import '../../unstable-core-do-not-import/rootConfig.mjs';
 function createBody(req, opts) {
     // Some adapters will pre-parse the body and add it to the request object
     if ('body' in req) {
+        if (req.body === undefined) {
+            // If body property exists but is undefined, return undefined
+            return undefined;
+        }
         // If the body is already a string, return it directly
         if (typeof req.body === 'string') {
             return req.body;
-        } else if (req.body !== undefined) {
-            return JSON.stringify(req.body);
         }
-        // If body property exists but is undefined, return undefined
-        return undefined;
+        // If body exists but isn't a string, stringify it as JSON
+        return JSON.stringify(req.body);
     }
     let size = 0;
     let hasClosed = false;
@@ -86,12 +88,12 @@ function createHeaders(incoming) {
     const ac = new AbortController();
     const onAbort = ()=>{
         res.off('close', onAbort);
-        req.socket.off('end', onAbort);
+        req.socket?.off?.('end', onAbort);
         // abort the request
         ac.abort();
     };
     res.once('close', onAbort);
-    req.socket.once('end', onAbort);
+    req.socket?.once?.('end', onAbort);
     // Get host from either regular header or HTTP/2 pseudo-header
     const url = createURL(req);
     const init = {

package/dist/adapters/ws.js

@@ -6,9 +6,9 @@ var utils = require('../unstable-core-do-not-import/utils.js');
 var parseConnectionParams = require('../unstable-core-do-not-import/http/parseConnectionParams.js');
 var parseTRPCMessage = require('../unstable-core-do-not-import/rpc/parseTRPCMessage.js');
 var observable = require('../observable/observable.js');
-var unpromise = require('../vendor/unpromise/unpromise.js');
 var asyncIterable = require('../unstable-core-do-not-import/stream/utils/asyncIterable.js');
 require('../unstable-core-do-not-import/stream/utils/disposable.js');
+var unpromise = require('../vendor/unpromise/unpromise.js');
 var tracked = require('../unstable-core-do-not-import/stream/tracked.js');
 var transformer = require('../unstable-core-do-not-import/transformer.js');
 require('../unstable-core-do-not-import/rootConfig.js');

package/dist/adapters/ws.mjs

@@ -4,9 +4,9 @@ import { run, isObject, isAsyncIterable } from '../unstable-core-do-not-import/u
 import { parseConnectionParamsFromUnknown } from '../unstable-core-do-not-import/http/parseConnectionParams.mjs';
 import { parseTRPCMessage } from '../unstable-core-do-not-import/rpc/parseTRPCMessage.mjs';
 import { isObservable, observableToAsyncIterable } from '../observable/observable.mjs';
-import { Unpromise } from '../vendor/unpromise/unpromise.mjs';
 import { iteratorResource } from '../unstable-core-do-not-import/stream/utils/asyncIterable.mjs';
 import '../unstable-core-do-not-import/stream/utils/disposable.mjs';
+import { Unpromise } from '../vendor/unpromise/unpromise.mjs';
 import { isTrackedEnvelope } from '../unstable-core-do-not-import/stream/tracked.mjs';
 import { transformTRPCResponse } from '../unstable-core-do-not-import/transformer.mjs';
 import '../unstable-core-do-not-import/rootConfig.mjs';