lambda-live-debugger 0.0.93 → 0.0.95

package/README.md

@@ -4,7 +4,7 @@
 
 Lambda Live Debugger is an indispensable tool for debugging AWS Lambda functions from your computer, even though they are deployed in the cloud. It supports Lambdas written in JavaScript or TypeScript.
 
-This tool offers similar functionality to [SST](https://sst.dev/) and [Serverless Framework v4](https://www.serverless.com/blog/serverless-framework-v4-general-availability), with the addition of an Observability mode.
+This tool offers similar functionality to [SST](https://sst.dev/) and [Serverless Framework v4](https://www.serverless.com/blog/serverless-framework-v4-general-availability), with the addition of an Observability Mode.
 
 It supports the following frameworks:
 
@@ -202,7 +202,7 @@ Check the [open issues](https://github.com/ServerlessLife/lambda-live-debugger/i
 
 ## Authors:
 
-- [Marko (ServerlessLife)](https://github.com/ServerlessLife)
+- [Marko (ServerlessLife)](https://www.serverlesslife.com/)
 - ⭐ Your name here for big code contributions
 
 ## Contributors (alphabetical)

package/dist/configuration/getConfigFromWizard.mjs

@@ -6,6 +6,7 @@ import { ResourceDiscovery } from "../resourceDiscovery.mjs";
 import { GitIgnore } from "../gitignore.mjs";
 import { VsCode } from "../vsCode.mjs";
 import { Logger } from "../logger.mjs";
+import { Configuration } from "../configuration.mjs";
 const configFileName = path.resolve(configFileDefaultName);
 /**
  * Get configuration from wizard
@@ -18,7 +19,7 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
         {
             type: "list",
             name: "framework",
-            message: `Which framework are you using (detected ${currentFramework})?`,
+            message: `Which framework are you using (detected: ${currentFramework ?? "?"})?`,
             choices: supportedFrameworks,
             default: currentConfig?.framework ?? currentFramework,
         },
@@ -156,6 +157,9 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
         },
     ]);
     if (answersFilter.function === "Pick one") {
+        // I need to use congiration settings I accquired so far to get the list of lambdas
+        const configTemp = getConfigFromAnswers(answers);
+        Configuration.setConfig(configTemp); // not complete config
         lambdasList = await ResourceDiscovery.getLambdas(getConfigFromAnswers(answers));
         if (!lambdasList) {
             throw new Error("No Lambdas found");
@@ -231,9 +235,14 @@ export async function getConfigFromWizard({ supportedFrameworks, currentFramewor
   */
     const config = getConfigFromAnswers(answers);
     if (save) {
-        // save to file that looks like this:
-        Logger.log("Saving to config file");
-        const configContent = `
+        await saveConfiguration(config);
+    }
+    return config;
+}
+async function saveConfiguration(config) {
+    Logger.log(`Saving to config file ${configFileName}`);
+    // save to file that looks like this:
+    const configContent = `
 import { type LldConfigTs } from "lambda-live-debugger";
 
 export default {
@@ -255,15 +264,13 @@ export default {
   //},
 } satisfies LldConfigTs;
     `;
-        // remove lines that contains undefined or ""
-        const configContentCleaned = configContent
-            .trim()
-            .split("\n")
-            .filter((l) => !l.includes("undefined") && !l.includes('""'))
-            .join("\n");
-        await fs.writeFile(configFileName, configContentCleaned);
-    }
-    return config;
+    // remove lines that contains undefined or ""
+    const configContentCleaned = configContent
+        .trim()
+        .split("\n")
+        .filter((l) => !l.includes("undefined") && !l.includes('""'))
+        .join("\n");
+    await fs.writeFile(configFileName, configContentCleaned);
 }
 function getConfigFromAnswers(answers) {
     const config = {

package/dist/configuration.d.ts

@@ -19,11 +19,17 @@ declare function getLambdas(): LambdaProps[];
  * Discover Lambdas
  */
 declare function discoverLambdas(): Promise<void>;
+/**
+ * Set the configuration
+ * @param newConfig
+ */
+declare function setConfig(newConfig: LldConfig): void;
 export declare const Configuration: {
     readConfig: typeof readConfig;
     readonly config: LldConfig;
     discoverLambdas: typeof discoverLambdas;
     getLambda: typeof getLambda;
     getLambdas: typeof getLambdas;
+    setConfig: typeof setConfig;
 };
 export {};

package/dist/configuration.mjs

@@ -17,6 +17,7 @@ async function readConfig() {
     const supportedFrameworks = ResourceDiscovery.getSupportedFrameworksNames();
     const currentFramework = await ResourceDiscovery.getCurrentFrameworkName();
     const configFromCliArgs = await getConfigFromCliArgs(supportedFrameworks);
+    Logger.setVerbose(configFromCliArgs.verbose === true);
     const configFileName = configFromCliArgs.config || configFileDefaultName;
     const configFromConfigFile = (await getConfigTsFromConfigFile(configFileName))
         ?.default;
@@ -27,20 +28,20 @@ async function readConfig() {
             currentConfig: configFromConfigFile,
         });
         const debuggerId = await generateDebuggerId(!!configFromWizard.observable);
-        config = {
+        setConfig({
             ...configFromWizard,
             debuggerId,
             start: false, // don't start the debugger after the wizard
-        };
+        });
     }
     else {
         const configMerged = { ...configFromCliArgs, ...configFromConfigFile };
         const debuggerId = await generateDebuggerId(!!configMerged.observable);
-        config = {
+        setConfig({
             ...configMerged,
             debuggerId,
             start: true,
-        };
+        });
     }
 }
 /**
@@ -133,6 +134,13 @@ function saveDiscoveredLambdas(lambdasListNew) {
             .join("\n - ")}`);
     }
 }
+/**
+ * Set the configuration
+ * @param newConfig
+ */
+function setConfig(newConfig) {
+    config = newConfig;
+}
 export const Configuration = {
     readConfig,
     get config() {
@@ -144,4 +152,5 @@ export const Configuration = {
     discoverLambdas,
     getLambda,
     getLambdas,
+    setConfig,
 };

package/dist/frameworks/cdkFrameworkWorker.mjs

@@ -18,7 +18,7 @@ parentPort.on("message", async (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
+  const __dirname = path.resolve("./x"); // CDK needs this, pure magic
   eval(codeFile);
 
   if (global.lambdas.length === 0) {

package/dist/frameworks/slsFramework.mjs

@@ -21,7 +21,7 @@ export class SlsFramework {
         const serverlessFiles = [
             path.resolve("serverless.yml"),
             path.resolve("serverless.yaml"),
-            path.resolve("serverless.mjs"),
+            path.resolve("serverless.js"),
             path.resolve("serverless.ts"),
             path.resolve("serverless.json"),
         ];
@@ -52,12 +52,10 @@ export class SlsFramework {
             // lazy load modules
             resolveConfigurationPath = (await import(
             //@ts-ignore
-            "serverless/lib/cli/resolve-configuration-path." + "js" // hack for avoiding renaming to .mjs by build script
-            )).default;
+            "serverless/lib/cli/resolve-configuration-path.js")).default;
             readConfiguration = (await import(
             //@ts-ignore
-            "serverless/lib/configuration/read." + "js" // hack for avoiding renaming to .mjs by build script
-            )).default;
+            "serverless/lib/configuration/read.js")).default;
             Serverless = (await import("serverless")).default;
         }
         catch (error) {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { CdkFramework } from "./frameworks/cdkFramework.mjs";
-export { SlsFramework } from "./frameworks/slsFramework.mjs";
-export { SamFramework } from "./frameworks/samFramework.mjs";
-export { TerraformFramework } from "./frameworks/terraformFramework.mjs";
+export { CdkFramework } from "./frameworks/cdkFramework.js";
+export { SlsFramework } from "./frameworks/slsFramework.js";
+export { SamFramework } from "./frameworks/samFramework.js";
+export { TerraformFramework } from "./frameworks/terraformFramework.js";

package/dist/lambdaConnection.mjs

@@ -63,7 +63,7 @@ async function onMessageFromLambda(message) {
         else {
             // first 50 characters of the response
             const requestPretty = message.data
-                ? JSON.stringify(message.data).substring(0, 50)
+                ? JSON.stringify(message.data).substring(0, 100)
                 : "";
             Logger.log(`${message.data.functionId} request: ${requestPretty}${requestPretty.length < 50 ? "" : "..."}`);
         }
@@ -74,7 +74,7 @@ async function onMessageFromLambda(message) {
         else {
             // first 50 characters of the response
             const responsePretty = response
-                ? JSON.stringify(response).substring(0, 50)
+                ? JSON.stringify(response).substring(0, 100)
                 : "";
             Logger.log(`${message.data.functionId} response: ${responsePretty}${responsePretty.length < 50 ? "" : "..."}`);
         }

package/dist/nodeEsBuild.mjs

@@ -20,7 +20,7 @@ async function getBuild(functionId) {
         let newBuild = false;
         const func = await Configuration.getLambda(functionId);
         // if handler is a JavaScript file and not force bundle, just return the file
-        if ((func.codePath.endsWith(".mjs") ||
+        if ((func.codePath.endsWith(".js") ||
             func.codePath.endsWith(".mjs") ||
             func.codePath.endsWith(".cjs")) &&
             !func.forceBundle) {
@@ -53,8 +53,7 @@ async function getBuild(functionId) {
         if (newBuild) {
             Logger.verbose(`[Function ${functionId}] Build complete`);
         }
-        const artifactFile = Object.keys(result.metafile?.outputs).find((key) => key.endsWith("." + "js") // hack for avoiding renaming to .mjs by build script
-        );
+        const artifactFile = Object.keys(result.metafile?.outputs).find((key) => key.endsWith(".js"));
         if (!artifactFile) {
             throw new Error(`Artifact file not found for function ${functionId}`);
         }

package/dist/nodeWorker.mjs

@@ -27,7 +27,7 @@ async function runInWorker(input) {
             Logger.verbose(`[Function ${input.fuctionRequest.functionId}] [Worker ${input.fuctionRequest.workerId}] Reusing worker`);
         }
         worker.on("message", (msg) => {
-            Logger.log("Worker message", msg);
+            Logger.verbose(`[Function ${input.fuctionRequest.functionId}] [Worker ${input.fuctionRequest.workerId}] Worker message`, JSON.stringify(msg));
             if (msg?.errorType) {
                 reject(msg);
             }
@@ -36,7 +36,7 @@ async function runInWorker(input) {
             }
         });
         worker.on("error", (err) => {
-            Logger.log("Worker error", err);
+            Logger.error(`[Function ${input.fuctionRequest.functionId}] [Worker ${input.fuctionRequest.workerId}] Error`, err);
             reject(err);
         });
         worker.postMessage({

package/dist/vsCode.mjs

@@ -1,7 +1,7 @@
 import fs from "fs/promises";
 import path from "path";
 import { parse, printParseErrorCode, applyEdits, modify, } from "jsonc-parser";
-import { getModuleDirname } from "./getDirname.mjs";
+import { getModuleDirname, getProjectDirname } from "./getDirname.mjs";
 import { Logger } from "./logger.mjs";
 async function getVsCodeLaunchConfig(lldConfig) {
     const localRuntimeExecutable = "${workspaceFolder}/node_modules/.bin/lld";
@@ -40,9 +40,10 @@ async function getVsCodeLaunchConfig(lldConfig) {
             //Logger.log("Not found", localFolder);
         }
     }
-    if (!runtimeExecutableSet) {
-        const globalModule1 = path.join(moduleDirname, "..", "..", ".bin/lld");
-        const globalModule2 = path.join(moduleDirname, "..", "..", "bin/lld");
+    if (runtimeExecutableSet) {
+        const projectDirname = getProjectDirname();
+        const globalModule1 = path.join(projectDirname, "..", "..", ".bin/lld");
+        const globalModule2 = path.join(projectDirname, "..", "..", "bin/lld");
         const globalModule3 = path.join(moduleDirname, "..", "..", "..", "..", "bin/lld");
         const possibleFolders = {
             [localFolder]: "${workspaceFolder}/node_modules/.bin/lld",
@@ -104,6 +105,7 @@ async function writeConfiguration(filePath, jsonString, changes, position) {
         });
         const modifiedJsonString = applyEdits(jsonString, edits);
         // Write the modified JSON string back to the file
+        Logger.verbose(`Adding to VsCode configuration file: ${filePath}`);
         await fs.writeFile(filePath, modifiedJsonString, "utf-8");
     }
     catch (err) {
@@ -112,7 +114,7 @@ async function writeConfiguration(filePath, jsonString, changes, position) {
     }
 }
 async function getCurrentState() {
-    const filePath = path.join(path.resolve(), ".vscode/launch.json");
+    const filePath = path.join(getProjectDirname(), ".vscode/launch.json");
     let createNewFile = false;
     // does file exist
     try {
@@ -130,6 +132,7 @@ async function getCurrentState() {
             return c.name === vsCodeLaunchConfig.configurations[0].name;
         });
         if (!exists) {
+            Logger.verbose(`${filePath} exists but configuration does not exist!`);
             return {
                 state: "FILE_EXISTS_CONFIGURATION_DOES_NOT_EXIST",
                 jsonString,
@@ -138,13 +141,14 @@ async function getCurrentState() {
             };
         }
         else {
-            Logger.log("Configuration already exists!");
+            Logger.verbose(`Configuration already exists in ${filePath}`);
             return {
                 state: "FILE_EXISTS_CONFIGURATION_EXISTS",
             };
         }
     }
     else {
+        Logger.verbose(`${filePath} does not exist!`);
         return {
             state: "FILE_DOES_NOT_EXIST",
             filePath,
@@ -169,6 +173,7 @@ async function addConfiguration(lldConfig) {
     else if (state.state === "FILE_DOES_NOT_EXIST") {
         // crete folder of filePath recursive if not exists
         await fs.mkdir(path.dirname(state.filePath), { recursive: true });
+        Logger.verbose(`Creating VsCode configuration file: ${state.filePath}`);
         await fs.writeFile(state.filePath, JSON.stringify(config, null, 2), "utf-8");
     }
 }

package/fix-imports.js

@@ -17,7 +17,15 @@ async function processFiles(directory) {
       await processFiles(fullPath);
     } else if (entry.isFile() && entry.name.endsWith(".js")) {
       const data = await readFile(fullPath, "utf8");
-      const updatedData = data.replace(/\.js"/g, '.mjs"');
+      const updatedData = data
+        .split("\n")
+        .map((line) => {
+          if (line.trim().startsWith("import")) {
+            return line.replace(/\.js"/g, '.mjs"');
+          }
+          return line;
+        })
+        .join("\n");
       const { dir, name } = parse(fullPath);
       const newFullPath = join(dir, `${name}.mjs`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambda-live-debugger",
-  "version": "0.0.93",
+  "version": "0.0.95",
   "type": "module",
   "description": "Debug Lambda functions locally like it is running in the cloud",
   "repository": {
@@ -60,7 +60,6 @@
   "devDependencies": {
     "@tsconfig/node20": "^20.1.4",
     "@types/aws-iot-device-sdk": "^2.2.8",
-    "@types/commander": "^2.12.2",
     "@types/inquirer": "^9.0.7",
     "@types/node": "^20.11.16",
     "@types/serverless": "^3.12.22",