lambda-live-debugger 1.1.1 → 1.1.3

package/dist/frameworks/slsFramework.d.ts

@@ -21,6 +21,6 @@ export declare class SlsFramework implements IFramework {
      * @returns Lambda functions
      */
     getLambdas(config: LldConfigBase): Promise<LambdaResource[]>;
-    protected getEsBuildOptions(serverless: Serverless): EsBuildOptions | undefined;
+    protected getEsBuildOptions(serverless: Serverless, config: LldConfigBase): EsBuildOptions | undefined;
 }
 export declare const slsFramework: SlsFramework;

package/dist/frameworks/slsFramework.mjs

@@ -47,6 +47,9 @@ export class SlsFramework {
         process.argv = [];
         let resolveConfigurationPath;
         let readConfiguration;
+        let resolveVariables;
+        let resolveVariablesMeta;
+        let sources;
         let Serverless;
         try {
             // lazy load modules
@@ -56,11 +59,43 @@ export class SlsFramework {
             readConfiguration = (await import(
             //@ts-ignore
             'serverless/lib/configuration/read.js')).default;
+            resolveVariables = (await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/resolve.js')).default;
+            resolveVariablesMeta = (await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/resolve-meta.js')).default;
+            const env = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/env.js');
+            const file = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/file.js');
+            const opt = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/opt.js');
+            const self = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/self.js');
+            const strToBool = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/str-to-bool.js');
+            const sls = await import(
+            //@ts-ignores
+            'serverless/lib/configuration/variables/sources/instance-dependent/get-sls.js');
+            sources = {
+                env: env.default,
+                file: file.default,
+                opt: opt.default,
+                self: self.default,
+                strToBool: strToBool.default,
+                sls: sls.default(),
+            };
             Serverless = (await import('serverless')).default;
         }
         catch (error) {
             Logger.error('Error loading serverless modules', error);
-            Logger.log('If you are running Lambda Live Debugger from a global installation, install Serverless Framework globally as well.');
+            Logger.log('If you are running Lambda Live Debugger from a global installation, install Serverless Framework globally as well. If you are using monorepo, install Serverless Framework also in the project root folder.');
             throw new Error(`Error loading serverless modules. ${error.message}`, {
                 cause: error,
             });
@@ -83,7 +118,15 @@ export class SlsFramework {
         if (config.profile) {
             options.profile = config.profile;
         }
-        const variablesMeta = {};
+        const variablesMeta = resolveVariablesMeta(configuration);
+        await resolveVariables({
+            serviceDir,
+            configuration,
+            variablesMeta,
+            sources,
+            options,
+            fulfilledSources: new Set(),
+        });
         let serverless;
         try {
             serverless = new Serverless({
@@ -117,7 +160,7 @@ export class SlsFramework {
             });
         }
         const lambdasDiscovered = [];
-        const esBuildOptions = this.getEsBuildOptions(serverless);
+        const esBuildOptions = this.getEsBuildOptions(serverless, config);
         const lambdas = serverless.service.functions;
         Logger.verbose(`[SLS] Found Lambdas:`, JSON.stringify(lambdas, null, 2));
         for (const func in lambdas) {
@@ -165,7 +208,8 @@ export class SlsFramework {
         }
         return lambdasDiscovered;
     }
-    getEsBuildOptions(serverless) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    getEsBuildOptions(serverless, config) {
         // 1) Get from from LLD specific options in custom.lldEsBuild
         let esBuildOptions = serverless.service.custom?.lldEsBuild;
         // 2) Get from serverless-esbuild plugin
@@ -189,7 +233,7 @@ export class SlsFramework {
                 const settings = serverless.service.custom?.serverlessPluginTypescript;
                 if (settings) {
                     esBuildOptions = {
-                        tsconfig: settings.tsConfigFileLocation,
+                        tsconfig: path.resolve(settings.tsConfigFileLocation),
                     };
                 }
             }

package/dist/nodeEsBuild.mjs

@@ -102,7 +102,7 @@ async function build(input) {
         isESM = false;
     }
     let ctx = input.oldCtx;
-    Logger.verbose(`[Function ${input.functionId}] Module type: ${isESM ? 'ESM' : 'CJS'})`);
+    Logger.verbose(`[Function ${input.functionId}] Module type: ${isESM ? 'ESM' : 'CJS'}`);
     if (!ctx) {
         const optionsDefault = {
             entryPoints: [handlerCodePath],

package/dist/nodeWorker.mjs

@@ -103,13 +103,6 @@ async function stopAllWorkers() {
     for (const worker of workers.values()) {
         if (worker.used) {
             worker.toKill = true;
-            // set timout for 5 minutes and kill the worker if it is still running
-            setTimeout(() => {
-                if (worker.toKill) {
-                    worker.toKill = false;
-                    void worker.terminate();
-                }
-            }, 300000);
         }
         else {
             promises.push(worker.terminate());

package/dist/nodeWorkerRunner.mjs

@@ -65,7 +65,7 @@ process.on('unhandledRejection', (error) => {
 function handleError(error) {
   parentPort.postMessage({
     errorType: error.name ?? 'Error',
-    errorMessage: error.message,
+    errorMessage: error.message ?? error.toString(),
     trace: error.stack,
   });
 }

package/package.json

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