Commit 09535e3e authored by nanahira's avatar nanahira

bump version and put logger together

parent 7d3daf78
Pipeline #6105 passed with stages
in 1 minute and 25 seconds
{
"name": "koishi-nestjs",
"version": "1.0.11",
"version": "1.0.15",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "koishi-nestjs",
"version": "1.0.11",
"version": "1.0.15",
"license": "MIT",
"dependencies": {
"@koa/router": "^10.1.1",
......@@ -27,7 +27,7 @@
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.1",
"express": "^4.17.1",
"koishi": "^4.0.0-alpha.8",
"koishi": "^4.0.0-alpha.9",
"prettier": "^2.4.1",
"proxy-agent": "^5.0.0",
"reflect-metadata": "^0.1.13",
......@@ -214,12 +214,12 @@
"integrity": "sha512-f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg=="
},
"node_modules/@koishijs/core": {
"version": "4.0.0-alpha.8",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-alpha.8.tgz",
"integrity": "sha512-0SSweBTdXfSeD1IlWeBiAKDWD7MYGqHlhhuKAAstZDQm+Hh5oyX5oaZBhTUxbwwDjk//HwYH9AeLqqHTgVZYWw==",
"version": "4.0.0-alpha.9",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-alpha.9.tgz",
"integrity": "sha512-dVnK3+XGV0uee1hQo67gcYHx1Vjn7j1JD4Ztl884nlCmrGkF3Yglv2H24HSdZq1/0/SanfehVbF9g4YhvoLNgw==",
"dev": true,
"dependencies": {
"@koishijs/utils": "^5.0.0-alpha.4",
"@koishijs/utils": "^5.0.0-alpha.5",
"fastest-levenshtein": "^1.0.12"
},
"engines": {
......@@ -227,9 +227,9 @@
}
},
"node_modules/@koishijs/utils": {
"version": "5.0.0-alpha.4",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.0.0-alpha.4.tgz",
"integrity": "sha512-cB1mUh3iLQKVHd8O9Lbdm/8LPmQ/VtiO+DlnAZXwbyczSIBu3HJiQo5t9pjy4LFcOoboEO4iCfbqBXpA2L/JHg==",
"version": "5.0.0-alpha.5",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.0.0-alpha.5.tgz",
"integrity": "sha512-zYgsYu5ukD5xqtan1y/RlE198w1bYVngKo49wefERsmDLMplHUf/3R6qhmPad6gvYy5ALVmkTQLwX646yReMPg==",
"dev": true,
"dependencies": {
"supports-color": "^8.1.0"
......@@ -2501,14 +2501,14 @@
}
},
"node_modules/koishi": {
"version": "4.0.0-alpha.8",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-alpha.8.tgz",
"integrity": "sha512-Q8Zp+K/P8woCHQRHOOWzSYDE1twJo/Frm5wcUDXMuhYySZtX6ci31ciVE+KSIh230yD30wYpWRbo1xhwTzepvg==",
"version": "4.0.0-alpha.9",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-alpha.9.tgz",
"integrity": "sha512-rgGqktMxyM5XiuYPGNn5kCcsXpW0ceTT7mLYxyH5PBTIz1aF0FthzbaC+J0i5gLyDlHAC43lhND/ZxaudLS5Kg==",
"dev": true,
"dependencies": {
"@koa/router": "^10.1.1",
"@koishijs/core": "^4.0.0-alpha.8",
"@koishijs/utils": "^5.0.0-alpha.4",
"@koishijs/core": "^4.0.0-alpha.9",
"@koishijs/utils": "^5.0.0-alpha.5",
"@types/koa": "*",
"@types/koa__router": "*",
"@types/ws": "^7.4.7",
......@@ -3870,19 +3870,19 @@
}
},
"@koishijs/core": {
"version": "4.0.0-alpha.8",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-alpha.8.tgz",
"integrity": "sha512-0SSweBTdXfSeD1IlWeBiAKDWD7MYGqHlhhuKAAstZDQm+Hh5oyX5oaZBhTUxbwwDjk//HwYH9AeLqqHTgVZYWw==",
"version": "4.0.0-alpha.9",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-alpha.9.tgz",
"integrity": "sha512-dVnK3+XGV0uee1hQo67gcYHx1Vjn7j1JD4Ztl884nlCmrGkF3Yglv2H24HSdZq1/0/SanfehVbF9g4YhvoLNgw==",
"dev": true,
"requires": {
"@koishijs/utils": "^5.0.0-alpha.4",
"@koishijs/utils": "^5.0.0-alpha.5",
"fastest-levenshtein": "^1.0.12"
}
},
"@koishijs/utils": {
"version": "5.0.0-alpha.4",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.0.0-alpha.4.tgz",
"integrity": "sha512-cB1mUh3iLQKVHd8O9Lbdm/8LPmQ/VtiO+DlnAZXwbyczSIBu3HJiQo5t9pjy4LFcOoboEO4iCfbqBXpA2L/JHg==",
"version": "5.0.0-alpha.5",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.0.0-alpha.5.tgz",
"integrity": "sha512-zYgsYu5ukD5xqtan1y/RlE198w1bYVngKo49wefERsmDLMplHUf/3R6qhmPad6gvYy5ALVmkTQLwX646yReMPg==",
"dev": true,
"requires": {
"supports-color": "^8.1.0"
......@@ -5620,14 +5620,14 @@
}
},
"koishi": {
"version": "4.0.0-alpha.8",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-alpha.8.tgz",
"integrity": "sha512-Q8Zp+K/P8woCHQRHOOWzSYDE1twJo/Frm5wcUDXMuhYySZtX6ci31ciVE+KSIh230yD30wYpWRbo1xhwTzepvg==",
"version": "4.0.0-alpha.9",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-alpha.9.tgz",
"integrity": "sha512-rgGqktMxyM5XiuYPGNn5kCcsXpW0ceTT7mLYxyH5PBTIz1aF0FthzbaC+J0i5gLyDlHAC43lhND/ZxaudLS5Kg==",
"dev": true,
"requires": {
"@koa/router": "^10.1.1",
"@koishijs/core": "^4.0.0-alpha.8",
"@koishijs/utils": "^5.0.0-alpha.4",
"@koishijs/core": "^4.0.0-alpha.9",
"@koishijs/utils": "^5.0.0-alpha.5",
"@types/koa": "*",
"@types/koa__router": "*",
"@types/ws": "^7.4.7",
......
{
"name": "koishi-nestjs",
"version": "1.0.15",
"version": "1.0.16",
"description": "Koishi.js as Nest.js Module",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
......@@ -32,7 +32,7 @@
"peerDependencies": {
"@nestjs/common": "^7.0.0 || ^8.0.0",
"@nestjs/core": "^7.0.0 || ^8.0.0",
"koishi": "^4.0.0-alpha.8",
"koishi": "^4.0.0-alpha.9",
"proxy-agent": "^5.0.0",
"reflect-metadata": "^0.1.13"
},
......@@ -49,7 +49,7 @@
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.1",
"express": "^4.17.1",
"koishi": "^4.0.0-alpha.8",
"koishi": "^4.0.0-alpha.9",
"prettier": "^2.4.1",
"proxy-agent": "^5.0.0",
"reflect-metadata": "^0.1.13",
......
import {
ConsoleLogger,
Inject,
Injectable,
OnModuleInit,
} from '@nestjs/common';
import { Logger } from 'koishi';
import { KOISHI_MODULE_OPTIONS } from './koishi.constants';
import { KoishiModuleOptions } from './koishi.interfaces';
@Injectable()
export class KoishiLoggerService extends ConsoleLogger {
constructor(@Inject(KOISHI_MODULE_OPTIONS) options: KoishiModuleOptions) {
super(options.loggerPrefix || 'koishi');
// eslint-disable-next-line @typescript-eslint/no-this-alias
const _this = this;
Logger.targets = [
{
colors: 3,
print(text: string) {
const header = text.slice(0, 4);
const body = text.slice(4);
switch (header) {
case '[S] ':
case '[I] ':
_this.log(body);
break;
case '[W] ':
_this.warn(body);
break;
case '[E] ':
_this.error(body);
break;
case '[D] ':
_this.debug(body);
break;
default:
_this.log(text);
break;
}
},
},
];
}
}
......@@ -37,7 +37,8 @@ export function PluginDef<T extends Plugin>(
export interface KoishiModuleOptions extends App.Config {
usePlugins?: KoishiModulePlugin<Plugin>[];
httpAdapter: AbstractHttpAdapter;
httpAdapter?: AbstractHttpAdapter;
loggerPrefix?: string;
}
export interface KoishiModuleOptionsFactory {
......
......@@ -21,6 +21,7 @@ import {
import { KoishiMiddleware } from './koishi.middleware';
import { createServer } from 'http';
import { AddressInfo } from 'net';
import { KoishiLoggerService } from './koishi-logger.service';
const koishiContextProvider: Provider = {
provide: KOISHI_CONTEXT,
......@@ -63,6 +64,7 @@ const koishiContextProviderPrivate: Provider = {
return koishi;
},
},
KoishiLoggerService,
koishiContextProvider,
koishiContextProviderChannel,
koishiContextProviderGuild,
......
import { App } from 'koishi';
import { App, Logger } from 'koishi';
import {
ConsoleLogger,
Inject,
Injectable,
OnApplicationBootstrap,
......@@ -13,6 +14,8 @@ import Koa from 'koa';
import KoaRouter from '@koa/router';
import KoaBodyParser from 'koa-bodyparser';
const nestLogger = new ConsoleLogger('koishi');
@Injectable()
export class KoishiService
extends App
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment