From f48c3a999a8a639054a0f1dc4076b6f0bfced3b0 Mon Sep 17 00:00:00 2001
From: Innei <tukon479@gmail.com>
Date: Sun, 10 Apr 2022 21:39:13 +0800
Subject: [PATCH] fix: serverless module found

---
 package.json                                 |  2 +-
 src/modules/serverless/serverless.service.ts | 30 ++++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index e01f34f8..6f964266 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "prebuild": "rimraf dist",
     "build": "nest build",
     "build:webpack": "nest build --webpack --webpackPath ./configs/webpack.config.js -c ./configs/nest-cli.webpack.json",
-    "dev": "NODE_PATH=`npm root --quiet -g` npm run start",
+    "dev": "npm run start",
     "bundle": "rimraf out && npm run build && cd dist/src && npx ncc build main.js -o ../../out -m && cd ../.. && chmod +x out/index.js",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "start": "cross-env NODE_ENV=development nest start -w --path tsconfig.json",
diff --git a/src/modules/serverless/serverless.service.ts b/src/modules/serverless/serverless.service.ts
index fd7a43b3..df9c02a3 100644
--- a/src/modules/serverless/serverless.service.ts
+++ b/src/modules/serverless/serverless.service.ts
@@ -63,7 +63,7 @@ export class ServerlessService {
         }
       })
 
-      module.paths.push(NODE_REQUIRE_PATH)
+      // module.paths.push(NODE_REQUIRE_PATH)
       consola.info(module.paths)
     })
   }
@@ -274,13 +274,33 @@ export class ServerlessService {
 
     this.requireModuleIdSet.clear()
   }
+
+  private resolvePath(id: string) {
+    try {
+      return require.resolve(id)
+    } catch {
+      try {
+        const modulePath = path.resolve(NODE_REQUIRE_PATH, id)
+        const resolvePath = require.resolve(modulePath)
+
+        return resolvePath
+      } catch {
+        throw new InternalServerErrorException(`module "${id}" not found.`)
+      }
+    }
+  }
+
   private inNewContextRequire() {
     const __require = (id: string) => {
-      const module = require(id)
+      const isBuiltin = isBuiltinModule(id)
+
+      const resolvePath = this.resolvePath(id)
+      const module = require(resolvePath)
+      // TODO remove cache in-used package dependencies, because it will not exist in prod
       // eslint-disable-next-line no-empty
-      if (Object.keys(PKG.dependencies).includes(id) || isBuiltinModule(id)) {
+      if (Object.keys(PKG.dependencies).includes(id) || isBuiltin) {
       } else {
-        this.requireModuleIdSet.add(require.resolve(id))
+        this.requireModuleIdSet.add(resolvePath)
       }
       const clonedModule = cloneDeep(module)
       return typeof module === 'function'
@@ -294,7 +314,7 @@ export class ServerlessService {
     }
 
     const __requireNoCache = (id: string) => {
-      delete require.cache[require.resolve(id)]
+      delete require.cache[this.resolvePath(id)]
       const clonedModule = __require(id)
 
       return clonedModule