trpc-uwebsockets 0.10.0-proxy-beta.15 → 10.38.3-beta.0

package/README.md

@@ -4,18 +4,20 @@
 
 # Installation
 
-To use old, stable version 9
+Latest stable version
 
 ```bash
-yarn add trpc-uwebsockets@^0.9.*
+yarn add trpc-uwebsockets@latest
 ```
 
-To use version 10 beta run
+Or install beta version with subscription support
 
 ```bash
-yarn add trpc-uwebsockets
+yarn add trpc-uwebsockets@beta
 ```
 
+##
+
 # Usage
 
 Import needed packages
@@ -100,27 +102,61 @@ type CreateContextOptions = {
     query: string;
     path: string;
   };
-  /* minimal response interface, useful for setting cookies */
+  /* see https://unetworking.github.io/uWebSockets.js/generated/interfaces/HttpResponse.html */
   res: {
-    setStatus(status: number): void;
-    setHeader(name: string, value: string): void;
+    writeStatus(status: RecognizedString): HttpResponse;
+    writeHeader(key: RecognizedString, value: RecognizedString): HttpResponse;
   };
 };
 ```
 
-# Testing
+# Enabling subscrptions
 
-```bash
-yarn t
+Simple method: enable subscriptions when creating the main handler.
+
+```typescript
+createUWebSocketsHandler(app, '/trpc', {
+  router,
+  createContext,
+  enableSubscriptions: true,
+});
 ```
 
-or
+Recommended method: enable subscriptions after registering main request handler. This allows for contexts to be evaluated differently
 
