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

package/dist/unstable-core-do-not-import/stream/jsonl.mjs

@@ -1,9 +1,8 @@
 import { _ as _define_property } from '../../node_modules/.pnpm/@swc_helpers@0.5.13/node_modules/@swc/helpers/esm/_define_property.mjs';
-import { Unpromise } from '../../vendor/unpromise/unpromise.mjs';
-import { getTRPCErrorFromUnknown } from '../error/TRPCError.mjs';
 import { isObject, isFunction, isAsyncIterable, run } from '../utils.mjs';
 import { createDeferred } from './utils/createDeferred.mjs';
-import { createReadableStream, isCancelledStreamResult } from './utils/createReadableStream.mjs';
+import { createReadableStream } from './utils/createReadableStream.mjs';
+import { withRefCount } from './utils/withRefCount.mjs';
 
 // ---------- types
 const CHUNK_VALUE_TYPE_PROMISE = 0;
@@ -26,41 +25,43 @@ function createBatchStreamProducer(opts) {
     let counter = 0;
     const placeholder = 0;
     const stream = createReadableStream();
-    const pending = new Set();
-    function maybeClose() {
-        if (pending.size === 0 && !stream.cancelled()) {
+    const pending = withRefCount(new Set(), ()=>{
+        if (!stream.cancelled()) {
             stream.controller.close();
         }
-    }
-    function dehydratePromise(promise, path) {
-        //
+    });
+    const maybeEnqueue = (chunk)=>{
+        if (!stream.cancelled()) {
+            stream.controller.enqueue(chunk);
+        }
+    };
+    function encodePromise(promise, path) {
         const error = checkMaxDepth(path);
         if (error) {
-            promise.catch(()=>{
-            // ignore
+            // Catch any errors from the original promise to ensure they're reported
+            promise.catch((cause)=>{
+                opts.onError?.({
+                    error: cause,
+                    path
+                });
             });
+            // Replace the promise with a rejected one containing the max depth error
             promise = Promise.reject(error);
         }
         const idx = counter++;
         pending.add(idx);
-        Unpromise.race([
-            promise,
-            stream.cancelledPromise
-        ]).then((it)=>{
-            if (isCancelledStreamResult(it)) {
-                return;
-            }
-            stream.controller.enqueue([
+        promise.then((it)=>{
+            maybeEnqueue([
                 idx,
                 PROMISE_STATUS_FULFILLED,
-                dehydrate(it, path)
+                encode(it, path)
             ]);
         }).catch((cause)=>{
             opts.onError?.({
                 error: cause,
                 path
             });
-            stream.controller.enqueue([
+            maybeEnqueue([
                 idx,
                 PROMISE_STATUS_REJECTED,
                 opts.formatError?.({
@@ -70,73 +71,53 @@ function createBatchStreamProducer(opts) {
             ]);
         }).finally(()=>{
             pending.delete(idx);
-            maybeClose();
         });
         return idx;
     }
-    function dehydrateAsyncIterable(iterable, path) {
-        const error = checkMaxDepth(path);
-        if (error) {
-            iterable = {
-                [Symbol.asyncIterator] () {
-                    throw error;
-                }
-            };
-        }
+    function encodeAsyncIterable(iterable, path) {
         const idx = counter++;
         pending.add(idx);
         run(async ()=>{
+            const error = checkMaxDepth(path);
+            if (error) {
+                throw error;
+            }
             const iterator = iterable[Symbol.asyncIterator]();
             while(true){
-                const next = await Unpromise.race([
-                    iterator.next().catch(getTRPCErrorFromUnknown),
-                    stream.cancelledPromise
-                ]);
-                if (next instanceof Error) {
-                    opts.onError?.({
-                        error: next,
-                        path
-                    });
-                    stream.controller.enqueue([
-                        idx,
-                        ASYNC_ITERABLE_STATUS_ERROR,
-                        opts.formatError?.({
-                            error: next,
-                            path
-                        })
-                    ]);
-                    return;
-                }
-                if (isCancelledStreamResult(next)) {
-                    await iterator.return?.();
-                    break;
+                if (stream.cancelled()) {
+                    const res = await iterator.return?.();
+                    return res?.value;
                 }
+                const next = await iterator.next();
                 if (next.done) {
-                    stream.controller.enqueue([
+                    maybeEnqueue([
                         idx,
                         ASYNC_ITERABLE_STATUS_RETURN,
-                        dehydrate(next.value, path)
+                        encode(next.value, path)
                     ]);
                     break;
                 }
-                stream.controller.enqueue([
+                maybeEnqueue([
                     idx,
                     ASYNC_ITERABLE_STATUS_VALUE,
-                    dehydrate(next.value, path)
+                    encode(next.value, path)
                 ]);
             }
-            pending.delete(idx);
-            maybeClose();
         }).catch((cause)=>{
-            // this shouldn't happen, but node crashes if we don't catch it
             opts.onError?.({
-                error: new Error('You found a bug - please report it on https://github.com/trpc/trpc', // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore https://github.com/tc39/proposal-error-cause
-                {
-                    cause
-                }),
+                error: cause,
                 path
             });
+            maybeEnqueue([
+                idx,
+                ASYNC_ITERABLE_STATUS_ERROR,
+                opts.formatError?.({
+                    error: cause,
+                    path
+                })
+            ]);
+        }).finally(()=>{
+            pending.delete(idx);
         });
         return idx;
     }
@@ -146,11 +127,11 @@ function createBatchStreamProducer(opts) {
         }
         return null;
     }
-    function dehydrateAsync(value, path) {
+    function encodeAsync(value, path) {
         if (isPromise(value)) {
             return [
                 CHUNK_VALUE_TYPE_PROMISE,
-                dehydratePromise(value, path)
+                encodePromise(value, path)
             ];
         }
         if (isAsyncIterable(value)) {
@@ -159,12 +140,12 @@ function createBatchStreamProducer(opts) {
             }
             return [
                 CHUNK_VALUE_TYPE_ASYNC_ITERABLE,
-                dehydrateAsyncIterable(value, path)
+                encodeAsyncIterable(value, path)
             ];
         }
         return null;
     }
-    function dehydrate(value, path) {
+    function encode(value, path) {
         if (value === undefined) {
             return [
                 []
@@ -177,7 +158,7 @@ function createBatchStreamProducer(opts) {
                 ]
             ];
         }
-        const reg = dehydrateAsync(value, path);
+        const reg = encodeAsync(value, path);
         if (reg) {
             return [
                 [
@@ -192,7 +173,7 @@ function createBatchStreamProducer(opts) {
         const newObj = {};
         const asyncValues = [];
         for (const [key, item] of Object.entries(value)){
-            const transformed = dehydrateAsync(item, [
+            const transformed = encodeAsync(item, [
                 ...path,
                 key
             ]);
@@ -215,10 +196,11 @@ function createBatchStreamProducer(opts) {
     }
     const newHead = {};
     for (const [key, item] of Object.entries(data)){
-        newHead[key] = dehydrate(item, [
+        newHead[key] = encode(item, [
             key
         ]);
     }
+    pending.activate();
     return [
         newHead,
         stream.readable
@@ -334,34 +316,19 @@ function createConsumerStream(from) {
         }));
     }
     let headDeferred = createDeferred();
-    const chunkDeferred = new Map();
-    const controllers = new Map();
-    const maybeAbort = ()=>{
-        if (chunkDeferred.size === 0 && Array.from(controllers.values()).every((it)=>it.returned)) {
-            // nothing is listening to the stream anymore
-            opts.abortController?.abort();
-        }
-    };
-    function hydrateChunkDefinition(value) {
+    const controllers = withRefCount(new Map(), ()=>{
+        opts.abortController?.abort();
+    });
+    function decodeChunkDefinition(value) {
         const [_path, type, chunkId] = value;
-        const { readable, controller } = createReadableStream();
-        const wrapper = {
-            controller,
-            returned: false
-        };
-        controllers.set(chunkId, wrapper);
-        // resolve chunk deferred if it exists
-        const deferred = chunkDeferred.get(chunkId);
-        if (deferred) {
-            deferred.resolve(wrapper);
-            chunkDeferred.delete(chunkId);
-        }
+        const stream = createReadableStream();
+        controllers.set(chunkId, stream.controller);
         switch(type){
             case CHUNK_VALUE_TYPE_PROMISE:
                 {
                     return new Promise((resolve, reject)=>{
                         // listen for next value in the stream
-                        const reader = readable.getReader();
+                        const reader = stream.readable.getReader();
                         reader.read().then((it)=>{
                             if (it.done) {
                                 reject(new Error('Promise chunk ended without value'));
@@ -375,7 +342,7 @@ function createConsumerStream(from) {
                             const [_chunkId, status, data] = value;
                             switch(status){
                                 case PROMISE_STATUS_FULFILLED:
-                                    resolve(hydrate(data));
+                                    resolve(decode(data));
                                     break;
                                 case PROMISE_STATUS_REJECTED:
                                     reject(opts.formatError?.({
@@ -384,9 +351,7 @@ function createConsumerStream(from) {
                                     break;
                             }
                         }).catch(reject).finally(()=>{
-                            // reader.releaseLock();
                             controllers.delete(chunkId);
-                            maybeAbort();
                         });
                     });
                 }
@@ -394,7 +359,7 @@ function createConsumerStream(from) {
                 {
                     return {
                         [Symbol.asyncIterator]: ()=>{
-                            const reader = readable.getReader();
+                            const reader = stream.readable.getReader();
                             const iterator = {
                                 next: async ()=>{
                                     const { done, value } = await reader.read();
@@ -403,7 +368,6 @@ function createConsumerStream(from) {
                                     }
                                     if (done) {
                                         controllers.delete(chunkId);
-                                        maybeAbort();
                                         return {
                                             done: true,
                                             value: undefined
@@ -414,26 +378,23 @@ function createConsumerStream(from) {
                                         case ASYNC_ITERABLE_STATUS_VALUE:
                                             return {
                                                 done: false,
-                                                value: hydrate(data)
+                                                value: decode(data)
                                             };
                                         case ASYNC_ITERABLE_STATUS_RETURN:
                                             controllers.delete(chunkId);
-                                            maybeAbort();
                                             return {
                                                 done: true,
-                                                value: hydrate(data)
+                                                value: decode(data)
                                             };
                                         case ASYNC_ITERABLE_STATUS_ERROR:
                                             controllers.delete(chunkId);
-                                            maybeAbort();
                                             throw opts.formatError?.({
                                                 error: data
                                             }) ?? new AsyncError(data);
                                     }
                                 },
                                 return: async ()=>{
-                                    wrapper.returned = true;
-                                    maybeAbort();
+                                    controllers.delete(chunkId);
                                     return {
                                         done: true,
                                         value: undefined
@@ -446,26 +407,22 @@ function createConsumerStream(from) {
                 }
         }
     }
-    function hydrate(value) {
+    function decode(value) {
         const [[data], ...asyncProps] = value;
         for (const value of asyncProps){
             const [key] = value;
-            const hydrated = hydrateChunkDefinition(value);
+            const decoded = decodeChunkDefinition(value);
             if (key === null) {
-                return hydrated;
+                return decoded;
             }
-            data[key] = hydrated;
+            data[key] = decoded;
         }
         return data;
     }
     const closeOrAbort = (reason)=>{
         const error = new StreamInterruptedError(reason);
         headDeferred?.reject(error);
-        for (const deferred of chunkDeferred.values()){
-            deferred.reject(error);
-        }
-        chunkDeferred.clear();
-        for (const { controller } of controllers.values()){
+        for (const controller of controllers.values()){
             controller.enqueue(error);
             controller.close();
         }
@@ -476,25 +433,19 @@ function createConsumerStream(from) {
             if (headDeferred) {
                 const head = chunkOrHead;
                 for (const [key, value] of Object.entries(chunkOrHead)){
-                    const parsed = hydrate(value);
+                    const parsed = decode(value);
                     head[key] = parsed;
                 }
                 headDeferred.resolve(head);
                 headDeferred = null;
+                controllers.activate();
                 return;
             }
             const chunk = chunkOrHead;
             const [idx] = chunk;
-            let wrapper = controllers.get(idx);
-            if (!wrapper) {
-                let deferred = chunkDeferred.get(idx);
-                if (!deferred) {
-                    deferred = createDeferred();
-                    chunkDeferred.set(idx, deferred);
-                }
-                wrapper = await deferred.promise;
-            }
-            wrapper.controller.enqueue(chunk);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const controller = controllers.get(idx);
+            controller.enqueue(chunk);
         },
         close: closeOrAbort,
         abort: closeOrAbort

package/dist/unstable-core-do-not-import/stream/sse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"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"}

package/dist/unstable-core-do-not-import/stream/sse.js

@@ -1,11 +1,11 @@
 'use strict';
 
 var TRPCError = require('../error/TRPCError.js');
+var isAbortError = require('../http/isAbortError.js');
 var utils = require('../utils.js');
 var tracked = require('./tracked.js');
 var asyncIterable = require('./utils/asyncIterable.js');
 var createReadableStream = require('./utils/createReadableStream.js');
-var promiseTimer = require('./utils/promiseTimer.js');
 var withPing = require('./utils/withPing.js');
 
 const SERIALIZED_ERROR_EVENT = 'serialized-error';
@@ -24,18 +24,18 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
     };
     utils.run(async ()=>{
         let iterable = opts.data;
-        iterable = asyncIterable.withCancel(iterable, stream.cancelledPromise);
         if (opts.emitAndEndImmediately) {
             iterable = asyncIterable.takeWithGrace(iterable, {
                 count: 1,
                 gracePeriodMs: 1,
-                onCancel: ()=>opts.abortCtrl.abort()
+                abortCtrl: opts.abortCtrl
             });
         }
-        let maxDurationTimer = null;
-        if (opts.maxDurationMs != null && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) {
-            maxDurationTimer = promiseTimer.createPromiseTimer(opts.maxDurationMs).start();
-            iterable = asyncIterable.withCancel(iterable, maxDurationTimer.promise.then(()=>opts.abortCtrl.abort()));
+        if (opts.maxDurationMs && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) {
+            iterable = asyncIterable.withMaxDuration(iterable, {
+                maxDurationMs: opts.maxDurationMs,
+                abortCtrl: opts.abortCtrl
+            });
         }
         if (ping.enabled && ping.intervalMs !== Infinity && ping.intervalMs > 0) {
             iterable = withPing.withPing(iterable, ping.intervalMs);
@@ -67,22 +67,26 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
                 chunk = null;
             }
         } catch (err) {
-            // ignore abort errors, send any other errors
-            if (!(err instanceof Error) || err.name !== 'AbortError') {
-                // `err` must be caused by `opts.data`, `JSON.stringify` or `serialize`.
-                // So, a user error in any case.
-                const error = TRPCError.getTRPCErrorFromUnknown(err);
-                const data = opts.formatError?.({
-                    error
-                }) ?? null;
-                stream.controller.enqueue({
-                    event: SERIALIZED_ERROR_EVENT,
-                    data: JSON.stringify(serialize(data))
-                });
+            if (isAbortError.isAbortError(err)) {
+                // ignore abort errors, send any other errors
+                return;
             }
+            // `err` must be caused by `opts.data`, `JSON.stringify` or `serialize`.
+            // So, a user error in any case.
+            const error = TRPCError.getTRPCErrorFromUnknown(err);
+            const data = opts.formatError?.({
+                error
+            }) ?? null;
+            stream.controller.enqueue({
+                event: SERIALIZED_ERROR_EVENT,
+                data: JSON.stringify(serialize(data))
+            });
         } finally{
-            maxDurationTimer?.clear();
-            stream.controller.close();
+            try {
+                stream.controller.close();
+            } catch  {
+            // ignore
+            }
         }
     }).catch((err)=>{
         // should not be reached; just in case...

package/dist/unstable-core-do-not-import/stream/sse.mjs

@@ -1,9 +1,9 @@
 import { getTRPCErrorFromUnknown } from '../error/TRPCError.mjs';
+import { isAbortError } from '../http/isAbortError.mjs';
 import { run, identity } from '../utils.mjs';
 import { isTrackedEnvelope } from './tracked.mjs';
-import { withCancel, takeWithGrace } from './utils/asyncIterable.mjs';
+import { takeWithGrace, withMaxDuration } from './utils/asyncIterable.mjs';
 import { createReadableStream } from './utils/createReadableStream.mjs';
-import { createPromiseTimer } from './utils/promiseTimer.mjs';
 import { withPing, PING_SYM } from './utils/withPing.mjs';
 
 const SERIALIZED_ERROR_EVENT = 'serialized-error';
@@ -22,18 +22,18 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
     };
     run(async ()=>{
         let iterable = opts.data;
-        iterable = withCancel(iterable, stream.cancelledPromise);
         if (opts.emitAndEndImmediately) {
             iterable = takeWithGrace(iterable, {
                 count: 1,
                 gracePeriodMs: 1,
-                onCancel: ()=>opts.abortCtrl.abort()
+                abortCtrl: opts.abortCtrl
             });
         }
-        let maxDurationTimer = null;
-        if (opts.maxDurationMs != null && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) {
-            maxDurationTimer = createPromiseTimer(opts.maxDurationMs).start();
-            iterable = withCancel(iterable, maxDurationTimer.promise.then(()=>opts.abortCtrl.abort()));
+        if (opts.maxDurationMs && opts.maxDurationMs > 0 && opts.maxDurationMs !== Infinity) {
+            iterable = withMaxDuration(iterable, {
+                maxDurationMs: opts.maxDurationMs,
+                abortCtrl: opts.abortCtrl
+            });
         }
         if (ping.enabled && ping.intervalMs !== Infinity && ping.intervalMs > 0) {
             iterable = withPing(iterable, ping.intervalMs);
@@ -65,22 +65,26 @@ const SERIALIZED_ERROR_EVENT = 'serialized-error';
                 chunk = null;
             }
         } catch (err) {
-            // ignore abort errors, send any other errors
-            if (!(err instanceof Error) || err.name !== 'AbortError') {
-                // `err` must be caused by `opts.data`, `JSON.stringify` or `serialize`.
-                // So, a user error in any case.
-                const error = getTRPCErrorFromUnknown(err);
-                const data = opts.formatError?.({
-                    error
-                }) ?? null;
-                stream.controller.enqueue({
-                    event: SERIALIZED_ERROR_EVENT,
-                    data: JSON.stringify(serialize(data))
-                });
+            if (isAbortError(err)) {
+                // ignore abort errors, send any other errors
+                return;
             }
+            // `err` must be caused by `opts.data`, `JSON.stringify` or `serialize`.
+            // So, a user error in any case.
+            const error = getTRPCErrorFromUnknown(err);
+            const data = opts.formatError?.({
+                error
+            }) ?? null;
+            stream.controller.enqueue({
+                event: SERIALIZED_ERROR_EVENT,
+                data: JSON.stringify(serialize(data))
+            });
         } finally{
-            maxDurationTimer?.clear();
-            stream.controller.close();
+            try {
+                stream.controller.close();
+            } catch  {
+            // ignore
+            }
         }
     }).catch((err)=>{
         // should not be reached; just in case...

package/dist/unstable-core-do-not-import/stream/utils/asyncIterable.d.ts

@@ -1,18 +1,18 @@
 /**
- * Derives a new {@link AsyncGenerator} based of {@link iterable}, that automatically stops with the
- * passed {@link cancel} promise.
+ * Derives a new {@link AsyncGenerator} based on {@link iterable}, that automatically stops after the specified duration.
  */
-export declare function withCancel<T>(iterable: AsyncIterable<T>, cancel: Promise<unknown>): AsyncGenerator<T>;
-interface TakeWithGraceOptions {
-    count: number;
-    gracePeriodMs: number;
-    onCancel: () => void;
-}
+export declare function withMaxDuration<T>(iterable: AsyncIterable<T>, opts: {
+    maxDurationMs: number;
+    abortCtrl: AbortController;
+}): AsyncGenerator<T>;
 /**
  * Derives a new {@link AsyncGenerator} based of {@link iterable}, that yields its first
  * {@link count} values. Then, a grace period of {@link gracePeriodMs} is started in which further
  * values may still come through. After this period, the generator stops.
  */
-export declare function takeWithGrace<T>(iterable: AsyncIterable<T>, { count, gracePeriodMs, onCancel }: TakeWithGraceOptions): AsyncGenerator<T>;
-export {};
+export declare function takeWithGrace<T>(iterable: AsyncIterable<T>, opts: {
+    count: number;
+    gracePeriodMs: number;
+    abortCtrl: AbortController;
+}): AsyncGenerator<T>;
 //# sourceMappingURL=asyncIterable.d.ts.map

package/dist/unstable-core-do-not-import/stream/utils/asyncIterable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asyncIterable.d.ts","sourceRoot":"","sources":["../../../../src/unstable-core-do-not-import/stream/utils/asyncIterable.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAuB,UAAU,CAAC,CAAC,EACjC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC1B,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GACvB,cAAc,CAAC,CAAC,CAAC,CAkBnB;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAuB,aAAa,CAAC,CAAC,EACpC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC1B,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,oBAAoB,GACvD,cAAc,CAAC,CAAC,CAAC,CA0BnB"}
+{"version":3,"file":"asyncIterable.d.ts","sourceRoot":"","sources":["../../../../src/unstable-core-do-not-import/stream/utils/asyncIterable.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,wBAAuB,eAAe,CAAC,CAAC,EACtC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC1B,IAAI,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,eAAe,CAAA;CAAE,GAC1D,cAAc,CAAC,CAAC,CAAC,CA8BnB;AAED;;;;GAIG;AACH,wBAAuB,aAAa,CAAC,CAAC,EACpC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC1B,IAAI,EAAE;IACJ,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,eAAe,CAAC;CAC5B,GACA,cAAc,CAAC,CAAC,CAAC,CAoCnB"}