@trpc/server 11.0.0-alpha-tmp-subscription-connection-state.488 → 11.0.0-alpha-tmp-12-06-react.665

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,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAS,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAatE,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CAAC,SAAS,CACb,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC1C,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QACV;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,YAKnB,EAAE,CAAC,SAAS,OAAO,eAAe,mBAqUzD;AAiCD,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA+BjC"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAa/D,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAa,KAAK,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQ7E;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,CACpE,eAAe,EACf,EAAE,CAAC,SAAS,CACb,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC1C,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QACV;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACF;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAGJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,YAKV,EAAE,CAAC,SAAS,OAAO,eAAe,mBAkYzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,SAAS,EACpB,MAAM,SAAS,EACf,UAAU,SAAQ,QAiCnB;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAwCjC"}

package/dist/adapters/ws.js

@@ -6,22 +6,95 @@ 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 tracked = require('../unstable-core-do-not-import/stream/tracked.js');
 var transformer = require('../unstable-core-do-not-import/transformer.js');
-var toURL = require('../unstable-core-do-not-import/http/toURL.js');
 require('../unstable-core-do-not-import/rootConfig.js');
 var router = require('../unstable-core-do-not-import/router.js');
+var incomingMessageToRequest = require('./node-http/incomingMessageToRequest.js');
 
+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
- * @link https://github.com/trpc/trpc/pull/5279
+ * @see https://github.com/trpc/trpc/pull/5279
  */ 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;
+            handleKeepAlive(client, pingMs, pongWaitMs);
+        }
         function respond(untransformedJSON) {
             client.send(JSON.stringify(transformer.transformTRPCResponse(router$1._def._config, untransformedJSON)));
         }
