@eggjs/cluster 3.0.0-beta.1 → 3.0.0-beta.3

package/src/utils/messenger.ts

@@ -12,9 +12,12 @@ export interface MessageBody {
   data?: unknown;
   to?: MessageCharacter;
   from?: MessageCharacter;
+  /**
+   * @deprecated Keep compatible, please use receiverWorkerId instead
+   */
   receiverPid?: string;
-  // receiverWorkerId?: number;
-  senderWorkerId?: number;
+  receiverWorkerId?: string;
+  senderWorkerId?: string;
 }
 
 /**
@@ -93,11 +96,12 @@ export class Messenger {
     }
 
     // https://github.com/eggjs/egg/blob/b6861f1c7548f05a281386050dfeaeb30f236558/lib/core/messenger/ipc.js#L56
-    // recognize receiverPid is to who
-    if (data.receiverPid) {
-      if (data.receiverPid === String(process.pid)) {
+    // recognize receiverWorkerId is to who
+    const receiverWorkerId = data.receiverWorkerId ?? data.receiverPid;
+    if (receiverWorkerId) {
+      if (receiverWorkerId === String(process.pid)) {
         data.to = 'master';
-      } else if (data.receiverPid === String(this.#workerManager.getAgent()!.workerId)) {
+      } else if (receiverWorkerId === String(this.#workerManager.getAgent()!.workerId)) {
         data.to = 'agent';
       } else {
         data.to = 'app';
@@ -157,6 +161,7 @@ export class Messenger {
    * @param {Object} data message body
    */
   sendToMaster(data: MessageBody) {
+    // e.g: master.on('app-start', data => {})
     this.#master.emit(data.action, data.data);
   }
 
@@ -180,8 +185,9 @@ export class Messenger {
       if (worker.state === 'disconnected') {
         continue;
       }
-      // check receiverPid
-      if (data.receiverPid && data.receiverPid !== String(worker.workerId)) {
+      // check receiverWorkerId
+      const receiverWorkerId = data.receiverWorkerId ?? data.receiverPid;
+      if (receiverWorkerId && receiverWorkerId !== String(worker.workerId)) {
         continue;
       }
       worker.send(data);

package/src/utils/mode/base/app.ts

@@ -52,6 +52,12 @@ export abstract class BaseAppWorker<T = ThreadWorker | ClusterProcessWorker> {
     throw new Error('BaseAppWorker should implement clean.');
   }
 
+  // static methods use on src/app_worker.ts
+
+  static get workerId(): number {
+    throw new Error('BaseAppWorker should implement workerId.');
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static on(..._args: any[]) {
     throw new Error('BaseAppWorker should implement on.');

package/src/utils/mode/impl/process/agent.ts

@@ -16,7 +16,7 @@ export class AgentProcessWorker extends BaseAgentWorker<ChildProcess> {
   }
 
   static send(message: MessageBody) {
-    message.senderWorkerId = process.pid;
+    message.senderWorkerId = String(process.pid);
     process.send!(message);
   }
 

package/src/utils/mode/impl/process/app.ts

@@ -31,12 +31,18 @@ export class AppProcessWorker extends BaseAppWorker<ClusterProcessWorker> {
     this.instance.removeAllListeners();
   }
 
+  // static methods use on src/app_worker.ts
+
+  static get workerId() {
+    return process.pid;
+  }
+
   static on(event: string, listener: (...args: any[]) => void) {
     process.on(event, listener);
   }
 
   static send(message: MessageBody) {
-    message.senderWorkerId = process.pid;
+    message.senderWorkerId = String(process.pid);
     process.send!(message);
   }
 
@@ -121,21 +127,6 @@ export class AppProcessUtils extends BaseAppUtils {
         from: 'app',
       });
     });
-    cluster.on('listening', (worker, address) => {
-      const appWorker = new AppProcessWorker(worker);
-      appWorker.state = 'listening';
-      this.log('[master] app_worker#%s:%s listening at %j', appWorker.id, appWorker.workerId, address);
-      this.messenger.send({
-        action: 'app-start',
-        data: {
-          workerId: appWorker.workerId,
-          address,
-        },
-        to: 'master',
-        from: 'app',
-      });
-    });
-
     return this;
   }
 

package/src/utils/mode/impl/worker_threads/agent.ts

@@ -14,7 +14,7 @@ export class AgentThreadWorker extends BaseAgentWorker<Worker> {
   }
 
   static send(message: MessageBody) {
-    message.senderWorkerId = workerThreads.threadId;
+    message.senderWorkerId = String(workerThreads.threadId);
     workerThreads.parentPort!.postMessage(message);
   }
 

package/src/utils/mode/impl/worker_threads/app.ts

@@ -46,12 +46,18 @@ export class AppThreadWorker extends BaseAppWorker<ThreadWorker> {
     this.instance.removeAllListeners();
   }
 
+  // static methods use on src/app_worker.ts
+
+  static get workerId() {
+    return threadId;
+  }
+
   static on(event: string, listener: (...args: any[]) => void) {
     parentPort!.on(event, listener);
   }
 
   static send(message: MessageBody) {
-    message.senderWorkerId = threadId;
+    message.senderWorkerId = String(threadId);
     parentPort!.postMessage(message);
   }
 
@@ -109,29 +115,6 @@ export class AppThreadUtils extends BaseAppUtils {
       });
     }
 
-    // handle worker listening
-    worker.on('message', ({ action, data: address }) => {
-      if (action !== 'listening') {
-        return;
-      }
-
-      if (!address) {
-        return;
-      }
-
-      appWorker.state = 'listening';
-      this.messenger.send({
-        action: 'app-start',
-        data: {
-          workerId: appWorker.workerId,
-          address,
-        },
-        to: 'master',
-        from: 'app',
-      });
-
-    });
-
     // handle worker exit
     worker.on('exit', async code => {
       appWorker.state = 'dead';