Add domain and stage to environment

Author: Perlkonig

api/sockets/messageHandler.ts

@@ -8,6 +8,7 @@ import {
   ApiGatewayManagementApiClient,
   PostToConnectionCommand,
 } from "@aws-sdk/client-apigatewaymanagementapi";
+import { SQSEvent, SQSRecord } from "aws-lambda";
 
 const REGION = "us-east-1";
 const clnt = new DynamoDBClient({ region: REGION });
@@ -26,7 +27,7 @@ const unmarshallOptions = {
 const translateConfig = { marshallOptions, unmarshallOptions };
 const ddbDocClient = DynamoDBDocumentClient.from(clnt, translateConfig);
 
-export const handler = async (event: any) => {
+export const handler = async (event: SQSEvent) => {
   // SQS may batch multiple messages
   for (const record of event.Records) {
     await processRecord(record);
@@ -35,7 +36,7 @@ export const handler = async (event: any) => {
   return { statusCode: 200 };
 };
 
-async function processRecord(record: any) {
+async function processRecord(record: SQSRecord) {
   let body;
   try {
     body = JSON.parse(record.body);
@@ -75,11 +76,13 @@ async function processRecord(record: any) {
   const now = Math.floor(Date.now() / 1000);
 
   for (const item of result.Items ?? []) {
+    console.log(`Processing item: ${JSON.stringify(item)}`);
     const connectionId = item.sk.S!;
     const ttl = item.ttl?.N ? parseInt(item.ttl.N) : null;
 
     // Delete expired TTL entries
     if (ttl && ttl < now) {
+        console.log(`Deleting expired connection: ${connectionId}`);
       await deleteConnection(connectionId);
       continue;
     }

serverless.yml

@@ -86,6 +86,8 @@ provider:
     userpoolClient: ${self:custom.stageConfig.${self:provider.stage}.userpoolClient}
     SQS_URL: ${self:custom.stageConfig.${self:provider.stage}.sqsurl}
     AIAI_USERID: SkQfHAjeDxs8eeEnScuYA
+    WEBSOCKET_DOMAIN: ${cf:${self:service}-${self:provider.stage}.WebSocketApiDomainName}
+    WEBSOCKET_STAGE: ${self:provider.stage}
     TOTP_KEY: ${env:TOTP_KEY}
     VAPID_PRIVATE_KEY: ${env:VAPID_PRIVATE_KEY}
     VAPID_PUBLIC_KEY: ${env:VAPID_PUBLIC_KEY}
@@ -218,6 +220,14 @@ resources:
       Value: !Ref WsMessageQueue
       Export:
         Name: WsMessageQueueUrl-${self:provider.stage}
+    WebSocketApiDomainName:
+      Value:
+        Fn::Join:
+          - ""
+          - - Ref: WebsocketsApi
+            - ".execute-api."
+            - Ref: AWS::Region
+            - ".amazonaws.com"
     WebsocketApiUrl:
       Value:
         Fn::Join: