nestjs-vk
Advanced tools
Comparing version 4.4.0-rc.1 to 4.4.0-rc.2
@@ -1,3 +0,3 @@ | ||
export * from './inject-vk-bot.decorator'; | ||
export * from './inject-vk-api.decorator'; | ||
export * from './scene.decorator'; | ||
export * from './update.decorator'; |
@@ -13,4 +13,4 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
__exportStar(require("./inject-vk-bot.decorator"), exports); | ||
__exportStar(require("./inject-vk-api.decorator"), exports); | ||
__exportStar(require("./scene.decorator"), exports); | ||
__exportStar(require("./update.decorator"), exports); |
@@ -9,3 +9,3 @@ "use strict"; | ||
*/ | ||
const Scene = (id) => common_1.SetMetadata(vk_constants_1.SCENE_METADATA, id); | ||
const Scene = (id) => common_1.SetMetadata(vk_constants_1.VK_SCENE_METADATA, id); | ||
exports.Scene = Scene; |
@@ -10,3 +10,3 @@ "use strict"; | ||
*/ | ||
const Update = () => common_1.SetMetadata(vk_constants_1.UPDATE_METADATA, true); | ||
const Update = () => common_1.SetMetadata(vk_constants_1.VK_UPDATE_METADATA, true); | ||
exports.Update = Update; |
@@ -10,3 +10,3 @@ import { ModuleMetadata, Type } from '@nestjs/common/interfaces'; | ||
token: string; | ||
botName?: string; | ||
vkName?: string; | ||
options?: Partial<VKOptions>; | ||
@@ -28,3 +28,3 @@ launchOptions?: { | ||
export interface VkModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'> { | ||
botName?: string; | ||
vkName?: string; | ||
useExisting?: Type<VkOptionsFactory>; | ||
@@ -31,0 +31,0 @@ useClass?: Type<VkOptionsFactory>; |
@@ -17,3 +17,3 @@ import { OnModuleInit } from '@nestjs/common'; | ||
private readonly vkOptions; | ||
private readonly botName; | ||
private readonly vkName; | ||
private readonly moduleRef; | ||
@@ -25,4 +25,4 @@ private readonly metadataAccessor; | ||
private readonly vkParamsFactory; | ||
private bot; | ||
constructor(hearManagerProvider: HearManager<MessageContext>, sessionManagerProvider: SessionManager, sceneManager: SceneManager, vkOptions: VkModuleOptions, botName: string, moduleRef: ModuleRef, metadataAccessor: MetadataAccessorService, metadataScanner: MetadataScanner, modulesContainer: ModulesContainer, externalContextCreator: ExternalContextCreator); | ||
private vk; | ||
constructor(hearManagerProvider: HearManager<MessageContext>, sessionManagerProvider: SessionManager, sceneManager: SceneManager, vkOptions: VkModuleOptions, vkName: string, moduleRef: ModuleRef, metadataAccessor: MetadataAccessorService, metadataScanner: MetadataScanner, modulesContainer: ModulesContainer, externalContextCreator: ExternalContextCreator); | ||
onModuleInit(): void; | ||
@@ -29,0 +29,0 @@ explore(): void; |
@@ -29,3 +29,3 @@ "use strict"; | ||
let ListenersExplorerService = class ListenersExplorerService extends base_explorer_service_1.BaseExplorerService { | ||
constructor(hearManagerProvider, sessionManagerProvider, sceneManager, vkOptions, botName, moduleRef, metadataAccessor, metadataScanner, modulesContainer, externalContextCreator) { | ||
constructor(hearManagerProvider, sessionManagerProvider, sceneManager, vkOptions, vkName, moduleRef, metadataAccessor, metadataScanner, modulesContainer, externalContextCreator) { | ||
super(); | ||
@@ -36,3 +36,3 @@ this.hearManagerProvider = hearManagerProvider; | ||
this.vkOptions = vkOptions; | ||
this.botName = botName; | ||
this.vkName = vkName; | ||
this.moduleRef = moduleRef; | ||
@@ -46,3 +46,3 @@ this.metadataAccessor = metadataAccessor; | ||
onModuleInit() { | ||
this.bot = this.moduleRef.get(this.botName, { strict: false }); | ||
this.vk = this.moduleRef.get(this.vkName, { strict: false }); | ||
if (this.vkOptions.middlewaresBefore) { | ||
@@ -53,10 +53,10 @@ const composer = vk_io_1.Composer.builder(); | ||
} | ||
this.bot.updates.use(composer.compose()); | ||
this.vk.updates.use(composer.compose()); | ||
} | ||
if (this.vkOptions.useSessionManager !== false) { | ||
this.bot.updates.use((this.vkOptions.useSessionManager instanceof session_1.SessionManager && this.vkOptions.useSessionManager.middleware) || | ||
this.vk.updates.use((this.vkOptions.useSessionManager instanceof session_1.SessionManager && this.vkOptions.useSessionManager.middleware) || | ||
this.sessionManagerProvider.middleware); | ||
} | ||
if (this.vkOptions.useSceneManager !== false) { | ||
this.bot.updates.use((this.vkOptions.useSceneManager instanceof scenes_1.SceneManager && this.vkOptions.useSceneManager.middleware) || | ||
this.vk.updates.use((this.vkOptions.useSceneManager instanceof scenes_1.SceneManager && this.vkOptions.useSceneManager.middleware) || | ||
this.sceneManager.middleware); | ||
@@ -66,3 +66,3 @@ } | ||
if (this.vkOptions.useHearManager !== false) { | ||
this.bot.updates.use((this.vkOptions.useHearManager instanceof hear_1.HearManager && this.vkOptions.useHearManager.middleware) || | ||
this.vk.updates.use((this.vkOptions.useHearManager instanceof hear_1.HearManager && this.vkOptions.useHearManager.middleware) || | ||
this.hearManagerProvider.middleware); | ||
@@ -75,3 +75,3 @@ } | ||
} | ||
this.bot.updates.use(composer.compose()); | ||
this.vk.updates.use(composer.compose()); | ||
} | ||
@@ -86,3 +86,3 @@ } | ||
const updates = this.flatMap(modules, (instance) => this.filterUpdates(instance)); | ||
updates.forEach((wrapper) => this.registerListeners(this.bot.updates, wrapper)); | ||
updates.forEach((wrapper) => this.registerListeners(this.vk.updates, wrapper)); | ||
} | ||
@@ -186,3 +186,3 @@ filterUpdates(wrapper) { | ||
__param(3, common_1.Inject(vk_constants_1.VK_MODULE_OPTIONS)), | ||
__param(4, common_1.Inject(vk_constants_1.VK_BOT_NAME)), | ||
__param(4, common_1.Inject(vk_constants_1.VK_API_NAME)), | ||
__metadata("design:paramtypes", [hear_1.HearManager, | ||
@@ -189,0 +189,0 @@ session_1.SessionManager, |
@@ -23,3 +23,3 @@ "use strict"; | ||
return false; | ||
return !!this.reflector.get(vk_constants_1.UPDATE_METADATA, target); | ||
return !!this.reflector.get(vk_constants_1.VK_UPDATE_METADATA, target); | ||
} | ||
@@ -29,9 +29,9 @@ isScene(target) { | ||
return false; | ||
return !!this.reflector.get(vk_constants_1.SCENE_METADATA, target); | ||
return !!this.reflector.get(vk_constants_1.VK_SCENE_METADATA, target); | ||
} | ||
getListenerMetadata(target) { | ||
return this.reflector.get(vk_constants_1.LISTENERS_METADATA, target); | ||
return this.reflector.get(vk_constants_1.VK_LISTENERS_METADATA, target); | ||
} | ||
getSceneMetadata(target) { | ||
return this.reflector.get(vk_constants_1.SCENE_METADATA, target); | ||
return this.reflector.get(vk_constants_1.VK_SCENE_METADATA, target); | ||
} | ||
@@ -38,0 +38,0 @@ }; |
@@ -16,5 +16,5 @@ "use strict"; | ||
]; | ||
const previousValue = Reflect.getMetadata(vk_constants_1.LISTENERS_METADATA, descriptor.value) || []; | ||
const previousValue = Reflect.getMetadata(vk_constants_1.VK_LISTENERS_METADATA, descriptor.value) || []; | ||
const value = [...previousValue, ...metadata]; | ||
Reflect.defineMetadata(vk_constants_1.LISTENERS_METADATA, value, descriptor.value); | ||
Reflect.defineMetadata(vk_constants_1.VK_LISTENERS_METADATA, value, descriptor.value); | ||
return descriptor; | ||
@@ -21,0 +21,0 @@ }; |
@@ -1,4 +0,4 @@ | ||
export * from './create-bot-factory.util'; | ||
export * from './create-vk-api-factory.util'; | ||
export * from './create-listener-decorator.util'; | ||
export * from './get-bot-token.util'; | ||
export * from './get-vk-api-token.util'; | ||
export * from './param-decorator.util'; |
@@ -13,5 +13,5 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
__exportStar(require("./create-bot-factory.util"), exports); | ||
__exportStar(require("./create-vk-api-factory.util"), exports); | ||
__exportStar(require("./create-listener-decorator.util"), exports); | ||
__exportStar(require("./get-bot-token.util"), exports); | ||
__exportStar(require("./get-vk-api-token.util"), exports); | ||
__exportStar(require("./param-decorator.util"), exports); |
@@ -5,5 +5,5 @@ import { ModuleRef } from '@nestjs/core'; | ||
export declare class VkCoreModule implements OnApplicationShutdown { | ||
private readonly botName; | ||
private readonly vkApiName; | ||
private readonly moduleRef; | ||
constructor(botName: string, moduleRef: ModuleRef); | ||
constructor(vkApiName: string, moduleRef: ModuleRef); | ||
static forRoot(options: VkModuleOptions): DynamicModule; | ||
@@ -10,0 +10,0 @@ static forRootAsync(options: VkModuleAsyncOptions): DynamicModule; |
@@ -24,15 +24,15 @@ "use strict"; | ||
let VkCoreModule = VkCoreModule_1 = class VkCoreModule { | ||
constructor(botName, moduleRef) { | ||
this.botName = botName; | ||
constructor(vkApiName, moduleRef) { | ||
this.vkApiName = vkApiName; | ||
this.moduleRef = moduleRef; | ||
} | ||
static forRoot(options) { | ||
const vkBotName = utils_1.getBotToken(options.botName); | ||
const vkBotNameProvider = { | ||
provide: vk_constants_1.VK_BOT_NAME, | ||
useValue: vkBotName, | ||
const vkApiName = utils_1.getVkApiToken(options.vkName); | ||
const vkApiNameProvider = { | ||
provide: vk_constants_1.VK_API_NAME, | ||
useValue: vkApiName, | ||
}; | ||
const vkBotProvider = { | ||
provide: vkBotName, | ||
useFactory: async () => await utils_1.createBotFactory(options), | ||
const vkApiProvider = { | ||
provide: vkApiName, | ||
useFactory: async () => await utils_1.createVkApiFactory(options), | ||
}; | ||
@@ -43,4 +43,4 @@ const providers = [ | ||
providers_1.hearManagerProvider, | ||
vkBotNameProvider, | ||
vkBotProvider, | ||
vkApiNameProvider, | ||
vkApiProvider, | ||
]; | ||
@@ -60,10 +60,10 @@ return { | ||
static forRootAsync(options) { | ||
const vkBotName = utils_1.getBotToken(options.botName); | ||
const vkBotNameProvider = { | ||
provide: vk_constants_1.VK_BOT_NAME, | ||
useValue: vkBotName, | ||
const vkApiName = utils_1.getVkApiToken(options.vkName); | ||
const vkApiNameProvider = { | ||
provide: vk_constants_1.VK_API_NAME, | ||
useValue: vkApiName, | ||
}; | ||
const vkBotProvider = { | ||
provide: vkBotName, | ||
useFactory: async (options) => await utils_1.createBotFactory(options), | ||
const vkApiProvider = { | ||
provide: vkApiName, | ||
useFactory: async (options) => await utils_1.createVkApiFactory(options), | ||
inject: [vk_constants_1.VK_MODULE_OPTIONS], | ||
@@ -76,4 +76,4 @@ }; | ||
providers_1.hearManagerProvider, | ||
vkBotNameProvider, | ||
vkBotProvider, | ||
vkApiNameProvider, | ||
vkApiProvider, | ||
]; | ||
@@ -88,4 +88,4 @@ return { | ||
async onApplicationShutdown() { | ||
const bot = this.moduleRef.get(this.botName); | ||
bot && (await bot.stop()); | ||
const vk = this.moduleRef.get(this.vkApiName); | ||
vk && (await vk.updates.stop()); | ||
} | ||
@@ -128,5 +128,5 @@ static createAsyncProviders(options) { | ||
}), | ||
__param(0, common_1.Inject(vk_constants_1.VK_BOT_NAME)), | ||
__param(0, common_1.Inject(vk_constants_1.VK_API_NAME)), | ||
__metadata("design:paramtypes", [String, core_1.ModuleRef]) | ||
], VkCoreModule); | ||
exports.VkCoreModule = VkCoreModule; |
export declare const VK_MODULE_OPTIONS = "VK_MODULE_OPTIONS"; | ||
export declare const VK_BOT_NAME = "VK_BOT_NAME"; | ||
export declare const DEFAULT_BOT_NAME = "DEFAULT_BOT_NAME"; | ||
export declare const UPDATE_METADATA = "UPDATE_METADATA"; | ||
export declare const SCENE_METADATA = "SCENE_METADATA"; | ||
export declare const LISTENERS_METADATA = "LISTENERS_METADATA"; | ||
export declare const VK_API_NAME = "VK_API_NAME"; | ||
export declare const DEFAULT_VK_API_NAME = "DEFAULT_VK_API_NAME"; | ||
export declare const VK_UPDATE_METADATA = "VK_UPDATE_METADATA"; | ||
export declare const VK_SCENE_METADATA = "VK_SCENE_METADATA"; | ||
export declare const VK_LISTENERS_METADATA = "VK_LISTENERS_METADATA"; | ||
export declare const PARAM_ARGS_METADATA = "__routeArguments__"; | ||
@@ -8,0 +8,0 @@ export declare const VK_SESSION_MANAGER = "VkSessionManager"; |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.VK_HEAR_MANAGER = exports.VK_SCENE_MANAGER = exports.VK_SESSION_MANAGER = exports.PARAM_ARGS_METADATA = exports.LISTENERS_METADATA = exports.SCENE_METADATA = exports.UPDATE_METADATA = exports.DEFAULT_BOT_NAME = exports.VK_BOT_NAME = exports.VK_MODULE_OPTIONS = void 0; | ||
exports.VK_HEAR_MANAGER = exports.VK_SCENE_MANAGER = exports.VK_SESSION_MANAGER = exports.PARAM_ARGS_METADATA = exports.VK_LISTENERS_METADATA = exports.VK_SCENE_METADATA = exports.VK_UPDATE_METADATA = exports.DEFAULT_VK_API_NAME = exports.VK_API_NAME = exports.VK_MODULE_OPTIONS = void 0; | ||
const constants_1 = require("@nestjs/common/constants"); | ||
exports.VK_MODULE_OPTIONS = 'VK_MODULE_OPTIONS'; | ||
exports.VK_BOT_NAME = 'VK_BOT_NAME'; | ||
exports.DEFAULT_BOT_NAME = 'DEFAULT_BOT_NAME'; | ||
exports.UPDATE_METADATA = 'UPDATE_METADATA'; | ||
exports.SCENE_METADATA = 'SCENE_METADATA'; | ||
exports.LISTENERS_METADATA = 'LISTENERS_METADATA'; | ||
exports.VK_API_NAME = 'VK_API_NAME'; | ||
exports.DEFAULT_VK_API_NAME = 'DEFAULT_VK_API_NAME'; | ||
exports.VK_UPDATE_METADATA = 'VK_UPDATE_METADATA'; | ||
exports.VK_SCENE_METADATA = 'VK_SCENE_METADATA'; | ||
exports.VK_LISTENERS_METADATA = 'VK_LISTENERS_METADATA'; | ||
exports.PARAM_ARGS_METADATA = constants_1.ROUTE_ARGS_METADATA; | ||
@@ -12,0 +12,0 @@ exports.VK_SESSION_MANAGER = 'VkSessionManager'; |
{ | ||
"name": "nestjs-vk", | ||
"version": "4.4.0-rc.1", | ||
"version": "4.4.0-rc.2", | ||
"description": "VK-IO module for NestJS", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
# NestJS VK | ||
![npm](https://img.shields.io/npm/dm/nestjs-vk) | ||
![GitHub last commit](https://img.shields.io/github/last-commit/xtcry/nestjs-vk) | ||
![NPM](https://img.shields.io/npm/l/nestjs-vk) | ||
[![npm](https://img.shields.io/npm/v/nestjs-vk.svg?style=flat-square)](https://www.npmjs.com/package/nestjs-vk) | ||
[![NPM](https://img.shields.io/npm/dt/nestjs-vk.svg?style=flat-square)](https://www.npmjs.com/package/nestjs-vk) | ||
[![GitHub last commit](https://img.shields.io/github/last-commit/xtcry/nestjs-vk)](https://github.com/xtcry/nestjs-vk) | ||
@@ -50,3 +50,3 @@ <img src="https://nestjs.com/img/logo-small.svg" title="NestJS logotype" align="right" width="95" height="148"> | ||
```typescript | ||
import { InjectVkBot, Update, Ctx, Message, Hears, HearFallback } from 'nestjs-vk'; | ||
import { InjectVkApi, Update, Ctx, Message, Hears, HearFallback } from 'nestjs-vk'; | ||
import { MessageContext, VK } from 'vk-io'; | ||
@@ -60,4 +60,4 @@ import { AppService } from './app.service'; | ||
constructor( | ||
@InjectVkBot() | ||
private readonly bot: VK, | ||
@InjectVkApi() | ||
private readonly vk: VK, | ||
private readonly appService: AppService, | ||
@@ -68,3 +68,3 @@ ) {} | ||
try { | ||
const [group] = await this.bot.api.groups.getById({}); | ||
const [group] = await this.vk.api.groups.getById({}); | ||
this.groupId = group.id; | ||
@@ -88,3 +88,3 @@ } catch (err) { | ||
async onSubscriberCommand(@Ctx() ctx: MessageContext) { | ||
const isSib = await this.bot.api.groups.isMember({ | ||
const isSib = await this.vk.api.groups.isMember({ | ||
group_id: String(this.groupId), | ||
@@ -91,0 +91,0 @@ user_id: ctx.senderId, |
58482
1105