lambda-live-debugger 0.0.92 → 0.0.93

package/dist/frameworks/cdkFramework.d.ts

@@ -1,18 +1,7 @@
 import { LambdaResource } from "../types/resourcesDiscovery.js";
-import type { BundlingOptions } from "aws-cdk-lib/aws-lambda-nodejs";
 import { IFramework } from "./iFrameworks.js";
 import { AwsConfiguration } from "../types/awsConfiguration.js";
 import { LldConfigBase } from "../types/lldConfig.js";
-declare global {
-    var lambdas: Array<{
-        code: any;
-        node: any;
-        stackName: string;
-        codePath: string;
-        handler: string;
-        bundling: BundlingOptions;
-    }>;
-}
 /**
  * Support for AWS CDK framework
  */

package/dist/frameworks/cdkFramework.mjs

@@ -6,6 +6,9 @@ import { outputFolder } from "../constants.mjs";
 import { findPackageJson } from "../utils/findPackageJson.mjs";
 import { CloudFormation } from "../cloudFormation.mjs";
 import { Logger } from "../logger.mjs";
+import { Worker } from "node:worker_threads";
+import { getModuleDirname } from "../getDirname.mjs";
+import { Configuration } from "../configuration.mjs";
 /**
  * Support for AWS CDK framework
  */
