fix(): use bot token in di

This commit is contained in:
Morb0 2021-01-05 13:36:12 +03:00
parent 5fe60dc5b2
commit 751b15b4b2
5 changed files with 48 additions and 23 deletions

View File

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

View File

@ -8,7 +8,7 @@ import {
export interface TelegrafModuleOptions<C extends Context = Context> { export interface TelegrafModuleOptions<C extends Context = Context> {
token: string; token: string;
name?: string; botName?: string;
options?: TelegrafOptions; options?: TelegrafOptions;
launchOptions?: { launchOptions?: {
polling?: LaunchPollingOptions; polling?: LaunchPollingOptions;
@ -24,7 +24,7 @@ export interface TelegrafOptionsFactory {
export interface TelegrafModuleAsyncOptions export interface TelegrafModuleAsyncOptions
extends Pick<ModuleMetadata, 'imports'> { extends Pick<ModuleMetadata, 'imports'> {
name?: string; botName?: string;
useExisting?: Type<TelegrafOptionsFactory>; useExisting?: Type<TelegrafOptionsFactory>;
useClass?: Type<TelegrafOptionsFactory>; useClass?: Type<TelegrafOptionsFactory>;
useFactory?: ( useFactory?: (

View File

@ -6,10 +6,12 @@ import { Module } from '@nestjs/core/injector/module';
import { BaseScene, Composer, Stage, Telegraf } from 'telegraf'; import { BaseScene, Composer, Stage, Telegraf } from 'telegraf';
import { MetadataAccessorService } from './metadata-accessor.service'; import { MetadataAccessorService } from './metadata-accessor.service';
import { TELEGRAF_MODULE_OPTIONS } from '../telegraf.constants'; import {
TELEGRAF_BOT_NAME,
TELEGRAF_MODULE_OPTIONS,
} from '../telegraf.constants';
import { TelegrafModuleOptions } from '../interfaces'; import { TelegrafModuleOptions } from '../interfaces';
import { BaseExplorerService } from './base-explorer.service'; import { BaseExplorerService } from './base-explorer.service';
import { getBotToken } from '../utils';
@Injectable() @Injectable()
export class ListenersExplorerService export class ListenersExplorerService
@ -19,6 +21,8 @@ export class ListenersExplorerService
private bot: Telegraf<any>; private bot: Telegraf<any>;
constructor( constructor(
@Inject(TELEGRAF_BOT_NAME)
private readonly botName: string,
@Inject(TELEGRAF_MODULE_OPTIONS) @Inject(TELEGRAF_MODULE_OPTIONS)
private readonly telegrafOptions: TelegrafModuleOptions, private readonly telegrafOptions: TelegrafModuleOptions,
private readonly moduleRef: ModuleRef, private readonly moduleRef: ModuleRef,
@ -31,8 +35,9 @@ export class ListenersExplorerService
} }
onModuleInit(): void { onModuleInit(): void {
const botToken = getBotToken(this.telegrafOptions.name); this.bot = this.moduleRef.get<Telegraf<never>>(this.botName, {
this.bot = this.moduleRef.get<Telegraf<never>>(botToken); strict: false,
});
this.bot.use(this.stage.middleware()); this.bot.use(this.stage.middleware());
this.explore(); this.explore();

View File

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

View File

@ -1,4 +1,5 @@
export const TELEGRAF_MODULE_OPTIONS = 'TELEGRAF_MODULE_OPTIONS'; 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 DEFAULT_BOT_NAME = 'DEFAULT_BOT_NAME';
export const UPDATE_METADATA = 'UPDATE_METADATA'; export const UPDATE_METADATA = 'UPDATE_METADATA';