Merge pull request #23 from ServerlessLife/development

feat: Support Python lambdas (local branch)

Author: Lewenhaupt

.github/workflows/build.yml

@@ -25,6 +25,13 @@ const project = new awscdk.AwsCdkConstructLibrary({
       singleQuote: true,
     },
   },
+  jestOptions: {
+    jestConfig: {
+      moduleNameMapper: {
+        ['^aws-cdk-lib/.warnings.jsii.js$']: '<rootDir>/node_modules/aws-cdk-lib/.warnings.jsii.js',
+      },
+    },
+  },
 
   // deps: [],                /* Runtime dependencies of this module. */
   // description: undefined,  /* The description is just a string that helps people understand the purpose of the package. */

.gitignore

@@ -4,7 +4,7 @@ CDK-based library for writing elegant, fast-executing integration tests on AWS s
 
 # How it works
 
-**ServerlessSpy CDK construct creates infrastructure to intercept events in Lambda, SNS, SQS, EventBridge, DynamoDB, S3... and sends it to a testing library or your local web console via API Gateway WebSocket. The testing library subscribes to events so tests can be executed fast without checking/retrying if the process has finished. The testing library is integrated with Jest but can also be used with any other testing library. The web console can be used to see and inspect events in real time.**
+**ServerlessSpy CDK construct creates infrastructure to intercept events in Lambda, SNS, SQS, EventBridge, DynamoDB, S3... and sends it to a testing library or your local web console via AWS IoT WebSockets. The testing library subscribes to events so tests can be executed fast without checking/retrying if the process has finished. The testing library is integrated with Jest but can also be used with any other testing library. The web console can be used to see and inspect events in real time.**
 
 [![Concept](./doc/concept.svg)](https://serverlessspy.com/)
 
@@ -58,9 +58,12 @@ CDK-based library for writing elegant, fast-executing integration tests on AWS s
 # What ServerlessSpy is not
  - ServerlessSpy can not be used if your infrastructure is not created with CDK.
  - The solution is meant only for the development and (automatic) testing environment. You should **EXCLUDE** ServerlessSpy CDK construct in any other environment, especially a production or a high-load environment. ServerlessSpy is not meant for those; it just induces costs and could contribute to hitting AWS quotas (Lambda concurrent executions, ...).
- - Only Node.js stack is supported. There are no plans to support Python or any other. Use of TypeScript is deeply encouraged.
+ - Node.js and Python stacks are supported. There are no plans to support any other but feel free to contribute. Use of TypeScript is deeply encouraged.
  - Web console only runs on your local computer. No cloud hosting of any kind (for now).
 
+# Troubleshooting
+When first setting up ServerlessSpy for a new account it can take a couple of minutes before AWS has fully activated AWS IoT. You can tell if it's not activated if you cannot connect using the MQTT Test Client in the AWS IoT console.
+
 # Documentation
  - [Quick Start](doc/quick_start.md)
  - [CDK Construct](doc/CDK_construct.md)
@@ -81,8 +84,11 @@ CDK-based library for writing elegant, fast-executing integration tests on AWS s
  - [Contributing Guide](doc/CONTRIBUTING.md)
  - [License](./LICENSE.md)
 
+# Co-authors
+ - [Marko (ServerlessLife)](https://github.com/ServerlessLife)
+ - [Hugo Lewenhaupt](https://github.com/Lewenhaupt)
+
 # Contributors (alphabetical)
  - [Corentin Doue](https://github.com/CorentinDoue)
- - [Hugo Lewenhaupt](https://github.com/Lewenhaupt)
  - [Ricardo](https://github.com/cino)
  - ⭐⭐⭐ place for your name ⭐⭐⭐

.projen/tasks.json

@@ -3,9 +3,13 @@ import * as fs from 'fs';
 import * as http from 'http';
 import * as path from 'path';
 import { promisify } from 'util';
+import { device } from 'aws-iot-device-sdk';
 import * as progam from 'caporal';
 import * as open from 'open';
-import { getSignedWebSocketUrl } from '../common/getWebSocketUrl';
+import { WebSocketServer } from 'ws';
+// @ts-ignore
+import { getConnection } from '../listener/iot-connection';
+import { getTopic } from '../listener/topic';
 
 const readFileAsync = promisify(fs.readFile);
 
@@ -26,7 +30,7 @@ async function run() {
     .option('--ws <ws>', 'Websocket link')
     .option(
       '--cdkoutput <cdkoutput>',
-      'CDK output file that contains Websocket link in a property ServerlessSpyWsUrl'
+      'CDK output file that contains IoT Endpoint link in a property ServerlessSpyWsUrl'
     )
     .option(
       '--cdkstack <cdkstack>',
@@ -39,6 +43,12 @@ async function run() {
       progam.INT,
       '3456'
     )
+    .option(
+      '--wsport <wsp>',
+      `A port on localhost where ServerlessSpy websocket is accessible.`,
+      progam.INT,
+      '3457'
+    )
     .action((_args, opt, _logger) => {
       options = opt;
     });
@@ -55,6 +65,56 @@ async function run() {
     stackList = Object.keys(cdkOutput);
   }
 
+  const wss = new WebSocketServer({ port: options.wsport });
+  let connection: device | undefined = undefined;
+
+  wss.on('close', async () => {
+    if (connection) connection.end(true);
+  });
+
+  wss.on('connection', async function connect(ws) {
+    console.log('Connection');
+    ws.on('message', function message(data) {
+      console.log('received: %s', data);
+    });
+
+    let wsUrl: string | undefined;
+    if (options.ws) {
+      wsUrl = options.ws;
+    } else {
+      if (cdkOutput && cdkOutput[Object.keys(cdkOutput)[0]]) {
+        wsUrl = cdkOutput[Object.keys(cdkOutput)[0]].ServerlessSpyWsUrl;
+      }
+    }
+
+    if (!wsUrl) {
+      throw new Error('Missing IoT endpoint url');
+    }
+
+    const wsUrlWithoutScope = wsUrl.split('/')[0];
+
+    connection = await getConnection(true, wsUrlWithoutScope);
+
+    const topic = getTopic('#');
+    console.log(`Subscribing to ${topic}`);
+
+    connection.on('connect', () => {
+      console.log('Connection opened');
+      if (connection) {
+        connection.subscribe(topic);
+      }
+    });
+
+    connection.on('message', (topic: string, data: Buffer) => {
+      ws.send(
+        JSON.stringify({
+          ...JSON.parse(JSON.parse(data.toString()).data),
+          topic,
+        })
+      );
+    });
+  });
+
   http
     .createServer((request, response) => {
       void (async () => {
@@ -122,32 +182,8 @@ async function run() {
 
             response.end(JSON.stringify(stackListAvailable), 'utf-8');
           } else if (request.url?.match('^/wsUrl')) {
-            let wsUrl: string | undefined;
-            if (options.ws) {
-              wsUrl = options.ws;
-            } else {
-              // options.cdkoutput
-              const urlPaths = request.url.split('/');
-              let stack = urlPaths[2];
-
-              if (stack) {
-                wsUrl = cdkOutput[stack].ServerlessSpyWsUrl;
-              } else {
-                if (cdkOutput && cdkOutput[Object.keys(cdkOutput)[0]]) {
-                  wsUrl =
-                    cdkOutput[Object.keys(cdkOutput)[0]].ServerlessSpyWsUrl;
-                }
-              }
-            }
-
-            if (!wsUrl) {
-              throw new Error('Missing websocket url');
-            }
-
-            //console.log(`WS URL: ${wsUrl}`);
-            const signedWSUrl = await getSignedWebSocketUrl(wsUrl);
             response.writeHead(200, { 'Content-Type': 'text/html' });
-            response.end(signedWSUrl, 'utf-8');
+            response.end(`ws:localhost:${options.wsport}`, 'utf-8');
           } else {
             try {
               const content = await readFileAsync(filePath);