@@ -136,8 +139,6 @@ export class CdkFramework {
      */
     async getLambdasDataFromCdkByCompilingAndRunning(cdkConfigPath, config) {
         const entryFile = await this.getCdkEntryFile(cdkConfigPath);
-        // this is global variable to store the data from the CDK code once it is executed
-        global.lambdas = [];
         // Define a plugin to prepend custom code to .ts or .tsx files
         const injectCodePlugin = {
             name: "injectCode",
@@ -215,22 +216,32 @@ export class CdkFramework {
         };
         process.env.CDK_CONTEXT_JSON = JSON.stringify(CDK_CONTEXT_JSON);
         Logger.verbose(`[CDK] context:`, JSON.stringify(CDK_CONTEXT_JSON, null, 2));
-        // execute code to get the data into global.lambdas
-        const codeFile = await fs.readFile(compileOutput, "utf8");
-        //const __dirname = path.resolve("x/"); // CDK needs this, pure magic
-        const __dirname = path.resolve("./node_modules/aws-cdk-lib/x/x"); // CDK needs this, pure magic
-        eval(codeFile);
-        if (global.lambdas.length === 0) {
-            throw new Error("No Lambda functions found in the CDK code");
-        }
-        const lambdasPrettified = global.lambdas.map((lambda) => ({
-            stackName: lambda.stackName,
-            codePath: lambda.codePath,
-            handler: lambda.handler,
-            bundling: lambda.bundling,
-        }));
-        Logger.verbose(`[CDK] Found the following Lambda functions in the CDK code:`, JSON.stringify(lambdasPrettified, null, 2));
-        const list = await Promise.all(global.lambdas.map(async (lambda) => {
+        const lambdas = await new Promise((resolve, reject) => {
+            const worker = new Worker(path.resolve(path.join(getModuleDirname(), "frameworks/cdkFrameworkWorker.mjs")), {
+                workerData: {
+                    verbose: Configuration.config.verbose,
+                },
+            });
+            worker.on("message", (message) => {
+                resolve(message);
+                worker.terminate();
+            });
+            worker.on("error", (error) => {
+                reject(new Error(`Error running CDK code in worker: ${error.message}`, {
+                    cause: error,
+                }));
+            });
+            worker.on("exit", (code) => {
+                if (code !== 0) {
+                    reject(new Error(`CDK worker stopped with exit code ${code}`));
+                }
+            });
+            worker.postMessage({
+                compileOutput,
+            });
+        });
+        Logger.verbose(`[CDK] Found the following Lambda functions in the CDK code:`, JSON.stringify(lambdas, null, 2));
+        const list = await Promise.all(lambdas.map(async (lambda) => {
             // handler slit into file and file name
             const handlerSplit = lambda.handler.split(".");
             const handler = handlerSplit.pop();
@@ -252,7 +263,7 @@ export class CdkFramework {
             const packageJsonPath = await findPackageJson(codePath);
             Logger.verbose(`[CDK] package.json path: ${packageJsonPath}`);
             return {
-                cdkPath: lambda.node.defaultChild.node.path,
+                cdkPath: lambda.cdkPath,
                 stackName: lambda.stackName,
                 packageJsonPath,
                 codePath,

package/dist/frameworks/cdkFrameworkWorker.mjs

@@ -0,0 +1,61 @@
+import { createRequire as topLevelCreateRequire } from "module";
+const require = topLevelCreateRequire(import.meta.url);
+
+import { workerData, parentPort } from "node:worker_threads";
+import fs from "fs/promises";
+import path from "path";
+
+import { Logger } from "../logger.mjs";
+
+Logger.setVerbose(workerData.verbose);
+Logger.verbose(`[CDK] [Worker] Started`);
+
+parentPort.on("message", async (data) => {
+  // this is global variable to store the data from the CDK code once it is executed
+  global.lambdas = [];
+
+  Logger.verbose(`[Worker ${workerData.workerId}] Received message`, data);
+
+  // execute code to get the data into global.lambdas
+  const codeFile = await fs.readFile(data.compileOutput, "utf8");
+  const __dirname = path.resolve("./node_modules/aws-cdk-lib/x/x"); // CDK needs this, pure magic
+  eval(codeFile);
+
+  if (global.lambdas.length === 0) {
+    throw new Error("No Lambda functions found in the CDK code");
+  }
+
+  const lambdas = global.lambdas.map((lambda) => ({
+    handler: lambda.handler,
+    stackName: lambda.stackName,
+    codePath: lambda.codePath,
+    code: {
+      path: lambda.code?.path,
+    },
+    cdkPath: lambda.node.defaultChild.node.path,
+    bundling: lambda.bundling,
+  }));
+
+  try {
+    Logger.verbose(
+      `[CDK] [Worker] Sending found lambdas`,
+      JSON.stringify(lambdas, null, 2)
+    );
+    parentPort.postMessage(lambdas);
+  } catch (error) {
+    handleError(error);
+  }
+});
+
+process.on("unhandledRejection", (error) => {
+  Logger.error(`[CDK] [Worker] Unhandled Rejection`, error);
+  handleError(error);
+});
+
+function handleError(error) {
+  parentPort.postMessage({
+    errorType: error.name ?? "Error",
+    errorMessage: error.message,
+    trace: error.stack,
+  });
+}

package/dist/ioTService.mjs

@@ -1,6 +1,7 @@
 import * as iot from "aws-iot-device-sdk";
 import { splitMessageToChunks } from "./utils/splitIoTMessage.mjs";
 import { IoTClient, DescribeEndpointCommand } from "@aws-sdk/client-iot";
+import { Logger } from "./logger.mjs";
 let device;
 const chunks = new Map();
 /**
@@ -49,20 +50,20 @@ async function connect(props) {
     });
     if (props?.topic) {
         device.subscribe(props.topic, { qos: 1 });
-        console.debug("Subscribed to topic ", props.topic);
+        Logger.verbose("[IoT] Subscribed to topic ", props.topic);
     }
     device.on("connect", () => {
-        console.debug("IoT connected");
+        Logger.verbose("[IoT] Connected");
         connectedPromiseResolve();
     });
     device.on("error", (err) => {
-        console.debug("IoT error", err);
+        Logger.error("[IoT] Error", err);
     });
     device.on("close", () => {
-        console.debug("IoT closed");
+        Logger.verbose("[IoT] Closed");
     });
     device.on("reconnect", () => {
-        console.debug("IoT reconnecting...");
+        Logger.verbose("[IoT] Reconnecting...");
     });
     if (props?.onMessage) {
         const messageReceived = (topic, buffer) => {
@@ -88,6 +89,7 @@ async function connect(props) {
         };
         device.on("message", messageReceived);
     }
+    await connectedPromise;
     return {
         publish: async (payload, topic) => {
             await connectedPromise;

package/dist/lldebugger.mjs

@@ -71,7 +71,7 @@ async function run() {
     // get the uppermost folder of all lambdas or the project root to watch for changes
     const rootFolderForWarchingChanges = getRootFolder(folders);
     FileWatcher.watchForFileChanges(rootFolderForWarchingChanges);
-    LambdaConnection.connect();
+    await LambdaConnection.connect();
     Logger.log("Debugger started!");
 }
 run().catch(Logger.error);

package/dist/nodeWorkerRunner.mjs

@@ -2,7 +2,7 @@ import { createRequire as topLevelCreateRequire } from "module";
 const require = topLevelCreateRequire(import.meta.url);
 
 import { workerData, parentPort } from "node:worker_threads";
-import { Logger } from "../dist/logger.mjs";
+import { Logger } from "./logger.mjs";
 
 Logger.setVerbose(workerData.verbose);
 Logger.verbose(

package/package.json

@@ -1,7 +1,37 @@
 {
   "name": "lambda-live-debugger",
-  "version": "0.0.92",
+  "version": "0.0.93",
   "type": "module",
+  "description": "Debug Lambda functions locally like it is running in the cloud",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:ServerlessLife/lambda-live-debugger.git"
+  },
+  "license": "MPL-2.0",
+  "author": {
+    "name": "Marko (ServerlessLife.com)",
+    "email": "marko@serverlesslife.com",
+    "organization": false
+  },
+  "keywords": [
+    "aws",
+    "lambda",
+    "debugger",
+    "serverless",
+    "aws-lambda",
+    "javascript",
+    "typescript",
+    "dev-tools",
+    "lambda-debugger",
+    "aws-cdk",
+    "serverless-framework",
+    "sls",
+    "aws-sam",
+    "sam",
+    "terraform",
+    "local-debugging",
+    "cloud-development"
+  ],
   "bin": {
     "lld": "dist/lldebugger.mjs"
   },
@@ -9,7 +39,7 @@
   "scripts": {
     "typecheck": "tsc --noEmit -p tsconfig.typecheck.json && npx tsc --noEmit -p src/extension/tsconfig.json",
     "add-bang": "sed -i '1s|^|#!/usr/bin/env node\\n|' ./dist/lldebugger.mjs",
-    "build": "tsc -p tsconfig.build.json && cp src/nodeWorkerRunner.mjs dist && node fix-imports.js && npm run add-bang && npm run bundle-extension",
+    "build": "tsc -p tsconfig.build.json && cp src/nodeWorkerRunner.mjs dist && cp src/frameworks/cdkFrameworkWorker.mjs dist/frameworks && node fix-imports.js && npm run add-bang && npm run bundle-extension",
     "bundle-extension": "cd src/extension && npm run build && cd ../../",
     "deploy-github-role": "aws cloudformation deploy --stack-name lld-deploy-role --template-file cloudformation/gitHubDeployRole.yaml --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM --profile lldebugger",
     "deploy-tests": "npm run deploy --workspaces",