lambda-live-debugger 0.0.102 → 0.0.104

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

@@ -22,7 +22,7 @@ parentPort.on("message", async (data) => {
   // execute code to get the data into global.lambdas
   const codeFile = await fs.readFile(data.compileOutput, "utf8");
 
-  fixCdkPaths();
+  await fixCdkPaths(workerData.awsCdkLibPath);
 
   eval(codeFile);
 
@@ -54,12 +54,11 @@ parentPort.on("message", async (data) => {
 /**
  * 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
+async function fixCdkPaths(awsCdkLibPath) {
+  // leave this lines for manual debugging
+  //const awsCdkLibPath = path.resolve("node_modules/aws-cdk-lib");
+  //const path = require("path");
 
-  // 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 = {

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,45 @@
+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);
+        try {
+            await fs.access(modulePath);
+        }
+        catch {
+            return undefined;
+        }
+        return modulePath;
+    }
+    return undefined;
+}

package/package.json

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