@mstuercke/api-utils 5.2.2 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mstuercke/api-utils",
-  "version": "5.2.2",
+  "version": "6.0.0",
   "type": "module",
   "main": "src/index.ts",
   "files": [

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

@@ -1,6 +1,6 @@
 import {PostToConnectionCommand} from '@aws-sdk/client-apigatewaymanagementapi';
 import {AnyTRPCRouter, callTRPCProcedure, inferRouterContext} from '@trpc/server';
-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';
@@ -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 === '[]')
@@ -89,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;