trpc-uwebsockets 0.9.4 → 0.10.0-proxy-beta.10

package/README.md

@@ -4,6 +4,14 @@
 
 # Installation
 
+To use old, stable version 9
+
+```bash
+yarn add trpc-uwebsockets@^0.9.*
+```
+
+To use version 10 beta run
+
 ```bash
 yarn add trpc-uwebsockets
 ```
@@ -14,44 +22,47 @@ Import needed packages
 
 ```typescript
 import { App } from 'uWebSockets.js';
-import * as trpc from '@trpc/server';
+import { inferAsyncReturnType, initTRPC } from '@trpc/server';
+import { CreateContextOptions } from 'trpc-uwebsockets';
 import z from 'zod';
 ```
 
-Define tRPC context and router
+Define tRPC, context, and router
 
 ```typescript
-type Context = {
-  user: {
-    name: string;
-  } | null;
-};
+const t = initTRPC.context<Context>().create();
 
-const createContext = (opts: UWebSocketsContextOptions): Context => {
+const createContext = ({ req, res }: CreateContextOptions) => {
   const getUser = () => {
-    if (opts?.req.headers.authorization) {
-      // const user = await decodeJwtToken(req.headers.authorization.split(' ')[1])
-      // return user;
+    if (req.headers.authorization === 'meow') {
+      return {
+        name: 'KATT',
+      };
     }
     return null;
   };
-
   return {
+    req,
+    res,
     user: getUser(),
   };
 };
-
-const router = trpc.router<Context>().query('hello', {
-  input: z
-    .object({
-      who: z.string().nullish(),
-    })
-    .nullish(),
-  resolve({ input, ctx }) {
-    return {
-      text: `hello ${input?.who ?? ctx.user?.name ?? 'world'}`,
-    };
-  },
+export type Context = inferAsyncReturnType<typeof createContext>;
+
+const router = t.router({
+  hello: t.procedure
+    .input(
+      z
+        .object({
+          who: z.string().nullish(),
+        })
+        .nullish()
+    )
+    .query(({ input, ctx }) => {
+      return {
+        text: `hello ${input?.who ?? ctx.user?.name ?? 'world'}`,
+      };
+    }),
 });
 ```
 
