trpc-uwebsockets 10.44.0 → 10.45.0

package/README.md

@@ -65,10 +65,8 @@ const app = App();
 
 /* handle CORS as needed */
 app.options('/*', (res) => {
-  res.cork(() => {
-    res.writeHeader('Access-Control-Allow-Origin', allowOrigin);
-    res.endWithoutBody();
-  });
+  res.writeHeader('Access-Control-Allow-Origin', allowOrigin);
+  res.endWithoutBody();
 });
 
 createUWebSocketsHandler(app, '/trpc', {

package/dist/utils.js

@@ -24,7 +24,7 @@ function getPostBody(method, res, maxBodySize) {
                 return;
             }
             const chunk = Buffer.from(ab);
-            if (maxBodySize && buffer.length >= maxBodySize) {
+            if (maxBodySize && buffer && buffer.length >= maxBodySize) {
                 resolve({
                     ok: false,
                     error: new server_1.TRPCError({ code: 'PAYLOAD_TOO_LARGE' }),

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAEA,yCAAyC;AAGzC,SAAgB,WAAW,CAAC,MAAM,EAAE,GAAiB,EAAE,WAAoB;IACzE,OAAO,IAAI,OAAO,CAGhB,CAAC,OAAO,EAAE,EAAE;QACZ,IAAI,MAAM,IAAI,KAAK,EAAE;YACnB,yBAAyB;YACzB,OAAO,CAAC;gBACN,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,KAAK;aACpB,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;oBAChC,YAAY,EAAE,KAAK;iBACpB,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;oBACvB,YAAY,EAAE,KAAK;iBACpB,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,SAAgB,yBAAyB,CACvC,MAAc,EACd,GAAgB;IAEhB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,WAAW,EAAoB,CAAC;IAC/D,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAElD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACzB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO;QACP,MAAM;QACN,KAAK;QACL,GAAG;KACJ,CAAC;AACJ,CAAC;AAnBD,8DAmBC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAEA,yCAAyC;AAGzC,SAAgB,WAAW,CACzB,MAAsB,EACtB,GAAiB,EACjB,WAAoB;IAEpB,OAAO,IAAI,OAAO,CAGhB,CAAC,OAAO,EAAE,EAAE;QACZ,IAAI,MAAM,IAAI,KAAK,EAAE;YACnB,yBAAyB;YACzB,OAAO,CAAC;gBACN,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,KAAK;aACpB,CAAC,CAAC;SACJ;QAED,IAAI,MAA0B,CAAC;QAE/B,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;oBAChC,YAAY,EAAE,KAAK;iBACpB,CAAC,CAAC;gBACH,OAAO;aACR;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAE9B,IAAI,WAAW,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,WAAW,EAAE;gBACzD,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;oBACvB,YAAY,EAAE,KAAK;iBACpB,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;AA5DD,kCA4DC;AAED,SAAgB,yBAAyB,CACvC,MAAc,EACd,GAAgB;IAEhB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,WAAW,EAAoB,CAAC;IAC/D,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAElD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACzB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO;QACP,MAAM;QACN,KAAK;QACL,GAAG;KACJ,CAAC;AACJ,CAAC;AAnBD,8DAmBC"}

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "trpc-uwebsockets",
   "description": "tRPC adapter for uWebSockets.js server",
-  "version": "10.44.0",
+  "version": "10.45.0",
   "main": "./dist/index.js",
   "type": "commonjs",
   "types": "./types/index.d.ts",

package/src/utils.ts

@@ -3,7 +3,11 @@ import { HttpRequest, HttpResponse } from 'uWebSockets.js';
 import { TRPCError } from '@trpc/server';
 import { WrappedHTTPRequest } from './types';
 
-export function getPostBody(method, res: HttpResponse, maxBodySize?: number) {
+export function getPostBody(
+  method: 'GET' | 'POST',
+  res: HttpResponse,
+  maxBodySize?: number
+) {
   return new Promise<
     | { ok: true; data: unknown; preprocessed: boolean }
     | { ok: false; error: TRPCError }
@@ -17,7 +21,7 @@ export function getPostBody(method, res: HttpResponse, maxBodySize?: number) {
       });
     }
 
-    let buffer: Buffer;
+    let buffer: Buffer | undefined;
 
     res.onData((ab, isLast) => {
       //resolve right away if there is only one chunk
@@ -32,7 +36,7 @@ export function getPostBody(method, res: HttpResponse, maxBodySize?: number) {
 
       const chunk = Buffer.from(ab);
 
-      if (maxBodySize && buffer.length >= maxBodySize) {
+      if (maxBodySize && buffer && buffer.length >= maxBodySize) {
         resolve({
           ok: false,
           error: new TRPCError({ code: 'PAYLOAD_TOO_LARGE' }),

package/test/index.spec.ts

@@ -1,12 +1,4 @@
-import {
-  vi,
-  beforeEach,
-  afterEach,
-  test,
-  expect,
-  expectTypeOf,
-  describe,
-} from 'vitest';
+import { vi, beforeEach, afterEach, test, expect, expectTypeOf } from 'vitest';
 // idk how to use that
 // import { waitFor } from '@testing-library/dom';
 
@@ -153,6 +145,7 @@ async function startServer() {
         },
       };
     },
+    maxBodySize: 10000,
 
     router,
     createContext: makeContext(),
@@ -302,37 +295,34 @@ const linkSpy: TRPCLink<AppRouter> = () => {
   };
 };
 
-describe('main tests', () => {
-  test('query simple success and error handling', async () => {
-    // t.client.runtime.headers = ()
-    const { client } = makeClient({});
-
-    // client.
-    expect(
-      await client.hello.query({
-        who: 'test',
-      })
-    ).toMatchInlineSnapshot(`
+test('query simple success and error handling', async () => {
+  // t.client.runtime.headers = ()
+  const { client } = makeClient({});
+
+  // client.
+  expect(
+    await client.hello.query({
+      who: 'test',
+    })
+  ).toMatchInlineSnapshot(`
     {
       "text": "hello test",
     }
   `);
 
-    await expect(client.error.query()).rejects.toThrowError(
-      'error as expected'
-    );
-  });
+  await expect(client.error.query()).rejects.toThrowError('error as expected');
+});
 
-  test('mutation and reading headers', async () => {
-    const { client } = makeClient({
-      authorization: 'meow',
-    });
+test('mutation and reading headers', async () => {
+  const { client } = makeClient({
+    authorization: 'meow',
+  });
 
-    expect(
-      await client.test.mutate({
-        value: 'lala',
-      })
-    ).toMatchInlineSnapshot(`
+  expect(
+    await client.test.mutate({
+      value: 'lala',
+    })
+  ).toMatchInlineSnapshot(`
     {
       "originalValue": "lala",
       "user": {
@@ -340,99 +330,99 @@ describe('main tests', () => {
       },
     }
   `);
-  });
-
-  test('manually sets status and headers', async () => {
-    const fetcher = await fetch(
-      `http://localhost:${testPort}/trpc/manualRes?input=${encodeURI('{}')}`
-    );
-    const body = await fetcher.json();
-    expect(fetcher.status).toEqual(400);
-    expect(body.result.data).toEqual('status 400');
+});
 
-    expect(fetcher.headers.get('Access-Control-Allow-Origin')).toEqual('*'); // from the meta
-    expect(fetcher.headers.get('manual')).toEqual('header'); //from the result
-  });
+test('manually sets status and headers', async () => {
+  const fetcher = await fetch(
+    `http://localhost:${testPort}/trpc/manualRes?input=${encodeURI('{}')}`
+  );
+  const body = await fetcher.json();
+  expect(fetcher.status).toEqual(400);
+  expect(body.result.data).toEqual('status 400');
 
-  // this needs to be tested
-  test('aborting requests works', async () => {
-    const ac = new AbortController();
-    const { client } = makeClient({});
+  expect(fetcher.headers.get('Access-Control-Allow-Origin')).toEqual('*'); // from the meta
+  expect(fetcher.headers.get('manual')).toEqual('header'); //from the result
+});
 
-    expect.assertions(1);
+// this needs to be tested
+test('aborting requests works', async () => {
+  const ac = new AbortController();
+  const { client } = makeClient({});
 
-    setTimeout(() => {
-      ac.abort();
-    });
+  expect.assertions(1);
 
-    try {
-      await client.test.mutate(
-        {
-          value: 'haha',
-        },
-        {
-          signal: ac.signal as any,
-        }
-      );
-    } catch (error) {
-      expect(error.name).toBe('TRPCClientError');
-    }
+  setTimeout(() => {
+    ac.abort();
   });
 
-  // FIXME no idea how to make it non-flaky
-  const sleep = (ms: number) => new Promise((res) => setTimeout(res, ms));
-
-  // Source: https://github.com/trpc/trpc/blob/main/packages/tests/server/adapters/fastify.test.ts
-  test(
-    'ugly subscription tests',
-    async () => {
-      ee.once('subscription:created', () => {
-        setTimeout(() => {
-          ee.emit('server:msg', {
-            id: '1',
-          });
-          ee.emit('server:msg', {
-            id: '2',
-          });
+  try {
+    await client.test.mutate(
+      {
+        value: 'haha',
+      },
+      {
+        signal: ac.signal as any,
+      }
+    );
+  } catch (error) {
+    expect(error.name).toBe('TRPCClientError');
+  }
+});
+
+// FIXME no idea how to make it non-flaky
+const sleep = (ms: number) => new Promise((res) => setTimeout(res, ms));
+
+// Source: https://github.com/trpc/trpc/blob/main/packages/tests/server/adapters/fastify.test.ts
+test(
+  'ugly subscription tests',
+  async () => {
+    ee.once('subscription:created', () => {
+      setTimeout(() => {
+        ee.emit('server:msg', {
+          id: '1',
+        });
+        ee.emit('server:msg', {
+          id: '2',
         });
       });
+    });
 
-      const { client, closeWs } = makeClientWithWs({});
+    const { client, closeWs } = makeClientWithWs({});
 
-      const onStartedMock = vi.fn();
-      const onDataMock = vi.fn();
-      const sub = client.onMessage.subscribe('onMessage', {
-        onStarted: onStartedMock,
-        onData(data) {
-          expectTypeOf(data).not.toBeAny();
-          expectTypeOf(data).toMatchTypeOf<Message>();
-          onDataMock(data);
-        },
-      });
+    const onStartedMock = vi.fn();
+    const onDataMock = vi.fn();
+    const sub = client.onMessage.subscribe('onMessage', {
+      onStarted: onStartedMock,
+      onData(data) {
+        expectTypeOf(data).not.toBeAny();
+        expectTypeOf(data).toMatchTypeOf<Message>();
+        onDataMock(data);
+      },
+    });
 
-      // onStartedMock.
+    // onStartedMock.
 
-      // expect(onStartedMock).toh
+    // expect(onStartedMock).toh
 
-      await sleep(300); // FIXME how to use waitFor instead?
-      expect(onStartedMock).toHaveBeenCalledTimes(1);
-      expect(onDataMock).toHaveBeenCalledTimes(2);
-      // await waitFor(() => {
-      //   expect(onStartedMock).toHaveBeenCalledTimes(1);
-      //   expect(onDataMock).toHaveBeenCalledTimes(2);
-      // });
+    await sleep(300); // FIXME how to use waitFor instead?
+    expect(onStartedMock).toHaveBeenCalledTimes(1);
+    expect(onDataMock).toHaveBeenCalledTimes(2);
+    // await waitFor(() => {
+    //   expect(onStartedMock).toHaveBeenCalledTimes(1);
+    //   expect(onDataMock).toHaveBeenCalledTimes(2);
+    // });
 
-      ee.emit('server:msg', {
-        id: '3',
-      });
-      await sleep(500);
-      expect(onDataMock).toHaveBeenCalledTimes(3);
+    ee.emit('server:msg', {
+      id: '3',
+    });
+    await sleep(500);
+    expect(onDataMock).toHaveBeenCalledTimes(3);
 
-      // await waitFor(() => {
-      //   expect(onDataMock).toHaveBeenCalledTimes(3);
-      // });
+    // await waitFor(() => {
+    //   expect(onDataMock).toHaveBeenCalledTimes(3);
+    // });
 
-      expect(onDataMock.mock.calls).toMatchInlineSnapshot(`
+    expect(onDataMock.mock.calls).toMatchInlineSnapshot(`
     [
       [
         {
@@ -452,64 +442,77 @@ describe('main tests', () => {
     ]
   `);
 
-      sub.unsubscribe();
+    sub.unsubscribe();
+
+    await sleep(500);
+
+    expect(ee.listenerCount('server:msg')).toBe(0);
+    expect(ee.listenerCount('server:error')).toBe(0);
+
+    await closeWs();
+  },
+  {
+    timeout: 10000,
+  }
+);
+
+test(
+  'subscription failed context',
+  async () => {
+    expect.assertions(2);
+    // const host = `localhost:${testPort}/trpc?user=user1`; // weClient can inject values via query string
+    const host = `localhost:${testPort}/trpc?user=user1&fail=yess`; // weClient can inject values via query string
+    const wsClient = createWSClient({
+      url: `ws://${host}`,
+      WebSocket,
+      retryDelayMs: (i) => {
+        console.log('retrying connection in subscription only', i);
+        return 200;
+      },
+    });
 
-      await sleep(500);
+    const client = createTRPCProxyClient<AppRouter>({
+      links: [wsLink({ client: wsClient })],
+    });
 
-      expect(ee.listenerCount('server:msg')).toBe(0);
-      expect(ee.listenerCount('server:error')).toBe(0);
+    client.onMessage.subscribe('lala', {
+      onError(err) {
+        // expect this error here?
+        expect(err).toBeInstanceOf(TRPCClientError);
+        expect(err.message).toBe('failing as expected');
+      },
+    });
 
-      await closeWs();
-    },
+    await sleep(100);
+    wsClient.close();
+  },
+  {
+    timeout: 3000,
+  }
+);
+
+test('options still passthrough (cors)', async () => {
+  const res = await fetch(
+    `http://localhost:${testPort}/trpc/hello?input=${encodeURI('{}')}`,
     {
-      timeout: 10000,
+      method: 'OPTIONS',
     }
   );
 
-  test(
-    'subscription failed context',
-    async () => {
-      expect.assertions(2);
-      // const host = `localhost:${testPort}/trpc?user=user1`; // weClient can inject values via query string
-      const host = `localhost:${testPort}/trpc?user=user1&fail=yess`; // weClient can inject values via query string
-      const wsClient = createWSClient({
-        url: `ws://${host}`,
-        WebSocket,
-        retryDelayMs: (i) => {
-          console.log('retrying connection in subscription only', i);
-          return 200;
-        },
-      });
-
-      const client = createTRPCProxyClient<AppRouter>({
-        links: [wsLink({ client: wsClient })],
-      });
-
-      client.onMessage.subscribe('lala', {
-        onError(err) {
-          // expect this error here?
-          expect(err).toBeInstanceOf(TRPCClientError);
-          expect(err.message).toBe('failing as expected');
-        },
-      });
-
-      await sleep(100);
-      wsClient.close();
-    },
-    {
-      timeout: 3000,
-    }
-  );
+  expect(res.status).toBe(200);
+  expect(res.headers.get('Access-Control-Allow-Origin')).toBe('*');
+});
 
-  test('options still passthrough (cors)', async () => {
-    const res = await fetch(
-      `http://localhost:${testPort}/trpc/hello?input=${encodeURI('{}')}`,
-      {
-        method: 'OPTIONS',
-      }
-    );
+test('large request body handling', async () => {
+  const { client } = makeClient({});
+  expect.assertions(2);
 
-    expect(res.status).toBe(200);
-    expect(res.headers.get('Access-Control-Allow-Origin')).toBe('*');
-  });
+  try {
+    await client.test.mutate({
+      value: '0'.repeat(200000),
+    });
+  } catch (error) {
+    expect(error.name).toBe('TRPCClientError');
+    expect(error.data.code).toBe('PAYLOAD_TOO_LARGE');
+  }
 });

package/types/utils.d.ts

@@ -1,7 +1,7 @@
 import { HttpRequest, HttpResponse } from 'uWebSockets.js';
 import { TRPCError } from '@trpc/server';
 import { WrappedHTTPRequest } from './types';
-export declare function getPostBody(method: any, res: HttpResponse, maxBodySize?: number): Promise<{
+export declare function getPostBody(method: 'GET' | 'POST', res: HttpResponse, maxBodySize?: number): Promise<{
     ok: true;
     data: unknown;
     preprocessed: boolean;