-```bash
-yarn test:watch
+```typescript
+const app = App();
+
+createUWebSocketsHandler(app, '/trpc', {
+  router,
+  createContext: ({ req, res }) => {},
+});
+
+applyWSHandler(app, '/trpc', {
+  router,
+  createContext: ({ req, res }) => {},
+});
 ```
 
-# Todo
+## example of subscrption client
 
-- [ ] Various improvements (res.tryEnd + reading multiple headers /w same key)
-- [ ] Subscription support with websockets
+```typescript
+const host = `localhost:8080/trpc`;
+const wsClient = createWSClient({ url: `ws://${host}` });
+const client = createTRPCProxyClient<AppRouter>({
+  links: [
+    splitLink({
+      condition(op) {
+        return op.type === 'subscription';
+      },
+      true: wsLink({ client: wsClient }),
+      false: httpBatchLink({
+        url: `http://${host}`,
+        headers: headers,
+        AbortController,
+        fetch: fetch as any,
+      }),
+    }),
+  ],
+});
+```

package/dist/applyWsHandler.js

@@ -0,0 +1,348 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyWSHandler = void 0;
+const server_1 = require("@trpc/server");
+const observable_1 = require("@trpc/server/observable");
+// import { transformTRPCResponse } from '../shared/transformTRPCResponse';
+const shared_1 = require("@trpc/server/shared");
+const utils_1 = require("./utils");
+/* istanbul ignore next -- @preserve */
+function assertIsObject(obj) {
+    if (typeof obj !== 'object' || Array.isArray(obj) || !obj) {
+        throw new Error('Not an object');
+    }
+}
+/* istanbul ignore next -- @preserve */
+function assertIsProcedureType(obj) {
+    if (obj !== 'query' && obj !== 'subscription' && obj !== 'mutation') {
+        throw new Error('Invalid procedure type');
+    }
+}
+/* istanbul ignore next -- @preserve */
+function assertIsRequestId(obj) {
+    if (obj !== null &&
+        typeof obj === 'number' &&
+        isNaN(obj) &&
+        typeof obj !== 'string') {
+        throw new Error('Invalid request id');
+    }
+}
+/* istanbul ignore next -- @preserve */
+function assertIsString(obj) {
+    if (typeof obj !== 'string') {
+        throw new Error('Invalid string');
+    }
+}
+/* istanbul ignore next -- @preserve */
+function assertIsJSONRPC2OrUndefined(obj) {
+    if (typeof obj !== 'undefined' && obj !== '2.0') {
+        throw new Error('Must be JSONRPC 2.0');
+    }
+}
+function parseMessage(obj, transformer) {
+    assertIsObject(obj);
+    const { method, params, id, jsonrpc } = obj;
+    assertIsRequestId(id);
+    assertIsJSONRPC2OrUndefined(jsonrpc);
+    if (method === 'subscription.stop') {
+        return {
+            id,
+            jsonrpc,
+            method,
+        };
+    }
+    assertIsProcedureType(method);
+    assertIsObject(params);
+    const { input: rawInput, path } = params;
+    assertIsString(path);
+    const input = transformer.input.deserialize(rawInput);
+    return {
+        id,
+        jsonrpc,
+        method,
+        params: {
+            input,
+            path,
+        },
+    };
+}
+function applyWSHandler(app, prefix, opts) {
+    const { createContext, router } = opts;
+    const { transformer } = router._def._config;
+    // global map of maps
+    //   const globalSubs = new Map<WebSocket, Map<number | string, Unsubscribable>>();
+    //   const globals = new Map<WebSocket, Decoration>();
+    function respond(ws, untransformedJSON) {
+        ws.send(JSON.stringify((0, shared_1.transformTRPCResponse)(router._def._config, untransformedJSON)));
+    }
+    function stopSubscription(ws, subscription, { id, jsonrpc }) {
+        subscription.unsubscribe();
+        respond(ws, {
+            id,
+            jsonrpc,
+            result: {
+                type: 'stopped',
+            },
+        });
+    }
+    async function handleRequest(ws, msg) {
+        const clientSubscriptions = ws.clientSubscriptions;
+        const { id, jsonrpc } = msg;
+        /* istanbul ignore next -- @preserve */
+        if (id === null) {
+            throw new server_1.TRPCError({
+                code: 'BAD_REQUEST',
+                message: '`id` is required',
+            });
+        }
+        if (msg.method === 'subscription.stop') {
+            const sub = clientSubscriptions.get(id);
+            if (sub) {
+                stopSubscription(ws, sub, { id, jsonrpc });
+            }
+            clientSubscriptions.delete(id);
+            return;
+        }
+        const { path, input } = msg.params;
+        const type = msg.method;
+        try {
+            await ws.ctxPromise; // asserts context has been set
+            const result = await (0, server_1.callProcedure)({
+                procedures: router._def.procedures,
+                path,
+                rawInput: input,
+                ctx: ws.ctx,
+                type,
+            });
+            if (type === 'subscription') {
+                if (!(0, observable_1.isObservable)(result)) {
+                    throw new server_1.TRPCError({
+                        message: `Subscription ${path} did not return an observable`,
+                        code: 'INTERNAL_SERVER_ERROR',
+                    });
+                }
+            }
+            else {
+                // send the value as data if the method is not a subscription
+                respond(ws, {
+                    id,
+                    jsonrpc,
+                    result: {
+                        type: 'data',
+                        data: result,
+                    },
+                });
+                return;
+            }
+            const observable = result;
+            const sub = observable.subscribe({
+                next(data) {
+                    respond(ws, {
+                        id,
+                        jsonrpc,
+                        result: {
+                            type: 'data',
+                            data,
+                        },
+                    });
+                },
+                error(err) {
+                    const error = (0, server_1.getTRPCErrorFromUnknown)(err);
+                    opts.onError?.({
+                        error,
+                        path,
+                        type,
+                        ctx: ws.ctx,
+                        req: ws.req,
+                        input,
+                    });
+                    respond(ws, {
+                        id,
+                        jsonrpc,
+                        error: (0, shared_1.getErrorShape)({
+                            config: router._def._config,
+                            error,
+                            type,
+                            path,
+                            input,
+                            ctx: ws.ctx,
+                        }),
+                    });
+                },
+                complete() {
+                    respond(ws, {
+                        id,
+                        jsonrpc,
+                        result: {
+                            type: 'stopped',
+                        },
+                    });
+                },
+            });
+            /* istanbul ignore next -- @preserve */
+            // FIXME handle these edge cases
+            //   if (client.readyState !== client.OPEN) {
+            //     // if the client got disconnected whilst initializing the subscription
+            //     // no need to send stopped message if the client is disconnected
+            //     sub.unsubscribe();
+            //     return;
+            //   }
+            /* istanbul ignore next -- @preserve */
+            if (clientSubscriptions.has(id)) {
+                // duplicate request ids for client
+                stopSubscription(ws, sub, { id, jsonrpc });
+                throw new server_1.TRPCError({
+                    message: `Duplicate id ${id}`,
+                    code: 'BAD_REQUEST',
+                });
+            }
+            clientSubscriptions.set(id, sub);
+            respond(ws, {
+                id,
+                jsonrpc,
+                result: {
+                    type: 'started',
+                },
+            });
+        }
+        catch (cause) /* istanbul ignore next -- @preserve */ {
+            // procedure threw an error
+            const error = (0, server_1.getTRPCErrorFromUnknown)(cause);
+            opts.onError?.({ error, path, type, ctx: ws.ctx, req: ws.req, input });
+            respond(ws, {
+                id,
+                jsonrpc,
+                error: (0, shared_1.getErrorShape)({
+                    config: router._def._config,
+                    error,
+                    type,
+                    path,
+                    input,
+                    ctx: ws.ctx,
+                }),
+            });
+        }
+    }
+    // this is probably bad, but its for reconnection notification
+    const allClients = new Set();
+    app.ws(prefix, {
+        // sendPingsAutomatically: true, // could this be enabled?
+        upgrade: (res, ogReq, context) => {
+            // console.log(
+            //   'An Http connection wants to become WebSocket, URL: ' +
+            //     ogReq.getUrl() +
+            //     '!'
+            // );
+            const wrappedReq = (0, utils_1.extractAndWrapHttpRequest)(prefix, ogReq);
+            const secWebSocketKey = wrappedReq.headers['sec-websocket-key'];
+            const secWebSocketProtocol = wrappedReq.headers['sec-websocket-protocol'];
+            const secWebSocketExtensions = wrappedReq.headers['sec-websocket-extensions'];
+            const d = {
+                clientSubscriptions: new Map(),
+                ctx: undefined,
+                req: wrappedReq,
+                ctxPromise: createContext?.({ req: wrappedReq, res }), // this cannot use RES!
+            };
+            res.upgrade(d, 
+            /* Spell these correctly */
+            secWebSocketKey, secWebSocketProtocol, secWebSocketExtensions, context);
+        },
+        // @ts-expect-error Adds decoration on ws type
+        async open(ws) {
+            async function createContextAsync() {
+                try {
+                    ws.ctx = await ws.ctxPromise;
+                }
+                catch (cause) {
+                    const error = (0, server_1.getTRPCErrorFromUnknown)(cause);
+                    opts.onError?.({
+                        error,
+                        path: undefined,
+                        type: 'unknown',
+                        ctx: ws.ctx,
+                        req: ws.req,
+                        input: undefined,
+                    });
+                    respond(ws, {
+                        id: null,
+                        error: (0, shared_1.getErrorShape)({
+                            config: router._def._config,
+                            error,
+                            type: 'unknown',
+                            path: undefined,
+                            input: undefined,
+                            ctx: ws.ctx,
+                        }),
+                    });
+                    // close in next tick
+                    // FIXME check if this is okay?
+                    (global.setImmediate ?? global.setTimeout)(() => {
+                        ws.close();
+                    });
+                }
+            }
+            await createContextAsync();
+            allClients.add(ws);
+        },
+        // @ts-expect-error Adds decoration on ws type
+        async message(ws, rawMsg) {
+            try {
+                const stringMsg = Buffer.from(rawMsg).toString();
+                // eslint-disable-next-line @typescript-eslint/no-base-to-string
+                const msgJSON = JSON.parse(stringMsg);
+                // TODO pre-optimization? why does it always sends empty arrays?
+                // if (Array.isArray(msgJSON) && msgJSON.length == 0)
+                //   return;
+                const msgs = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
+                const promises = msgs
+                    .map((raw) => parseMessage(raw, transformer))
+                    .map((value) => handleRequest(ws, value));
+                await Promise.all(promises);
+            }
+            catch (cause) {
+                const error = new server_1.TRPCError({
+                    code: 'PARSE_ERROR',
+                    cause,
+                });
+                respond(ws, {
+                    id: null,
+                    error: (0, shared_1.getErrorShape)({
+                        config: router._def._config,
+                        error,
+                        type: 'unknown',
+                        path: undefined,
+                        input: undefined,
+                        ctx: undefined,
+                    }),
+                });
+            }
+        },
+        // @ts-expect-error Adds decoration on ws type
+        close(ws) {
+            for (const sub of ws.clientSubscriptions.values()) {
+                sub.unsubscribe();
+            }
+            ws.clientSubscriptions.clear();
+            allClients.delete(ws);
+        },
+    });
+    return {
+        broadcastReconnectNotification: () => {
+            const response = {
+                id: null,
+                method: 'reconnect',
+            };
+            const data = JSON.stringify(response);
+            allClients.forEach((v) => {
+                v.send(data);
+            });
+            // for (const client of wss.clients) {
+            //   if (client.readyState === 1 /* ws.OPEN */) {
+            //     client.send(data);
+            //   }
+            // }
+        },
+    };
+}
+exports.applyWSHandler = applyWSHandler;
+//# sourceMappingURL=applyWsHandler.js.map

package/dist/applyWsHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"applyWsHandler.js","sourceRoot":"","sources":["../src/applyWsHandler.ts"],"names":[],"mappings":";;;AAEA,yCASsB;AAGtB,wDAAuE;AAQvE,2EAA2E;AAC3E,gDAA2E;AAE3E,mCAAoD;AAEpD,uCAAuC;AACvC,SAAS,cAAc,CAAC,GAAY;IAClC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACzD,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;AACH,CAAC;AACD,uCAAuC;AACvC,SAAS,qBAAqB,CAAC,GAAY;IACzC,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,cAAc,IAAI,GAAG,KAAK,UAAU,EAAE;QACnE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;AACH,CAAC;AACD,uCAAuC;AACvC,SAAS,iBAAiB,CACxB,GAAY;IAEZ,IACE,GAAG,KAAK,IAAI;QACZ,OAAO,GAAG,KAAK,QAAQ;QACvB,KAAK,CAAC,GAAG,CAAC;QACV,OAAO,GAAG,KAAK,QAAQ,EACvB;QACA,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;KACvC;AACH,CAAC;AACD,uCAAuC;AACvC,SAAS,cAAc,CAAC,GAAY;IAClC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;KACnC;AACH,CAAC;AACD,uCAAuC;AACvC,SAAS,2BAA2B,CAClC,GAAY;IAEZ,IAAI,OAAO,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,KAAK,EAAE;QAC/C,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;KACxC;AACH,CAAC;AACD,SAAS,YAAY,CACnB,GAAY,EACZ,WAAoC;IAEpC,cAAc,CAAC,GAAG,CAAC,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IAC5C,iBAAiB,CAAC,EAAE,CAAC,CAAC;IACtB,2BAA2B,CAAC,OAAO,CAAC,CAAC;IACrC,IAAI,MAAM,KAAK,mBAAmB,EAAE;QAClC,OAAO;YACL,EAAE;YACF,OAAO;YACP,MAAM;SACP,CAAC;KACH;IACD,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAC9B,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACzC,cAAc,CAAC,IAAI,CAAC,CAAC;IACrB,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtD,OAAO;QACL,EAAE;QACF,OAAO;QACP,MAAM;QACN,MAAM,EAAE;YACN,KAAK;YACL,IAAI;SACL;KACF,CAAC;AACJ,CAAC;AA0BD,SAAgB,cAAc,CAC5B,GAAiB,EACjB,MAAc,EACd,IAAgC;IAEhC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAEvC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IAE5C,qBAAqB;IAErB,mFAAmF;IACnF,sDAAsD;IAEtD,SAAS,OAAO,CAAC,EAAa,EAAE,iBAAsC;QACpE,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CACZ,IAAA,8BAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAC9D,CACF,CAAC;IACJ,CAAC;IAED,SAAS,gBAAgB,CACvB,EAAa,EACb,YAA4B,EAC5B,EAAE,EAAE,EAAE,OAAO,EAAsD;QAEnE,YAAY,CAAC,WAAW,EAAE,CAAC;QAE3B,OAAO,CAAC,EAAE,EAAE;YACV,EAAE;YACF,OAAO;YACP,MAAM,EAAE;gBACN,IAAI,EAAE,SAAS;aAChB;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,UAAU,aAAa,CAC1B,EAAsB,EACtB,GAA8B;QAE9B,MAAM,mBAAmB,GAAG,EAAE,CAAC,mBAAmB,CAAC;QAEnD,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QAC5B,uCAAuC;QACvC,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,IAAI,kBAAS,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,kBAAkB;aAC5B,CAAC,CAAC;SACJ;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,mBAAmB,EAAE;YACtC,MAAM,GAAG,GAAG,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACxC,IAAI,GAAG,EAAE;gBACP,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;aAC5C;YACD,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC/B,OAAO;SACR;QACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACnC,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC;QACxB,IAAI;YACF,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC,+BAA+B;YAEpD,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAa,EAAC;gBACjC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU;gBAClC,IAAI;gBACJ,QAAQ,EAAE,KAAK;gBACf,GAAG,EAAE,EAAE,CAAC,GAAG;gBACX,IAAI;aACL,CAAC,CAAC;YAEH,IAAI,IAAI,KAAK,cAAc,EAAE;gBAC3B,IAAI,CAAC,IAAA,yBAAY,EAAC,MAAM,CAAC,EAAE;oBACzB,MAAM,IAAI,kBAAS,CAAC;wBAClB,OAAO,EAAE,gBAAgB,IAAI,+BAA+B;wBAC5D,IAAI,EAAE,uBAAuB;qBAC9B,CAAC,CAAC;iBACJ;aACF;iBAAM;gBACL,6DAA6D;gBAC7D,OAAO,CAAC,EAAE,EAAE;oBACV,EAAE;oBACF,OAAO;oBACP,MAAM,EAAE;wBACN,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,MAAM;qBACb;iBACF,CAAC,CAAC;gBACH,OAAO;aACR;YAED,MAAM,UAAU,GAAG,MAAM,CAAC;YAC1B,MAAM,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC;gBAC/B,IAAI,CAAC,IAAI;oBACP,OAAO,CAAC,EAAE,EAAE;wBACV,EAAE;wBACF,OAAO;wBACP,MAAM,EAAE;4BACN,IAAI,EAAE,MAAM;4BACZ,IAAI;yBACL;qBACF,CAAC,CAAC;gBACL,CAAC;gBACD,KAAK,CAAC,GAAG;oBACP,MAAM,KAAK,GAAG,IAAA,gCAAuB,EAAC,GAAG,CAAC,CAAC;oBAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,KAAK;wBACL,IAAI;wBACJ,IAAI;wBACJ,GAAG,EAAE,EAAE,CAAC,GAAG;wBACX,GAAG,EAAE,EAAE,CAAC,GAAG;wBACX,KAAK;qBACN,CAAC,CAAC;oBACH,OAAO,CAAC,EAAE,EAAE;wBACV,EAAE;wBACF,OAAO;wBACP,KAAK,EAAE,IAAA,sBAAa,EAAC;4BACnB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO;4BAC3B,KAAK;4BACL,IAAI;4BACJ,IAAI;4BACJ,KAAK;4BACL,GAAG,EAAE,EAAE,CAAC,GAAG;yBACZ,CAAC;qBACH,CAAC,CAAC;gBACL,CAAC;gBACD,QAAQ;oBACN,OAAO,CAAC,EAAE,EAAE;wBACV,EAAE;wBACF,OAAO;wBACP,MAAM,EAAE;4BACN,IAAI,EAAE,SAAS;yBAChB;qBACF,CAAC,CAAC;gBACL,CAAC;aACF,CAAC,CAAC;YACH,uCAAuC;YACvC,gCAAgC;YAChC,6CAA6C;YAC7C,6EAA6E;YAC7E,uEAAuE;YACvE,yBAAyB;YACzB,cAAc;YACd,MAAM;YAEN,uCAAuC;YACvC,IAAI,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC/B,mCAAmC;gBACnC,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC3C,MAAM,IAAI,kBAAS,CAAC;oBAClB,OAAO,EAAE,gBAAgB,EAAE,EAAE;oBAC7B,IAAI,EAAE,aAAa;iBACpB,CAAC,CAAC;aACJ;YACD,mBAAmB,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;YAEjC,OAAO,CAAC,EAAE,EAAE;gBACV,EAAE;gBACF,OAAO;gBACP,MAAM,EAAE;oBACN,IAAI,EAAE,SAAS;iBAChB;aACF,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE,uCAAuC,CAAC;YACtD,2BAA2B;YAC3B,MAAM,KAAK,GAAG,IAAA,gCAAuB,EAAC,KAAK,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;YACvE,OAAO,CAAC,EAAE,EAAE;gBACV,EAAE;gBACF,OAAO;gBACP,KAAK,EAAE,IAAA,sBAAa,EAAC;oBACnB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO;oBAC3B,KAAK;oBACL,IAAI;oBACJ,IAAI;oBACJ,KAAK;oBACL,GAAG,EAAE,EAAE,CAAC,GAAG;iBACZ,CAAC;aACH,CAAC,CAAC;SACJ;IACH,CAAC;IAED,8DAA8D;IAC9D,MAAM,UAAU,GAAG,IAAI,GAAG,EAAsB,CAAC;IAEjD,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE;QACb,0DAA0D;QAE1D,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC/B,eAAe;YACf,4DAA4D;YAC5D,uBAAuB;YACvB,UAAU;YACV,KAAK;YAEL,MAAM,UAAU,GAAG,IAAA,iCAAyB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAE5D,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAChE,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;YAC1E,MAAM,sBAAsB,GAC1B,UAAU,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;YAEjD,MAAM,CAAC,GAAe;gBACpB,mBAAmB,EAAE,IAAI,GAAG,EAAmC;gBAC/D,GAAG,EAAE,SAAS;gBACd,GAAG,EAAE,UAAU;gBACf,UAAU,EAAE,aAAa,EAAE,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,uBAAuB;aAC/E,CAAC;YAEF,GAAG,CAAC,OAAO,CACT,CAAC;YACD,2BAA2B;YAC3B,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,OAAO,CACR,CAAC;QACJ,CAAC;QACD,8CAA8C;QAC9C,KAAK,CAAC,IAAI,CAAC,EAAsB;YAC/B,KAAK,UAAU,kBAAkB;gBAC/B,IAAI;oBACF,EAAE,CAAC,GAAG,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC;iBAC9B;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,KAAK,GAAG,IAAA,gCAAuB,EAAC,KAAK,CAAC,CAAC;oBAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,KAAK;wBACL,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,SAAS;wBACf,GAAG,EAAE,EAAE,CAAC,GAAG;wBACX,GAAG,EAAE,EAAE,CAAC,GAAG;wBACX,KAAK,EAAE,SAAS;qBACjB,CAAC,CAAC;oBACH,OAAO,CAAC,EAAE,EAAE;wBACV,EAAE,EAAE,IAAI;wBACR,KAAK,EAAE,IAAA,sBAAa,EAAC;4BACnB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO;4BAC3B,KAAK;4BACL,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,SAAS;4BACf,KAAK,EAAE,SAAS;4BAChB,GAAG,EAAE,EAAE,CAAC,GAAG;yBACZ,CAAC;qBACH,CAAC,CAAC;oBAEH,qBAAqB;oBACrB,+BAA+B;oBAC/B,CAAC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE;wBAC9C,EAAE,CAAC,KAAK,EAAE,CAAC;oBACb,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC;YACD,MAAM,kBAAkB,EAAE,CAAC;YAC3B,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC;QAED,8CAA8C;QAC9C,KAAK,CAAC,OAAO,CAAC,EAAsB,EAAE,MAAM;YAC1C,IAAI;gBACF,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAEjD,gEAAgE;gBAChE,MAAM,OAAO,GAAY,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC/C,gEAAgE;gBAChE,qDAAqD;gBACrD,YAAY;gBAEZ,MAAM,IAAI,GAAc,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACrE,MAAM,QAAQ,GAAG,IAAI;qBAClB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;qBAC5C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;gBAE5C,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;aAC7B;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,KAAK,GAAG,IAAI,kBAAS,CAAC;oBAC1B,IAAI,EAAE,aAAa;oBACnB,KAAK;iBACN,CAAC,CAAC;gBAEH,OAAO,CAAC,EAAE,EAAE;oBACV,EAAE,EAAE,IAAI;oBACR,KAAK,EAAE,IAAA,sBAAa,EAAC;wBACnB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO;wBAC3B,KAAK;wBACL,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE,SAAS;wBAChB,GAAG,EAAE,SAAS;qBACf,CAAC;iBACH,CAAC,CAAC;aACJ;QACH,CAAC;QAED,8CAA8C;QAC9C,KAAK,CAAC,EAAsB;YAC1B,KAAK,MAAM,GAAG,IAAI,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,EAAE;gBACjD,GAAG,CAAC,WAAW,EAAE,CAAC;aACnB;YACD,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;YAC/B,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;KACF,CAAC,CAAC;IAEH,OAAO;QACL,8BAA8B,EAAE,GAAG,EAAE;YACnC,MAAM,QAAQ,GAA8B;gBAC1C,EAAE,EAAE,IAAI;gBACR,MAAM,EAAE,WAAW;aACpB,CAAC;YACF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACtC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACvB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;YACH,sCAAsC;YACtC,iDAAiD;YACjD,yBAAyB;YACzB,MAAM;YACN,IAAI;QACN,CAAC;KACF,CAAC;AACJ,CAAC;AAlUD,wCAkUC"}

package/dist/index.js

@@ -16,40 +16,35 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUWebSocketsHandler = void 0;
 const requestHandler_1 = require("./requestHandler");
+const utils_1 = require("./utils");
+const applyWsHandler_1 = require("./applyWsHandler");
 __exportStar(require("./types"), exports);
+__exportStar(require("./applyWsHandler"), exports);
 /**
  * @param uWsApp uWebsockets server instance
  * @param prefix The path to trpc without trailing slash (ex: "/trpc")
  * @param opts handler options
  */
-function createUWebSocketsHandler(uWsApp, prefix, opts) {
-    const prefixTrimLength = prefix.length + 1; // remove /* from url
+function createUWebSocketsHandler(uWsApp, prefix, opts
+// opts: uHTTPHandlerOptions<TRouter, TRequest, TResponse>
+) {
+    // const prefixTrimLength = prefix.length + 1; // remove /* from url
     const handler = (res, req) => {
-        const method = req.getMethod().toUpperCase();
-        const url = req.getUrl().substring(prefixTrimLength);
-        const query = req.getQuery();
-        const headers = {};
-        req.forEach((key, value) => {
-            // TODO handle headers with the same key, potential issue
-            headers[key] = value;
-        });
-        // new request object needs to be created, because socket
-        // can only be accessed synchronously, after await it cannot be accessed
-        const wrappedReq = {
-            headers,
-            method,
-            query,
-            url,
-        };
+        const wrappedReq = (0, utils_1.extractAndWrapHttpRequest)(prefix, req);
         (0, requestHandler_1.uWsHTTPRequestHandler)({
             req: wrappedReq,
-            uRes: res,
-            path: url,
+            res: res,
+            path: wrappedReq.url,
             ...opts,
         });
     };
     uWsApp.get(prefix + '/*', handler);
     uWsApp.post(prefix + '/*', handler);
+    if (opts.enableSubscriptions) {
+        // do something
+        (0, applyWsHandler_1.applyWSHandler)(uWsApp, prefix, opts);
+        // uWsApp.ws(prefix + '/*', behavior)
+    }
 }
 exports.createUWebSocketsHandler = createUWebSocketsHandler;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,qDAAyD;AAQzD,0CAAwB;AAExB;;;;GAIG;AACH,SAAgB,wBAAwB,CACtC,MAAoB,EACpB,MAAc,EACd,IAAkC;IAElC,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,qBAAqB;IAEjE,MAAM,OAAO,GAAG,CAAC,GAAiB,EAAE,GAAgB,EAAE,EAAE;QACtD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,WAAW,EAAoB,CAAC;QAC/D,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAE7B,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACzB,yDAAyD;YACzD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,yDAAyD;QACzD,wEAAwE;QACxE,MAAM,UAAU,GAAuB;YACrC,OAAO;YACP,MAAM;YACN,KAAK;YACL,GAAG;SACJ,CAAC;QAEF,IAAA,sCAAqB,EAAC;YACpB,GAAG,EAAE,UAAU;YACf,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,GAAG;YACT,GAAG,IAAI;SACR,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AApCD,4DAoCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAGA,qDAAyD;AAGzD,mCAAoD;AACpD,qDAAkD;AAElD,0CAAwB;AACxB,mDAAiC;AAEjC;;;;GAIG;AACH,SAAgB,wBAAwB,CACtC,MAAoB,EACpB,MAAc,EACd,IAAoE;AACpE,0DAA0D;;IAE1D,oEAAoE;IAEpE,MAAM,OAAO,GAAG,CAAC,GAAiB,EAAE,GAAgB,EAAE,EAAE;QACtD,MAAM,UAAU,GAAG,IAAA,iCAAyB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAE1D,IAAA,sCAAqB,EAAC;YACpB,GAAG,EAAE,UAAU;YACf,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,UAAU,CAAC,GAAG;YACpB,GAAG,IAAI;SACR,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAEpC,IAAI,IAAI,CAAC,mBAAmB,EAAE;QAC5B,eAAe;QAEf,IAAA,+BAAc,EAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAErC,qCAAqC;KACtC;AACH,CAAC;AA5BD,4DA4BC"}

package/dist/requestHandler.js

@@ -1,85 +1,67 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uWsHTTPRequestHandler = void 0;
-const server_1 = require("@trpc/server");
 const utils_1 = require("./utils");
+const http_1 = require("@trpc/server/http");
 async function uWsHTTPRequestHandler(opts) {
-    const resOverride = {
-        headers: [],
-        status: 0,
-    };
-    const wrappedRes = {
-        setStatus: (status) => {
-            resOverride.status = status;
-        },
-        setHeader: (name, value) => {
-            resOverride.headers.push({ name, value });
-            // resOverride.headers.set(key, value);
-        },
-    };
-    const createContext = async function _createContext() {
-        return await opts.createContext?.({
-            req: opts.req,
-            res: wrappedRes,
+    const handleViaMiddleware = opts.middleware ?? ((_req, _res, next) => next());
+    return handleViaMiddleware(opts.req, opts.res, async (err) => {
+        if (err)
+            throw err;
+        const createContext = async () => {
+            return await opts.createContext?.(opts); // TODO type this up
+        };
+        // this may not be needed
+        const query = new URLSearchParams(opts.req.query);
+        const { res, req } = opts;
+        let aborted = false;
+        res.onAborted(() => {
+            // console.log('request was aborted');
+            aborted = true;
         });
-    };
-    const { path, router, uRes, req } = opts;
-    let aborted = false;
-    uRes.onAborted(() => {
-        // console.log('request was aborted');
-        aborted = true;
-    });
-    const bodyResult = await (0, utils_1.getPostBody)(req.method, uRes, opts.maxBodySize);
-    const query = new URLSearchParams(opts.req.query);
-    const requestObj = {
-        method: opts.req.method,
-        headers: opts.req.headers,
-        query,
-        body: bodyResult.ok ? bodyResult.data : undefined,
-    };
-    const result = await (0, server_1.resolveHTTPResponse)({
-        batching: opts.batching,
-        responseMeta: opts.responseMeta,
-        path,
-        createContext,
-        router,
-        req: requestObj,
-        error: bodyResult.ok ? null : bodyResult.error,
-        onError(o) {
-            opts?.onError?.({
-                ...o,
-                req: opts.req,
-            });
-        },
-    });
-    if (aborted) {
-        // TODO check this behavior
-        return;
-    }
-    uRes.cork(() => {
-        // if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
-        if (resOverride.status > 0) {
-            uRes.writeStatus(resOverride.status.toString()); // TODO convert code to actual message
-        }
-        if ('status' in result) {
-            uRes.writeStatus(result.status.toString());
-        }
-        //send our manual headers
-        resOverride.headers.forEach((h) => {
-            uRes.writeHeader(h.name, h.value);
-        });
-        for (const [key, value] of Object.entries(result.headers ?? {})) {
-            if (typeof value === 'undefined') {
-                continue;
-            }
-            if (Array.isArray(value))
-                value.forEach((v) => {
-                    uRes.writeHeader(key, v);
+        const bodyResult = await (0, utils_1.getPostBody)(req.method, res, opts.maxBodySize);
+        const reqObj = {
+            method: opts.req.method,
+            headers: opts.req.headers,
+            query,
+            body: bodyResult.ok ? bodyResult.data : undefined,
+        };
+        const result = await (0, http_1.resolveHTTPResponse)({
+            batching: opts.batching,
+            responseMeta: opts.responseMeta,
+            path: opts.path,
+            createContext,
+            router: opts.router,
+            req: reqObj,
+            error: bodyResult.ok ? null : bodyResult.error,
+            preprocessedBody: false,
+            onError(o) {
+                opts?.onError?.({
+                    ...o,
+                    req: opts.req,
                 });
-            else
-                uRes.writeHeader(key, value);
+            },
+        });
+        if (aborted) {
+            // TODO check this behavior
+            return;
         }
-        (0, utils_1.sendResponse)(uRes, result.body);
+        res.cork(() => {
+            res.writeStatus(result.status.toString()); // is this okay?
+            // oldschool way of writing headers
+            for (const [key, value] of Object.entries(result.headers ?? {})) {
+                if (typeof value === 'undefined') {
+                    continue;
+                }
+                if (Array.isArray(value))
+                    value.forEach((v) => {
+                        res.writeHeader(key, v);
+                    });
+                else
+                    res.writeHeader(key, value);
+            }
+            (0, utils_1.sendResponse)(res, result.body);
+        });
     });
 }
 exports.uWsHTTPRequestHandler = uWsHTTPRequestHandler;