@trpc/server 11.0.0-rc.621 → 11.0.0-rc.632

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

@@ -0,0 +1,18 @@
+import type { NodeHTTPResponse } from './types';
+/**
+ * @internal
+ */
+export declare function writeResponseBody(opts: {
+    res: NodeHTTPResponse;
+    signal: AbortSignal;
+    body: NonNullable<Response['body']>;
+}): Promise<void>;
+/**
+ * @internal
+ */
+export declare function writeResponse(opts: {
+    request: Request;
+    response: Response;
+    rawResponse: NodeHTTPResponse;
+}): Promise<void>;
+//# sourceMappingURL=writeResponse.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"writeResponse.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/writeResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAyBhD;;GAEG;AAEH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,gBAAgB,CAAC;IACtB,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;CACrC,iBAyBA;AACD;;GAEG;AAEH,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,gBAAgB,CAAC;CAC/B,iBA0BA"}

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

@@ -0,0 +1,85 @@
+'use strict';
+
+var isAbortError = require('../../unstable-core-do-not-import/http/isAbortError.js');
+require('../../vendor/unpromise/unpromise.js');
+require('../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
+require('../../unstable-core-do-not-import/rootConfig.js');
+
+// eslint-disable-next-line no-restricted-imports
+async function writeResponseBodyChunk(res, chunk) {
+    if (res.write(chunk) === false) {
+        await new Promise((resolve, reject)=>{
+            const onError = (err)=>{
+                reject(err);
+                cleanup();
+            };
+            const onDrain = ()=>{
+                resolve();
+                cleanup();
+            };
+            const cleanup = ()=>{
+                res.off('error', onError);
+                res.off('drain', onDrain);
+            };
+            res.once('error', onError);
+            res.once('drain', onDrain);
+        });
+    }
+}
+/**
+ * @internal
+ */ async function writeResponseBody(opts) {
+    const { res } = opts;
+    try {
+        const writableStream = new WritableStream({
+            async write (chunk) {
+                await writeResponseBodyChunk(res, chunk);
+                res.flush?.();
+            },
+            abort () {
+                if (!res.headersSent) {
+                    res.statusCode = 500;
+                }
+            }
+        });
+        await opts.body.pipeTo(writableStream, {
+            signal: opts.signal
+        });
+    } catch (err) {
+        if (isAbortError.isAbortError(err)) {
+            return;
+        }
+        throw err;
+    }
+}
+/**
+ * @internal
+ */ async function writeResponse(opts) {
+    const { response, rawResponse } = opts;
+    // Only override status code if it hasn't been explicitly set in a procedure etc
+    if (rawResponse.statusCode === 200) {
+        rawResponse.statusCode = response.status;
+    }
+    for (const [key, value] of response.headers){
+        rawResponse.setHeader(key, value);
+    }
+    try {
+        if (response.body) {
+            await writeResponseBody({
+                res: rawResponse,
+                signal: opts.request.signal,
+                body: response.body
+            });
+        }
+    } catch (err) {
+        if (!rawResponse.headersSent) {
+            rawResponse.statusCode = 500;
+        }
+        throw err;
+    } finally{
+        rawResponse.end();
+    }
+}
+
+exports.writeResponse = writeResponse;
+exports.writeResponseBody = writeResponseBody;

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

@@ -0,0 +1,82 @@
+import { isAbortError } from '../../unstable-core-do-not-import/http/isAbortError.mjs';
+import '../../vendor/unpromise/unpromise.mjs';
+import '../../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
+import '../../unstable-core-do-not-import/rootConfig.mjs';
+
+// eslint-disable-next-line no-restricted-imports
+async function writeResponseBodyChunk(res, chunk) {
+    if (res.write(chunk) === false) {
+        await new Promise((resolve, reject)=>{
+            const onError = (err)=>{
+                reject(err);
+                cleanup();
+            };
+            const onDrain = ()=>{
+                resolve();
+                cleanup();
+            };
+            const cleanup = ()=>{
+                res.off('error', onError);
+                res.off('drain', onDrain);
+            };
+            res.once('error', onError);
+            res.once('drain', onDrain);
+        });
+    }
+}
+/**
+ * @internal
+ */ async function writeResponseBody(opts) {
+    const { res } = opts;
+    try {
+        const writableStream = new WritableStream({
+            async write (chunk) {
+                await writeResponseBodyChunk(res, chunk);
+                res.flush?.();
+            },
+            abort () {
+                if (!res.headersSent) {
+                    res.statusCode = 500;
+                }
+            }
+        });
+        await opts.body.pipeTo(writableStream, {
+            signal: opts.signal
+        });
+    } catch (err) {
+        if (isAbortError(err)) {
+            return;
+        }
+        throw err;
+    }
+}
+/**
+ * @internal
+ */ async function writeResponse(opts) {
+    const { response, rawResponse } = opts;
+    // Only override status code if it hasn't been explicitly set in a procedure etc
+    if (rawResponse.statusCode === 200) {
+        rawResponse.statusCode = response.status;
+    }
+    for (const [key, value] of response.headers){
+        rawResponse.setHeader(key, value);
+    }
+    try {
+        if (response.body) {
+            await writeResponseBody({
+                res: rawResponse,
+                signal: opts.request.signal,
+                body: response.body
+            });
+        }
+    } catch (err) {
+        if (!rawResponse.headersSent) {
+            rawResponse.statusCode = 500;
+        }
+        throw err;
+    } finally{
+        rawResponse.end();
+    }
+}
+
+export { writeResponse, writeResponseBody };

package/dist/adapters/standalone.js

@@ -2,6 +2,8 @@
 
 var http = require('node:http');
 var utils = require('../unstable-core-do-not-import/utils.js');
+require('../vendor/unpromise/unpromise.js');
+require('../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 require('../unstable-core-do-not-import/rootConfig.js');
 var nodeHTTPRequestHandler = require('./node-http/nodeHTTPRequestHandler.js');
 var incomingMessageToRequest = require('./node-http/incomingMessageToRequest.js');

package/dist/adapters/standalone.mjs

@@ -1,5 +1,7 @@
 import http from 'node:http';
 import { run } from '../unstable-core-do-not-import/utils.mjs';
+import '../vendor/unpromise/unpromise.mjs';
+import '../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import '../unstable-core-do-not-import/rootConfig.mjs';
 import { nodeHTTPRequestHandler, internal_exceptionHandler } from './node-http/nodeHTTPRequestHandler.mjs';
 import { createURL } from './node-http/incomingMessageToRequest.mjs';

package/dist/adapters/ws.js

@@ -6,8 +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 tracked = require('../unstable-core-do-not-import/stream/tracked.js');
+var unpromise = require('../vendor/unpromise/unpromise.js');
+require('../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.js');
 var transformer = require('../unstable-core-do-not-import/transformer.js');
 require('../unstable-core-do-not-import/rootConfig.js');
 var router = require('../unstable-core-do-not-import/router.js');
@@ -19,13 +20,13 @@ var incomingMessageToRequest = require('./node-http/incomingMessageToRequest.js'
  */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
 const unsetContextPromiseSymbol = Symbol('unsetContextPromise');
 function getWSConnectionHandler(opts) {
-    const { createContext , router: router$1  } = opts;
-    const { transformer: transformer$1  } = router$1._def._config;
+    const { createContext, router: router$1 } = opts;
+    const { transformer: transformer$1 } = router$1._def._config;
     return async (client, req)=>{
         const clientSubscriptions = new Map();
         const abortController = new AbortController();
         if (opts.keepAlive?.enabled) {
-            const { pingMs , pongWaitMs  } = opts.keepAlive;
+            const { pingMs, pongWaitMs } = opts.keepAlive;
             handleKeepAlive(client, pingMs, pongWaitMs);
         }
         function respond(untransformedJSON) {
@@ -82,7 +83,7 @@ function getWSConnectionHandler(opts) {
      * - if connection params are expected, they will be created once received
      */ let ctxPromise = incomingMessageToRequest.createURL(req).searchParams.get('connectionParams') === '1' ? unsetContextPromiseSymbol : createCtxPromise(()=>null);
         async function handleRequest(msg) {
-            const { id , jsonrpc  } = msg;
+            const { id, jsonrpc } = msg;
             /* istanbul ignore next -- @preserve */ if (id === null) {
                 throw new TRPCError.TRPCError({
                     code: 'BAD_REQUEST',
@@ -93,8 +94,8 @@ function getWSConnectionHandler(opts) {
                 clientSubscriptions.get(id)?.abort();
                 return;
             }
-            const { path , lastEventId  } = msg.params;
-            let { input  } = msg.params;
+            const { path, lastEventId } = msg.params;
+            let { input } = msg.params;
             const type = msg.method;
             try {
                 if (lastEventId !== undefined) {
@@ -207,10 +208,10 @@ function getWSConnectionHandler(opts) {
                             data: next.value
                         };
                         if (tracked.isTrackedEnvelope(next.value)) {
-                            const [id1, data] = next.value;
-                            result.id = id1;
+                            const [id, data] = next.value;
+                            result.id = id;
                             result.data = {
-                                id: id1,
+                                id,
                                 data
                             };
                         }

package/dist/adapters/ws.mjs

@@ -4,8 +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 { isTrackedEnvelope } from '../unstable-core-do-not-import/stream/tracked.mjs';
+import { Unpromise } from '../vendor/unpromise/unpromise.mjs';
+import '../unstable-core-do-not-import/stream/utils/disposablePromiseTimer.mjs';
 import { transformTRPCResponse } from '../unstable-core-do-not-import/transformer.mjs';
 import '../unstable-core-do-not-import/rootConfig.mjs';
 import { callProcedure } from '../unstable-core-do-not-import/router.mjs';
@@ -17,13 +18,13 @@ import { createURL } from './node-http/incomingMessageToRequest.mjs';
  */ const WEBSOCKET_OPEN = 1; /* ws.WebSocket.OPEN */ 
 const unsetContextPromiseSymbol = Symbol('unsetContextPromise');
 function getWSConnectionHandler(opts) {
-    const { createContext , router  } = opts;
-    const { transformer  } = router._def._config;
+    const { createContext, router } = opts;
+    const { transformer } = router._def._config;
     return async (client, req)=>{
         const clientSubscriptions = new Map();
         const abortController = new AbortController();
         if (opts.keepAlive?.enabled) {
-            const { pingMs , pongWaitMs  } = opts.keepAlive;
+            const { pingMs, pongWaitMs } = opts.keepAlive;
             handleKeepAlive(client, pingMs, pongWaitMs);
         }
         function respond(untransformedJSON) {
@@ -80,7 +81,7 @@ function getWSConnectionHandler(opts) {
      * - if connection params are expected, they will be created once received
      */ let ctxPromise = createURL(req).searchParams.get('connectionParams') === '1' ? unsetContextPromiseSymbol : createCtxPromise(()=>null);
         async function handleRequest(msg) {
-            const { id , jsonrpc  } = msg;
+            const { id, jsonrpc } = msg;
             /* istanbul ignore next -- @preserve */ if (id === null) {
                 throw new TRPCError({
                     code: 'BAD_REQUEST',
@@ -91,8 +92,8 @@ function getWSConnectionHandler(opts) {
                 clientSubscriptions.get(id)?.abort();
                 return;
             }
-            const { path , lastEventId  } = msg.params;
-            let { input  } = msg.params;
+            const { path, lastEventId } = msg.params;
+            let { input } = msg.params;
             const type = msg.method;
             try {
                 if (lastEventId !== undefined) {
@@ -205,10 +206,10 @@ function getWSConnectionHandler(opts) {
                             data: next.value
                         };
                         if (isTrackedEnvelope(next.value)) {
-                            const [id1, data] = next.value;
-                            result.id = id1;
+                            const [id, data] = next.value;
+                            result.id = id;
                             result.data = {
-                                id: id1,
+                                id,
                                 data
                             };
                         }