refactor: in-process constructor

dherault · Aug 11, 2022 · 12ab4c9 · 12ab4c9
1 parent 77f71cc
commit 12ab4c9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/src/lambda/handler-runner/HandlerRunner.js b/src/lambda/handler-runner/HandlerRunner.js
@@ -72,12 +72,14 @@ export default class HandlerRunner {
         )
 
         return new InProcessRunner(
-          functionKey,
+          {
+            codeDir,
+            functionKey,
+            handler,
+            servicePath,
+            timeout,
+          },
           this.#env,
-          timeout,
-          handler,
-          servicePath,
-          codeDir,
         )
       }
 

diff --git a/src/lambda/handler-runner/child-process-runner/childProcessHelper.js b/src/lambda/handler-runner/child-process-runner/childProcessHelper.js
@@ -28,12 +28,14 @@ process.on('message', async (messageData) => {
 
   // TODO we could probably cache this in the module scope?
   const inProcessRunner = new InProcessRunner(
-    functionKey,
+    {
+      codeDir,
+      functionKey,
+      handler,
+      servicePath,
+      timeout,
+    },
     process.env,
-    timeout,
-    handler,
-    servicePath,
-    codeDir,
   )
 
   const result = await inProcessRunner.run(event, context)

diff --git a/src/lambda/handler-runner/in-process-runner/InProcessRunner.js b/src/lambda/handler-runner/in-process-runner/InProcessRunner.js
@@ -19,7 +19,9 @@ export default class InProcessRunner {
 
   #timeout = null
 
-  constructor(functionKey, env, timeout, handler, servicePath, codeDir) {
+  constructor(funOptions, env) {
+    const { codeDir, functionKey, handler, servicePath, timeout } = funOptions
+
     this.#codeDir = codeDir
     this.#env = env
     this.#functionKey = functionKey

diff --git a/src/lambda/handler-runner/worker-thread-runner/workerThreadHelper.js b/src/lambda/handler-runner/worker-thread-runner/workerThreadHelper.js
@@ -9,12 +9,14 @@ parentPort.on('message', async (messageData) => {
 
   // TODO we could probably cache this in the module scope?
   const inProcessRunner = new InProcessRunner(
-    functionKey,
+    {
+      codeDir,
+      functionKey,
+      handler,
+      servicePath,
+      timeout,
+    },
     env,
-    timeout,
-    handler,
-    servicePath,
-    codeDir,
   )
 
   let result