@mstuercke/api-utils 6.0.1 → 6.0.3

package/package.json

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

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

@@ -1,4 +1,4 @@
-import {GoneException, PostToConnectionCommand} from '@aws-sdk/client-apigatewaymanagementapi'
+import {GetConnectionCommand, GoneException, PostToConnectionCommand} from '@aws-sdk/client-apigatewaymanagementapi'
 import {type AnyTRPCRouter, callTRPCProcedure, type inferRouterContext} from '@trpc/server'
 import type {APIGatewayProxyEvent, APIGatewayProxyResult, Context} from 'aws-lambda'
 import {getApiGatewayManagementApiClient} from '../getApiGatewayManagementApiClient'
@@ -29,6 +29,12 @@ export const awsLambdaTrpcSubscriptionRequestHandler = <Router extends AnyTRPCRo
         }),
       )
     }
+    const isConnected = async (): Promise<boolean> => {
+      return getApiGatewayManagementApiClient(connection.endpoint)
+        .send(new GetConnectionCommand({ConnectionId: connection.connectionId}))
+        .then(() => true)
+        .catch(() => false)
+    }
     const stopConnection = async (): Promise<void> => {
       await sendMessage({
         id: request.id,
@@ -87,6 +93,8 @@ export const awsLambdaTrpcSubscriptionRequestHandler = <Router extends AnyTRPCRo
           },
         })
 
+        const pingIntervalMs = 5_000
+        let lastPing = Date.now()
         let stopped = false
         while (!stopped) {
           if (messageQueue.length === 0) await new Promise((resolve) => setTimeout(resolve, 10))
@@ -96,11 +104,20 @@ export const awsLambdaTrpcSubscriptionRequestHandler = <Router extends AnyTRPCRo
           await sendMessage(message)
 
           stopped = message.result.type === 'stopped'
+
+          if (Date.now() > lastPing + pingIntervalMs) {
+            const connected = await isConnected()
+            if (!connected) {
+              console.info('Ping: Connection closed by client')
+              stopped = true
+            }
+            lastPing = Date.now()
+          }
         }
       }
     } catch (err) {
       if (err instanceof GoneException) {
-        console.info('Connection closed by client')
+        console.info('Error: Connection closed by client', err.message)
       } else {
         console.error(err)
         await stopConnection()