fix(commons): wait to register hosts listener

ulixee · Feb 25, 2023 · 02fcddb · 02fcddb
1 parent cbd982b
commit 02fcddb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/commons/config/hosts.ts b/commons/config/hosts.ts
@@ -21,14 +21,17 @@ export default class UlixeeHostsConfig extends TypedEventEmitter<{ change: void
       Fs.mkdirSync(this.configPath, { recursive: true });
     }
 
-    // note supported on linux!
-    if (process.platform === 'win32' || process.platform === 'darwin') {
-      this.#watchHandle = Fs.watch(
-        this.configPath,
-        { recursive: true, persistent: false },
-        this.reload.bind(this, true),
-      );
-    }
+    // not supported on linux!
+    this.onEventListenerAdded = event => {
+      if (event !== 'change') return;
+      if (process.platform === 'win32' || process.platform === 'darwin') {
+        this.#watchHandle = Fs.watch(
+          this.configPath,
+          { recursive: true, persistent: false },
+          this.reload.bind(this, true),
+        );
+      }
+    };
     this.reload();
   }
 

diff --git a/commons/lib/TypedEventEmitter.ts b/commons/lib/TypedEventEmitter.ts
@@ -9,6 +9,8 @@ export default class TypedEventEmitter<T> extends EventEmitter implements ITyped
   public storeEventsWithoutListeners = false;
   public EventTypes: T;
 
+  public onEventListenerAdded?: <K extends keyof T & (string | symbol)>(event: K) => void;
+
   #logger?: IBoundLog;
 
   private pendingIdCounter = 0;
@@ -103,6 +105,7 @@ export default class TypedEventEmitter<T> extends EventEmitter implements ITyped
     includeUnhandledEvents = false,
   ): this {
     super.on(eventType, listenerFn);
+    this.onListener?.(eventType);
     return this.replayOrClearMissedEvents(includeUnhandledEvents, eventType);
   }
 
@@ -119,6 +122,7 @@ export default class TypedEventEmitter<T> extends EventEmitter implements ITyped
     includeUnhandledEvents = false,
   ): this {
     super.once(eventType, listenerFn);
+    this.onListener?.(eventType);
     return this.replayOrClearMissedEvents(includeUnhandledEvents, eventType);
   }