@trpc/server 11.0.0-rc.643 → 11.0.0-rc.648

package/dist/adapters/ws.mjs

@@ -5,13 +5,79 @@ import { parseConnectionParamsFromUnknown } from '../unstable-core-do-not-import
 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 { isTrackedEnvelope } from '../unstable-core-do-not-import/stream/tracked.mjs';
-import '../unstable-core-do-not-import/stream/utils/timerResource.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';
 import { createURL } from './node-http/incomingMessageToRequest.mjs';
 
+function _ts_add_disposable_resource(env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() {
+            try {
+                inner.call(this);
+            } catch (e) {
+                return Promise.reject(e);
+            }
+        };
+        env.stack.push({
+            value: value,
+            dispose: dispose,
+            async: async
+        });
+    } else {
+        env.stack.push({
+            async: true
+        });
+    }
+    return value;
+}
+function _ts_dispose_resources(env) {
+    var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
+    return (_ts_dispose_resources = function _ts_dispose_resources(env) {
+        function fail(e) {
+            env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while(r = env.stack.pop()){
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+                            fail(e);
+                            return next();
+                        });
+                    } else s |= 1;
+                } catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    })(env);
+}
 /**
  * Importing ws causes a build error
  * @see https://github.com/trpc/trpc/pull/5279
@@ -155,82 +221,95 @@ function getWSConnectionHandler(opts) {
                         code: 'BAD_REQUEST'
                     });
                 }
-                const iterable = isObservable(result) ? observableToAsyncIterable(result) : result;
-                const iterator = iterable[Symbol.asyncIterator]();
-                const abortPromise = new Promise((resolve)=>{
-                    abortController.signal.onabort = ()=>resolve('abort');
-                });
+                const iterable = isObservable(result) ? observableToAsyncIterable(result, abortController.signal) : result;
                 run(async ()=>{
-                    // We need those declarations outside the loop for garbage collection reasons. If they
-                    // were declared inside, they would not be freed until the next value is present.
-                    let next;
-                    let result;
-                    while(true){
-                        next = await Unpromise.race([
-                            iterator.next().catch(getTRPCErrorFromUnknown),
-                            abortPromise
-                        ]);
-                        if (next === 'abort') {
-                            await iterator.return?.();
-                            break;
-                        }
-                        if (next instanceof Error) {
-                            const error = getTRPCErrorFromUnknown(next);
-                            opts.onError?.({
-                                error,
-                                path,
-                                type,
-                                ctx,
-                                req,
-                                input
-                            });
+                    const env = {
+                        stack: [],
+                        error: void 0,
+                        hasError: false
+                    };
+                    try {
+                        const iterator = _ts_add_disposable_resource(env, iteratorResource(iterable), true);
+                        ;
+                        const abortPromise = new Promise((resolve)=>{
+                            abortController.signal.onabort = ()=>resolve('abort');
+                        });
+                        // We need those declarations outside the loop for garbage collection reasons. If they
+                        // were declared inside, they would not be freed until the next value is present.
+                        let next;
+                        let result;
+                        while(true){
+                            next = await Unpromise.race([
+                                iterator.next().catch(getTRPCErrorFromUnknown),
+                                abortPromise
+                            ]);
+                            if (next === 'abort') {
+                                await iterator.return?.();
+                                break;
+                            }
+                            if (next instanceof Error) {
+                                const error = getTRPCErrorFromUnknown(next);
+                                opts.onError?.({
+                                    error,
+                                    path,
+                                    type,
+                                    ctx,
+                                    req,
+                                    input
+                                });
+                                respond({
+                                    id,
+                                    jsonrpc,
+                                    error: getErrorShape({
+                                        config: router._def._config,
+                                        error,
+                                        type,
+                                        path,
+                                        input,
+                                        ctx
+                                    })
+                                });
+                                break;
+                            }
+                            if (next.done) {
+                                break;
+                            }
+                            result = {
+                                type: 'data',
+                                data: next.value
+                            };
+                            if (isTrackedEnvelope(next.value)) {
+                                const [id, data] = next.value;
+                                result.id = id;
+                                result.data = {
+                                    id,
+                                    data
+                                };
+                            }
                             respond({
                                 id,
                                 jsonrpc,
-                                error: getErrorShape({
-                                    config: router._def._config,
-                                    error,
-                                    type,
-                                    path,
-                                    input,
-                                    ctx
-                                })
+                                result
                             });
-                            break;
-                        }
-                        if (next.done) {
-                            break;
-                        }
-                        result = {
-                            type: 'data',
-                            data: next.value
-                        };
-                        if (isTrackedEnvelope(next.value)) {
-                            const [id, data] = next.value;
-                            result.id = id;
-                            result.data = {
-                                id,
-                                data
-                            };
+                            // free up references for garbage collection
+                            next = null;
+                            result = null;
                         }
                         respond({
                             id,
                             jsonrpc,
-                            result
+                            result: {
+                                type: 'stopped'
+                            }
                         });
-                        // free up references for garbage collection
-                        next = null;
-                        result = null;
+                        clientSubscriptions.delete(id);
+                    } catch (e) {
+                        env.error = e;
+                        env.hasError = true;
+                    } finally{
+                        const result = _ts_dispose_resources(env);
+                        if (result) await result;
                     }
-                    await iterator.return?.();
-                    respond({
-                        id,
-                        jsonrpc,
-                        result: {
-                            type: 'stopped'
-                        }
-                    });
-                    clientSubscriptions.delete(id);
                 }).catch((cause)=>{
                     const error = getTRPCErrorFromUnknown(cause);
                     opts.onError?.({