@@ -78,57 +89,22 @@ app.listen('0.0.0.0', 8000, () => {
 
 # API
 
-Create uWebSockets handler options
-
-```typescript
-function createUWebSocketsHandler<TRouter extends AnyRouter>(
-  /* instance of the uWebSockets server */
-  uWsApp: TemplatedApp,
-  /* Path to trpc without trailing slash (ex: "/trpc") */
-  pathPrefix: string,
-  /* Handler options */
-  opts: UWebSocketsCreateHandlerOptions<TRouter>
-);
-```
-
-Handler options
-
-```typescript
-type UWebSocketsCreateHandlerOptions<TRouter extends AnyRouter> = {
-  /* trpc router */
-  router: TRouter;
-  /* optional create context */
-  createContext?: (
-    opts: UWebSocketsCreateContextOptions
-  ) => Promise<inferRouterContext<TRouter>> | inferRouterContext<TRouter>;
-  /* optional pre-request handler. Useful for dealing with CORS, or sending extra headers */
-  onRequest?: (
-    req: UWebSocketsRequestObject,
-    res: UWebSocketsResponseObject
-  ) => void;
-};
-```
-
 Create context options
 
 ```typescript
-type UWebSocketsCreateContextOptions = {
+type CreateContextOptions = {
   /* read-only request information */
   req: {
     headers: Record<string, string>;
     method: 'POST' | 'GET';
-    query: URLSearchParams;
+    query: string;
     path: string;
-    getCookies: (opts?: CookieParseOptions) => Record<string, string>;
   };
-  /* minimal response interface */
+  /* minimal response interface, useful for setting cookies */
   res: {
     setStatus(status: number): void;
-    setHeader(key: string, value: string): void;
-    setCookie(key: string, value: string, opts?: CookieSerializeOptions): void;
+    setHeader(name: string, value: string): void;
   };
-  /* instance of the uWebSockets server */
-  uWs: TemplatedApp;
 };
 ```
 
@@ -146,5 +122,6 @@ yarn test:watch
 
 # Todo
 
-- [ ] Expose batching options (like express adapter)
-- [ ] Implement onError handling (like express adapter)
+- [ ] Various improvements (res.tryEnd + reading multiple headers /w same key)
+- [ ] Improve these (remove rollup and many dependencies)
+- [ ] Subscription support with websockets

package/dist/index.js

@@ -1,146 +1,41 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUWebSocketsHandler = void 0;
-const server_1 = require("@trpc/server");
-const utils_1 = require("./utils");
-const cookie_1 = __importDefault(require("cookie"));
-__exportStar(require("./types"), exports);
+const requestHandler_1 = require("./requestHandler");
+// export * from './types';
 /**
  * @param uWsApp uWebsockets server instance
- * @param pathPrefix The path to trpc without trailing slash (ex: "/trpc")
+ * @param prefix The path to trpc without trailing slash (ex: "/trpc")
  * @param opts handler options
  */
-function createUWebSocketsHandler(uWsApp, pathPrefix, opts) {
-    const prefixTrimLength = pathPrefix.length + 1; // remove /* from url
-    const handler = async (res, req) => {
+function createUWebSocketsHandler(uWsApp, prefix, opts) {
+    const prefixTrimLength = prefix.length + 1; // remove /* from url
+    const handler = (res, req) => {
         const method = req.getMethod().toUpperCase();
-        if (method !== 'GET' && method !== 'POST') {
-            // handle only get and post requests, while the rest
-            // will not be captured and propagated further
-            req.setYield(true);
-            return;
-        }
-        const path = req.getUrl().substring(prefixTrimLength);
-        const query = new URLSearchParams(decodeURIComponent(req.getQuery()));
+        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 request = {
+        const wrappedReq = {
             headers,
             method,
             query,
-            path,
-            getCookies: (0, utils_1.getCookieFn)(headers),
+            url,
         };
-        const resOverride = {
-            headers: new Map(),
-            cookies: [],
-            status: 0,
-        };
-        const response = {
-            setCookie: (name, value, opts) => {
-                const serialized = cookie_1.default.serialize(name, value, opts); //.substring(12); //remove the "Set-Cookie: "
-                resOverride.cookies.push(serialized);
-            },
-            setStatus: (status) => {
-                resOverride.status = status;
-            },
-            setHeader: (key, value) => {
-                resOverride.headers.set(key, value);
-            },
-        };
-        const bodyResult = await (0, utils_1.readPostBody)(method, res);
-        // req is no longer available!
-        const createContext = async function _() {
-            //res could be proxied here
-            return await opts.createContext?.({
-                uWs: uWsApp,
-                req: request,
-                res: response,
-            });
-        };
-        const internalReqObj = {
-            method,
-            headers,
-            query,
-            body: bodyResult.ok ? bodyResult.data : undefined,
-        };
-        // TODO batching, onError options need implementation.
-        const result = await (0, server_1.resolveHTTPResponse)({
-            path,
-            createContext,
-            router: opts.router,
-            req: internalReqObj,
-            error: bodyResult.ok ? null : bodyResult.error,
-        });
-        // user returned already, do nothing
-        res.cork(() => {
-            if (resOverride.status != 0) {
-                res.writeStatus(resOverride.status.toString());
-            }
-            else if ('status' in result) {
-                res.writeStatus(result.status.toString());
-            }
-            else {
-                // assume something went bad, should never happen?
-                throw new Error('No status to send');
-                // res.writeStatus('500 INTERNAL SERVER ERROR');
-                // res.end();
-                // return;
-            }
-            if (opts.onRequest)
-                opts.onRequest(request, response);
-            //send all cookies
-            resOverride.cookies.forEach((value) => {
-                res.writeHeader('Set-Cookie', value);
-            });
-            resOverride.headers.forEach((value, key) => {
-                res.writeHeader(key, value);
-            });
-            for (const [key, value] of Object.entries(result.headers ?? {})) {
-                if (typeof value === 'undefined') {
-                    continue;
-                }
-                // make sure to never override user defined headers
-                // cookies are an exception
-                if (resOverride.headers.has(key))
-                    continue;
-                // not sure why it could be an array. This code path is not tested
-                // maybe its duplicates for the same key? like multiple "Set-Cookie"
-                if (Array.isArray(value))
-                    value.forEach((header) => {
-                        res.writeHeader(key, header);
-                    });
-                else
-                    res.writeHeader(key, value);
-            }
-            //now send user headers
-            if (result.body)
-                res.write(result.body);
-            res.end();
+        (0, requestHandler_1.uWsHTTPRequestHandler)({
+            req: wrappedReq,
+            uRes: res,
+            path: url,
+            ...opts,
         });
     };
-    uWsApp.any(pathPrefix + '/*', handler);
+    uWsApp.get(prefix + '/*', handler);
+    uWsApp.post(prefix + '/*', handler);
 }
 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":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAIA,qDAAyD;AAQzD,2BAA2B;AAE3B;;;;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"}

package/dist/requestHandler.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uWsHTTPRequestHandler = void 0;
+const server_1 = require("@trpc/server");
+const utils_1 = require("./utils");
+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 { 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);
+                });
+            else
+                uRes.writeHeader(key, value);
+        }
+        (0, utils_1.sendResponse)(uRes, result.body);
+    });
+}
+exports.uWsHTTPRequestHandler = uWsHTTPRequestHandler;
+//# sourceMappingURL=requestHandler.js.map

