Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-12 07:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: log

Browse Source
This commit is contained in:
linyuchen
2024-04-27 11:45:24 +08:00
parent caeafe7c23
commit 6cc2bacbe7
9 changed files with 113 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/data.ts
View File

@@ -49,7 +49,7 @@ export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
}
}
export async function getGroup(qq: string): Promise<Group | undefined> {
export async function getGroup(qq: string | number): Promise<Group | undefined> {
const group = groups.get(qq.toString());
return group;
}

53
src/common/utils/ConfigBase.ts Normal file
View File

@@ -0,0 +1,53 @@
import path from 'node:path';
import fs from 'node:fs';
import { logDebug, logError } from '@/common/utils/log';
const configDir = path.resolve(__dirname, 'config');
fs.mkdirSync(configDir, { recursive: true });
export class ConfigBase<T>{
constructor() {
}
getConfigPath(): string {
throw new Error('Method not implemented.');
}
read() {
const configPath = this.getConfigPath();
if (!fs.existsSync(configPath)) {
try{
fs.writeFileSync(configPath, JSON.stringify(this, null, 2));
logDebug(`配置文件${configPath}已创建, 修改此文件后重启NapCat生效`);
}
catch (e: any) {
logError(`创建配置文件 ${configPath} 时发生错误:`, e.message);
}
return this;
}
try {
const data = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
logDebug(`配置文件${configPath}已加载`, data);
Object.assign(this, data);
return this;
} catch (e: any) {
if (e instanceof SyntaxError) {
logError(`配置文件 ${configPath} 格式错误，请检查配置文件:`, e.message);
} else {
logError(`读取配置文件 ${configPath} 时发生错误:`, e.message);
}
return this;
}
}
save(config: T) {
const configPath = this.getConfigPath();
try {
fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
} catch (e: any) {
logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
}
}
}

40
src/common/utils/db.ts
View File

@@ -1,7 +1,7 @@
import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '../../core/src/entities';
import sqlite3 from 'sqlite3';
import { log } from '@/common/utils/log';
import { log, logDebug, logError } from '@/common/utils/log';
type DBMsg = {
id: number,
@@ -33,7 +33,7 @@ class DBUtilBase {
}
this.db = new sqlite3.Database(dbPath, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, (err) => {
if (err) {
log('Could not connect to database', err);
logError('Could not connect to database', err);
return;
}
this.createTable();
@@ -56,7 +56,7 @@ class DBUtil extends DBUtilBase {
super();
const interval = 1000 * 60 * 10; // 10分钟清理一次缓存
setInterval(() => {
log('清理消息缓存');
logDebug('清理消息缓存');
this.msgCache.forEach((msg, key) => {
if ((Date.now() - parseInt(msg.msgTime) * 1000) > interval) {
this.msgCache.delete(key);
@@ -78,7 +78,7 @@ class DBUtil extends DBUtilBase {
)`;
this.db!.run(createTableSQL, function (err) {
if (err) {
log('Could not create table', err);
logError('Could not create table', err);
}
});
@@ -98,7 +98,7 @@ class DBUtil extends DBUtilBase {
)`;
this.db!.run(createFileTableSQL, function (err) {
if (err) {
log('Could not create table files', err);
logError('Could not create table files', err);
}
});
@@ -111,7 +111,7 @@ class DBUtil extends DBUtilBase {
)`;
this.db!.run(createTempUinTableSQL, function (err) {
if (err) {
log('Could not create table temp_uins', err);
logError('Could not create table temp_uins', err);
}
});
}
@@ -122,7 +122,7 @@ class DBUtil extends DBUtilBase {
stmt.get(...params, (err: any, row: DBMsg) => {
// log("getMsg", row, err);
if (err) {
log('Could not get msg by short id', err);
logError('Could not get msg by short id', err);
resolve(null);
}
try {
@@ -154,10 +154,10 @@ class DBUtil extends DBUtilBase {
}
async addMsg(msg: RawMessage, update = true): Promise<number> {
log('正在记录消息到数据库', msg.msgId);
logDebug('正在记录消息到数据库', msg.msgId);
const existMsg = await this.getMsgByLongId(msg.msgId);
if (existMsg) {
// log('消息已存在，更新数据库', msg.msgId);
// logDebug('消息已存在，更新数据库', msg.msgId);
if (update) this.updateMsg(msg).then();
return existMsg.id!;
}
@@ -170,19 +170,19 @@ class DBUtil extends DBUtilBase {
stmt.run(msg.msgId, msg.msgSeq, msg.peerUid, JSON.stringify(msg), function (err: any) {
if (err) {
if (err.errno === 19) {
// log('消息已存在，更新数据库', msg.msgId);
// logDebug('消息已存在，更新数据库', msg.msgId);
dbInstance.getMsgByLongId(msg.msgId).then((msg: RawMessage | null) => {
if (msg) {
dbInstance.msgCache.set(msg.msgId, msg);
// log('获取消息短id成功', msg.id);
// logDebug('获取消息短id成功', msg.id);
resolve(msg.id!);
} else {
log('db could not get msg by long id', err);
logError('db could not get msg by long id', err);
resolve(-1);
}
});
} else {
log('db could not add msg', err);
logError('db could not add msg', err);
resolve(-1);
}
} else {
@@ -210,7 +210,7 @@ class DBUtil extends DBUtilBase {
try {
stmt.run(JSON.stringify(msg), msg.msgSeq, msg.msgId);
} catch (e) {
log('updateMsg db error', e);
logError('updateMsg db error', e);
}
}
@@ -224,7 +224,7 @@ class DBUtil extends DBUtilBase {
file.msgId,
function (err: any) {
if (err) {
log('db could not add file', err);
logError('db could not add file', err);
reject(err);
}
resolve(null);
@@ -237,7 +237,7 @@ class DBUtil extends DBUtilBase {
return new Promise<DBFile | null>((resolve, reject) => {
stmt.get(...params, (err: any, row: DBFile & { element: string }) => {
if (err) {
log('db could not get file cache', err);
logError('db could not get file cache', err);
reject(err);
}
if (row) {
@@ -262,7 +262,7 @@ class DBUtil extends DBUtilBase {
return new Promise((resolve, reject) => {
stmt.run(file.path, file.url,file.uuid, function (err: any) {
if (err) {
log('db could not update file cache', err);
logError('db could not update file cache', err);
reject(err);
}
resolve(null);
@@ -276,7 +276,7 @@ class DBUtil extends DBUtilBase {
return new Promise<Record<string, string>>((resolve, reject) => {
this.db!.all(stmt, (err, rows: { uin: string, uid: string }[]) => {
if (err) {
log('db could not get temp uin map', err);
logError('db could not get temp uin map', err);
reject(err);
}
const map: Record<string, string> = {};
@@ -294,7 +294,7 @@ class DBUtil extends DBUtilBase {
return new Promise<string>((resolve, reject) => {
this.db!.get(stmt, [uid], (err, row: { uin: string, uid: string }) => {
if (err) {
log('db could not get temp uin map', err);
logError('db could not get temp uin map', err);
reject(err);
}
resolve(row?.uid);
@@ -309,7 +309,7 @@ class DBUtil extends DBUtilBase {
return new Promise((resolve, reject) => {
stmt.run(uin, uid, function (err: any) {
if (err) {
log('db could not add temp uin', err);
logError('db could not add temp uin', err);
reject(err);
}
resolve(null);

6
src/common/utils/log.ts
View File

@@ -25,9 +25,9 @@ function genLogConfig(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
}
},
categories: {
default: { appenders: ['fileAppender', 'consoleAppender'], level: 'info' }, // 默认情况下同时输出到文件和控制台
default: { appenders: ['fileAppender', 'consoleAppender'], level: 'debug' }, // 默认情况下同时输出到文件和控制台
file: { appenders: ['fileAppender'], level: fileLogLevel },
console: { appenders: ['consoleAppender'], level: fileLogLevel }
console: { appenders: ['consoleAppender'], level: consoleLogLevel }
}
};
}
@@ -59,7 +59,7 @@ function formatMsg(msg: any[]){
}
logMsg += msgItem + ' ';
}
return logMsg;
return '\n' + logMsg + '\n';
}
function _log(level: LogLevel, ...args: any[]){