trpc-uwebsockets 11.0.2 → 11.0.4-canary.0

package/README.md

@@ -25,7 +25,7 @@ import {
   CreateContextOptions,
 } from 'trpc-uwebsockets';
 
-/* Define context. `client` is available when websocket connection is used */
+/* Define context. During websocket connection do not use `res`, use `client` instead */
 function createContext({ req, res, info, client }: CreateContextOptions) {
   const user = { name: req.headers.get('username') || 'anonymous' };
   return { req, res, user, info, client };

package/dist/___testHelpers.js

@@ -0,0 +1,234 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.testFactory = testFactory;
+const vitest_1 = require("vitest");
+const websockets_1 = require("./websockets");
+const observable_1 = require("@trpc/server/observable");
+const uWebSockets_js_1 = __importDefault(require("uWebSockets.js"));
+const requestHandler_1 = require("./requestHandler");
+const client_1 = require("@trpc/client");
+const event_source_polyfill_1 = require("event-source-polyfill");
+global.EventSource = event_source_polyfill_1.EventSourcePolyfill;
+function createServer(opts) {
+    const prefix = opts.prefix ?? '/trpc';
+    const instance = uWebSockets_js_1.default.App();
+    const router = opts.appRouter;
+    const onServerErrorSpy = vitest_1.vi.fn();
+    (0, requestHandler_1.applyRequestHandler)(instance, {
+        prefix,
+        ssl: false,
+        trpcOptions: {
+            router,
+            createContext: opts.createContext ?? (() => ({})),
+            onError(data) {
+                onServerErrorSpy(data);
+            },
+            responseMeta() {
+                return {
+                    headers: {
+                        'Access-Control-Allow-Origin': '*',
+                    },
+                };
+            },
+        },
+    });
+    (0, websockets_1.applyWebsocketHandler)(instance, {
+        prefix,
+        ssl: false,
+        router,
+        createContext: opts.createContext ?? (() => ({})),
+        onError(data) {
+            onServerErrorSpy(data);
+        },
+        uWsBehaviorOptions: opts.uWsBehaviorOptions,
+        keepAlive: opts.keepAlive,
+    });
+    instance.get('/hello', async (res) => {
+        res.end('Hello world');
+    });
+    instance.post('/hello', async (res) => {
+        res.end(JSON.stringify({ hello: 'POST', body: 'TODO, why?' }));
+    });
+    instance.ws('/ws', {
+        message: (client, rawMsg) => {
+            client.send(rawMsg);
+        },
+    });
+    instance.ws('/pubsub', {
+        open: (client) => {
+            const ok = client.subscribe('topic');
+            if (!ok) {
+                throw new Error("assertion: failed to subscribe to 'topic'");
+            }
+        },
+    });
+    instance.any('/*', (res) => {
+        res.writeStatus('404 NOT FOUND');
+        res.end();
+    });
+    let socket = null;
+    instance.listen('0.0.0.0', 0, (token) => {
+        socket = token;
+    });
+    if (!socket) {
+        throw new Error('could not make a socket');
+    }
+    const port = uWebSockets_js_1.default.us_socket_local_port(socket);
+    return {
+        stop() {
+            if (!socket) {
+                throw new Error('could not close socket as socket is already closed');
+            }
+            uWebSockets_js_1.default.us_listen_socket_close(socket);
+            socket = null;
+        },
+        port,
+        instance,
+        onServerErrorSpy,
+    };
+}
+function makeLinkSpy() {
+    const orderedResults = [];
+    const linkSpy = () => {
+        // here we just got initialized in the app - this happens once per app
+        // useful for storing cache for instance
+        return ({ next, op }) => {
+            // this is when passing the result to the next link
+            // each link needs to return an observable which propagates results
+            return (0, observable_1.observable)((observer) => {
+                const unsubscribe = next(op).subscribe({
+                    next(value) {
+                        const data = value.result.data;
+                        if (data !== undefined) {
+                            orderedResults.push(data);
+                        }
+                        observer.next(value);
+                    },
+                    error: observer.error,
+                });
+                return unsubscribe;
+            });
+        };
+    };
+    return {
+        orderedResults,
+        linkSpy,
+    };
+}
+function toQueryString(queryParams) {
+    const raw = new URLSearchParams(queryParams).toString();
+    return raw.length == 0 ? '' : `?${raw}`;
+}
+function createClientWs(router, opts) {
+    const prefix = opts.prefix ?? '/trpc';
+    const transformer = router._def._config.transformer;
+    const qs = toQueryString(opts.queryParams ?? {});
+    const host = `localhost:${opts.port}${prefix}${qs}`;
+    const wsClient = (0, client_1.createWSClient)({
+        retryDelayMs: () => 99999, // never retry by default
+        ...opts.wsClientOptions,
+        url: `ws://${host}`,
+    });
+    const { orderedResults, linkSpy } = makeLinkSpy();
+    const client = (0, client_1.createTRPCClient)({
+        links: [linkSpy, (0, client_1.wsLink)({ client: wsClient, transformer })],
+    });
+    return { client, wsClient, orderedResults };
+}
+function createClientBatchStream(router, opts) {
+    const prefix = opts.prefix ?? '/trpc';
+    const transformer = router._def._config.transformer;
+    const qs = toQueryString(opts.queryParams ?? {});
+    const host = `localhost:${opts.port}${prefix}${qs}`;
+    const { orderedResults, linkSpy } = makeLinkSpy();
+    const client = (0, client_1.createTRPCClient)({
+        links: [
+            linkSpy,
+            (0, client_1.httpBatchStreamLink)({
+                url: `http://${host}`,
+                headers: opts.headers,
+                transformer,
+            }),
+        ],
+    });
+    return { client, orderedResults };
+}
+function createClientBatch(router, opts) {
+    const prefix = opts.prefix ?? '/trpc';
+    const transformer = router._def._config.transformer;
+    const qs = toQueryString(opts.queryParams ?? {});
+    const host = `localhost:${opts.port}${prefix}${qs}`;
+    const client = (0, client_1.createTRPCClient)({
+        links: [
+            (0, client_1.httpBatchLink)({
+                url: `http://${host}`,
+                headers: opts.headers,
+                transformer,
+            }),
+        ],
+    });
+    return { client };
+}
+function createClientSse(router, opts) {
+    const prefix = opts.prefix ?? '/trpc';
+    const transformer = router._def._config.transformer;
+    const qs = toQueryString(opts.queryParams ?? {});
+    const host = `localhost:${opts.port}${prefix}${qs}`;
+    const { orderedResults, linkSpy } = makeLinkSpy();
+    const client = (0, client_1.createTRPCClient)({
+        links: [
+            linkSpy,
+            (0, client_1.httpSubscriptionLink)({
+                url: `http://${host}`,
+                connectionParams: opts.wsClientOptions?.connectionParams,
+                // ponyfill EventSource
+                EventSource: event_source_polyfill_1.EventSourcePolyfill,
+                transformer,
+            }),
+        ],
+    });
+    return { client, orderedResults };
+}
+function testFactory(serverOptions) {
+    const { instance, port, stop, onServerErrorSpy } = createServer({
+        ...serverOptions,
+    });
+    return {
+        server: instance,
+        stop,
+        onServerErrorSpy,
+        port,
+        opts: serverOptions,
+        fetch(path, opts) {
+            return fetch(`http://localhost:${port}${path}`, { ...opts });
+        },
+        clientBatchStream(clientOptions) {
+            return createClientBatchStream(serverOptions.appRouter, {
+                ...clientOptions,
+                port,
+            });
+        },
+        clientBatch(clientOptions) {
+            return createClientBatch(serverOptions.appRouter, {
+                ...clientOptions,
+                port,
+            });
+        },
+        clientSse(clientOptions) {
+            return createClientSse(serverOptions.appRouter, {
+                ...clientOptions,
+                port,
+            });
+        },
+        clientWs(clientOptions) {
+            return createClientWs(serverOptions.appRouter, {
+                ...clientOptions,
+                port,
+            });
+        },
+    };
+}
+//# sourceMappingURL=___testHelpers.js.map

package/dist/___testHelpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"___testHelpers.js","sourceRoot":"","sources":["../src/___testHelpers.ts"],"names":[],"mappings":"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"}

