perf: 调整名称

src/controllers/DeleteMessageController.ts

@@ -1,5 +1,4 @@
 import DeleteMessageService from '../services/DeleteMessageService';
-import { getLogger } from 'log4js';
 import Telegram from '../client/Telegram';
 import OicqClient from '../client/OicqClient';
 import { Api } from 'telegram';
@@ -9,13 +8,12 @@ import Instance from '../models/Instance';
 
 export default class DeleteMessageController {
   private readonly deleteMessageService: DeleteMessageService;
-  private readonly log = getLogger('DeleteMessageController');
 
   constructor(private readonly instance: Instance,
               private readonly tgBot: Telegram,
               private readonly tgUser: Telegram,
               private readonly oicq: OicqClient) {
-    this.deleteMessageService = new DeleteMessageService(this.instance, tgBot, oicq);
+    this.deleteMessageService = new DeleteMessageService(this.instance, tgBot);
     tgBot.addNewMessageEventHandler(this.onTelegramMessage);
     tgBot.addEditedMessageEventHandler(this.onTelegramEditMessage);
     tgUser.addDeletedMessageEventHandler(this.onTgDeletedMessage);

src/controllers/FileAndFlashPhotoController.ts

@@ -3,7 +3,7 @@ import OicqClient from '../client/OicqClient';
 import { Api } from 'telegram';
 import db from '../models/db';
 import { Button } from 'telegram/tl/custom/button';
-import { getLogger } from 'log4js';
+import { getLogger, Logger } from 'log4js';
 import { CustomFile } from 'telegram/client/uploads';
 import { fetchFile, getImageUrlByMd5 } from '../utils/urls';
 import Instance from '../models/Instance';
@@ -11,12 +11,13 @@ import Instance from '../models/Instance';
 const REGEX = /^\/start (file|flash)-(\d+)$/;
 
 export default class FileAndFlashPhotoController {
-  private readonly log = getLogger('FileController');
+  private readonly log: Logger;
 
   constructor(private readonly instance: Instance,
               private readonly tgBot: Telegram,
               private readonly oicq: OicqClient) {
     tgBot.addNewMessageEventHandler(this.onTelegramMessage);
+    this.log = getLogger(`FileAndFlashPhotoController - ${instance.id}`);
   }
 
   private onTelegramMessage = async (message: Api.Message) => {

src/controllers/ForwardController.ts

@@ -4,18 +4,19 @@ import ForwardService from '../services/ForwardService';
 import { GroupMessageEvent, PrivateMessageEvent } from 'oicq';
 import db from '../models/db';
 import { Api } from 'telegram';
-import { getLogger } from 'log4js';
+import { getLogger, Logger } from 'log4js';
 import Instance from '../models/Instance';
 
 export default class ForwardController {
   private readonly forwardService: ForwardService;
-  private readonly log = getLogger('ForwardController');
+  private readonly log: Logger;
 
   constructor(private readonly instance: Instance,
               private readonly tgBot: Telegram,
               private readonly tgUser: Telegram,
               private readonly oicq: OicqClient) {
-    this.forwardService = new ForwardService(this.instance, tgBot, oicq);
+    this.log = getLogger(`ForwardController - ${instance.id}`);
+    this.forwardService = new ForwardService(this.instance, tgBot);
     oicq.addNewMessageEventHandler(this.onQqMessage);
     tgBot.addNewMessageEventHandler(this.onTelegramMessage);
     tgBot.addEditedMessageEventHandler(this.onTelegramMessage);

src/controllers/SetupController.ts

@@ -1,7 +1,7 @@
 import Telegram from '../client/Telegram';
 import SetupService from '../services/SetupService';
 import { Api } from 'telegram';
-import { getLogger } from 'log4js';
+import { getLogger, Logger } from 'log4js';
 import { Button } from 'telegram/tl/custom/button';
 import setupHelper from '../helpers/setupHelper';
 import { Platform } from 'oicq';
@@ -13,7 +13,7 @@ import Instance from '../models/Instance';
 
 export default class SetupController {
   private readonly setupService: SetupService;
-  private log = getLogger('SetupController');
+  private readonly log: Logger;
   private isInProgress = false;
   private waitForFinishCallbacks: Array<(ret: { tgUser: Telegram, oicq: OicqClient }) => unknown> = [];
   // 创建的 UserBot
@@ -22,6 +22,7 @@ export default class SetupController {
 
   constructor(private readonly instance: Instance,
               private readonly tgBot: Telegram) {
+    this.log = getLogger(`SetupController - ${instance.id}`);
     this.setupService = new SetupService(this.instance, tgBot);
     tgBot.addNewMessageEventHandler(this.handleMessage);
     tgBot.setCommands(commands.preSetupCommands, new Api.BotCommandScopeUsers());

src/models/TelegramSession.ts

@@ -1,16 +1,17 @@
 import { MemorySession } from 'telegram/sessions';
 import db from './db';
 import { AuthKey } from 'telegram/crypto/AuthKey';
-import { getLogger } from 'log4js';
+import { getLogger, Logger } from 'log4js';
 
 const PASS = () => 0;
 
 export default class TelegramSession extends MemorySession {
   private dbId: number;
-  private log = getLogger('TelegramSession');
+  private readonly log: Logger;
 
   constructor(private readonly sessionName: string) {
     super();
+    this.log = getLogger(`TelegramSession - ${sessionName}`);
   }
 
   async load() {

src/services/ConfigService.ts

@@ -1,7 +1,7 @@
 import Telegram from '../client/Telegram';
 import { Friend, FriendInfo, Group } from 'oicq';
 import { Button } from 'telegram/tl/custom/button';
-import { getLogger } from 'log4js';
+import { getLogger, Logger } from 'log4js';
 import { getAvatar } from '../utils/urls';
 import { CustomFile } from 'telegram/client/uploads';
 import db from '../models/db';
@@ -16,12 +16,13 @@ const DEFAULT_FILTER_ID = 114; // 514
 
 export default class ConfigService {
   private owner: Promise<TelegramChat>;
-  private log = getLogger('ConfigService');
+  private readonly log: Logger;
 
   constructor(private readonly instance: Instance,
               private readonly tgBot: Telegram,
               private readonly tgUser: Telegram,
               private readonly oicq: OicqClient) {
+    this.log = getLogger(`ConfigService - ${instance.id}`)
     this.owner = tgBot.getChat(this.instance.owner);
   }
 

src/services/DeleteMessageService.ts

@@ -1,6 +1,6 @@
 import Telegram from '../client/Telegram';
 import OicqClient from '../client/OicqClient';
-import { getLogger } from 'log4js';
+import { getLogger, Logger } from 'log4js';
 import { Api } from 'telegram';
 import db from '../models/db';
 import { Friend, FriendRecallEvent, GroupRecallEvent } from 'oicq';
@@ -8,11 +8,11 @@ import Instance from '../models/Instance';
 import { Pair } from '../models/Pair';
 
 export default class DeleteMessageService {
-  private log = getLogger('DeleteMessageService');
+  private readonly log: Logger;
 
   constructor(private readonly instance: Instance,
-              private readonly tgBot: Telegram,
-              private readonly oicq: OicqClient) {
+              private readonly tgBot: Telegram) {
+    this.log = getLogger(`DeleteMessageService - ${instance.id}`);
   }
 
   /**

src/services/ForwardService.ts

@@ -1,10 +1,9 @@
 import Telegram from '../client/Telegram';
-import OicqClient from '../client/OicqClient';
 import { Group, GroupMessageEvent, PrivateMessageEvent, Quotable, segment, Sendable } from 'oicq';
 import { fetchFile, getBigFaceUrl, getImageUrlByMd5 } from '../utils/urls';
 import { FileLike, MarkupLike } from 'telegram/define';
 import { CustomFile } from 'telegram/client/uploads';
-import { getLogger } from 'log4js';
+import { getLogger, Logger } from 'log4js';
 import path from 'path';
 import exts from '../constants/exts';
 import helper from '../helpers/forwardHelper';
@@ -25,11 +24,11 @@ import { Pair } from '../models/Pair';
 
 // noinspection FallThroughInSwitchStatementJS
 export default class ForwardService {
-  private log = getLogger('ForwardService');
+  private readonly log: Logger;
 
   constructor(private readonly instance: Instance,
-              private readonly tgBot: Telegram,
-              private readonly oicq: OicqClient) {
+              private readonly tgBot: Telegram) {
+    this.log = getLogger(`ForwardService - ${instance.id}`);
   }
 
   public async forwardFromQq(event: PrivateMessageEvent | GroupMessageEvent, pair: Pair) {

src/services/SetupService.ts

@@ -1,5 +1,5 @@
 import Telegram from '../client/Telegram';
-import { getLogger } from 'log4js';
+import { getLogger, Logger } from 'log4js';
 import { BigInteger } from 'big-integer';
 import { Platform } from 'oicq';
 import { MarkupLike } from 'telegram/define';
@@ -12,10 +12,11 @@ import Instance from '../models/Instance';
 
 export default class SetupService {
   private owner: TelegramChat;
-  private log = getLogger('SetupService');
+  private readonly log: Logger;
 
   constructor(private readonly instance: Instance,
               private readonly tgBot: Telegram) {
+    this.log = getLogger(`SetupService - ${instance.id}`)
   }
 
   public setWorkMode(mode: WorkMode) {