Доработка вотчера в лаунчсервере (closes #71)

packages/server/src/components/commands/commands/updates/DownloadClientCommand.ts

@@ -1,17 +1,17 @@
 import {
+    ClientsManager,
     CommandsManager,
     ConfigManager,
     FabricManager,
+    ForgeManager,
     LangManager,
     MirrorManager,
     MojangManager,
+    NeoForgeManager,
     ProfilesManager,
-    ClientsManager,
     QuiltManager,
-    ForgeManager,
-    NeoForgeManager,
 } from "@root/components";
-import { Watcher } from "@root/components/watcher/Watcher"
+import { Watcher } from "@root/components/watcher/Watcher";
 import { AbstractCommand, Category, LogHelper } from "@root/utils";
 import { Service } from "typedi";
 

packages/server/src/components/watcher/WatchService.ts

@@ -0,0 +1,22 @@
+import { LogHelper } from "@root/utils";
+import { FSWatcher, watch } from "chokidar";
+
+export class WatchService {
+    #watcherInstance: FSWatcher;
+    #timer: NodeJS.Timeout;
+
+    subscribe(dir: string, cwd: string, reload: (path: string) => void) {
+        this.#watcherInstance = watch(dir, { ignoreInitial: true, cwd }).on(
+            "all",
+            (event, path) => {
+                if (this.#timer) clearTimeout(this.#timer);
+                this.#timer = setTimeout(() => reload(path), 3000);
+                LogHelper.debug(event, path);
+            },
+        );
+    }
+
+    async unsubscribe() {
+        await this.#watcherInstance.close();
+    }
+}

packages/server/src/components/watcher/Watcher.ts

@@ -1,44 +1,40 @@
 import { sep } from "path";
+
+import { StorageHelper } from "@root/utils";
 import { Service } from "typedi";
-import { FSWatcher, watch } from 'chokidar';
-import { LogHelper, StorageHelper } from "@root/utils";
-import { ProfilesManager } from "../profiles/ProfilesManager";
+
 import { ClientsManager } from "../clients/ClientsManager";
+import { ProfilesManager } from "../profiles/ProfilesManager";
+import { WatchService } from "./WatchService";
 
 @Service()
 export class Watcher {
-    #prcess1:FSWatcher
-    #prcess2:FSWatcher
+    #clientsWatcher = new WatchService();
+    #profilesWatcher = new WatchService();
 
     constructor(
-        private readonly profilesManager:ProfilesManager,
-        private readonly clientsManager:ClientsManager
+        private readonly profilesManager: ProfilesManager,
+        private readonly clientsManager: ClientsManager,
     ) {
         this.subscription();
     }
 
-    async subscription() {
-
-        this.#prcess1 = watch(StorageHelper.clientsDir, {ignoreInitial: true, cwd: StorageHelper.clientsDir})
-            .on('all', (event, path) => this.reloadClient(event, path));
-
-        this.#prcess2 = watch(StorageHelper.profilesDir, {ignoreInitial: true, cwd: '.'})
-            .on('all', (event, path) => this.reloadProfile(event, path));
+    subscription() {
+        this.#clientsWatcher.subscribe(
+            StorageHelper.clientsDir,
+            StorageHelper.clientsDir,
+            (path) => {
+                const dir = path.split(sep);
+                this.clientsManager.hashClients(dir[0]);
+            },
+        );
+        this.#profilesWatcher.subscribe(StorageHelper.profilesDir, ".", () =>
+            this.profilesManager.reloadProfiles(),
+        );
     }
 
     async closeWatcher() {
-        await this.#prcess1.close()
-        await this.#prcess2.close()
-    }
-
-    private reloadClient(event:string, path:string) {
-        LogHelper.debug(event, path);
-        const dir = path.split(sep);
-        this.clientsManager.hashClients(dir[0]);
-    }
-
-    private reloadProfile(event:string, path:string) {
-        LogHelper.debug(event, path);
-        this.profilesManager.reloadProfiles();
+        await this.#clientsWatcher.unsubscribe();
+        await this.#profilesWatcher.unsubscribe();
     }
-}
+}