merge refactor/v2

.gitignore

@@ -1,6 +1,3 @@
-# lock
-yarn.lock
-
 # dependencies
 /node_modules
 

lib/decorators/core/inject-bot.decorator.ts

@@ -1,5 +1,5 @@
 import { Inject } from '@nestjs/common';
 import { getBotToken } from '../../utils';
 
-export const InjectBot = (name?: string): ParameterDecorator =>
-  Inject(getBotToken(name));
+export const InjectBot = (botName?: string): ParameterDecorator =>
+  Inject(getBotToken(botName));

lib/interfaces/telegraf-options.interface.ts

@@ -8,7 +8,7 @@ import {
 
 export interface TelegrafModuleOptions<C extends Context = Context> {
   token: string;
-  name?: string;
+  botName?: string;
   options?: TelegrafOptions;
   launchOptions?: {
     polling?: LaunchPollingOptions;

lib/services/listeners-explorer.service.ts

@@ -3,20 +3,20 @@ import { DiscoveryService, ModuleRef, ModulesContainer } from '@nestjs/core';
 import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
 import { MetadataScanner } from '@nestjs/core/metadata-scanner';
 import { Module } from '@nestjs/core/injector/module';
+import { ParamMetadata } from '@nestjs/core/helpers/interfaces';
 import { BaseScene, Composer, Stage, Telegraf } from 'telegraf';
 
 import { MetadataAccessorService } from './metadata-accessor.service';
 import {
   PARAM_ARGS_METADATA,
+  TELEGRAF_BOT_NAME,
   TELEGRAF_MODULE_OPTIONS,
 } from '../telegraf.constants';
-import { ListenerMetadata, TelegrafModuleOptions } from '../interfaces';
 import { BaseExplorerService } from './base-explorer.service';
-import { getBotToken } from '../utils';
 import { ExternalContextCreator } from '@nestjs/core/helpers/external-context-creator';
 import { TelegrafParamsFactory } from '../factories/telegraf-params-factory';
 import { TelegrafContextType } from '../execution-context/telegraf-execution-context';
-import { ParamMetadata } from '@nestjs/core/helpers/interfaces';
+import { TelegrafModuleOptions } from '../interfaces';
 
 @Injectable()
 export class ListenersExplorerService
@@ -24,11 +24,13 @@ export class ListenersExplorerService
   implements OnModuleInit {
   private readonly telegrafParamsFactory = new TelegrafParamsFactory();
   private readonly stage = new Stage([]);
-  private bot: Telegraf<never>;
+  private bot: Telegraf<any>;
 
   constructor(
     @Inject(TELEGRAF_MODULE_OPTIONS)
     private readonly telegrafOptions: TelegrafModuleOptions,
+    @Inject(TELEGRAF_BOT_NAME)
+    private readonly botName: string,
     private readonly moduleRef: ModuleRef,
     private readonly discoveryService: DiscoveryService,
     private readonly metadataAccessor: MetadataAccessorService,
@@ -40,8 +42,9 @@ export class ListenersExplorerService
   }
 
   onModuleInit(): void {
-    const botToken = getBotToken(this.telegrafOptions.name);
-    this.bot = this.moduleRef.get<Telegraf<never>>(botToken);
+    this.bot = this.moduleRef.get<Telegraf<never>>(this.botName, {
+      strict: false,
+    });
     this.bot.use(this.stage.middleware());
 
     this.explore();

lib/telegraf-core.module.ts

@@ -1,21 +1,24 @@
 import { DiscoveryModule, ModuleRef } from '@nestjs/core';
 import {
-  Module,
   DynamicModule,
-  Provider,
-  Type,
   Global,
   Inject,
+  Module,
   OnApplicationShutdown,
+  Provider,
+  Type,
 } from '@nestjs/common';
 import {
-  TelegrafModuleOptions,
   TelegrafModuleAsyncOptions,
+  TelegrafModuleOptions,
   TelegrafOptionsFactory,
 } from './interfaces';
-import { TELEGRAF_MODULE_OPTIONS } from './telegraf.constants';
-import { MetadataAccessorService, ListenersExplorerService } from './services';
-import { getBotToken, createBotFactory } from './utils';
+import {
+  TELEGRAF_BOT_NAME,
+  TELEGRAF_MODULE_OPTIONS,
+} from './telegraf.constants';
+import { ListenersExplorerService, MetadataAccessorService } from './services';
+import { createBotFactory, getBotToken } from './utils';
 
 @Global()
 @Module({
@@ -24,14 +27,21 @@ import { getBotToken, createBotFactory } from './utils';
 })
 export class TelegrafCoreModule implements OnApplicationShutdown {
   constructor(
-    @Inject(TELEGRAF_MODULE_OPTIONS)
-    private readonly options: TelegrafModuleOptions,
+    @Inject(TELEGRAF_BOT_NAME)
+    private readonly botName: string,
     private readonly moduleRef: ModuleRef,
   ) {}
 
   public static forRoot(options: TelegrafModuleOptions): DynamicModule {
+    const telegrafBotName = getBotToken(options.botName);
+
+    const telegrafBotNameProvider = {
+      provide: TELEGRAF_BOT_NAME,
+      useValue: telegrafBotName,
+    };
+
     const telegrafBotProvider: Provider = {
-      provide: getBotToken(options.name),
+      provide: telegrafBotName,
       useFactory: async () => await createBotFactory(options),
     };
 
@@ -42,6 +52,7 @@ export class TelegrafCoreModule implements OnApplicationShutdown {
           provide: TELEGRAF_MODULE_OPTIONS,
           useValue: options,
         },
+        telegrafBotNameProvider,
         telegrafBotProvider,
       ],
       exports: [telegrafBotProvider],
@@ -53,6 +64,11 @@ export class TelegrafCoreModule implements OnApplicationShutdown {
   ): DynamicModule {
     const telegrafBotName = getBotToken(options.botName);
 
+    const telegrafBotNameProvider = {
+      provide: TELEGRAF_BOT_NAME,
+      useValue: telegrafBotName,
+    };
+
     const telegrafBotProvider: Provider = {
       provide: telegrafBotName,
       useFactory: async (options: TelegrafModuleOptions) =>
@@ -64,14 +80,17 @@ export class TelegrafCoreModule implements OnApplicationShutdown {
     return {
       module: TelegrafCoreModule,
       imports: options.imports,
-      providers: [...asyncProviders, telegrafBotProvider],
-      exports: [telegrafBotProvider],
+      providers: [
+        ...asyncProviders,
+        telegrafBotNameProvider,
+        telegrafBotProvider,
+      ],
+      exports: [telegrafBotNameProvider, telegrafBotProvider],
     };
   }
 
   async onApplicationShutdown(): Promise<void> {
-    const botName = getBotToken(this.options.name);
-    const bot = this.moduleRef.get<any>(botName);
+    const bot = this.moduleRef.get<any>(this.botName);
     bot && (await bot.stop());
   }
 

lib/telegraf.constants.ts

@@ -1,6 +1,7 @@
 import { ROUTE_ARGS_METADATA } from '@nestjs/common/constants';
 
 export const TELEGRAF_MODULE_OPTIONS = 'TELEGRAF_MODULE_OPTIONS';
+export const TELEGRAF_BOT_NAME = 'TELEGRAF_BOT_NAME';
 export const DEFAULT_BOT_NAME = 'DEFAULT_BOT_NAME';
 
 export const UPDATE_METADATA = 'UPDATE_METADATA';

sample/01-complete-app/package.json

@@ -23,12 +23,12 @@
     "@nestjs/common": "7.5.1",
     "@nestjs/core": "7.5.1",
     "@nestjs/platform-express": "7.5.1",
-    "dotenv": "^8.2.0",
+    "dotenv": "8.2.0",
     "nestjs-telegraf": "*",
     "reflect-metadata": "0.1.13",
     "rimraf": "3.0.2",
     "rxjs": "6.6.3",
-    "telegraf": "^3.38.0"
+    "telegraf": "3.38.0"
   },
   "devDependencies": {
     "@nestjs/cli": "7.5.1",

sample/01-complete-app/src/app.module.ts

@@ -12,11 +12,13 @@ import { GreeterBotName } from './app.constants';
       middlewares: [sessionMiddleware],
       include: [EchoModule],
     }),
-    TelegrafModule.forRoot({
-      name: GreeterBotName,
-      token: process.env.GREETER_BOT_TOKEN,
-      middlewares: [sessionMiddleware],
-      include: [GreeterModule],
+    TelegrafModule.forRootAsync({
+      botName: GreeterBotName,
+      useFactory: () => ({
+        token: process.env.GREETER_BOT_TOKEN,
+        middlewares: [sessionMiddleware],
+        include: [GreeterModule],
+      }),
     }),
     EchoModule,
     GreeterModule,

sample/01-complete-app/src/echo/echo.update.ts

@@ -1,13 +1,13 @@
 import { Telegraf } from 'telegraf';
 import { Command, Help, InjectBot, On, Start, Update } from 'nestjs-telegraf';
 import { EchoService } from './echo.service';
-import { HELLO_SCENE_ID } from '../app.constants';
+import { GreeterBotName, HELLO_SCENE_ID } from '../app.constants';
 import { Context } from '../interfaces/context.interface';
 
 @Update()
 export class EchoUpdate {
   constructor(
-    @InjectBot()
+    @InjectBot(GreeterBotName)
     private readonly bot: Telegraf<Context>,
     private readonly echoService: EchoService,
   ) {}