lambda-live-debugger 0.0.101 → 0.0.103

package/dist/configuration.mjs

@@ -37,7 +37,13 @@ async function readConfig() {
         });
     }
     else {
-        const configMerged = { ...configFromCliArgs, ...configFromConfigFile };
+        // remove all undefined values from the configFromCliArgs
+        for (const key in configFromCliArgs) {
+            if (configFromCliArgs[key] === undefined) {
+                delete configFromCliArgs[key];
+            }
+        }
+        const configMerged = { ...configFromConfigFile, ...configFromCliArgs };
         const debuggerId = await generateDebuggerId(!!configMerged.observable);
         setConfig({
             ...configMerged,

package/dist/frameworks/cdkFramework.mjs

@@ -9,6 +9,7 @@ import { Logger } from "../logger.mjs";
 import { Worker } from "node:worker_threads";
 import { getModuleDirname, getProjectDirname } from "../getDirname.mjs";
 import { Configuration } from "../configuration.mjs";
+import { findNpmPath } from "../utils/findNpmPath.mjs";
 /**
  * Support for AWS CDK framework
  */
@@ -216,10 +217,13 @@ export class CdkFramework {
         };
         process.env.CDK_CONTEXT_JSON = JSON.stringify(CDK_CONTEXT_JSON);
         Logger.verbose(`[CDK] Context:`, JSON.stringify(CDK_CONTEXT_JSON, null, 2));
+        const awsCdkLibPath = await findNpmPath(path.join(getProjectDirname(), config.subfolder ?? "/"), "aws-cdk-lib");
+        Logger.verbose(`[CDK] aws-cdk-lib path: ${awsCdkLibPath}`);
         const lambdas = await new Promise((resolve, reject) => {
             const worker = new Worker(path.resolve(path.join(getModuleDirname(), "frameworks/cdkFrameworkWorker.mjs")), {
                 workerData: {
                     verbose: Configuration.config.verbose,
+                    awsCdkLibPath,
                 },
             });
             worker.on("message", (message) => {

package/dist/frameworks/cdkFrameworkWorker.mjs

@@ -1,9 +1,12 @@
 import { createRequire as topLevelCreateRequire } from "module";
 const require = topLevelCreateRequire(import.meta.url);
+import path from "path";
+import { fileURLToPath } from "node:url";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 import { workerData, parentPort } from "node:worker_threads";
 import fs from "fs/promises";
-import path from "path";
 
 import { Logger } from "../logger.mjs";
 
@@ -18,7 +21,9 @@ 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("./x"); // CDK needs this, pure magic
+
+  fixCdkPaths();
+
   eval(codeFile);
 
   if (!global.lambdas || global.lambdas?.length === 0) {
@@ -45,3 +50,53 @@ parentPort.on("message", async (data) => {
   );
   parentPort.postMessage(lambdas);
 });
+
+/**
+ * Some paths are not resolved correctly in the CDK code, so we need to fix them
+ */
+function fixCdkPaths() {
+  //const path = require("path"); // leave this line for manual debugging
+
+  // Get the path to the aws-cdk-lib module
+  let awsCdkLibPath = require.resolve("aws-cdk-lib");
+  awsCdkLibPath = awsCdkLibPath.replace("/index.js", "");
+  Logger.verbose(`[CDK] [Worker] aws-cdk-lib PATH ${awsCdkLibPath}`);
+
+  const pathsFix = {
+    "custom-resource-handlers/": `${awsCdkLibPath}/custom-resource-handlers/`,
+  };
+
+  // Create a proxy to intercept calls to the path module so we can fix paths
+  const pathProxy = new Proxy(path, {
+    get(target, prop) {
+      if (typeof target[prop] === "function") {
+        return function (...args) {
+          if (prop === "resolve") {
+            let resolvedPath = target[prop].apply(target, args);
+
+            for (const [key, value] of Object.entries(pathsFix)) {
+              if (resolvedPath.includes(key)) {
+                // replace the beginning of the path with the value
+                const i = resolvedPath.indexOf(key);
+                const newResolvedPath = `${value}${resolvedPath.substring(i + key.length)}`;
+                Logger.verbose(
+                  `[CDK] [Worker] Fixing path ${resolvedPath} -> ${newResolvedPath}`
+                );
+                resolvedPath = newResolvedPath;
+              }
+            }
+
+            return resolvedPath;
+          }
+          return target[prop].apply(target, args);
+        };
+      }
+      return target[prop];
+    },
+  });
+
+  // Override the path module in the require cache
+  require.cache[require.resolve("path")] = {
+    exports: pathProxy,
+  };
+}

package/dist/lldebugger.mjs

@@ -13,7 +13,6 @@ import { VsCode } from "./vsCode.mjs";
 import path from "path";
 import { getRootFolder } from "./utils/getRootFolder.mjs";
 import fs from "fs/promises";
-import { outputFolder } from "./constants.mjs";
 import { Logger } from "./logger.mjs";
 import { getModuleDirname, getProjectDirname } from "./getDirname.mjs";
 import { LambdaConnection } from "./lambdaConnection.mjs";
@@ -56,8 +55,9 @@ async function run() {
         await InfraDeploy.removeInfrastructure();
         // await GitIgnore.removeFromGitIgnore();
         // delete folder .lldebugger
-        Logger.verbose(`Removing ${outputFolder} folder...`);
-        await fs.rm(outputFolder, { recursive: true });
+        const folder = path.join(getProjectDirname(), ".lldebugger");
+        Logger.verbose(`Removing ${folder} folder...`);
+        await fs.rm(folder, { recursive: true });
         if (Configuration.config.remove === "all") {
             await InfraDeploy.deleteLayer();
         }

package/dist/utils/findNpmPath.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Function to find the path of a module in the directory and parent directories
+ * @param {*} dir
+ * @param {*} moduleName
+ */
+export declare function findNpmPath(dir: string, moduleName: string): Promise<string | undefined>;

package/dist/utils/findNpmPath.mjs

@@ -0,0 +1,39 @@
+import fs from "fs/promises";
+import path from "path";
+/**
+ * Function to find the path of a module in the directory and parent directories
+ * @param {*} dir
+ * @param {*} moduleName
+ */
+export async function findNpmPath(dir, moduleName) {
+    if (dir === "/")
+        return undefined;
+    try {
+        await fs.access(path.join(dir, "package.json"));
+        const modulePath = await checkModuleInPackageJson(dir, moduleName);
+        if (modulePath) {
+            return modulePath;
+        }
+    }
+    catch {
+        // ignore, no package.json in this directory
+    }
+    return await findNpmPath(path.resolve(path.join(dir, "..")), moduleName);
+}
+/**
+ * Function to check if a module exists in package.json and return the path
+ * @param {*} dir
+ * @param {*} moduleName
+ * @returns
+ */
+async function checkModuleInPackageJson(dir, moduleName) {
+    const packageJsonPath = path.join(dir, "package.json");
+    const packageJson = JSON.parse(await fs.readFile(packageJsonPath, "utf8"));
+    const dependencies = packageJson.dependencies || {};
+    const devDependencies = packageJson.devDependencies || {};
+    if (dependencies[moduleName] || devDependencies[moduleName]) {
+        const modulePath = path.join(dir, "node_modules", moduleName);
+        return modulePath;
+    }
+    return undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambda-live-debugger",
-  "version": "0.0.101",
+  "version": "0.0.103",
   "type": "module",
   "description": "Debug Lambda functions locally like it is running in the cloud",
   "repository": {