Websocket support

.gitignore

@@ -104,6 +104,7 @@ fabric.properties
 # auto-generated tag files
 tags
 =======
-
-.idea/
-manual_test/.serverless
+
+.idea/
+.serverless
+.dynamodb

manual_test_websocket/README.md

@@ -26,28 +26,24 @@ To start AWS DynamoDB locally (can run only after first deploying locally): `sls
 
 ## Testing on AWS
 
-`npm --endpoint={WebSocket endpoint URL on AWS} run test`
+`npm --endpoint={WebSocket endpoint URL on AWS} --timeout={timeout in ms} run test`
 
 
-## Usage Assumption - In order to send messages back to clients
-`const newAWSApiGatewayManagementApi=(event, context)=>{`
+## Usage in order to send messages back to clients
+
+`POST http://localhost:3001/@connections/{connectionId}`
 
-`  const endpoint=event.requestContext.domainName+'/'+event.requestContext.stage;`
+Or,
 
-`  const apiVersion='2018-11-29';`
+`let endpoint=event.apiGatewayUrl;`
 
-`  let API=context.API;`
+`if (!endpoint) endpoint = event.requestContext.domainName+'/'+event.requestContext.stage;`
 
-`  if (!process.env.IS_OFFLINE) {`
+`const apiVersion='2018-11-29';`
 
-`    API = require('aws-sdk');`
+`const apiGM=new API.ApiGatewayManagementApi({ apiVersion, endpoint });`
 
-`    require('aws-sdk/clients/apigatewaymanagementapi');`
+`apiGM.postToConnection({ConnectionId, Data});`
 
-`  }`
-
-`  return new API.ApiGatewayManagementApi({ apiVersion, endpoint });`
-
-`};`
 
 

manual_test_websocket/handler.js

@@ -17,15 +17,28 @@ const errorResponse = {
   body: 'Request is not OK.'
 };
 
+// module.exports.http = async (event, context) => {
+//   return successfullResponse; 
+// };
+
 module.exports.connect = async (event, context) => {
+  // console.log('connect:');
   const listener=await ddb.get({TableName:'listeners', Key:{name:'default'}}).promise();
-  if (listener.Item) await sendToClient(JSON.stringify({action:'update', event:'connect', info:{id:event.requestContext.connectionId}}), listener.Item.id, newAWSApiGatewayManagementApi(event, context)).catch(()=>{});
+
+  if (listener.Item) {
+    const timeout=new Promise((resolve) => setTimeout(resolve,100));
+    const send=sendToClient( // sendToClient won't return on AWS when client doesn't exits so we set a timeout
+      JSON.stringify({action:'update', event:'connect', info:{id:event.requestContext.connectionId, event:{...event,  apiGatewayUrl:`${event.apiGatewayUrl}`}, context}}), 
+      listener.Item.id, 
+      newAWSApiGatewayManagementApi(event, context)).catch(()=>{});
+    await Promise.race([send, timeout]);
+  }
   return successfullResponse; 
 };
 
 module.exports.disconnect = async (event, context) => {
   const listener=await ddb.get({TableName:'listeners', Key:{name:'default'}}).promise();
-  if (listener.Item) await sendToClient(JSON.stringify({action:'update', event:'disconnect', info:{id:event.requestContext.connectionId}}), listener.Item.id, newAWSApiGatewayManagementApi(event, context)).catch(()=>{});
+  if (listener.Item) await sendToClient(JSON.stringify({action:'update', event:'disconnect', info:{id:event.requestContext.connectionId, event:{...event,  apiGatewayUrl:`${event.apiGatewayUrl}`}, context}}), listener.Item.id, newAWSApiGatewayManagementApi(event, context)).catch(()=>{});
   return successfullResponse; 
 };
 
@@ -35,10 +48,16 @@ module.exports.defaultHandler = async (event, context) => {
 };
 
 module.exports.getClientInfo = async (event, context) => {
+  // console.log('getClientInfo:');
   await sendToClient({action:'update', event:'client-info', info:{id:event.requestContext.connectionId}}, event.requestContext.connectionId, newAWSApiGatewayManagementApi(event, context)).catch(err=>console.log(err));
   return successfullResponse; 
 };
 
+module.exports.getCallInfo = async (event, context) => {
+  await sendToClient({action:'update', event:'call-info', info:{event:{...event,  apiGatewayUrl:`${event.apiGatewayUrl}`}, context}}, event.requestContext.connectionId, newAWSApiGatewayManagementApi(event, context)).catch(err=>console.log(err));
+  return successfullResponse; 
+};
+
 module.exports.makeError = async (event, context) => {
   const obj=null;
   obj.non.non=1;
@@ -81,17 +100,15 @@ module.exports.deleteListener = async (event, context) => {
 };
 
 const newAWSApiGatewayManagementApi=(event, context)=>{
-  const endpoint=event.requestContext.domainName+'/'+event.requestContext.stage;
+  let endpoint=event.apiGatewayUrl;
+
+  if (!endpoint) endpoint = event.requestContext.domainName+'/'+event.requestContext.stage;
   const apiVersion='2018-11-29';
-  let API=context.API;
-  if (!process.env.IS_OFFLINE) {
-    API = require('aws-sdk');
-    require('aws-sdk/clients/apigatewaymanagementapi'); 
-  }
-  return new API.ApiGatewayManagementApi({ apiVersion, endpoint });
+  return new AWS.ApiGatewayManagementApi({ apiVersion, endpoint });
 };
 
 const sendToClient = (data, connectionId, apigwManagementApi) => {
+  // console.log(`sendToClient:${connectionId}`);
   let sendee=data;
   if ('object'==typeof data) sendee=JSON.stringify(data);