refactor: move splitHandlerPathAndName call to runners

src/lambda/LambdaFunction.js

@@ -13,7 +13,7 @@ import {
   DEFAULT_LAMBDA_TIMEOUT,
   supportedRuntimes,
 } from '../config/index.js'
-import { createUniqueId, splitHandlerPathAndName } from '../utils/index.js'
+import { createUniqueId } from '../utils/index.js'
 
 const { ceil } = Math
 const { entries, fromEntries } = Object
@@ -70,7 +70,6 @@ export default class LambdaFunction {
     const servicepath = resolve(servicePath, options.location || '')
 
     const { handler, name, package: functionPackage = {} } = functionDefinition
-    const [handlerPath, handlerName] = splitHandlerPathAndName(handler)
 
     const memorySize =
       functionDefinition.memorySize ||
@@ -140,8 +139,6 @@ export default class LambdaFunction {
         ? resolve(servicepath, functionPackage.artifact)
         : undefined,
       handler,
-      handlerName,
-      handlerPath: resolve(this.#codeDir, handlerPath),
       layers: functionDefinition.layers || [],
       provider,
       runtime,

src/lambda/handler-runner/HandlerRunner.js

@@ -25,7 +25,7 @@ export default class HandlerRunner {
   async #loadRunner() {
     const { useChildProcesses, useDocker, useInProcess } = this.#options
 
-    const { functionKey, handler, runtime, servicePath, timeout } =
+    const { codeDir, functionKey, handler, runtime, servicePath, timeout } =
       this.#funOptions
 
     log.debug(`Loading handler... (${handler})`)
@@ -77,6 +77,7 @@ export default class HandlerRunner {
           timeout,
           handler,
           servicePath,
+          codeDir,
         )
       }
 

src/lambda/handler-runner/child-process-runner/ChildProcessRunner.js

@@ -7,6 +7,8 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 const childProcessHelperPath = resolve(__dirname, 'childProcessHelper.js')
 
 export default class ChildProcessRunner {
+  #codeDir = null
+
   #env = null
 
   #functionKey = null
@@ -18,8 +20,9 @@ export default class ChildProcessRunner {
   #timeout = null
 
   constructor(funOptions, env) {
-    const { functionKey, handler, servicePath, timeout } = funOptions
+    const { codeDir, functionKey, handler, servicePath, timeout } = funOptions
 
+    this.#codeDir = codeDir
     this.#env = env
     this.#functionKey = functionKey
     this.#handler = handler
@@ -34,7 +37,7 @@ export default class ChildProcessRunner {
   async run(event, context) {
     const childProcess = execaNode(
       childProcessHelperPath,
-      [this.#functionKey, this.#handler, this.#servicePath],
+      [this.#functionKey, this.#handler, this.#servicePath, this.#codeDir],
       {
         env: this.#env,
         stdio: 'inherit',

src/lambda/handler-runner/child-process-runner/childProcessHelper.js

@@ -21,7 +21,7 @@ process.on('uncaughtException', (err) => {
   })
 })
 
-const [, , functionKey, handler, servicePath] = argv
+const [, , functionKey, handler, servicePath, codeDir] = argv
 
 process.on('message', async (messageData) => {
   const { context, event, timeout } = messageData
@@ -33,6 +33,7 @@ process.on('message', async (messageData) => {
     timeout,
     handler,
     servicePath,
+    codeDir,
   )
 
   const result = await inProcessRunner.run(event, context)

src/lambda/handler-runner/go-runner/GoRunner.js

@@ -4,6 +4,7 @@ import process, { chdir, cwd } from 'node:process'
 import { parse as pathParse, resolve, sep } from 'node:path'
 import { log } from '@serverless/utils/log.js'
 import { execa } from 'execa'
+import { splitHandlerPathAndName } from '../../../utils/index.js'
 
 const { parse, stringify } = JSON
 
@@ -23,7 +24,8 @@ export default class GoRunner {
   #tmpPath = null
 
   constructor(funOptions, env) {
-    const { handlerPath, codeDir } = funOptions
+    const { handler, codeDir } = funOptions
+    const [handlerPath] = splitHandlerPathAndName(handler)
 
     this.#codeDir = codeDir
     this.#env = env

src/lambda/handler-runner/in-process-runner/InProcessRunner.js

@@ -1,3 +1,4 @@
+import { join } from 'node:path'
 import { performance } from 'node:perf_hooks'
 import process from 'node:process'
 import { load } from './aws-lambda-ric/UserFunction.js'
@@ -6,6 +7,8 @@ const { floor } = Math
 const { assign } = Object
 
 export default class InProcessRunner {
+  #codeDir = null
+
   #env = null
 
   #functionKey = null
@@ -16,7 +19,8 @@ export default class InProcessRunner {
 
   #timeout = null
 
-  constructor(functionKey, env, timeout, handler, servicePath) {
+  constructor(functionKey, env, timeout, handler, servicePath, codeDir) {
+    this.#codeDir = codeDir
     this.#env = env
     this.#functionKey = functionKey
     this.#handler = handler
@@ -35,7 +39,10 @@ export default class InProcessRunner {
     // e.g. process.env.foo = 1 should be coerced to '1' (string)
     assign(process.env, this.#env)
 
-    const handler = await load(this.#servicePath, this.#handler)
+    const handler = await load(
+      this.#servicePath,
+      join(this.#codeDir, this.#handler),
+    )
 
     let callback
 

src/lambda/handler-runner/python-runner/PythonRunner.js

@@ -5,6 +5,7 @@ import process, { cwd } from 'node:process'
 import readline from 'node:readline'
 import { fileURLToPath } from 'node:url'
 import { log } from '@serverless/utils/log.js'
+import { splitHandlerPathAndName } from '../../../utils/index.js'
 
 const { parse, stringify } = JSON
 const { assign, hasOwn } = Object
@@ -16,18 +17,13 @@ export default class PythonRunner {
 
   #env = null
 
-  #handlerName = null
-
-  #handlerPath = null
-
   #runtime = null
 
   constructor(funOptions, env) {
-    const { handlerName, handlerPath, runtime } = funOptions
+    const { handler, runtime } = funOptions
+    const [handlerPath, handlerName] = splitHandlerPathAndName(handler)
 
     this.#env = env
-    this.#handlerName = handlerName
-    this.#handlerPath = handlerPath
     this.#runtime = platform() === 'win32' ? 'python.exe' : runtime
 
     if (process.env.VIRTUAL_ENV) {
@@ -47,8 +43,8 @@ export default class PythonRunner {
       [
         '-u',
         resolve(__dirname, 'invoke.py'),
-        relative(cwd(), this.#handlerPath),
-        this.#handlerName,
+        relative(cwd(), handlerPath),
+        handlerName,
       ],
       {
         env: assign(process.env, this.#env),

src/lambda/handler-runner/ruby-runner/RubyRunner.js

@@ -4,6 +4,7 @@ import { cwd } from 'node:process'
 import { fileURLToPath } from 'node:url'
 import { log } from '@serverless/utils/log.js'
 import { execa } from 'execa'
+import { splitHandlerPathAndName } from '../../../utils/index.js'
 
 const { parse, stringify } = JSON
 const { hasOwn } = Object
@@ -20,7 +21,9 @@ export default class RubyRunner {
   #handlerPath = null
 
   constructor(funOptions, env) {
-    const { handlerName, handlerPath } = funOptions
+    const [handlerPath, handlerName] = splitHandlerPathAndName(
+      funOptions.handler,
+    )
 
     this.#env = env
     this.#handlerName = handlerName

src/lambda/handler-runner/worker-thread-runner/WorkerThreadRunner.js

@@ -11,12 +11,13 @@ export default class WorkerThreadRunner {
   constructor(funOptions /* options */, env) {
     // this._options = options
 
-    const { functionKey, handler, servicePath, timeout } = funOptions
+    const { codeDir, functionKey, handler, servicePath, timeout } = funOptions
 
     this.#workerThread = new Worker(workerThreadHelperPath, {
       // don't pass process.env from the main process!
       env,
       workerData: {
+        codeDir,
         functionKey,
         handler,
         servicePath,

src/lambda/handler-runner/worker-thread-runner/workerThreadHelper.js

@@ -2,7 +2,7 @@ import { env } from 'node:process'
 import { parentPort, workerData } from 'node:worker_threads'
 import InProcessRunner from '../in-process-runner/index.js'
 
-const { functionKey, handler, servicePath, timeout } = workerData
+const { functionKey, handler, servicePath, timeout, codeDir } = workerData
 
 parentPort.on('message', async (messageData) => {
   const { context, event, port } = messageData
@@ -14,6 +14,7 @@ parentPort.on('message', async (messageData) => {
     timeout,
     handler,
     servicePath,
+    codeDir,
   )
 
   let result