package/dist/fetchCompat.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorateHttpResponse = decorateHttpResponse;
+exports.uWsToRequestNoBody = uWsToRequestNoBody;
 exports.uWsToRequest = uWsToRequest;
 exports.createURL = createURL;
 exports.uWsSendResponse = uWsSendResponse;
@@ -12,6 +13,18 @@ function decorateHttpResponse(res, ssl = false) {
     resDecorated.ssl = ssl;
     return resDecorated;
 }
+function uWsToRequestNoBody(req, res) {
+    const headers = createHeaders(req);
+    const method = req.getCaseSensitiveMethod().toUpperCase();
+    const isSsl = res.ssl;
+    const url = createURL(req, isSsl ? 'https' : 'http');
+    const init = {
+        headers: headers,
+        method: method,
+    };
+    const request = new Request(url, init);
+    return request;
+}
 function uWsToRequest(req, res, opts) {
     const ac = new AbortController();
     const onAbort = () => {
@@ -74,37 +87,36 @@ function createBody(res, opts) {
     let hasClosed = false;
     return new ReadableStream({
         start(controller) {
-            const onData = (ab, isLast) => {
-                // special case of empty body
-                if (size == 0 && ab.byteLength == 0 && isLast) {
-                    onEnd();
+            res.onData((tempChunk, isLast) => {
+                if (hasClosed)
                     return;
-                }
-                size += ab.byteLength;
+                // This copies the buffer *immediately* and avoids using a detached buffer
+                const chunk = new Uint8Array(tempChunk.byteLength);
+                chunk.set(new Uint8Array(tempChunk)); // must be done before enqueue
+                size += chunk.byteLength;
                 if (!opts.maxBodySize || size <= opts.maxBodySize) {
-                    controller.enqueue(new Uint8Array(ab));
+                    controller.enqueue(chunk);
                     if (isLast) {
-                        onEnd();
+                        hasClosed = true;
+                        controller.close();
                     }
-                    return;
                 }
-                controller.error(new server_1.TRPCError({
-                    code: 'PAYLOAD_TOO_LARGE',
-                }));
-                hasClosed = true;
-            };
-            const onEnd = () => {
-                if (hasClosed) {
-                    return;
+                else {
+                    hasClosed = true;
+                    controller.error(new server_1.TRPCError({ code: 'PAYLOAD_TOO_LARGE' }));
                 }
-                hasClosed = true;
-                controller.close();
-            };
-            res.onData(onData);
-            res.onAborted(onEnd);
+            });
+            res.onAborted(() => {
+                if (!hasClosed) {
+                    hasClosed = true;
+                    controller.error(new server_1.TRPCError({ code: 'CLIENT_CLOSED_REQUEST' }));
+                }
+            });
         },
         cancel() {
-            res.close();
+            res.cork(() => {
+                res.close();
+            });
         },
     });
 }

package/dist/fetchCompat.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchCompat.js","sourceRoot":"","sources":["../src/fetchCompat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetchCompat.js","sourceRoot":"","sources":["../src/fetchCompat.ts"],"names":[],"mappings":"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"}

package/dist/websockets.js

@@ -60,8 +60,20 @@ const http_1 = require("@trpc/server/http");
 const observable_1 = require("@trpc/server/observable");
 const rpc_1 = require("@trpc/server/rpc");
 const unstable_core_do_not_import_1 = require("@trpc/server/unstable-core-do-not-import");
-const url_1 = require("url");
 const fetchCompat_1 = require("./fetchCompat");
+function createCompleter() {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    return {
+        promise,
+        resolve: resolve,
+        reject: reject,
+    };
+}
 function getWSConnectionHandler(opts, allClients) {
     const { createContext, router } = opts;
     const { transformer } = router._def._config;
@@ -75,62 +87,23 @@ function getWSConnectionHandler(opts, allClients) {
             // and server is sending keepalive messages
         }
     }
-    // this deviates from standard implementation
-    // this function returns true is context was resolved and set
-    // it returns false if context threw, and execution must be halted.
-    // this function will cleanup the connection
-    async function tryResolveContext(client, getConnectionParams) {
-        const data = client.getUserData();
-        data.contextResolveAttempted = true;
+    function getConnectionParams(msgStr) {
+        let msg;
         try {
-            data.ctx = await createContext?.({
-                req: data.req,
-                // @ts-expect-error res cant be used, but undefined is needed here
-                // for type compatibility with main handler
-                res: undefined,
-                client,
-                info: {
-                    connectionParams: getConnectionParams(),
-                    calls: [],
-                    isBatchCall: false,
-                    accept: null,
-                    type: 'unknown',
-                    signal: data.abortController.signal,
-                    url: data.url,
-                },
-            });
-            return true;
+            msg = JSON.parse(msgStr);
+            if (!(0, unstable_core_do_not_import_1.isObject)(msg)) {
+                throw new Error('Message was not an object');
+            }
         }
         catch (cause) {
-            // console.error('could not resolve context, cause', cause);
-            const error = (0, server_1.getTRPCErrorFromUnknown)(cause);
-            opts.onError?.({
-                error,
-                path: undefined,
-                type: 'unknown',
-                ctx: data.ctx,
-                req: data.req,
-                input: undefined,
-            });
-            respond(client, {
-                id: null,
-                error: (0, server_1.getErrorShape)({
-                    config: router._def._config,
-                    error,
-                    type: 'unknown',
-                    path: undefined,
-                    input: undefined,
-                    ctx: data.ctx,
-                }),
-            });
-            setTimeout(() => {
-                // trpc wierd behavior:
-                // no mater whats the websocket close status code, trpc websocket still attemps to reconnect indefinitely
-                // I chose 1008 as due to https://datatracker.ietf.org/doc/html/rfc6455#section-7.4
-                client.end(1008, 'bad context');
+            throw new server_1.TRPCError({
+                code: 'PARSE_ERROR',
+                message: `Malformed TRPCConnectionParamsMessage`,
+                cause,
             });
-            return false;
         }
+        const connectionParams = (0, http_1.parseConnectionParamsFromUnknown)(msg.data);
+        return connectionParams;
     }
     async function handleRequest(client, msg) {
         const { clientSubscriptions, ctx, req } = client.getUserData();
@@ -223,10 +196,6 @@ function getWSConnectionHandler(opts, allClients) {
                     let next;
                     let result;
                     while (true) {
-                        // using the Promise.race could introduce memory leaks?
-                        // more on this here: https://github.com/cefn/watchable/tree/main/packages/unpromise
-                        // the trpc used Unpromise to accomplish this
-                        // next = await Unpromise.race([
                         next = await unstable_core_do_not_import_1.Unpromise.race([
                             iterator.next().catch(server_1.getTRPCErrorFromUnknown),
                             abortPromise,
@@ -346,14 +315,12 @@ function getWSConnectionHandler(opts, allClients) {
         maxPayloadLength: opts.uWsBehaviorOptions?.maxPayloadLength,
         maxLifetime: opts.uWsBehaviorOptions?.maxLifetime,
         idleTimeout: opts.uWsBehaviorOptions?.idleTimeout,
-        async upgrade(res, req, context) {
+        upgrade(res, req, context) {
             const resDecorated = (0, fetchCompat_1.decorateHttpResponse)(res);
             res.onAborted(() => {
                 resDecorated.aborted = true;
             });
-            const reqFetch = (0, fetchCompat_1.uWsToRequest)(req, resDecorated, {
-                maxBodySize: null,
-            });
+            const reqFetch = (0, fetchCompat_1.uWsToRequestNoBody)(req, resDecorated);
             const secWebSocketKey = req.getHeader('sec-websocket-key');
             const secWebSocketProtocol = req.getHeader('sec-websocket-protocol');
             const secWebSocketExtensions = req.getHeader('sec-websocket-extensions');
@@ -363,9 +330,8 @@ function getWSConnectionHandler(opts, allClients) {
                 clientSubscriptions,
                 abortController,
                 req: reqFetch,
-                ctx: null,
-                contextResolveAttempted: false,
-                useConnectionParams: false,
+                ctx: undefined,
+                ctxCompleter: null,
                 keepAlive: null,
                 url: (0, fetchCompat_1.createURL)(req, resDecorated.sll ? 'wss' : 'ws'),
             };
@@ -373,16 +339,9 @@ function getWSConnectionHandler(opts, allClients) {
         },
         async open(client) {
             allClients.add(client);
-            const data = client.getUserData();
-            data.useConnectionParams =
-                new url_1.URL(data.req.url).searchParams.get('connectionParams') === '1';
-            if (!data.useConnectionParams) {
-                const ok = await tryResolveContext(client, () => null);
-                if (!ok)
-                    return;
-            }
             if (opts.keepAlive?.enabled) {
                 const { pingMs, pongWaitMs } = opts.keepAlive;
+                const data = client.getUserData();
                 data.keepAlive = handleKeepAlive(client, pingMs, pongWaitMs);
             }
         },
@@ -391,7 +350,6 @@ function getWSConnectionHandler(opts, allClients) {
             if (data.keepAlive) {
                 data.keepAlive.onMessage();
             }
-            // const msgStr = rawMsg.toString(); // or could do this ;
             const msgStr = Buffer.from(rawMsg).toString();
             if (msgStr === 'PONG') {
                 return;
@@ -402,31 +360,67 @@ function getWSConnectionHandler(opts, allClients) {
                 }
                 return;
             }
-            if (data.useConnectionParams && !data.contextResolveAttempted) {
-                if (data.ctx !== null) {
-                    // TODO: just in case for now, this can be removed later
-                    throw new Error('assertion: context should not be null');
+            if (data.ctxCompleter == null) {
+                data.ctxCompleter = createCompleter();
+                const useConnectionParams = data.url.searchParams.get('connectionParams') === '1';
+                try {
+                    data.ctx = await createContext?.({
+                        req: data.req,
+                        res: client,
+                        client: client,
+                        info: {
+                            connectionParams: useConnectionParams
+                                ? getConnectionParams(msgStr)
+                                : null,
+                            calls: [],
+                            isBatchCall: false,
+                            accept: null,
+                            type: 'unknown',
+                            signal: data.abortController.signal,
+                            url: data.url,
+                        },
+                    });
+                    data.ctxCompleter.resolve();
                 }
-                const ok = await tryResolveContext(client, () => {
-                    let msg;
-                    try {
-                        msg = JSON.parse(msgStr);
-                        if (!(0, unstable_core_do_not_import_1.isObject)(msg)) {
-                            throw new Error('Message was not an object');
-                        }
-                    }
-                    catch (cause) {
-                        throw new server_1.TRPCError({
-                            code: 'PARSE_ERROR',
-                            message: `Malformed TRPCConnectionParamsMessage`,
-                            cause,
-                        });
-                    }
-                    const connectionParams = (0, http_1.parseConnectionParamsFromUnknown)(msg.data);
-                    return connectionParams;
-                });
-                if (!ok)
+                catch (cause) {
+                    const error = (0, server_1.getTRPCErrorFromUnknown)(cause);
+                    opts.onError?.({
+                        ctx: data.ctx,
+                        error: error,
+                        input: undefined,
+                        path: undefined,
+                        type: 'unknown',
+                        req: data.req,
+                    });
+                    respond(client, {
+                        id: null,
+                        error: (0, server_1.getErrorShape)({
+                            config: router._def._config,
+                            error,
+                            type: 'unknown',
+                            path: undefined,
+                            input: undefined,
+                            ctx: data.ctx,
+                        }),
+                    });
+                    data.ctxCompleter.reject(error);
+                    // close in next tick
+                    (globalThis.setImmediate ?? globalThis.setTimeout)(() => {
+                        client.end(1008);
+                    });
+                }
+                if (useConnectionParams) {
+                    // fully consume first message
                     return;
+                }
+            }
+            try {
+                await data.ctxCompleter.promise;
+            }
+            catch {
+                // stop execution of pending requests when context could not be resolved
+                // single error message will be sent
+                return;
             }
             try {
                 const msgJSON = JSON.parse(msgStr);