fix: require support paths

Author: fengmk2

package.json

@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/eggjs/cluster#readme",
   "dependencies": {
-    "@eggjs/utils": "^4.1.6",
+    "@eggjs/utils": "^4.2.1",
     "@fengmk2/ps-tree": "^2.0.1",
     "cfork": "^2.0.0",
     "cluster-reload": "^2.0.0",

src/agent_worker.ts

@@ -18,14 +18,17 @@ async function main() {
   // $ node agent_worker.js options
   const options = JSON.parse(process.argv[2]) as {
     framework: string;
+    baseDir: string;
     require?: string[];
     startMode?: 'process' | 'worker_threads';
   };
   if (options.require) {
     // inject
-    options.require.forEach(mod => {
-      require(mod);
-    });
+    for (const mod of options.require) {
+      await importModule(mod, {
+        paths: [ options.baseDir ],
+      });
+    }
   }
 
   let AgentWorker: typeof BaseAgentWorker;
@@ -36,7 +39,9 @@ async function main() {
   }
 
   const consoleLogger = new ConsoleLogger({ level: process.env.EGG_AGENT_WORKER_LOGGER_LEVEL });
-  const { Agent } = await importModule(options.framework);
+  const { Agent } = await importModule(options.framework, {
+    paths: [ options.baseDir ],
+  });
   debug('new Agent with options %j', options);
   let agent: any;
   try {

src/app_worker.ts

@@ -15,6 +15,7 @@ async function main() {
   // $ node app_worker.js options-json-string
   const options = JSON.parse(process.argv[2]) as {
     framework: string;
+    baseDir: string;
     require?: string[];
     startMode?: 'process' | 'worker_threads';
     port: number;
@@ -26,7 +27,9 @@ async function main() {
   if (options.require) {
     // inject
     for (const mod of options.require) {
-      await importModule(mod);
+      await importModule(mod, {
+        paths: [ options.baseDir ],
+      });
     }
   }
 
@@ -40,7 +43,9 @@ async function main() {
   const consoleLogger = new ConsoleLogger({
     level: process.env.EGG_APP_WORKER_LOGGER_LEVEL,
   });
-  const { Application } = await importModule(options.framework);
+  const { Application } = await importModule(options.framework, {
+    paths: [ options.baseDir ],
+  });
   debug('[app_worker:%s] new Application with options %j', process.pid, options);
   let app: any;
   try {

src/utils/options.ts

@@ -106,7 +106,9 @@ export async function parseOptions(options?: ClusterOptions) {
     framework: options.framework ?? options.customEgg,
   });
 
-  const egg = await importModule(options.framework);
+  const egg = await importModule(options.framework, {
+    paths: [ options.baseDir! ],
+  });
   assert(egg.Application, `should define Application in ${options.framework}`);
   assert(egg.Agent, `should define Agent in ${options.framework}`);
 

test/agent_worker.test.ts

@@ -15,9 +15,10 @@ describe('test/agent_worker.test.ts', () => {
 
     it('support config agent debug port', () => {
       mm(process.env, 'EGG_AGENT_DEBUG_PORT', '15800');
-      app = cluster('apps/agent-debug-port', { isDebug: true } as any);
+      app = cluster('apps/agent-debug-port', { isDebug: true, require: [ './inject1.js' ] } as any);
       return app
         // .debug()
+        .expect('stdout', /@@inject1\.js run/)
         .expect('stdout', /=15800/)
         .end();
     });

test/fixtures/apps/agent-debug-port/agent.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = () => {
   console.log('agent argv: ', process.execArgv);
 };

test/fixtures/apps/agent-debug-port/inject1.js

@@ -0,0 +1 @@
+console.log('@@inject1.js run');