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

package/src/utils/messenger.ts

@@ -161,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);
   }
 

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/app.ts

@@ -31,6 +31,12 @@ 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);
   }
@@ -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/app.ts

@@ -46,6 +46,12 @@ 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);
   }
@@ -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';