fix: remove invalid dependencies to improve the efficiency of local c…

…lient reading
vodyani · Oct 14, 2022 · 3f3063a · 3f3063a
1 parent 48f9843
commit 3f3063a
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 28 deletions.
diff --git a/src/provider/dynamic-data-source.ts b/src/provider/dynamic-data-source.ts
@@ -113,17 +113,6 @@ export class DynamicDataSourceConfigObserver<T = any> implements IConfigObserver
     private readonly config: ConfigProvider<T>,
   ) {}
 
-  @This
-  public contrast(key: string, value: any) {
-    const afterHash = toHash(value);
-    const beforeHash = this.hash.get(key);
-
-    if (afterHash !== beforeHash) {
-      this.notify(key, value);
-      this.hash.set(key, afterHash);
-    }
-  }
-
   @This
   public subscribe(key: string, subscriber: IConfigSubscriber) {
     const config = this.config.get(key);
@@ -162,7 +151,25 @@ export class DynamicDataSourceConfigObserver<T = any> implements IConfigObserver
   private circularContrast() {
     this.keys.forEach((key) => {
       const value = this.config.get(key);
-      this.contrast(key, value);
+      const allowNotify = this.contrast(key, value);
+
+      if (allowNotify) {
+        this.notify(key, value);
+      }
     });
   }
+
+  @This
+  private contrast(key: string, value: any) {
+    const afterHash = toHash(value);
+    const beforeHash = this.hash.get(key);
+
+    if (afterHash !== beforeHash) {
+      this.hash.set(key, afterHash);
+      return true;
+    }
+
+    return false;
+  }
+
 }
diff --git a/src/struct/config-client.ts b/src/struct/config-client.ts
@@ -1,26 +1,10 @@
 import { IConfigClient, IConfigClientSubscriber, IConfigLoader } from '@vodyani/core';
-import { isValidString, toHash } from '@vodyani/utils';
 
 export class LocalConfigClient implements IConfigClient {
   private subscriber: IConfigClientSubscriber;
 
-  private hash: string;
-
-  public contrast(value: any) {
-    if (isValidString(this.hash)) {
-      const afterHash = toHash(value);
-      const beforeHash = this.hash;
-
-      if (afterHash !== beforeHash) {
-        this.notify(value);
-        this.hash = afterHash;
-      }
-    }
-  }
-
   public init<T = any>(loader: IConfigLoader) {
     const result = loader.execute<T>();
-    this.hash = toHash(result);
     return result;
   }
 

diff --git a/test/struct/config-client.spec.ts b/test/struct/config-client.spec.ts
@@ -1,6 +1,8 @@
 import { resolve } from 'path';
 
 import { describe, it, expect } from '@jest/globals';
+import { IConfigLoader } from '@vodyani/core';
+import { toHash, isValidString } from '@vodyani/utils';
 
 import { JSONConfigLoader, ConfigClientSubscriber, LocalConfigClient, ConfigProvider } from '../../src';
 
@@ -20,9 +22,29 @@ describe('LocalConfigClient', () => {
 
   it('LocalConfigClient', async () => {
     class DemoConfigClient extends LocalConfigClient {
+      private hash: string;
+
+      public init<T = any>(loader: IConfigLoader) {
+        const result = loader.execute<T>();
+        this.hash = toHash(result);
+        return result;
+      }
+
       public polling(): void {
         this.contrast({ poller: 'DemoConfigClient' });
       }
+
+      public contrast(value: any) {
+        if (isValidString(this.hash)) {
+          const afterHash = toHash(value);
+          const beforeHash = this.hash;
+
+          if (afterHash !== beforeHash) {
+            this.notify(value);
+            this.hash = afterHash;
+          }
+        }
+      }
     }
 
     const client = new DemoConfigClient();

diff --git a/test/struct/config-handler.spec.ts b/test/struct/config-handler.spec.ts
@@ -1,6 +1,8 @@
 import { resolve } from 'path';
 
 import { describe, expect, it } from '@jest/globals';
+import { IConfigLoader } from '@vodyani/core';
+import { toHash, isValidString } from '@vodyani/utils';
 
 import { ConfigClientSubscriber, ConfigHandlerOptions, ConfigProvider, JSONConfigLoader, LocalConfigClient } from '../../src';
 import { ConfigArgumentHandler, ConfigClientHandler } from '../../src/struct/config-handler';
@@ -16,9 +18,29 @@ interface File {
 }
 
 class DemoConfigClient extends LocalConfigClient {
+  private hash: string;
+
+  public init<T = any>(loader: IConfigLoader) {
+    const result = loader.execute<T>();
+    this.hash = toHash(result);
+    return result;
+  }
+
   public polling(): void {
     this.contrast({ poller: 'DemoConfigClient' });
   }
+
+  public contrast(value: any) {
+    if (isValidString(this.hash)) {
+      const afterHash = toHash(value);
+      const beforeHash = this.hash;
+
+      if (afterHash !== beforeHash) {
+        this.notify(value);
+        this.hash = afterHash;
+      }
+    }
+  }
 }
 
 const options: ConfigHandlerOptions = {