chore(providers): changed to useFactory

xTCry · Mar 14, 2022 · de7f02e · de7f02e
1 parent e3f06ef
commit de7f02e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/lib/providers/hear-manager.provider.ts b/lib/providers/hear-manager.provider.ts
@@ -1,8 +1,11 @@
 import { Provider } from '@nestjs/common';
 import { HearManager } from '@vk-io/hear';
-import { VK_HEAR_MANAGER } from '../vk.constants';
+import { VkModuleOptions } from '../interfaces';
+import { VK_HEAR_MANAGER, VK_MODULE_OPTIONS } from '../vk.constants';
 
 export const hearManagerProvider: Provider = {
   provide: VK_HEAR_MANAGER,
-  useClass: HearManager,
+  useFactory: (vkOptions: VkModuleOptions) =>
+    vkOptions.useHearManager instanceof HearManager ? vkOptions.useHearManager : new HearManager(),
+  inject: [VK_MODULE_OPTIONS],
 };
diff --git a/lib/providers/scene-manager.provider.ts b/lib/providers/scene-manager.provider.ts
@@ -1,8 +1,11 @@
 import { Provider } from '@nestjs/common';
 import { SceneManager } from '@vk-io/scenes';
-import { VK_SCENE_MANAGER } from '../vk.constants';
+import { VkModuleOptions } from '../interfaces';
+import { VK_MODULE_OPTIONS, VK_SCENE_MANAGER } from '../vk.constants';
 
 export const sceneManagerProvider: Provider = {
   provide: VK_SCENE_MANAGER,
-  useClass: SceneManager,
+  useFactory: (vkOptions: VkModuleOptions) =>
+    vkOptions.useSceneManager instanceof SceneManager ? vkOptions.useSceneManager : new SceneManager(),
+  inject: [VK_MODULE_OPTIONS],
 };
diff --git a/lib/providers/session-manager.provider.ts b/lib/providers/session-manager.provider.ts
@@ -1,8 +1,11 @@
 import { Provider } from '@nestjs/common';
 import { SessionManager } from '@vk-io/session';
-import { VK_SESSION_MANAGER } from '../vk.constants';
+import { VkModuleOptions } from '../interfaces';
+import { VK_MODULE_OPTIONS, VK_SESSION_MANAGER } from '../vk.constants';
 
 export const sessionManagerProvider: Provider = {
   provide: VK_SESSION_MANAGER,
-  useClass: SessionManager,
+  useFactory: (vkOptions: VkModuleOptions) =>
+    vkOptions.useSessionManager instanceof SessionManager ? vkOptions.useSessionManager : new SessionManager(),
+  inject: [VK_MODULE_OPTIONS],
 };
diff --git a/lib/services/listeners-explorer.service.ts b/lib/services/listeners-explorer.service.ts
@@ -64,26 +64,18 @@ export class ListenersExplorerService extends BaseExplorerService implements OnM
     }
 
     if (this.vkOptions.useSessionManager !== false) {
-      this.vk.updates.use(
-        (this.vkOptions.useSessionManager instanceof SessionManager && this.vkOptions.useSessionManager.middleware) ||
-          this.sessionManagerProvider.middleware,
-      );
+      this.vk.updates.use(this.sessionManagerProvider.middleware);
     }
 
     if (this.vkOptions.useSceneManager !== false) {
-      const sceneManager =
-        (this.vkOptions.useSceneManager instanceof SceneManager && this.vkOptions.useSceneManager) || this.sceneManager;
-      this.vk.updates.use(sceneManager.middleware);
-      this.vk.updates.use(sceneManager.middlewareIntercept);
+      this.vk.updates.use(this.sceneManager.middleware);
+      this.vk.updates.use(this.sceneManager.middlewareIntercept);
     }
 
     this.explore();
 
     if (this.vkOptions.useHearManager !== false) {
-      this.vk.updates.use(
-        (this.vkOptions.useHearManager instanceof HearManager && this.vkOptions.useHearManager.middleware) ||
-          this.hearManagerProvider.middleware,
-      );
+      this.vk.updates.use(this.hearManagerProvider.middleware);
     }
 
     if (this.vkOptions.middlewaresAfter) {