@swydo/byol 2.0.37 → 2.1.2

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 2.0.37 (2022-04-22)
+## 2.1.2 (2022-04-25)
 
 **Note:** Version bump only for package @swydo/byol
 
@@ -11,6 +11,25 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## 2.1.1 (2022-04-25)
+
+**Note:** Version bump only for package @swydo/byol
+
+
+
+
+
+# 2.1.0 (2022-04-22)
+
+
+### Features
+
+* support `--inspect` to enable attaching a debugger to child processes ([#376](https://github.com/Swydo/byol/issues/376)) ([097d139](https://github.com/Swydo/byol/commit/097d139f1690b64a3a994cd2c4fa44be7a61e49d))
+
+
+
+
+
 ## 2.0.36 (2022-04-22)
 
 **Note:** Version bump only for package @swydo/byol

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@swydo/byol",
-	"version": "2.0.37",
+	"version": "2.1.2",
 	"description": "Bring Your Own Lambda",
 	"license": "MIT",
 	"engines": {
@@ -27,5 +27,5 @@
 	"peerDependencies": {
 		"aws-xray-sdk-core": "^3.0.0"
 	},
-	"gitHead": "0fa566d99bb34aff9aa6b853e64a69fa272d82f4"
+	"gitHead": "f5ccc250d19b311bcd317943ce66a18945d88e3c"
 }

package/src/handlerWorkerPool.js

@@ -3,16 +3,16 @@ const workerpool = require('workerpool');
 
 const workerPoolMap = new Map();
 
-function getWorkerPoolKey(workingDirectory, indexPath, handlerName, requestId) {
+function getWorkerPoolKey(indexPath, handlerName, requestId, poolOptions) {
     if (requestId) {
-        return `${workingDirectory}:${indexPath}:${handlerName}:${requestId}`;
+        return `${indexPath}:${handlerName}:${requestId}:${JSON.stringify(poolOptions)}`;
     }
 
-    return `${workingDirectory}:${indexPath}:${handlerName}`;
+    return `${indexPath}:${handlerName}:${JSON.stringify(poolOptions)}`;
 }
 
-function terminateWorkerPool(workingDirectory, indexPath, handlerName, requestId) {
-    const poolKey = getWorkerPoolKey(workingDirectory, indexPath, handlerName, requestId);
+function terminateWorkerPool(indexPath, handlerName, requestId, poolOptions) {
+    const poolKey = getWorkerPoolKey(indexPath, handlerName, requestId, poolOptions);
 
     const { pool } = workerPoolMap.get(poolKey);
     const terminationPromise = pool.terminate();
@@ -26,22 +26,25 @@ function terminateWorkerPools() {
     const terminationPromises = [];
 
     workerPoolMap.forEach((pool) => {
-        const { absoluteIndexPath, handlerName, requestId } = pool;
-        terminationPromises.push(terminateWorkerPool(absoluteIndexPath, handlerName, requestId));
+        const {
+            absoluteIndexPath,
+            handlerName,
+            requestId,
+            poolOptions,
+        } = pool;
+        terminationPromises.push(terminateWorkerPool(absoluteIndexPath, handlerName, requestId, poolOptions));
     });
 
     return Promise.all(terminationPromises);
 }
 
-async function getWorkerPool(workingDirectory, indexPath, handlerName, environment = {}, requestId) {
-    const poolKey = getWorkerPoolKey(workingDirectory, indexPath, handlerName, requestId);
+async function getWorkerPool(indexPath, handlerName, environment = {}, requestId, poolOptions = {}) {
+    const poolKey = getWorkerPoolKey(indexPath, handlerName, requestId, poolOptions);
 
     if (!workerPoolMap.has(poolKey)) {
         const pool = workerpool.pool(path.join(__dirname, 'assets', 'callHandlerProcess.js'), {
             workerType: 'process',
-            forkOpts: {
-                cwd: workingDirectory,
-            },
+            ...poolOptions,
         });
 
         workerPoolMap.set(poolKey, {
@@ -50,6 +53,7 @@ async function getWorkerPool(workingDirectory, indexPath, handlerName, environme
             handlerName,
             environment,
             requestId,
+            poolOptions,
         });
     }
 
@@ -58,7 +62,7 @@ async function getWorkerPool(workingDirectory, indexPath, handlerName, environme
     if (JSON.stringify(poolEnvironment) !== JSON.stringify(environment)) {
         terminateWorkerPool(poolKey);
 
-        return getWorkerPool(workingDirectory, indexPath, handlerName, environment);
+        return getWorkerPool(indexPath, handlerName, environment, requestId, poolOptions);
     }
 
     return pool;

package/src/invokeFunction.js

@@ -41,6 +41,7 @@ function getAwsEnvironment({ profile, region }) {
 async function invokeFunction(functionName, event, {
     templatePath = path.join(process.cwd(), 'template.yml'),
     envPath = path.join(process.cwd(), 'env.json'),
+    debugPortStart,
     region,
     requestId,
     keepAlive = false,
@@ -66,6 +67,7 @@ async function invokeFunction(functionName, event, {
 
     const options = {
         indexPath,
+        debugPortStart,
         handlerName,
         environment,
         event,

package/src/invokeHandler.js

@@ -7,6 +7,7 @@ function getDebug(requestId) {
 }
 
 async function invokeHandler({
+    debugPortStart,
     indexPath,
     handlerName,
     environment,
@@ -19,7 +20,13 @@ async function invokeHandler({
     const debug = getDebug(id);
 
     const poolRequestId = keepAlive ? undefined : id;
-    const workerPool = await getWorkerPool(workingDirectory, indexPath, handlerName, environment, poolRequestId);
+    const poolOptions = {
+        debugPortStart,
+        forkOpts: {
+            cwd: workingDirectory,
+        },
+    };
+    const workerPool = await getWorkerPool(indexPath, handlerName, environment, poolRequestId, poolOptions);
 
     try {
         debug('Start');
@@ -45,7 +52,7 @@ async function invokeHandler({
         throw e;
     } finally {
         if (!keepAlive) {
-            await terminateWorkerPool(workingDirectory, indexPath, handlerName, poolRequestId);
+            await terminateWorkerPool(indexPath, handlerName, poolRequestId, poolOptions);
         }
     }
 }