@@ -74,9 +147,9 @@ function getWSConnectionHandler(opts) {
      *
      * - the context promise will be created immediately on connection if no connectionParams are expected
      * - if connection params are expected, they will be created once received
-     */ let ctxPromise = toURL.toURL(req.url ?? '').searchParams.get('connectionParams') === '1' ? unsetContextPromiseSymbol : createCtxPromise(()=>null);
+     */ 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',
@@ -87,18 +160,40 @@ function getWSConnectionHandler(opts) {
                 clientSubscriptions.get(id)?.abort();
                 return;
             }
-            const { path , input  } = msg.params;
+            const { path, lastEventId } = msg.params;
+            let { input } = msg.params;
             const type = msg.method;
             try {
+                if (lastEventId !== undefined) {
+                    if (utils.isObject(input)) {
+                        input = {
+                            ...input,
+                            lastEventId: lastEventId
+                        };
+                    } else {
+                        input ?? (input = {
+                            lastEventId: lastEventId
+                        });
+                    }
+                }
                 await ctxPromise; // asserts context has been set
+                const abortController = new AbortController();
                 const result = await router.callProcedure({
                     procedures: router$1._def.procedures,
                     path,
                     getRawInput: async ()=>input,
                     ctx,
-                    type
+                    type,
+                    signal: abortController.signal
                 });
+                const isIterableResult = utils.isAsyncIterable(result) || observable.isObservable(result);
                 if (type !== 'subscription') {
+                    if (isIterableResult) {
+                        throw new TRPCError.TRPCError({
+                            code: 'UNSUPPORTED_MEDIA_TYPE',
+                            message: `Cannot return an async iterable or observable from a ${type} procedure with WebSockets`
+                        });
+                    }
                     // send the value as data if the method is not a subscription
                     respond({
                         id,
@@ -110,7 +205,7 @@ function getWSConnectionHandler(opts) {
                     });
                     return;
                 }
-                if (!observable.isObservable(result) && !utils.isAsyncIterable(result)) {
+                if (!isIterableResult) {
                     throw new TRPCError.TRPCError({
                         message: `Subscription ${path} did not return an observable or a AsyncGenerator`,
                         code: 'INTERNAL_SERVER_ERROR'
@@ -128,67 +223,95 @@ function getWSConnectionHandler(opts) {
                         code: 'BAD_REQUEST'
                     });
                 }
-                const iterable = observable.isObservable(result) ? observable.observableToAsyncIterable(result) : result;
-                const iterator = iterable[Symbol.asyncIterator]();
-                const abortController = new AbortController();
-                const abortPromise = new Promise((resolve)=>{
-                    abortController.signal.onabort = ()=>resolve('abort');
-                });
+                const iterable = observable.isObservable(result) ? observable.observableToAsyncIterable(result, abortController.signal) : result;
                 utils.run(async ()=>{
-                    while(true){
-                        const next = await Promise.race([
-                            iterator.next().catch(TRPCError.getTRPCErrorFromUnknown),
-                            abortPromise
-                        ]);
-                        if (next === 'abort') {
-                            await iterator.return?.();
-                            break;
-                        }
-                        if (next instanceof Error) {
-                            const error = TRPCError.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, asyncIterable.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.Unpromise.race([
+                                iterator.next().catch(TRPCError.getTRPCErrorFromUnknown),
+                                abortPromise
+                            ]);
+                            if (next === 'abort') {
+                                await iterator.return?.();
+                                break;
+                            }
+                            if (next instanceof Error) {
+                                const error = TRPCError.getTRPCErrorFromUnknown(next);
+                                opts.onError?.({
+                                    error,
+                                    path,
+                                    type,
+                                    ctx,
+                                    req,
+                                    input
+                                });
+                                respond({
+                                    id,
+                                    jsonrpc,
+                                    error: getErrorShape.getErrorShape({
+                                        config: router$1._def._config,
+                                        error,
+                                        type,
+                                        path,
+                                        input,
+                                        ctx
+                                    })
+                                });
+                                break;
+                            }
+                            if (next.done) {
+                                break;
+                            }
+                            result = {
+                                type: 'data',
+                                data: next.value
+                            };
+                            if (tracked.isTrackedEnvelope(next.value)) {
+                                const [id, data] = next.value;
+                                result.id = id;
+                                result.data = {
+                                    id,
+                                    data
+                                };
+                            }
                             respond({
                                 id,
                                 jsonrpc,
-                                error: getErrorShape.getErrorShape({
-                                    config: router$1._def._config,
-                                    error,
-                                    type,
-                                    path,
-                                    input,
-                                    ctx
-                                })
+                                result
                             });
-                            break;
-                        }
-                        if (next.done) {
-                            break;
+                            // free up references for garbage collection
+                            next = null;
+                            result = null;
                         }
                         respond({
                             id,
                             jsonrpc,
                             result: {
-                                type: 'data',
-                                data: next.value
+                                type: 'stopped'
                             }
                         });
+                        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 = TRPCError.getTRPCErrorFromUnknown(cause);
                     opts.onError?.({
@@ -246,13 +369,24 @@ function getWSConnectionHandler(opts) {
                 });
             }
         }
-        client.on('message', async (message)=>{
+        client.on('message', async (rawData)=>{
+            // eslint-disable-next-line @typescript-eslint/no-base-to-string
+            const msgStr = rawData.toString();
+            if (msgStr === 'PONG') {
+                return;
+            }
+            if (msgStr === 'PING') {
+                if (!opts.dangerouslyDisablePong) {
+                    client.send('PONG');
+                }
+                return;
+            }
             if (ctxPromise === unsetContextPromiseSymbol) {
                 // If the ctxPromise wasn't created immediately, we're expecting the first message to be a TRPCConnectionParamsMessage
                 ctxPromise = createCtxPromise(()=>{
                     let msg;
                     try {
-                        msg = JSON.parse(message.toString());
+                        msg = JSON.parse(msgStr);
                         if (!utils.isObject(msg)) {
                             throw new Error('Message was not an object');
                         }
@@ -269,7 +403,7 @@ function getWSConnectionHandler(opts) {
                 return;
             }
             try {
-                const msgJSON = JSON.parse(message.toString());
+                const msgJSON = JSON.parse(msgStr);
                 const msgs = Array.isArray(msgJSON) ? msgJSON : [
                     msgJSON
                 ];
@@ -315,48 +449,59 @@ function getWSConnectionHandler(opts) {
             abortController.abort();
         });
         if (ctxPromise !== unsetContextPromiseSymbol) {
-            // prevent unhandled promise rejection errors
-            await ctxPromise.catch(()=>null);
+            await ctxPromise;
         }
     };
 }
 /**
  * Handle WebSocket keep-alive messages
  */ function handleKeepAlive(client, pingMs = 30000, pongWaitMs = 5000) {
-    let heartbeatTimeout;
-    const heartbeatInterval = setInterval(()=>{
-        if (client.readyState !== WEBSOCKET_OPEN) {
-            return;
-        }
-        // First we send a ping message and wait for a pong
-        client.ping();
-        // We set a timeout to close the connection if the pong is not received
-        heartbeatTimeout = setTimeout(()=>{
-            client.terminate();
-            clearInterval(heartbeatInterval);
-        }, pongWaitMs);
-    }, pingMs).unref();
-    // When we receive a pong message, we clear the timeout
-    client.on('pong', ()=>{
-        heartbeatTimeout && clearTimeout(heartbeatTimeout);
-    });
-    // If the connection is closed, we clear the interval
+    let timeout = undefined;
+    let ping = undefined;
+    const schedulePing = ()=>{
+        const scheduleTimeout = ()=>{
+            timeout = setTimeout(()=>{
+                client.terminate();
+            }, pongWaitMs);
+        };
+        ping = setTimeout(()=>{
+            client.send('PING');
+            scheduleTimeout();
+        }, pingMs);
+    };
+    const onMessage = ()=>{
+        clearTimeout(ping);
+        clearTimeout(timeout);
+        schedulePing();
+    };
+    client.on('message', onMessage);
     client.on('close', ()=>{
-        clearInterval(heartbeatInterval);
+        clearTimeout(ping);
+        clearTimeout(timeout);
     });
+    schedulePing();
 }
 function applyWSSHandler(opts) {
-    const { wss , prefix , keepAlive  } = opts;
     const onConnection = getWSConnectionHandler(opts);
-    wss.on('connection', async (client, req)=>{
-        if (prefix && !req.url?.startsWith(prefix)) {
+    opts.wss.on('connection', (client, req)=>{
+        if (opts.prefix && !req.url?.startsWith(opts.prefix)) {
             return;
         }
-        await onConnection(client, req);
-        if (keepAlive?.enabled) {
-            const { pingMs , pongWaitMs  } = keepAlive;
-            handleKeepAlive(client, pingMs, pongWaitMs);
-        }
+        onConnection(client, req).catch((cause)=>{
+            opts.onError?.({
+                error: new TRPCError.TRPCError({
+                    code: 'INTERNAL_SERVER_ERROR',
+                    cause,
+                    message: 'Failed to handle WebSocket connection'
+                }),
+                req: req,
+                path: undefined,
+                type: 'unknown',
+                ctx: undefined,
+                input: undefined
+            });
+            client.close();
+        });
     });
     return {
         broadcastReconnectNotification: ()=>{
@@ -365,7 +510,7 @@ function applyWSSHandler(opts) {
                 method: 'reconnect'
             };
             const data = JSON.stringify(response);
-            for (const client of wss.clients){
+            for (const client of opts.wss.clients){
                 if (client.readyState === WEBSOCKET_OPEN) {
                     client.send(data);
                 }
@@ -376,3 +521,4 @@ function applyWSSHandler(opts) {
 
 exports.applyWSSHandler = applyWSSHandler;
 exports.getWSConnectionHandler = getWSConnectionHandler;
+exports.handleKeepAlive = handleKeepAlive;