fix: fix compatibility with custom mods directory

Author: xiaoqch

src/baselib/BaseLib.js

@@ -28,7 +28,8 @@ SOFTWARE.
 
     let coreModules = new Map([]);
 
-    let basePath = "plugins/";
+    let basePath = ll.pluginsRoot;
+    if(!basePath.endsWith("/")) basePath += "/";
 
     let utilPath = {
         normalize(path) {
@@ -135,9 +136,9 @@ SOFTWARE.
                 throw new Error("cannot require file out of root dir");
             }
             path = path.replace(/^\//, "");
-            let cjsSelf = "plugins/cjs.js";
+            let cjsSelf = basePath + "lib/BaseLib.js";
             if (path === cjsSelf) {
-                throw new Error("cjs.js is trying to load itself");
+                throw new Error("BaseLib.js is trying to load itself");
             }
             requestPaths.push(path);
             let content = file.readFrom(path);
@@ -173,7 +174,7 @@ SOFTWARE.
             }
             result = tryFile(`${id}.json`);
             if (result != undefined) {
-                throw new Error(`cannot require a JSON file ${id}.mjs`);
+                throw new Error(`cannot require a JSON file ${id}.json`);
             }
             result = tryFile(`${id}.mjs`);
             if (result != undefined) {
@@ -194,7 +195,7 @@ SOFTWARE.
             }
             result = tryFile(utilPath.join(id, "index.json"));
             if (result != undefined) {
-                throw new Error(`cannot require a JSON file ${id}.mjs`);
+                throw new Error(`cannot require a JSON file ${id}.json`);
             }
             result = tryFile(utilPath.join(id, "index.mjs"));
             if (result != undefined) {
@@ -229,7 +230,7 @@ SOFTWARE.
             let dirs = node_modules_paths(start);
             let result;
             for (let dir of dirs) {
-                result = loadPackagExports(utilPath.join(dir, id));
+                result = loadPackageExports(utilPath.join(dir, id));
                 if (result != undefined) {
                     return result;
                 }
@@ -271,7 +272,7 @@ SOFTWARE.
             return undefined;
         }
 
-        function loadPackagExports(id) {
+        function loadPackageExports(id) {
             //TODO
             let package = file.readFrom(utilPath.join(id, "package.json"));
             if (package == undefined) {

src/baselib/BaseLib.lua

@@ -1,7 +1,7 @@
 -- ---------------------
 -- For require
 -- ---------------------
-package.path = "plugins/lib/?.lua;" .. package.path
+package.path = ll.pluginsRoot:match("^(.-)/?$") .. "/lib/?.lua;" .. package.path
 
 
 -- ---------------------

src/legacy/main/NodeJsHelper.cpp

@@ -397,6 +397,9 @@ int executeNpmCommand(const std::string& cmd, std::string workingDir) {
     if (!nodeJsInited && !initNodeJs()) {
         return -1;
     }
+    std::string engineDir =
+        ll::string_utils::u8str2str(lse::LegacyScriptEngine::getInstance().getSelf().getModDir().u8string());
+    if (workingDir.empty()) workingDir = engineDir;
     std::vector<std::string>                      errors;
     std::unique_ptr<node::CommonEnvironmentSetup> setup = node::CommonEnvironmentSetup::Create(
         platform.get(),
@@ -430,12 +433,23 @@ int executeNpmCommand(const std::string& cmd, std::string workingDir) {
         v8::HandleScope    handle_scope(isolate);
         v8::Context::Scope context_scope(setup->context());
 
-        string executeJs = "const oldCwd = process.cwd();"
-                           "const publicRequire = require('module').createRequire(oldCwd + "
-                           "'/plugins/legacy-script-engine-nodejs/');"
-                           "require('process').chdir('"
-                         + workingDir + "');" + "publicRequire('npm-js-interface')('" + cmd + "');"
-                         + "require('process').chdir(oldCwd);";
+        std::string executeJs = fmt::format(
+            R"(
+            const engineDir = "{0}";
+            const workingDir = "{1}";
+            const command = "{2}";
+            const oldCwd = process.cwd();
+            const publicRequire = require("module").createRequire(
+            require("path").resolve(engineDir) + require("path").sep
+            );
+            process.chdir(workingDir);
+            publicRequire("npm-js-interface")(command);
+            process.chdir(oldCwd);
+            )",
+            engineDir.erase(0,2)+"/",
+            workingDir,
+            cmd
+        );
 
         try {
             node::SetProcessExitHandler(env, [&](node::Environment* env_, int exit_code) { node::Stop(env); });

src/legacy/main/NodeJsHelper.h

@@ -30,6 +30,6 @@ bool        doesPluginPackHasDependency(const std::string& dirPath);
 bool        isESModulesSystem(const std::string& dirPath);
 
 bool processConsoleNpmCmd(const std::string& cmd);
-int  executeNpmCommand(const std::string& cmd, std::string workingDir = LLSE_NPM_EXECUTE_PATH);
+int  executeNpmCommand(const std::string& cmd, std::string workingDir = "");
 
 } // namespace NodeJsHelper