@mstuercke/api-utils 5.2.1 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mstuercke/api-utils",
-  "version": "5.2.1",
+  "version": "6.0.0",
   "type": "module",
   "main": "src/index.ts",
   "files": [
@@ -53,17 +53,17 @@
   },
   "peerDependencies": {
     "@aws-sdk/client-apigatewaymanagementapi": "^3.438.0",
-    "@trpc/server": "^11.0.0-rc.377",
+    "@trpc/server": "^11.0.0-rc.390",
     "@types/aws-lambda": "^8.10.138"
   },
   "devDependencies": {
     "@mstuercke/bun-utils": "6.0.2",
-    "@trpc/server": "^11.0.0-rc.377",
+    "@trpc/server": "^11.0.0-rc.390",
     "@types/aws-lambda": "^8.10.138",
     "@types/bun": "^1.1.3",
     "@types/path-to-regexp": "^1.7.0",
     "@types/react": "^18.3.3",
-    "aws-sdk-client-mock": "^4.0.0",
+    "aws-sdk-client-mock": "^4.0.1",
     "typescript": "^5.4.5",
     "zod": "^3.23.8"
   },

package/src/ws/server/trpc/awsLambdaTrpcSubscriptionRequestHandler.ts

@@ -1,11 +1,11 @@
 import {PostToConnectionCommand} from '@aws-sdk/client-apigatewaymanagementapi';
 import {AnyTRPCRouter, callTRPCProcedure, inferRouterContext} from '@trpc/server';
-import type {Observable} from '@trpc/server/observable';
-import {APIGatewayProxyEvent, APIGatewayProxyResult} from 'aws-lambda';
+import {APIGatewayProxyEvent, APIGatewayProxyResult, Context} from 'aws-lambda';
 import {getApiGatewayManagementApiClient} from '../getApiGatewayManagementApiClient';
 import {getConnection} from '../getConnection';
 import {TrpcSubscriptionRequest} from './TrpcSubscriptionRequest';
 import {TrpcSubscriptionResponse} from './TrpcSubscriptionResponse';
+import {isObservable} from './isObservable';
 
 export const awsLambdaTrpcSubscriptionRequestHandler = <Router extends AnyTRPCRouter>(opts: {
   router: Router
@@ -13,7 +13,8 @@ export const awsLambdaTrpcSubscriptionRequestHandler = <Router extends AnyTRPCRo
 }) => {
   const {router, createContext} = opts;
 
-  return async (event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult> => {
+  return async (event: APIGatewayProxyEvent, context: Context): Promise<APIGatewayProxyResult> => {
+    context.callbackWaitsForEmptyEventLoop = false;
     const connection = getConnection(event);
 
     if (!event.body || event.body === '[]')
@@ -37,26 +38,32 @@ export const awsLambdaTrpcSubscriptionRequestHandler = <Router extends AnyTRPCRo
     };
 
     try {
+      const messageQueue: TrpcSubscriptionResponse[] = [];
+
       if (request.method === 'subscription.stop') {
         await stopConnection();
       }
 
       if (request.method === 'subscription') {
-        await sendMessage({
+        messageQueue.push({
           id: request.id,
           result: {type: 'started'},
         });
 
-        const sub = (await callTRPCProcedure({
+        const procedure = (await callTRPCProcedure({
           procedures: router._def.procedures,
           path: request.params.path,
           type: 'subscription',
           ctx: await createContext?.(event) || {},
           getRawInput: async () => request.params.input,
-        })) as Observable<unknown, unknown>;
+        }));
+
+        if (!isObservable(procedure)) {
+          console.error(`observable`, procedure);
+          throw `Procedure is not an observable!`;
+        }
 
-        const messageQueue: TrpcSubscriptionResponse[] = [];
-        sub.subscribe({
+        procedure.subscribe({
           next: (data: unknown) => {
             messageQueue.push({
               id: request.id,
@@ -83,6 +90,8 @@ export const awsLambdaTrpcSubscriptionRequestHandler = <Router extends AnyTRPCRo
 
         let stopped = false;
         while (!stopped) {
+          if (messageQueue.length === 0)
+            await new Promise(resolve => setTimeout(resolve, 10));
           const message = messageQueue.shift();
           if (!message)
             continue;

package/src/ws/server/trpc/isObservable.ts

@@ -0,0 +1,8 @@
+import type {Observable} from '@trpc/server/observable';
+
+export const isObservable = (value: unknown): value is Observable<unknown, unknown> => {
+  return !!value
+      && typeof value === 'object'
+      && `subscribe` in value
+      && `pipe` in value;
+};