fix: remote config client subscribe argument

package.json

@@ -63,7 +63,7 @@
   },
   "dependencies": {
     "@vodyani/class-decorator": "^8.2.2",
-    "@vodyani/core": "^8.6.9",
+    "@vodyani/core": "^8.7.1",
     "@vodyani/utils": "^8.5.2",
     "chokidar": "3.5.3",
     "lodash": "4.17.21",

src/common/interface/manager.ts

@@ -67,10 +67,6 @@ export interface RemoteConfigOptions {
    * The boolean of enable remote config center cycle sync.
    */
   enableCycleSync?: boolean;
-  /**
-   * The key information in the remote config center for subscription methods.
-   */
-  subscribeInfo?: RemoteConfigSubscribeInfo[];
   /**
    * Periodic synchronization interval. The default value is `1000` milliseconds.
    */

src/provider/config.ts

@@ -1,7 +1,7 @@
+import { cloneDeep } from 'lodash';
 import { Injectable } from '@vodyani/core';
-import { cloneDeep, isObject } from 'lodash';
 import { ArgumentValidator, CustomValidated, Required, This } from '@vodyani/class-decorator';
-import { toDeepMerge, toDeepMatch, toDeepRestore, isValidObject, isKeyof } from '@vodyani/utils';
+import { toDeepMerge, toDeepMatch, toDeepRestore, isValidObject, isKeyof, isValidDict } from '@vodyani/utils';
 
 @Injectable()
 export class ConfigProvider<T = any> {
@@ -17,9 +17,9 @@ export class ConfigProvider<T = any> {
    */
   @This
   @ArgumentValidator()
-  public match(@Required() key: string) {
+  public match<V = any>(@Required() key: string): Partial<V> {
     const result = toDeepMatch(this.store, key);
-    return isObject(result) ? cloneDeep(result) as any : result;
+    return isValidDict(result) ? cloneDeep(result) : result;
   }
   /**
    * Get the configuration for the given key.
@@ -33,17 +33,17 @@ export class ConfigProvider<T = any> {
   public get<K extends keyof Partial<T>>(@Required() key: K) {
     if (isKeyof(this.store, key as string)) {
       const result = this.store[key];
-      return isObject(result) ? cloneDeep(result) : result;
+      return isValidDict(result) ? cloneDeep(result) : result;
     }
   }
   /**
    * set the configuration for the given key.
    */
   @This
   @ArgumentValidator()
-  public set(
+  public set<V = any>(
     @Required() key: string,
-    @Required() value: any,
+    @Required() value: Partial<V>,
   ) {
     const result = toDeepRestore(value, key);
     this.merge(result);
@@ -53,10 +53,9 @@ export class ConfigProvider<T = any> {
    */
   @This
   @ArgumentValidator()
-  public merge<T = any>(
-    @CustomValidated(isValidObject, 'value must be object !') value: Partial<T>,
+  public merge<V = any>(
+    @CustomValidated(isValidObject, 'value must be object !') value: Partial<V>,
   ) {
     this.store = toDeepMerge(this.store, cloneDeep(value));
   }
 }
-

src/provider/dynamic-data-source.ts

@@ -11,7 +11,7 @@ import { ConfigProvider } from './config';
 
 @Injectable()
 export class DynamicDataSourceProvider<T = any, O = any> {
-  private readonly store: Map<string, IClientProxy<T>> = new Map();
+  private readonly store: Map<string, IClientProxy<T, Partial<O>>> = new Map();
 
   constructor(
     @AsyncInject(ArkManager)
@@ -34,18 +34,18 @@ export class DynamicDataSourceProvider<T = any, O = any> {
   @This
   @ArgumentValidator()
   public deploy(
-    @Required() callback: CreateClient<T, O>,
+    @Required() create: CreateClient<T, Partial<O>>,
     @Required() configKey: string,
       ...args: any[]
   ) {
     const currentArgs = toConvert(args, { default: [] });
     const options = this.config.match(configKey);
-    const proxy = new ClientProxy<T, O>();
+    const proxy = new ClientProxy<T, Partial<O>>();
 
-    proxy.deploy(callback, options, ...currentArgs);
+    proxy.deploy(create, options, ...currentArgs);
 
     this.store.set(configKey, proxy);
-    this.monitor.watchConfig(proxy.redeploy, configKey);
+    this.monitor.setCheck(proxy.redeploy, configKey);
   }
 
   @This
@@ -59,7 +59,7 @@ export class DynamicDataSourceProvider<T = any, O = any> {
 
 @Injectable()
 export class AsyncDynamicDataSourceProvider<T = any, O = any> {
-  private readonly store = new Map<string, IAsyncClientProxy<T, O>>();
+  private readonly store = new Map<string, IAsyncClientProxy<T, Partial<O>>>();
 
   constructor(
     @AsyncInject(ArkManager)
@@ -80,22 +80,22 @@ export class AsyncDynamicDataSourceProvider<T = any, O = any> {
   @This
   @ArgumentValidator()
   public async deploy(
-    @Required() callback: CreateAsyncClient<T, O>,
+    @Required() create: CreateAsyncClient<T, Partial<O>>,
     @Required() configKey: string,
       ...args: any[]
   ) {
     const currentArgs = toConvert(args, { default: [] });
     const option = this.config.match(configKey);
-    const proxy = new AsyncClientProxy<T, O>();
+    const proxy = new AsyncClientProxy<T, Partial<O>>();
 
-    await proxy.deploy(callback, option, ...currentArgs);
+    await proxy.deploy(create, option, ...currentArgs);
 
     this.store.set(configKey, proxy);
-    this.monitor.watchConfig(proxy.redeploy, configKey);
+    this.monitor.setCheck(proxy.redeploy, configKey);
   }
 
   @This
-  public async clear(key: string) {
+  public async close(key: string) {
     if (this.store.has(key)) {
       await this.store.get(key).close();
       this.store.delete(key);

src/provider/handler.ts

@@ -2,7 +2,7 @@ import { readFileSync } from 'fs';
 
 import { Injectable } from '@vodyani/core';
 import { isValidObject } from '@vodyani/utils';
-import { ArgumentValidator, CustomValidated, Required, This } from '@vodyani/class-decorator';
+import { ArgumentValidator, Required, This } from '@vodyani/class-decorator';
 
 import { ConfigProvider } from './config';
 
@@ -14,17 +14,13 @@ export class ConfigHandler {
 
   @This
   @ArgumentValidator()
-  public init(
-    @CustomValidated(isValidObject, 'params must be object !') params: Record<string, any>,
-  ): void {
+  public init<V = any>(params: Partial<V>): void {
     this.config.merge(params);
   }
 
   @This
   @ArgumentValidator()
-  public deploy(
-    @Required() path: string,
-  ) {
+  public deploy(@Required() path: string) {
     try {
       const config = JSON.parse(readFileSync(path, 'utf8'));
 

src/provider/manager.ts

@@ -48,13 +48,13 @@ export class ArkManager extends AsyncProvider implements AsyncProviderFactory {
     const { local, remote } = this.options;
 
     if (!local) {
-      throw new Error('ArkManager: local is a required parameter!');
+      throw new Error('local is a required parameter!');
     }
 
     const { env, params, path, enableWatch, watchOptions } = local;
 
     if (!path) {
-      throw new Error('ArkManager: local.path is a required parameter!');
+      throw new Error('local.path is a required parameter!');
     }
 
     configHandler.init({ env: env.current, ...params });
@@ -65,8 +65,8 @@ export class ArkManager extends AsyncProvider implements AsyncProviderFactory {
     configHandler.deploy(currentPath);
 
     if (enableWatch) {
-      configMonitor.watchFile(defaultPath, watchOptions);
-      configMonitor.watchFile(currentPath, watchOptions);
+      configMonitor.setFileCheck(defaultPath, watchOptions);
+      configMonitor.setFileCheck(currentPath, watchOptions);
     }
 
     if (remote) {
@@ -85,11 +85,11 @@ export class ArkManager extends AsyncProvider implements AsyncProviderFactory {
     const currentPath = `${path}/${env.current}.json`;
 
     if (!existsSync(defaultPath)) {
-      throw new Error(`ArkManager.deployLocalPath: The file at ${defaultPath} does not exist!`);
+      throw new Error(`The file at ${defaultPath} does not exist!`);
     }
 
     if (!existsSync(currentPath)) {
-      throw new Error(`ArkManager.deployLocalPath: The file at ${currentPath} does not exist!`);
+      throw new Error(`The file at ${currentPath} does not exist!`);
     }
 
     return { currentPath, defaultPath };
@@ -123,16 +123,12 @@ export class ArkManager extends AsyncProvider implements AsyncProviderFactory {
     options: RemoteConfigOptions[],
   ) {
     await Promise.all(options.map(
-      async ({ enableCycleSync, enableSubscribe, subscribeInfo, cycleSyncInterval }, index) => {
+      async ({ enableCycleSync, enableSubscribe, cycleSyncInterval }, index) => {
         const client = clients[index];
 
         if (client) {
-          if (enableSubscribe && isValidArray(subscribeInfo)) {
-            await Promise.all(
-              subscribeInfo.map(
-                ({ key, args = [] }) => monitor.autoSubscribe(client.subscribe, key, ...args),
-              ),
-            );
+          if (enableSubscribe) {
+            monitor.autoSubscribe(client.subscribe);
           }
 
           if (enableCycleSync) {