package/dist/requestHandler.js.map

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

package/dist/utils.js

@@ -1,21 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readPostBody = exports.getCookieFn = void 0;
+exports.sendResponse = exports.getPostBody = void 0;
 const server_1 = require("@trpc/server");
-const cookie_1 = __importDefault(require("cookie"));
-/*
-cookie: 'cookie1=abc; cookie2=d.e'
-*/
-const getCookieFn = (headers) => (opts) => {
-    if (!('cookie' in headers))
-        return {};
-    return cookie_1.default.parse(headers.cookie, opts);
-};
-exports.getCookieFn = getCookieFn;
-function readPostBody(method, res) {
+function getPostBody(method, res, maxBodySize) {
     return new Promise((resolve) => {
         if (method == 'GET') {
             // no body in get request
@@ -35,8 +22,14 @@ function readPostBody(method, res) {
                 return;
             }
             const chunk = Buffer.from(ab);
-            //else accumulate
+            if (maxBodySize && buffer.length >= maxBodySize) {
+                resolve({
+                    ok: false,
+                    error: new server_1.TRPCError({ code: 'PAYLOAD_TOO_LARGE' }),
+                });
+            }
             if (buffer)
+                //else accumulate
                 buffer = Buffer.concat([buffer, chunk]);
             else
                 buffer = Buffer.concat([chunk]);
@@ -55,5 +48,11 @@ function readPostBody(method, res) {
         });
     });
 }
-exports.readPostBody = readPostBody;
+exports.getPostBody = getPostBody;
+// FIXME buffer the output with tryEnd instead
+// https://github.com/uNetworking/uWebSockets.js/blob/master/examples/VideoStreamer.js
+function sendResponse(res, payload) {
+    res.end(payload);
+}
+exports.sendResponse = sendResponse;
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAyC;AAEzC,oDAAoD;AACpD;;EAEE;AAEK,MAAM,WAAW,GACtB,CAAC,OAA+B,EAAE,EAAE,CAAC,CAAC,IAAyB,EAAE,EAAE;IACjE,IAAI,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC;IAEtC,OAAO,gBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC,CAAC;AALS,QAAA,WAAW,eAKpB;AAEJ,SAAgB,YAAY,CAAC,MAAc,EAAE,GAAiB;IAC5D,OAAO,IAAI,OAAO,CAEhB,CAAC,OAAO,EAAE,EAAE;QACZ,IAAI,MAAM,IAAI,KAAK,EAAE;YACnB,yBAAyB;YACzB,OAAO,CAAC;gBACN,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;SACJ;QAED,IAAI,MAAc,CAAC;QAEnB,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE;YACxB,+CAA+C;YAC/C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,EAAE;gBAClC,OAAO,CAAC;oBACN,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;iBACjC,CAAC,CAAC;gBACH,OAAO;aACR;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAE9B,iBAAiB;YACjB,IAAI,MAAM;gBAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;;gBAC/C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAErC,IAAI,MAAM,EAAE;gBACV,OAAO,CAAC;oBACN,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE;iBACxB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;YACjB,OAAO,CAAC;gBACN,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,kBAAS,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC;aACxD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA7CD,oCA6CC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAOA,yCAAoD;AAEpD,SAAgB,WAAW,CAIzB,MAAM,EAAE,GAAiB,EAAE,WAAoB;IAC/C,OAAO,IAAI,OAAO,CAEhB,CAAC,OAAO,EAAE,EAAE;QACZ,IAAI,MAAM,IAAI,KAAK,EAAE;YACnB,yBAAyB;YACzB,OAAO,CAAC;gBACN,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;SACJ;QAED,IAAI,MAAc,CAAC;QAEnB,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE;YACxB,+CAA+C;YAC/C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,EAAE;gBAClC,OAAO,CAAC;oBACN,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;iBACjC,CAAC,CAAC;gBACH,OAAO;aACR;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAE9B,IAAI,WAAW,IAAI,MAAM,CAAC,MAAM,IAAI,WAAW,EAAE;gBAC/C,OAAO,CAAC;oBACN,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,IAAI,kBAAS,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;iBACpD,CAAC,CAAC;aACJ;YACD,IAAI,MAAM;gBACR,iBAAiB;gBACjB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;;gBACrC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAErC,IAAI,MAAM,EAAE;gBACV,OAAO,CAAC;oBACN,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE;iBACxB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;YACjB,OAAO,CAAC;gBACN,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,kBAAS,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC;aACxD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAxDD,kCAwDC;AAED,8CAA8C;AAC9C,sFAAsF;AACtF,SAAgB,YAAY,CAAC,GAAiB,EAAE,OAAgB;IAC9D,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC;AAFD,oCAEC"}

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "trpc-uwebsockets",
   "description": "tRPC adapter for uWebSockets.js server",
-  "version": "0.9.4",
+  "version": "0.10.0-proxy-beta.10",
   "main": "./dist/index.js",
   "type": "commonjs",
   "types": "./types/index.d.ts",
@@ -24,18 +24,18 @@
     "prettier:dry": "prettier --config .prettierrc 'src/**/*.ts'"
   },
   "dependencies": {
-    "@trpc/server": "^9.26.2",
-    "cookie": "^0.5.0",
+    "@trpc/server": "^10.0.0-proxy-beta.10",
     "uWebSockets.js": "uNetworking/uWebSockets.js#v20.10.0"
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "^8.3.3",
     "@swc/core": "^1.2.215",
     "@swc/jest": "^0.2.21",
-    "@trpc/client": "^9.26.2",
+    "@trpc/client": "^10.0.0-proxy-beta.10",
     "@types/cookie": "^0.5.1",
     "@types/jest": "^28.1.6",
     "@types/node": "^18.0.6",
+    "@types/node-fetch": "^2.6.2",
     "@types/webrtc": "^0.0.32",
     "@typescript-eslint/eslint-plugin": "^5.30.6",
     "@typescript-eslint/parser": "^5.30.6",