fix(runtime): fix relative path of cloud function imports

labring · Nov 1, 2023 · 87e0ab0 · 87e0ab0
1 parent 0db715f
commit 87e0ab0
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 48 deletions.
diff --git a/runtimes/nodejs/README.md b/runtimes/nodejs/README.md
@@ -36,7 +36,7 @@ export appid=your-app-id
 telepresence intercept $appid -n laf-runtime -p 8000:8000 -e $(pwd)/.env
 
 # after intercept command, you can use following command to check if intercept active
-telepresence list -n $appid
+telepresence list -n laf-runtime
 
 # Start local service first, required nodejs version >= 18.0.0
 npm install

diff --git a/runtimes/nodejs/package-lock.json b/runtimes/nodejs/package-lock.json
diff --git a/runtimes/nodejs/src/support/engine/function.ts b/runtimes/nodejs/src/support/engine/function.ts
@@ -103,7 +103,7 @@ export class CloudFunction {
     const wrapped = `
       const require = (module) => {
         fromModule.push(__filename)
-        return requireFunc(module, fromModule)
+        return requireFunc(module, fromModule, __filename)
       }
       ${code}; 
       const __main__ = exports.main || exports.default
@@ -123,7 +123,7 @@ export class CloudFunction {
     const wrapped = `
       const require = (module) => {
         fromModule.push(__filename)
-        return requireFunc(module, fromModule)
+        return requireFunc(module, fromModule, __filename)
       }
 
       function __next__() {

diff --git a/runtimes/nodejs/src/support/engine/module.ts b/runtimes/nodejs/src/support/engine/module.ts
@@ -1,4 +1,3 @@
-import { FunctionCache, FunctionContext } from '.'
 import Config from '../../config'
 import path from 'path'
 import { FunctionCache } from './cache'
@@ -9,7 +8,7 @@ import { buildSandbox, createScript } from './utils'
 export class FunctionModule {
   private static cache: Map<string, any> = new Map()
 
-  static require(name: string, fromModule: string[]): any {
+  static require(name: string, fromModule: string[], filename: string): any {
     if (name === '@/cloud-sdk') {
       return require('@lafjs/cloud')
     } else if (
@@ -20,7 +19,7 @@ export class FunctionModule {
       if (!name.startsWith('@/')) {
         const dirname = '/'
         const filePath = path.join(
-          path.dirname(dirname + functionContext.__function_name),
+          path.dirname(dirname + filename),
           name,
         )
         name = filePath.slice(dirname.length)
@@ -93,7 +92,7 @@ export class FunctionModule {
     return `
     const require = (name) => {
       fromModule.push(__filename)
-      return requireFunc(name, fromModule)
+      return requireFunc(name, fromModule, __filename)
     }
     const exports = {};
     ${code}