diff --git a/src/common/audio-worker.ts b/src/common/audio-worker.ts index 8d84d3b2..64d48039 100644 --- a/src/common/audio-worker.ts +++ b/src/common/audio-worker.ts @@ -1,4 +1,4 @@ -import { encode } from "silk-wasm"; +import { encode } from 'silk-wasm'; export interface EncodeArgs { input: ArrayBufferView | ArrayBuffer diff --git a/src/common/audio.ts b/src/common/audio.ts index 771c57f3..6f7a8f49 100644 --- a/src/common/audio.ts +++ b/src/common/audio.ts @@ -4,8 +4,8 @@ import path from 'node:path'; import { randomUUID } from 'crypto'; import { EncodeResult, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm'; import { LogWrapper } from '@/common/log'; -import { EncodeArgs } from "@/common/audio-worker"; -import { FFmpegService } from "@/common/ffmpeg"; +import { EncodeArgs } from '@/common/audio-worker'; +import { FFmpegService } from '@/common/ffmpeg'; const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000]; diff --git a/src/common/config-base.ts b/src/common/config-base.ts index 7b8be702..c0f4a427 100644 --- a/src/common/config-base.ts +++ b/src/common/config-base.ts @@ -39,9 +39,9 @@ export abstract class ConfigBase { if (!fs.existsSync(configPath) && copy_default) { try { fs.writeFileSync(configPath, fs.readFileSync(this.getConfigPath(undefined), 'utf-8')); - this.core.context.logger.log(`[Core] [Config] 配置文件创建成功!\n`); + this.core.context.logger.log('[Core] [Config] 配置文件创建成功!\n'); } catch (e: any) { - this.core.context.logger.logError(`[Core] [Config] 创建配置文件时发生错误:`, e.message); + this.core.context.logger.logError('[Core] [Config] 创建配置文件时发生错误:', e.message); } } else if (!fs.existsSync(configPath) && !copy_default) { fs.writeFileSync(configPath, '{}'); @@ -52,9 +52,9 @@ export abstract class ConfigBase { return this.configData; } catch (e: any) { if (e instanceof SyntaxError) { - this.core.context.logger.logError(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message); + this.core.context.logger.logError('[Core] [Config] 配置文件格式错误，请检查配置文件:', e.message); } else { - this.core.context.logger.logError(`[Core] [Config] 读取配置文件时发生错误:`, e.message); + this.core.context.logger.logError('[Core] [Config] 读取配置文件时发生错误:', e.message); } return {} as T; } diff --git a/src/common/event.ts b/src/common/event.ts index ed2e36af..dcc5eee5 100644 --- a/src/common/event.ts +++ b/src/common/event.ts @@ -209,8 +209,8 @@ export class NTEventWrapper { } const ListenerNameList = listenerAndMethod.split('/'); - const ListenerMainName = ListenerNameList[0]??""; - const ListenerSubName = ListenerNameList[1]??""; + const ListenerMainName = ListenerNameList[0]??''; + const ListenerSubName = ListenerNameList[1]??''; return new Promise<[EventRet: Awaited>, ...Parameters]>( (resolve, reject) => { diff --git a/src/common/ffmpeg-worker.ts b/src/common/ffmpeg-worker.ts index a97cdd4a..146595a4 100644 --- a/src/common/ffmpeg-worker.ts +++ b/src/common/ffmpeg-worker.ts @@ -108,9 +108,9 @@ class FFmpegService { const message = msg.join(' '); const durationMatch = message.match(/Duration: (\d+):(\d+):(\d+\.\d+)/); if (durationMatch) { - const hours = parseInt(durationMatch[1] ?? "0", 10); - const minutes = parseInt(durationMatch[2] ?? "0", 10); - const seconds = parseFloat(durationMatch[3] ?? "0"); + const hours = parseInt(durationMatch[1] ?? '0', 10); + const minutes = parseInt(durationMatch[2] ?? '0', 10); + const seconds = parseFloat(durationMatch[3] ?? '0'); duration = hours * 3600 + minutes * 60 + seconds; } }); diff --git a/src/common/ffmpeg.ts b/src/common/ffmpeg.ts index 57e15e22..81dea249 100644 --- a/src/common/ffmpeg.ts +++ b/src/common/ffmpeg.ts @@ -1,5 +1,5 @@ -import Piscina from "piscina"; -import { VideoInfo } from "./video"; +import Piscina from 'piscina'; +import { VideoInfo } from './video'; type EncodeArgs = { method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo'; diff --git a/src/common/file-uuid.ts b/src/common/file-uuid.ts index 0f359ac5..d96797c6 100644 --- a/src/common/file-uuid.ts +++ b/src/common/file-uuid.ts @@ -83,7 +83,7 @@ class FileUUIDManager { this.cache = new TimeBasedCache(5000, ttl); } - public encode(data: FileUUIDData, endString: string = "", customUUID?: string): string { + public encode(data: FileUUIDData, endString: string = '', customUUID?: string): string { const uuid = customUUID ? customUUID : randomUUID().replace(/-/g, '') + endString; this.cache.put(uuid, data); return uuid; @@ -101,7 +101,7 @@ export class FileNapCatOneBotUUIDWrap { this.manager = new FileUUIDManager(ttl); } - public encodeModelId(peer: Peer, modelId: string, fileId: string, fileUUID: string = "", endString: string = "", customUUID?: string): string { + public encodeModelId(peer: Peer, modelId: string, fileId: string, fileUUID: string = '', endString: string = '', customUUID?: string): string { return this.manager.encode({ peer, modelId, fileId, fileUUID }, endString, customUUID); } @@ -109,8 +109,8 @@ export class FileNapCatOneBotUUIDWrap { return this.manager.decode(uuid); } - public encode(peer: Peer, msgId: string, elementId: string, fileUUID: string = "", customUUID?: string): string { - return this.manager.encode({ peer, msgId, elementId, fileUUID }, "", customUUID); + public encode(peer: Peer, msgId: string, elementId: string, fileUUID: string = '', customUUID?: string): string { + return this.manager.encode({ peer, msgId, elementId, fileUUID }, '', customUUID); } public decode(uuid: string): FileUUIDData | undefined { diff --git a/src/common/forward-msg-builder.ts b/src/common/forward-msg-builder.ts index c091c542..8aba1408 100644 --- a/src/common/forward-msg-builder.ts +++ b/src/common/forward-msg-builder.ts @@ -1,5 +1,5 @@ -import * as crypto from "node:crypto"; -import { PacketMsg } from "@/core/packet/message/message"; +import * as crypto from 'node:crypto'; +import { PacketMsg } from '@/core/packet/message/message'; interface ForwardMsgJson { app: string @@ -50,15 +50,15 @@ interface ForwardAdaptMsgElement { } export class ForwardMsgBuilder { - private static build(resId: string, msg: ForwardAdaptMsg[], source?: string, news?: ForwardMsgJsonMetaDetail["news"], summary?: string, prompt?: string): ForwardMsgJson { + private static build(resId: string, msg: ForwardAdaptMsg[], source?: string, news?: ForwardMsgJsonMetaDetail['news'], summary?: string, prompt?: string): ForwardMsgJson { const id = crypto.randomUUID(); const isGroupMsg = msg.some(m => m.isGroupMsg); if (!source) { - source = isGroupMsg ? "群聊的聊天记录" : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录'; + source = isGroupMsg ? '群聊的聊天记录' : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录'; } if (!news) { news = msg.length === 0 ? [{ - text: "Nya~ This message is send from NapCat.Packet!", + text: 'Nya~ This message is send from NapCat.Packet!', }] : msg.map(m => ({ text: `${m.senderName}: ${m.msg?.map(msg => msg.preview).join('')}`, })); @@ -67,15 +67,15 @@ export class ForwardMsgBuilder { summary = `查看${msg.length}条转发消息`; } if (!prompt) { - prompt = "[聊天记录]"; + prompt = '[聊天记录]'; } return { - app: "com.tencent.multimsg", + app: 'com.tencent.multimsg', config: { autosize: 1, forward: 1, round: 1, - type: "normal", + type: 'normal', width: 300 }, desc: prompt, @@ -93,8 +93,8 @@ export class ForwardMsgBuilder { } }, prompt, - ver: "0.0.0.5", - view: "contact", + ver: '0.0.0.5', + view: 'contact', }; } @@ -102,12 +102,12 @@ export class ForwardMsgBuilder { return this.build(resId, []); } - static fromPacketMsg(resId: string, packetMsg: PacketMsg[], source?: string, news?: ForwardMsgJsonMetaDetail["news"], summary?: string, prompt?: string): ForwardMsgJson { + static fromPacketMsg(resId: string, packetMsg: PacketMsg[], source?: string, news?: ForwardMsgJsonMetaDetail['news'], summary?: string, prompt?: string): ForwardMsgJson { return this.build(resId, packetMsg.map(msg => ({ senderName: msg.senderName, isGroupMsg: msg.groupId !== undefined, msg: msg.msg.map(m => ({ - preview: m.valid ? m.toPreview() : "[该消息类型暂不支持查看]", + preview: m.valid ? m.toPreview() : '[该消息类型暂不支持查看]', })) })), source, news, summary, prompt); } diff --git a/src/common/helper.ts b/src/common/helper.ts index 24da598d..129d5a7f 100644 --- a/src/common/helper.ts +++ b/src/common/helper.ts @@ -172,8 +172,8 @@ export function stringifyWithBigInt(obj: any) { } export function parseAppidFromMajor(nodeMajor: string): string | undefined { - const hexSequence = "A4 09 00 00 00 35"; - const sequenceBytes = Buffer.from(hexSequence.replace(/ /g, ""), "hex"); + const hexSequence = 'A4 09 00 00 00 35'; + const sequenceBytes = Buffer.from(hexSequence.replace(/ /g, ''), 'hex'); const filePath = path.resolve(nodeMajor); const fileContent = fs.readFileSync(filePath); @@ -192,7 +192,7 @@ export function parseAppidFromMajor(nodeMajor: string): string | undefined { const content = fileContent.subarray(start, end); if (!content.every(byte => byte === 0x00)) { try { - return content.toString("utf-8"); + return content.toString('utf-8'); } catch (error) { break; } diff --git a/src/common/log.ts b/src/common/log.ts index ea9beb09..5dfc0028 100644 --- a/src/common/log.ts +++ b/src/common/log.ts @@ -303,7 +303,7 @@ function textElementToText(textElement: any): string { const originalContentLines = textElement.content.split('\n'); return `${originalContentLines[0]}${originalContentLines.length > 1 ? ' ...' : ''}`; } else if (textElement.atType === NTMsgAtType.ATTYPEALL) { - return `@全体成员`; + return '@全体成员'; } else if (textElement.atType === NTMsgAtType.ATTYPEONE) { return `${textElement.content} (${textElement.atUid})`; } diff --git a/src/common/qq-basic-info.ts b/src/common/qq-basic-info.ts index 389d4a8c..a965146b 100644 --- a/src/common/qq-basic-info.ts +++ b/src/common/qq-basic-info.ts @@ -86,14 +86,14 @@ export class QQBasicInfoWrapper { try { const majorAppid = this.getAppidV2ByMajor(fullVersion); if (majorAppid) { - this.context.logger.log(`[QQ版本兼容性检测] 当前版本Appid未内置 通过Major获取 为了更好的性能请尝试更新NapCat`); + this.context.logger.log('[QQ版本兼容性检测] 当前版本Appid未内置 通过Major获取 为了更好的性能请尝试更新NapCat'); return { appid: majorAppid, qua: this.getQUAFallback() }; } } catch (error) { - this.context.logger.log(`[QQ版本兼容性检测] 通过Major 获取Appid异常 请检测NapCat/QQNT是否正常`); + this.context.logger.log('[QQ版本兼容性检测] 通过Major 获取Appid异常 请检测NapCat/QQNT是否正常'); } // 最终兜底为老版本 - this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`); + this.context.logger.log('[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常'); this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,); return { appid: this.getAppIdFallback(), qua: this.getQUAFallback() }; } diff --git a/src/core/adapters/NodeIDependsAdapter.ts b/src/core/adapters/NodeIDependsAdapter.ts index 8af142c5..03652aff 100644 --- a/src/core/adapters/NodeIDependsAdapter.ts +++ b/src/core/adapters/NodeIDependsAdapter.ts @@ -1,4 +1,4 @@ -import { MsfChangeReasonType, MsfStatusType } from "@/core/types/adapter"; +import { MsfChangeReasonType, MsfStatusType } from '@/core/types/adapter'; export class NodeIDependsAdapter { onMSFStatusChange(statusType: MsfStatusType, changeReasonType: MsfChangeReasonType) { diff --git a/src/core/apis/packet.ts b/src/core/apis/packet.ts index 358cea68..8b573631 100644 --- a/src/core/apis/packet.ts +++ b/src/core/apis/packet.ts @@ -1,9 +1,9 @@ import * as os from 'os'; import offset from '@/core/external/offset.json'; -import { InstanceContext, NapCatCore } from "@/core"; -import { LogWrapper } from "@/common/log"; -import { PacketClientSession } from "@/core/packet/clientSession"; -import { napCatVersion } from "@/common/version"; +import { InstanceContext, NapCatCore } from '@/core'; +import { LogWrapper } from '@/common/log'; +import { PacketClientSession } from '@/core/packet/clientSession'; +import { napCatVersion } from '@/common/version'; interface OffsetType { [key: string]: { diff --git a/src/core/apis/webapi.ts b/src/core/apis/webapi.ts index 37707f24..f6b436c1 100644 --- a/src/core/apis/webapi.ts +++ b/src/core/apis/webapi.ts @@ -322,18 +322,18 @@ export class NTQQWebApi { data: pskey, appid: 5 }, - appid: "qun", + appid: 'qun', checksum: img_md5, check_type: 0, file_len: img_size, env: { - refer: "qzone", - deviceInfo: "h5" + refer: 'qzone', + deviceInfo: 'h5' }, model: 0, biz_req: { sPicTitle: img_name, - sPicDesc: "", + sPicDesc: '', sAlbumName: sAlbumName, sAlbumID: sAlbumID, iAlbumTypeID: 0, @@ -341,7 +341,7 @@ export class NTQQWebApi { iUploadType: 0, iUpPicType: 0, iBatchID: time, - sPicPath: "", + sPicPath: '', iPicWidth: 0, iPicHight: 0, iWaterType: 0, @@ -349,19 +349,19 @@ export class NTQQWebApi { iNeedFeeds: 1, iUploadTime: time, mapExt: { - appid: "qun", + appid: 'qun', userid: gc } }, - session: "", + session: '', asy_upload: 0, - cmd: "FileUpload" + cmd: 'FileUpload' }] }; const api = `https://h5.qzone.qq.com/webapp/json/sliceUpload/FileBatchControl/${img_md5}?g_tk=${GTK}`; const post = await RequestUtil.HttpGetJson(api, 'POST', body, { - "Cookie": cookie, - "Content-Type": "application/json" + 'Cookie': cookie, + 'Content-Type': 'application/json' }); return post; diff --git a/src/core/helper/adaptDecoder.ts b/src/core/helper/adaptDecoder.ts index f3910363..f6298592 100644 --- a/src/core/helper/adaptDecoder.ts +++ b/src/core/helper/adaptDecoder.ts @@ -1,5 +1,5 @@ // TODO: further refactor in NapCat.Packet v2 -import { NapProtoMsg, ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { NapProtoMsg, ProtoField, ScalarType } from '@napneko/nap-proto-core'; const LikeDetail = { txt: ProtoField(1, ScalarType.STRING), diff --git a/src/core/helper/rkey.ts b/src/core/helper/rkey.ts index 25e6e8e2..5e0cb588 100644 --- a/src/core/helper/rkey.ts +++ b/src/core/helper/rkey.ts @@ -32,7 +32,7 @@ export class RkeyManager { } if (this.failureCount >= this.FAILURE_LIMIT) { - this.logger.logError(`[Rkey] 服务存在异常, 图片使用FallBack机制`); + this.logger.logError('[Rkey] 服务存在异常, 图片使用FallBack机制'); throw new Error('获取rkey失败次数过多，请稍后再试'); } diff --git a/src/core/helper/status.ts b/src/core/helper/status.ts index efcd1818..b3884de0 100644 --- a/src/core/helper/status.ts +++ b/src/core/helper/status.ts @@ -1,5 +1,5 @@ -import os from "node:os"; -import EventEmitter from "node:events"; +import os from 'node:os'; +import EventEmitter from 'node:events'; export interface SystemStatus { cpu: { diff --git a/src/core/index.ts b/src/core/index.ts index 05f40714..0552f2ac 100644 --- a/src/core/index.ts +++ b/src/core/index.ts @@ -52,7 +52,7 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi { } let wrapperNodePath = path.resolve(appPath, 'wrapper.node'); if (!fs.existsSync(wrapperNodePath)) { - wrapperNodePath = path.join(appPath, `./resources/app/wrapper.node`); + wrapperNodePath = path.join(appPath, './resources/app/wrapper.node'); } //老版本兼容 未来去掉 if (!fs.existsSync(wrapperNodePath)) { @@ -74,7 +74,7 @@ export function getMajorPath(QQVersion: string): string { } let majorPath = path.resolve(appPath, 'major.node'); if (!fs.existsSync(majorPath)) { - majorPath = path.join(appPath, `./resources/app/major.node`); + majorPath = path.join(appPath, './resources/app/major.node'); } //老版本兼容 未来去掉 if (!fs.existsSync(majorPath)) { @@ -177,7 +177,7 @@ export class NapCatCore { profileListener.onSelfStatusChanged = (Info: SelfStatusInfo) => { if (Info.status == 20) { this.selfInfo.online = false; - this.context.logger.log("账号状态变更为离线"); + this.context.logger.log('账号状态变更为离线'); } else { this.selfInfo.online = true; } diff --git a/src/core/packet/client/baseClient.ts b/src/core/packet/client/baseClient.ts index 4a8fab29..df5e15dd 100644 --- a/src/core/packet/client/baseClient.ts +++ b/src/core/packet/client/baseClient.ts @@ -1,9 +1,9 @@ -import { LRUCache } from "@/common/lru-cache"; -import crypto, { createHash } from "crypto"; -import { OidbPacket, PacketHexStr } from "@/core/packet/transformer/base"; -import { LogStack } from "@/core/packet/context/clientContext"; -import { NapCoreContext } from "@/core/packet/context/napCoreContext"; -import { PacketLogger } from "@/core/packet/context/loggerContext"; +import { LRUCache } from '@/common/lru-cache'; +import crypto, { createHash } from 'crypto'; +import { OidbPacket, PacketHexStr } from '@/core/packet/transformer/base'; +import { LogStack } from '@/core/packet/context/clientContext'; +import { NapCoreContext } from '@/core/packet/context/napCoreContext'; +import { PacketLogger } from '@/core/packet/context/loggerContext'; export interface RecvPacket { type: string, // 仅recv diff --git a/src/core/packet/client/nativeClient.ts b/src/core/packet/client/nativeClient.ts index da03b5a5..ad3ae995 100644 --- a/src/core/packet/client/nativeClient.ts +++ b/src/core/packet/client/nativeClient.ts @@ -1,13 +1,13 @@ -import { createHash } from "crypto"; -import path, { dirname } from "path"; -import { fileURLToPath } from "url"; -import fs from "fs"; -import { IPacketClient } from "@/core/packet/client/baseClient"; -import { constants } from "node:os"; -import { LRUCache } from "@/common/lru-cache"; -import { LogStack } from "@/core/packet/context/clientContext"; -import { NapCoreContext } from "@/core/packet/context/napCoreContext"; -import { PacketLogger } from "@/core/packet/context/loggerContext"; +import { createHash } from 'crypto'; +import path, { dirname } from 'path'; +import { fileURLToPath } from 'url'; +import fs from 'fs'; +import { IPacketClient } from '@/core/packet/client/baseClient'; +import { constants } from 'node:os'; +import { LRUCache } from '@/common/lru-cache'; +import { LogStack } from '@/core/packet/context/clientContext'; +import { NapCoreContext } from '@/core/packet/context/napCoreContext'; +import { PacketLogger } from '@/core/packet/context/loggerContext'; // 0 send 1 recv export interface NativePacketExportType { diff --git a/src/core/packet/client/wsClient.ts b/src/core/packet/client/wsClient.ts index c744f84e..6c86b054 100644 --- a/src/core/packet/client/wsClient.ts +++ b/src/core/packet/client/wsClient.ts @@ -1,8 +1,8 @@ -import { Data, WebSocket, ErrorEvent } from "ws"; -import { IPacketClient, RecvPacket } from "@/core/packet/client/baseClient"; -import { LogStack } from "@/core/packet/context/clientContext"; -import { NapCoreContext } from "@/core/packet/context/napCoreContext"; -import { PacketLogger } from "@/core/packet/context/loggerContext"; +import { Data, WebSocket, ErrorEvent } from 'ws'; +import { IPacketClient, RecvPacket } from '@/core/packet/client/baseClient'; +import { LogStack } from '@/core/packet/context/clientContext'; +import { NapCoreContext } from '@/core/packet/context/napCoreContext'; +import { PacketLogger } from '@/core/packet/context/loggerContext'; export class WsPacketClient extends IPacketClient { private websocket: WebSocket | null = null; @@ -23,7 +23,7 @@ export class WsPacketClient extends IPacketClient { check(): boolean { if (!this.napcore.config.packetServer) { - this.logStack.pushLogWarn(`wsPacketClient 未配置服务器地址`); + this.logStack.pushLogWarn('wsPacketClient 未配置服务器地址'); return false; } return true; @@ -80,7 +80,7 @@ export class WsPacketClient extends IPacketClient { }; this.websocket.onclose = () => { this.available = false; - this.logger.warn(`WebSocket 连接关闭，尝试重连...`); + this.logger.warn('WebSocket 连接关闭，尝试重连...'); reject(new Error('WebSocket 连接关闭')); }; this.websocket.onmessage = (event) => this.handleMessage(event.data).catch(err => { diff --git a/src/core/packet/clientSession.ts b/src/core/packet/clientSession.ts index 3faea314..4f2dc55a 100644 --- a/src/core/packet/clientSession.ts +++ b/src/core/packet/clientSession.ts @@ -1,5 +1,5 @@ -import { PacketContext } from "@/core/packet/context/packetContext"; -import { NapCatCore } from "@/core"; +import { PacketContext } from '@/core/packet/context/packetContext'; +import { NapCatCore } from '@/core'; export class PacketClientSession { private readonly context: PacketContext; diff --git a/src/core/packet/context/clientContext.ts b/src/core/packet/context/clientContext.ts index 168a9abc..98eb145a 100644 --- a/src/core/packet/context/clientContext.ts +++ b/src/core/packet/context/clientContext.ts @@ -1,9 +1,9 @@ -import { IPacketClient } from "@/core/packet/client/baseClient"; -import { NativePacketClient } from "@/core/packet/client/nativeClient"; -import { WsPacketClient } from "@/core/packet/client/wsClient"; -import { OidbPacket } from "@/core/packet/transformer/base"; -import { PacketLogger } from "@/core/packet/context/loggerContext"; -import { NapCoreContext } from "@/core/packet/context/napCoreContext"; +import { IPacketClient } from '@/core/packet/client/baseClient'; +import { NativePacketClient } from '@/core/packet/client/nativeClient'; +import { WsPacketClient } from '@/core/packet/client/wsClient'; +import { OidbPacket } from '@/core/packet/transformer/base'; +import { PacketLogger } from '@/core/packet/context/loggerContext'; +import { NapCoreContext } from '@/core/packet/context/napCoreContext'; type clientPriority = { [key: number]: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => IPacketClient; @@ -77,22 +77,22 @@ export class PacketClientContext { async sendOidbPacket(pkt: OidbPacket, rsp?: T): Promise { const raw = await this._client.sendOidbPacket(pkt, rsp); - return (rsp ? Buffer.from(raw.hex_data, "hex") : undefined) as T extends true ? Buffer : void; + return (rsp ? Buffer.from(raw.hex_data, 'hex') : undefined) as T extends true ? Buffer : void; } private newClient(): IPacketClient { const prefer = this.napCore.config.packetBackend; let client: IPacketClient | null; switch (prefer) { - case "native": - this.logger.info("使用指定的 NativePacketClient 作为后端"); + case 'native': + this.logger.info('使用指定的 NativePacketClient 作为后端'); client = new NativePacketClient(this.napCore, this.logger, this.logStack); break; - case "frida": - this.logger.info("[Core] [Packet] 使用指定的 FridaPacketClient 作为后端"); + case 'frida': + this.logger.info('[Core] [Packet] 使用指定的 FridaPacketClient 作为后端'); client = new WsPacketClient(this.napCore, this.logger, this.logStack); break; - case "auto": + case 'auto': case undefined: client = this.judgeClient(); break; @@ -101,10 +101,10 @@ export class PacketClientContext { client = null; } if (!client?.check()) { - throw new Error("[Core] [Packet] 无可用的后端，NapCat.Packet将不会加载！"); + throw new Error('[Core] [Packet] 无可用的后端，NapCat.Packet将不会加载！'); } if (!client) { - throw new Error("[Core] [Packet] 后端异常，NapCat.Packet将不会加载！"); + throw new Error('[Core] [Packet] 后端异常，NapCat.Packet将不会加载！'); } return client; } @@ -120,7 +120,7 @@ export class PacketClientContext { .sort((a, b) => b.score - a.score); const selectedClient = sortedClients[0]?.client; if (!selectedClient) { - throw new Error("[Core] [Packet] 无可用的后端，NapCat.Packet将不会加载！"); + throw new Error('[Core] [Packet] 无可用的后端，NapCat.Packet将不会加载！'); } this.logger.info(`自动选择 ${selectedClient.constructor.name} 作为后端`); return selectedClient; diff --git a/src/core/packet/context/loggerContext.ts b/src/core/packet/context/loggerContext.ts index 8c855f8f..86e89806 100644 --- a/src/core/packet/context/loggerContext.ts +++ b/src/core/packet/context/loggerContext.ts @@ -1,5 +1,5 @@ -import { LogLevel, LogWrapper } from "@/common/log"; -import { NapCoreContext } from "@/core/packet/context/napCoreContext"; +import { LogLevel, LogWrapper } from '@/common/log'; +import { NapCoreContext } from '@/core/packet/context/napCoreContext'; // TODO: check bind? export class PacketLogger { @@ -10,7 +10,7 @@ export class PacketLogger { } private _log(level: LogLevel, ...msg: any[]): void { - this.napLogger._log(level, "[Core] [Packet] " + msg); + this.napLogger._log(level, '[Core] [Packet] ' + msg); } debug(...msg: any[]): void { diff --git a/src/core/packet/context/napCoreContext.ts b/src/core/packet/context/napCoreContext.ts index d19c8616..15209bff 100644 --- a/src/core/packet/context/napCoreContext.ts +++ b/src/core/packet/context/napCoreContext.ts @@ -1,4 +1,4 @@ -import { NapCatCore } from "@/core"; +import { NapCatCore } from '@/core'; export interface NapCoreCompatBasicInfo { readonly uin: number; diff --git a/src/core/packet/context/operationContext.ts b/src/core/packet/context/operationContext.ts index 0fe50b62..6cf58ffe 100644 --- a/src/core/packet/context/operationContext.ts +++ b/src/core/packet/context/operationContext.ts @@ -1,20 +1,20 @@ import * as crypto from 'crypto'; -import { PacketContext } from "@/core/packet/context/packetContext"; -import * as trans from "@/core/packet/transformer"; -import { PacketMsg } from "@/core/packet/message/message"; +import { PacketContext } from '@/core/packet/context/packetContext'; +import * as trans from '@/core/packet/transformer'; +import { PacketMsg } from '@/core/packet/message/message'; import { PacketMsgFileElement, PacketMsgPicElement, PacketMsgPttElement, PacketMsgVideoElement -} from "@/core/packet/message/element"; -import { ChatType } from "@/core"; -import { MiniAppRawData, MiniAppReqParams } from "@/core/packet/entities/miniApp"; -import { AIVoiceChatType } from "@/core/packet/entities/aiChat"; -import { NapProtoDecodeStructType, NapProtoEncodeStructType } from "@napneko/nap-proto-core"; -import { IndexNode, MsgInfo } from "@/core/packet/transformer/proto"; -import { OidbPacket } from "@/core/packet/transformer/base"; -import { ImageOcrResult } from "@/core/packet/entities/ocrResult"; +} from '@/core/packet/message/element'; +import { ChatType } from '@/core'; +import { MiniAppRawData, MiniAppReqParams } from '@/core/packet/entities/miniApp'; +import { AIVoiceChatType } from '@/core/packet/entities/aiChat'; +import { NapProtoDecodeStructType, NapProtoEncodeStructType } from '@napneko/nap-proto-core'; +import { IndexNode, MsgInfo } from '@/core/packet/transformer/proto'; +import { OidbPacket } from '@/core/packet/transformer/base'; +import { ImageOcrResult } from '@/core/packet/entities/ocrResult'; export class PacketOperationContext { private readonly context: PacketContext; diff --git a/src/core/packet/context/packetContext.ts b/src/core/packet/context/packetContext.ts index b5484e5d..6a158166 100644 --- a/src/core/packet/context/packetContext.ts +++ b/src/core/packet/context/packetContext.ts @@ -1,10 +1,10 @@ -import { PacketHighwayContext } from "@/core/packet/highway/highwayContext"; -import { NapCatCore } from "@/core"; -import { PacketLogger } from "@/core/packet/context/loggerContext"; -import { NapCoreContext } from "@/core/packet/context/napCoreContext"; -import { PacketClientContext } from "@/core/packet/context/clientContext"; -import { PacketOperationContext } from "@/core/packet/context/operationContext"; -import { PacketMsgConverter } from "@/core/packet/message/converter"; +import { PacketHighwayContext } from '@/core/packet/highway/highwayContext'; +import { NapCatCore } from '@/core'; +import { PacketLogger } from '@/core/packet/context/loggerContext'; +import { NapCoreContext } from '@/core/packet/context/napCoreContext'; +import { PacketClientContext } from '@/core/packet/context/clientContext'; +import { PacketOperationContext } from '@/core/packet/context/operationContext'; +import { PacketMsgConverter } from '@/core/packet/message/converter'; export class PacketContext { readonly msgConverter: PacketMsgConverter; diff --git a/src/core/packet/highway/client.ts b/src/core/packet/highway/client.ts index e4c4d7fc..18274c64 100644 --- a/src/core/packet/highway/client.ts +++ b/src/core/packet/highway/client.ts @@ -1,9 +1,9 @@ import * as stream from 'node:stream'; -import { ReadStream } from "node:fs"; -import { HighwayTcpUploader } from "@/core/packet/highway/uploader/highwayTcpUploader"; -import { HighwayHttpUploader } from "@/core/packet/highway/uploader/highwayHttpUploader"; -import { PacketHighwaySig } from "@/core/packet/highway/highwayContext"; -import { PacketLogger } from "@/core/packet/context/loggerContext"; +import { ReadStream } from 'node:fs'; +import { HighwayTcpUploader } from '@/core/packet/highway/uploader/highwayTcpUploader'; +import { HighwayHttpUploader } from '@/core/packet/highway/uploader/highwayHttpUploader'; +import { PacketHighwaySig } from '@/core/packet/highway/highwayContext'; +import { PacketLogger } from '@/core/packet/context/loggerContext'; export interface PacketHighwayTrans { uin: string; diff --git a/src/core/packet/highway/frame.ts b/src/core/packet/highway/frame.ts index e0f87c4b..96806d2c 100644 --- a/src/core/packet/highway/frame.ts +++ b/src/core/packet/highway/frame.ts @@ -1,4 +1,4 @@ -import assert from "node:assert"; +import assert from 'node:assert'; export class Frame{ static pack(head: Buffer, body: Buffer): Buffer { diff --git a/src/core/packet/highway/highwayContext.ts b/src/core/packet/highway/highwayContext.ts index 2fdd6f52..76904cfd 100644 --- a/src/core/packet/highway/highwayContext.ts +++ b/src/core/packet/highway/highwayContext.ts @@ -1,22 +1,22 @@ -import { PacketHighwayClient } from "@/core/packet/highway/client"; -import { PacketLogger } from "@/core/packet/context/loggerContext"; -import FetchSessionKey from "@/core/packet/transformer/highway/FetchSessionKey"; -import { int32ip2str, oidbIpv4s2HighwayIpv4s } from "@/core/packet/highway/utils"; +import { PacketHighwayClient } from '@/core/packet/highway/client'; +import { PacketLogger } from '@/core/packet/context/loggerContext'; +import FetchSessionKey from '@/core/packet/transformer/highway/FetchSessionKey'; +import { int32ip2str, oidbIpv4s2HighwayIpv4s } from '@/core/packet/highway/utils'; import { PacketMsgFileElement, PacketMsgPicElement, PacketMsgPttElement, PacketMsgVideoElement -} from "@/core/packet/message/element"; -import { ChatType, Peer } from "@/core"; -import { calculateSha1, calculateSha1StreamBytes, computeMd5AndLengthWithLimit } from "@/core/packet/utils/crypto/hash"; -import UploadGroupImage from "@/core/packet/transformer/highway/UploadGroupImage"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import * as proto from "@/core/packet/transformer/proto"; -import * as trans from "@/core/packet/transformer"; -import fs from "fs"; -import { NapCoreContext } from "@/core/packet/context/napCoreContext"; -import { PacketClientContext } from "@/core/packet/context/clientContext"; +} from '@/core/packet/message/element'; +import { ChatType, Peer } from '@/core'; +import { calculateSha1, calculateSha1StreamBytes, computeMd5AndLengthWithLimit } from '@/core/packet/utils/crypto/hash'; +import UploadGroupImage from '@/core/packet/transformer/highway/UploadGroupImage'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import * as proto from '@/core/packet/transformer/proto'; +import * as trans from '@/core/packet/transformer'; +import fs from 'fs'; +import { NapCoreContext } from '@/core/packet/context/napCoreContext'; +import { PacketClientContext } from '@/core/packet/context/clientContext'; export const BlockSize = 1024 * 1024; @@ -142,7 +142,7 @@ export class PacketHighwayContext { const resp = await this.client.sendOidbPacket(req, true); const preRespData = UploadGroupImage.parse(resp); const ukey = preRespData.upload.uKey; - if (ukey && ukey != "") { + if (ukey && ukey != '') { this.logger.debug(`[Highway] uploadGroupImageReq get upload ukey: ${ukey}, need upload!`); const index = preRespData.upload.msgInfo.msgInfoBody[0].index; const sha1 = Buffer.from(index.info.fileSha1, 'hex'); @@ -179,7 +179,7 @@ export class PacketHighwayContext { const resp = await this.client.sendOidbPacket(req, true); const preRespData = trans.UploadPrivateImage.parse(resp); const ukey = preRespData.upload.uKey; - if (ukey && ukey != "") { + if (ukey && ukey != '') { this.logger.debug(`[Highway] uploadC2CImageReq get upload ukey: ${ukey}, need upload!`); const index = preRespData.upload.msgInfo.msgInfoBody[0].index; const sha1 = Buffer.from(index.info.fileSha1, 'hex'); @@ -210,14 +210,14 @@ export class PacketHighwayContext { } private async uploadGroupVideo(groupUin: number, video: PacketMsgVideoElement): Promise { - if (!video.filePath || !video.thumbPath) throw new Error("video.filePath or video.thumbPath is empty"); + if (!video.filePath || !video.thumbPath) throw new Error('video.filePath or video.thumbPath is empty'); video.fileSha1 = Buffer.from(await calculateSha1(video.filePath)).toString('hex'); video.thumbSha1 = Buffer.from(await calculateSha1(video.thumbPath)).toString('hex'); const req = trans.UploadGroupVideo.build(groupUin, video); const resp = await this.client.sendOidbPacket(req, true); const preRespData = trans.UploadGroupVideo.parse(resp); const ukey = preRespData.upload.uKey; - if (ukey && ukey != "") { + if (ukey && ukey != '') { this.logger.debug(`[Highway] uploadGroupVideoReq get upload video ukey: ${ukey}, need upload!`); const index = preRespData.upload.msgInfo.msgInfoBody[0].index; const md5 = Buffer.from(index.info.fileHash, 'hex'); @@ -244,7 +244,7 @@ export class PacketHighwayContext { this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid ukey ${ukey}, don't need upload!`); } const subFile = preRespData.upload.subFileInfos[0]; - if (subFile.uKey && subFile.uKey != "") { + if (subFile.uKey && subFile.uKey != '') { this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`); const index = preRespData.upload.msgInfo.msgInfoBody[1].index; const md5 = Buffer.from(index.info.fileHash, 'hex'); @@ -275,14 +275,14 @@ export class PacketHighwayContext { } private async uploadC2CVideo(peerUid: string, video: PacketMsgVideoElement): Promise { - if (!video.filePath || !video.thumbPath) throw new Error("video.filePath or video.thumbPath is empty"); + if (!video.filePath || !video.thumbPath) throw new Error('video.filePath or video.thumbPath is empty'); video.fileSha1 = Buffer.from(await calculateSha1(video.filePath)).toString('hex'); video.thumbSha1 = Buffer.from(await calculateSha1(video.thumbPath)).toString('hex'); const req = trans.UploadPrivateVideo.build(peerUid, video); const resp = await this.client.sendOidbPacket(req, true); const preRespData = trans.UploadPrivateVideo.parse(resp); const ukey = preRespData.upload.uKey; - if (ukey && ukey != "") { + if (ukey && ukey != '') { this.logger.debug(`[Highway] uploadC2CVideoReq get upload video ukey: ${ukey}, need upload!`); const index = preRespData.upload.msgInfo.msgInfoBody[0].index; const md5 = Buffer.from(index.info.fileHash, 'hex'); @@ -309,7 +309,7 @@ export class PacketHighwayContext { this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid ukey ${ukey}, don't need upload!`); } const subFile = preRespData.upload.subFileInfos[0]; - if (subFile.uKey && subFile.uKey != "") { + if (subFile.uKey && subFile.uKey != '') { this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`); const index = preRespData.upload.msgInfo.msgInfoBody[1].index; const md5 = Buffer.from(index.info.fileHash, 'hex'); @@ -345,7 +345,7 @@ export class PacketHighwayContext { const resp = await this.client.sendOidbPacket(req, true); const preRespData = trans.UploadGroupPtt.parse(resp); const ukey = preRespData.upload.uKey; - if (ukey && ukey != "") { + if (ukey && ukey != '') { this.logger.debug(`[Highway] uploadGroupPttReq get upload ptt ukey: ${ukey}, need upload!`); const index = preRespData.upload.msgInfo.msgInfoBody[0].index; const md5 = Buffer.from(index.info.fileHash, 'hex'); @@ -381,7 +381,7 @@ export class PacketHighwayContext { const resp = await this.client.sendOidbPacket(req, true); const preRespData = trans.UploadPrivatePtt.parse(resp); const ukey = preRespData.upload.uKey; - if (ukey && ukey != "") { + if (ukey && ukey != '') { this.logger.debug(`[Highway] uploadC2CPttReq get upload ptt ukey: ${ukey}, need upload!`); const index = preRespData.upload.msgInfo.msgInfoBody[0].index; const md5 = Buffer.from(index.info.fileHash, 'hex'); @@ -419,7 +419,7 @@ export class PacketHighwayContext { const resp = await this.client.sendOidbPacket(req, true); const preRespData = trans.UploadGroupFile.parse(resp); if (!preRespData?.upload?.boolFileExist) { - this.logger.debug(`[Highway] uploadGroupFileReq file not exist, need upload!`); + this.logger.debug('[Highway] uploadGroupFileReq file not exist, need upload!'); const ext = new NapProtoMsg(proto.FileUploadExt).encode({ unknown1: 100, unknown2: 1, @@ -439,9 +439,9 @@ export class PacketHighwayContext { }, clientInfo: { clientType: 3, - appId: "100", + appId: '100', terminalType: 3, - clientVer: "1.1.1", + clientVer: '1.1.1', unknown: 4 }, fileNameInfo: { @@ -469,7 +469,7 @@ export class PacketHighwayContext { ext ); } else { - this.logger.debug(`[Highway] uploadGroupFileReq file exist, don't need upload!`); + this.logger.debug('[Highway] uploadGroupFileReq file exist, don\'t need upload!'); } file.fileUuid = preRespData.upload.fileId; } @@ -482,7 +482,7 @@ export class PacketHighwayContext { const res = await this.client.sendOidbPacket(req, true); const preRespData = trans.UploadPrivateFile.parse(res); if (!preRespData.upload?.boolFileExist) { - this.logger.debug(`[Highway] uploadC2CFileReq file not exist, need upload!`); + this.logger.debug('[Highway] uploadC2CFileReq file not exist, need upload!'); const ext = new NapProtoMsg(proto.FileUploadExt).encode({ unknown1: 100, unknown2: 1, @@ -500,9 +500,9 @@ export class PacketHighwayContext { }, clientInfo: { clientType: 3, - appId: "100", + appId: '100', terminalType: 3, - clientVer: "1.1.1", + clientVer: '1.1.1', unknown: 4 }, fileNameInfo: { diff --git a/src/core/packet/highway/uploader/highwayHttpUploader.ts b/src/core/packet/highway/uploader/highwayHttpUploader.ts index 962261a2..4c14ce87 100644 --- a/src/core/packet/highway/uploader/highwayHttpUploader.ts +++ b/src/core/packet/highway/uploader/highwayHttpUploader.ts @@ -1,9 +1,9 @@ -import crypto from "node:crypto"; -import http from "node:http"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { IHighwayUploader } from "@/core/packet/highway/uploader/highwayUploader"; -import { Frame } from "@/core/packet/highway/frame"; -import * as proto from "@/core/packet/transformer/proto"; +import crypto from 'node:crypto'; +import http from 'node:http'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { IHighwayUploader } from '@/core/packet/highway/uploader/highwayUploader'; +import { Frame } from '@/core/packet/highway/frame'; +import * as proto from '@/core/packet/transformer/proto'; export class HighwayHttpUploader extends IHighwayUploader { async upload(): Promise { diff --git a/src/core/packet/highway/uploader/highwayTcpUploader.ts b/src/core/packet/highway/uploader/highwayTcpUploader.ts index 69e02ed2..35f23b21 100644 --- a/src/core/packet/highway/uploader/highwayTcpUploader.ts +++ b/src/core/packet/highway/uploader/highwayTcpUploader.ts @@ -1,11 +1,11 @@ -import net from "node:net"; -import stream from "node:stream"; -import crypto from "node:crypto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { BlockSize } from "@/core/packet/highway/highwayContext"; -import { Frame } from "@/core/packet/highway/frame"; -import { IHighwayUploader } from "@/core/packet/highway/uploader/highwayUploader"; -import * as proto from "@/core/packet/transformer/proto"; +import net from 'node:net'; +import stream from 'node:stream'; +import crypto from 'node:crypto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { BlockSize } from '@/core/packet/highway/highwayContext'; +import { Frame } from '@/core/packet/highway/frame'; +import { IHighwayUploader } from '@/core/packet/highway/uploader/highwayUploader'; +import * as proto from '@/core/packet/transformer/proto'; class HighwayTcpUploaderTransform extends stream.Transform { uploader: HighwayTcpUploader; diff --git a/src/core/packet/highway/uploader/highwayUploader.ts b/src/core/packet/highway/uploader/highwayUploader.ts index c8902dff..57d71409 100644 --- a/src/core/packet/highway/uploader/highwayUploader.ts +++ b/src/core/packet/highway/uploader/highwayUploader.ts @@ -1,8 +1,8 @@ -import * as tea from "@/core/packet/utils/crypto/tea"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { PacketHighwayTrans } from "@/core/packet/highway/client"; -import { PacketLogger } from "@/core/packet/context/loggerContext"; -import * as proto from "@/core/packet/transformer/proto"; +import * as tea from '@/core/packet/utils/crypto/tea'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { PacketHighwayTrans } from '@/core/packet/highway/client'; +import { PacketLogger } from '@/core/packet/context/loggerContext'; +import * as proto from '@/core/packet/transformer/proto'; export abstract class IHighwayUploader { readonly trans: PacketHighwayTrans; @@ -32,7 +32,7 @@ export abstract class IHighwayUploader { msgBaseHead: { version: 1, uin: this.trans.uin, - command: "PicUp.DataUp", + command: 'PicUp.DataUp', seq: 0, retryTimes: 0, appId: 1600001604, diff --git a/src/core/packet/highway/utils.ts b/src/core/packet/highway/utils.ts index 64b84cef..18cf7462 100644 --- a/src/core/packet/highway/utils.ts +++ b/src/core/packet/highway/utils.ts @@ -1,5 +1,5 @@ -import { NapProtoEncodeStructType } from "@napneko/nap-proto-core"; -import * as proto from "@/core/packet/transformer/proto"; +import { NapProtoEncodeStructType } from '@napneko/nap-proto-core'; +import * as proto from '@/core/packet/transformer/proto'; export const int32ip2str = (ip: number) => { diff --git a/src/core/packet/message/builder.ts b/src/core/packet/message/builder.ts index addb8771..2503645b 100644 --- a/src/core/packet/message/builder.ts +++ b/src/core/packet/message/builder.ts @@ -1,14 +1,14 @@ -import * as crypto from "crypto"; -import { PushMsgBody } from "@/core/packet/transformer/proto"; -import { NapProtoEncodeStructType } from "@napneko/nap-proto-core"; -import { PacketMsg, PacketSendMsgElement } from "@/core/packet/message/message"; -import { IPacketMsgElement, PacketMsgTextElement } from "@/core/packet/message/element"; -import { SendTextElement } from "@/core"; +import * as crypto from 'crypto'; +import { PushMsgBody } from '@/core/packet/transformer/proto'; +import { NapProtoEncodeStructType } from '@napneko/nap-proto-core'; +import { PacketMsg, PacketSendMsgElement } from '@/core/packet/message/message'; +import { IPacketMsgElement, PacketMsgTextElement } from '@/core/packet/message/element'; +import { SendTextElement } from '@/core'; export class PacketMsgBuilder { protected static failBackText = new PacketMsgTextElement( { - textElement: { content: "[该消息类型暂不支持查看]" } + textElement: { content: '[该消息类型暂不支持查看]' } } as SendTextElement ); @@ -24,7 +24,7 @@ export class PacketMsgBuilder { } return { responseHead: { - fromUid: "", + fromUid: '', fromUin: node.senderUin, toUid: node.groupId ? undefined : selfUid, forward: node.groupId ? undefined : { diff --git a/src/core/packet/message/converter.ts b/src/core/packet/message/converter.ts index cb193ed4..f995ac3e 100644 --- a/src/core/packet/message/converter.ts +++ b/src/core/packet/message/converter.ts @@ -15,7 +15,7 @@ import { SendStructLongMsgElement, SendTextElement, SendVideoElement -} from "@/core"; +} from '@/core'; import { IPacketMsgElement, PacketMsgAtElement, @@ -30,8 +30,8 @@ import { PacketMsgTextElement, PacketMsgVideoElement, PacketMultiMsgElement -} from "@/core/packet/message/element"; -import { PacketMsg, PacketSendMsgElement } from "@/core/packet/message/message"; +} from '@/core/packet/message/element'; +import { PacketMsg, PacketSendMsgElement } from '@/core/packet/message/message'; const SupportedElementTypes = [ ElementType.TEXT, @@ -146,7 +146,7 @@ export class PacketMsgConverter { ? msg.sendMemberName : msg.sendNickName && msg.sendNickName !== '' ? msg.sendNickName - : "QQ用户", + : 'QQ用户', time: +msg.msgTime, msg: msg.elements.map((element) => { if (!this.isValidElementType(element.elementType)) return null; diff --git a/src/core/packet/message/element.ts b/src/core/packet/message/element.ts index 3dfd7ec3..24861c5e 100644 --- a/src/core/packet/message/element.ts +++ b/src/core/packet/message/element.ts @@ -1,5 +1,5 @@ -import * as zlib from "node:zlib"; -import { NapProtoEncodeStructType, NapProtoMsg } from "@napneko/nap-proto-core"; +import * as zlib from 'node:zlib'; +import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; import { CustomFace, Elem, @@ -12,7 +12,7 @@ import { OidbSvcTrpcTcp0XE37_800Response, FileExtra, GroupFileExtra -} from "@/core/packet/transformer/proto"; +} from '@/core/packet/transformer/proto'; import { BaseEmojiType, FaceType, @@ -29,9 +29,9 @@ import { SendStructLongMsgElement, SendTextElement, SendVideoElement -} from "@/core"; -import { ForwardMsgBuilder } from "@/common/forward-msg-builder"; -import { PacketMsg, PacketSendMsgElement } from "@/core/packet/message/message"; +} from '@/core'; +import { ForwardMsgBuilder } from '@/common/forward-msg-builder'; +import { PacketMsg, PacketSendMsgElement } from '@/core/packet/message/message'; // raw <-> packet // TODO: SendStructLongMsgElement @@ -153,7 +153,7 @@ export class PacketMsgReplyElement extends IPacketMsgElement { } toPreview(): string { - return "[回复消息]"; + return '[回复消息]'; } } @@ -175,12 +175,12 @@ export class PacketMsgFaceElement extends IPacketMsgElement { commonElem: { serviceType: 37, pbElem: new NapProtoMsg(QBigFaceExtra).encode({ - aniStickerPackId: "1", - aniStickerId: "8", + aniStickerPackId: '1', + aniStickerId: '8', faceId: this.faceId, sourceType: 1, resultId: this.resultId, - preview: "", + preview: '', randomType: 1 }), businessType: 1 @@ -198,8 +198,8 @@ export class PacketMsgFaceElement extends IPacketMsgElement { serviceType: 33, pbElem: new NapProtoMsg(QSmallFaceExtra).encode({ faceId: this.faceId, - preview: "", - preview2: "" + preview: '', + preview2: '' }), businessType: 1 } @@ -208,7 +208,7 @@ export class PacketMsgFaceElement extends IPacketMsgElement { } toPreview(): string { - return "[表情]"; + return '[表情]'; } } @@ -341,7 +341,7 @@ export class PacketMsgVideoElement extends IPacketMsgElement { } toPreview(): string { - return "[视频]"; + return '[视频]'; } } @@ -378,7 +378,7 @@ export class PacketMsgPttElement extends IPacketMsgElement { } toPreview(): string { - return "[语音]"; + return '[语音]'; } } @@ -450,7 +450,7 @@ export class PacketMsgFileElement extends IPacketMsgElement { fileSize: BigInt(this.fileSize), fileName: this.fileName, fileSha: this.fileSha1, - extInfoString: "", + extInfoString: '', fileMd5: this.fileMd5, } } @@ -489,7 +489,7 @@ export class PacketMsgLightAppElement extends IPacketMsgElement } toPreview(): string { - return "[卡片消息]"; + return '[卡片消息]'; } } @@ -540,6 +540,6 @@ export class PacketMultiMsgElement extends IPacketMsgElement { constructor() { diff --git a/src/core/packet/transformer/action/GetAiVoice.ts b/src/core/packet/transformer/action/GetAiVoice.ts index d5b9c6c1..5cb3483c 100644 --- a/src/core/packet/transformer/action/GetAiVoice.ts +++ b/src/core/packet/transformer/action/GetAiVoice.ts @@ -1,8 +1,8 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; -import { AIVoiceChatType } from "@/core/packet/entities/aiChat"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; +import { AIVoiceChatType } from '@/core/packet/entities/aiChat'; class GetAiVoice extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts b/src/core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts index b67818ce..135c86d4 100644 --- a/src/core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts +++ b/src/core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts @@ -1,7 +1,7 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from "@/core/packet/transformer/base"; -import { MiniAppReqParams } from "@/core/packet/entities/miniApp"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base'; +import { MiniAppReqParams } from '@/core/packet/entities/miniApp'; class GetMiniAppAdaptShareInfo extends PacketTransformer { constructor() { @@ -23,24 +23,24 @@ class GetMiniAppAdaptShareInfo extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/action/GroupSign.ts b/src/core/packet/transformer/action/GroupSign.ts index e8379279..11858847 100644 --- a/src/core/packet/transformer/action/GroupSign.ts +++ b/src/core/packet/transformer/action/GroupSign.ts @@ -1,7 +1,7 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; class GroupSign extends PacketTransformer { constructor() { @@ -14,7 +14,7 @@ class GroupSign extends PacketTransformer { body: { uin: String(uin), groupUin: String(groupCode), - version: "9.0.90" + version: '9.0.90' } } ); diff --git a/src/core/packet/transformer/action/ImageOCR.ts b/src/core/packet/transformer/action/ImageOCR.ts index 1f05a91c..02217f79 100644 --- a/src/core/packet/transformer/action/ImageOCR.ts +++ b/src/core/packet/transformer/action/ImageOCR.ts @@ -1,7 +1,7 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; class ImageOCR extends PacketTransformer { constructor() { @@ -16,11 +16,11 @@ class ImageOCR extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/action/SetSpecialTitle.ts b/src/core/packet/transformer/action/SetSpecialTitle.ts index ce99e023..c7dbb2ff 100644 --- a/src/core/packet/transformer/action/SetSpecialTitle.ts +++ b/src/core/packet/transformer/action/SetSpecialTitle.ts @@ -1,7 +1,7 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; class SetSpecialTitle extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/base.ts b/src/core/packet/transformer/base.ts index eda5b730..3df5df0e 100644 --- a/src/core/packet/transformer/base.ts +++ b/src/core/packet/transformer/base.ts @@ -1,5 +1,5 @@ -import { NapProtoDecodeStructType } from "@napneko/nap-proto-core"; -import { PacketMsgBuilder } from "@/core/packet/message/builder"; +import { NapProtoDecodeStructType } from '@napneko/nap-proto-core'; +import { PacketMsgBuilder } from '@/core/packet/message/builder'; export type PacketHexStr = string & { readonly hexNya: unique symbol }; diff --git a/src/core/packet/transformer/highway/DownloadGroupFile.ts b/src/core/packet/transformer/highway/DownloadGroupFile.ts index 00e077ff..c5b381dc 100644 --- a/src/core/packet/transformer/highway/DownloadGroupFile.ts +++ b/src/core/packet/transformer/highway/DownloadGroupFile.ts @@ -1,7 +1,7 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; class DownloadGroupFile extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/highway/DownloadGroupPtt.ts b/src/core/packet/transformer/highway/DownloadGroupPtt.ts index c724868a..cc5028a3 100644 --- a/src/core/packet/transformer/highway/DownloadGroupPtt.ts +++ b/src/core/packet/transformer/highway/DownloadGroupPtt.ts @@ -1,7 +1,7 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoEncodeStructType, NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; class DownloadGroupPtt extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/highway/DownloadImage.ts b/src/core/packet/transformer/highway/DownloadImage.ts index 8d99fa2d..389e69bd 100644 --- a/src/core/packet/transformer/highway/DownloadImage.ts +++ b/src/core/packet/transformer/highway/DownloadImage.ts @@ -1,8 +1,8 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoEncodeStructType, NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; -import { IndexNode } from "@/core/packet/transformer/proto"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; +import { IndexNode } from '@/core/packet/transformer/proto'; class DownloadImage extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/highway/DownloadOfflineFile.ts b/src/core/packet/transformer/highway/DownloadOfflineFile.ts index 1ca3af7b..278f877a 100644 --- a/src/core/packet/transformer/highway/DownloadOfflineFile.ts +++ b/src/core/packet/transformer/highway/DownloadOfflineFile.ts @@ -1,7 +1,7 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; class DownloadOfflineFile extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/highway/DownloadPrivateFile.ts b/src/core/packet/transformer/highway/DownloadPrivateFile.ts index 6355c08e..fd3027b8 100644 --- a/src/core/packet/transformer/highway/DownloadPrivateFile.ts +++ b/src/core/packet/transformer/highway/DownloadPrivateFile.ts @@ -1,7 +1,7 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; class DownloadPrivateFile extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/highway/FetchSessionKey.ts b/src/core/packet/transformer/highway/FetchSessionKey.ts index 324968e9..263326f5 100644 --- a/src/core/packet/transformer/highway/FetchSessionKey.ts +++ b/src/core/packet/transformer/highway/FetchSessionKey.ts @@ -1,6 +1,6 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from "@/core/packet/transformer/base"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base'; class FetchSessionKey extends PacketTransformer { constructor() { @@ -20,11 +20,11 @@ class FetchSessionKey extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/highway/UploadGroupImage.ts b/src/core/packet/transformer/highway/UploadGroupImage.ts index 15d2f715..245a4af4 100644 --- a/src/core/packet/transformer/highway/UploadGroupImage.ts +++ b/src/core/packet/transformer/highway/UploadGroupImage.ts @@ -1,9 +1,9 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; -import crypto from "node:crypto"; -import { PacketMsgPicElement } from "@/core/packet/message/element"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; +import crypto from 'node:crypto'; +import { PacketMsgPicElement } from '@/core/packet/message/element'; class UploadGroupImage extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/highway/UploadGroupPtt.ts b/src/core/packet/transformer/highway/UploadGroupPtt.ts index 820c56de..272c090b 100644 --- a/src/core/packet/transformer/highway/UploadGroupPtt.ts +++ b/src/core/packet/transformer/highway/UploadGroupPtt.ts @@ -1,9 +1,9 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; -import crypto from "node:crypto"; -import { PacketMsgPttElement } from "@/core/packet/message/element"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; +import crypto from 'node:crypto'; +import { PacketMsgPttElement } from '@/core/packet/message/element'; class UploadGroupPtt extends PacketTransformer { constructor() { @@ -57,7 +57,7 @@ class UploadGroupPtt extends PacketTransformer { compatQMsgSceneType: 2, extBizInfo: { pic: { - textSummary: "Nya~", + textSummary: 'Nya~', }, video: { bytesPbReserve: Buffer.alloc(0), diff --git a/src/core/packet/transformer/highway/UploadGroupVideo.ts b/src/core/packet/transformer/highway/UploadGroupVideo.ts index 0f8e12b8..9637f5d0 100644 --- a/src/core/packet/transformer/highway/UploadGroupVideo.ts +++ b/src/core/packet/transformer/highway/UploadGroupVideo.ts @@ -1,9 +1,9 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; -import crypto from "node:crypto"; -import { PacketMsgVideoElement } from "@/core/packet/message/element"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; +import crypto from 'node:crypto'; +import { PacketMsgVideoElement } from '@/core/packet/message/element'; class UploadGroupVideo extends PacketTransformer { constructor() { @@ -11,7 +11,7 @@ class UploadGroupVideo extends PacketTransformer } build(groupUin: number, video: PacketMsgVideoElement): OidbPacket { - if (!video.fileSize || !video.thumbSize) throw new Error("video.fileSize or video.thumbSize is empty"); + if (!video.fileSize || !video.thumbSize) throw new Error('video.fileSize or video.thumbSize is empty'); const data = new NapProtoMsg(proto.NTV2RichMediaReq).encode({ reqHead: { common: { @@ -37,7 +37,7 @@ class UploadGroupVideo extends PacketTransformer fileSize: +video.fileSize, fileHash: video.fileMd5, fileSha1: video.fileSha1, - fileName: "nya.mp4", + fileName: 'nya.mp4', type: { type: 2, picFormat: 0, @@ -55,7 +55,7 @@ class UploadGroupVideo extends PacketTransformer fileSize: +video.thumbSize, fileHash: video.thumbMd5, fileSha1: video.thumbSha1, - fileName: "nya.jpg", + fileName: 'nya.jpg', type: { type: 1, picFormat: 0, @@ -77,7 +77,7 @@ class UploadGroupVideo extends PacketTransformer extBizInfo: { pic: { bizType: 0, - textSummary: "Nya~", + textSummary: 'Nya~', }, video: { bytesPbReserve: Buffer.from([0x80, 0x01, 0x00]), diff --git a/src/core/packet/transformer/highway/UploadPrivateFile.ts b/src/core/packet/transformer/highway/UploadPrivateFile.ts index 30a94f4c..8083f785 100644 --- a/src/core/packet/transformer/highway/UploadPrivateFile.ts +++ b/src/core/packet/transformer/highway/UploadPrivateFile.ts @@ -1,9 +1,9 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; -import { PacketMsgFileElement } from "@/core/packet/message/element"; -import { computeMd5AndLengthWithLimit } from "@/core/packet/utils/crypto/hash"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; +import { PacketMsgFileElement } from '@/core/packet/message/element'; +import { computeMd5AndLengthWithLimit } from '@/core/packet/utils/crypto/hash'; class UploadPrivateFile extends PacketTransformer { constructor() { @@ -21,7 +21,7 @@ class UploadPrivateFile extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/highway/UploadPrivatePtt.ts b/src/core/packet/transformer/highway/UploadPrivatePtt.ts index e943bfd1..07b151de 100644 --- a/src/core/packet/transformer/highway/UploadPrivatePtt.ts +++ b/src/core/packet/transformer/highway/UploadPrivatePtt.ts @@ -1,9 +1,9 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; -import crypto from "node:crypto"; -import { PacketMsgPttElement } from "@/core/packet/message/element"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; +import crypto from 'node:crypto'; +import { PacketMsgPttElement } from '@/core/packet/message/element'; class UploadPrivatePtt extends PacketTransformer { constructor() { @@ -58,7 +58,7 @@ class UploadPrivatePtt extends PacketTransformer compatQMsgSceneType: 1, extBizInfo: { pic: { - textSummary: "Nya~", + textSummary: 'Nya~', }, ptt: { bytesReserve: Buffer.from([0x08, 0x00, 0x38, 0x00]), diff --git a/src/core/packet/transformer/highway/UploadPrivateVideo.ts b/src/core/packet/transformer/highway/UploadPrivateVideo.ts index f47312c5..24c05093 100644 --- a/src/core/packet/transformer/highway/UploadPrivateVideo.ts +++ b/src/core/packet/transformer/highway/UploadPrivateVideo.ts @@ -1,9 +1,9 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; -import crypto from "node:crypto"; -import { PacketMsgVideoElement } from "@/core/packet/message/element"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; +import crypto from 'node:crypto'; +import { PacketMsgVideoElement } from '@/core/packet/message/element'; class UploadPrivateVideo extends PacketTransformer { constructor() { @@ -11,7 +11,7 @@ class UploadPrivateVideo extends PacketTransformer { constructor() { @@ -14,7 +14,7 @@ class UploadForwardMsg extends PacketTransformer { const longMsgResultData = new NapProtoMsg(proto.LongMsgResult).encode( { action: { - actionCommand: "MultiMsg", + actionCommand: 'MultiMsg', actionData: { msgBody: msgBody } @@ -38,7 +38,7 @@ class UploadForwardMsg extends PacketTransformer { } ); return { - cmd: "trpc.group.long_msg_interface.MsgService.SsoSendLongMsg", + cmd: 'trpc.group.long_msg_interface.MsgService.SsoSendLongMsg', data: PacketHexStrBuilder(req) }; } diff --git a/src/core/packet/transformer/oidb/oidbBase.ts b/src/core/packet/transformer/oidb/oidbBase.ts index 23cffefc..83cf0ee4 100644 --- a/src/core/packet/transformer/oidb/oidbBase.ts +++ b/src/core/packet/transformer/oidb/oidbBase.ts @@ -1,6 +1,6 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from "@/core/packet/transformer/base"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base'; class OidbBase extends PacketTransformer { constructor() { diff --git a/src/core/packet/transformer/proto/action/action.ts b/src/core/packet/transformer/proto/action/action.ts index 90f5add8..bd135726 100644 --- a/src/core/packet/transformer/proto/action/action.ts +++ b/src/core/packet/transformer/proto/action/action.ts @@ -1,6 +1,6 @@ -import { ScalarType } from "@protobuf-ts/runtime"; -import { ProtoField } from "@napneko/nap-proto-core"; -import { ContentHead, MessageBody, MessageControl, RoutingHead } from "@/core/packet/transformer/proto"; +import { ScalarType } from '@protobuf-ts/runtime'; +import { ProtoField } from '@napneko/nap-proto-core'; +import { ContentHead, MessageBody, MessageControl, RoutingHead } from '@/core/packet/transformer/proto'; export const FaceRoamRequest = { comm: ProtoField(1, () => PlatInfo, true), diff --git a/src/core/packet/transformer/proto/action/miniAppAdaptShareInfo.ts b/src/core/packet/transformer/proto/action/miniAppAdaptShareInfo.ts index c931992d..08e3c2a1 100644 --- a/src/core/packet/transformer/proto/action/miniAppAdaptShareInfo.ts +++ b/src/core/packet/transformer/proto/action/miniAppAdaptShareInfo.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const MiniAppAdaptShareInfoReq = { appId: ProtoField(2, ScalarType.STRING), diff --git a/src/core/packet/transformer/proto/highway/highway.ts b/src/core/packet/transformer/proto/highway/highway.ts index faeef73a..8e15e4e3 100644 --- a/src/core/packet/transformer/proto/highway/highway.ts +++ b/src/core/packet/transformer/proto/highway/highway.ts @@ -1,5 +1,5 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; -import { MsgInfoBody } from "@/core/packet/transformer/proto"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { MsgInfoBody } from '@/core/packet/transformer/proto'; export const DataHighwayHead = { version: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/transformer/proto/index.ts b/src/core/packet/transformer/proto/index.ts index 4e2aa3a8..4f9534ab 100644 --- a/src/core/packet/transformer/proto/index.ts +++ b/src/core/packet/transformer/proto/index.ts @@ -1,32 +1,32 @@ // action folder -export * from "./action/action"; -export * from "./action/miniAppAdaptShareInfo"; +export * from './action/action'; +export * from './action/miniAppAdaptShareInfo'; // highway folder -export * from "./highway/highway"; +export * from './highway/highway'; // message folder -export * from "./message/action"; -export * from "./message/c2c"; -export * from "./message/component"; -export * from "./message/element"; -export * from "./message/group"; -export * from "./message/message"; -export * from "./message/notify"; -export * from "./message/routing"; +export * from './message/action'; +export * from './message/c2c'; +export * from './message/component'; +export * from './message/element'; +export * from './message/group'; +export * from './message/message'; +export * from './message/notify'; +export * from './message/routing'; // oidb folder -export * from "./oidb/common/Ntv2.RichMediaReq"; -export * from "./oidb/common/Ntv2.RichMediaResp"; -export * from "./oidb/Oidb.0x6D6"; -export * from "./oidb/Oidb.0x8FC_2"; -export * from "./oidb/Oidb.0x9067_202"; -export * from "./oidb/Oidb.0x929"; -export * from "./oidb/Oidb.0xE37_1200"; -export * from "./oidb/Oidb.0xE37_1700"; -export * from "./oidb/Oidb.0XE37_800"; -export * from "./oidb/Oidb.0xEB7"; -export * from "./oidb/Oidb.0xED3_1"; -export * from "./oidb/Oidb.0XFE1_2"; -export * from "./oidb/OidbBase"; -export * from "./oidb/Oidb.0xE07"; +export * from './oidb/common/Ntv2.RichMediaReq'; +export * from './oidb/common/Ntv2.RichMediaResp'; +export * from './oidb/Oidb.0x6D6'; +export * from './oidb/Oidb.0x8FC_2'; +export * from './oidb/Oidb.0x9067_202'; +export * from './oidb/Oidb.0x929'; +export * from './oidb/Oidb.0xE37_1200'; +export * from './oidb/Oidb.0xE37_1700'; +export * from './oidb/Oidb.0XE37_800'; +export * from './oidb/Oidb.0xEB7'; +export * from './oidb/Oidb.0xED3_1'; +export * from './oidb/Oidb.0XFE1_2'; +export * from './oidb/OidbBase'; +export * from './oidb/Oidb.0xE07'; diff --git a/src/core/packet/transformer/proto/message/action.ts b/src/core/packet/transformer/proto/message/action.ts index 369c57d4..74f47132 100644 --- a/src/core/packet/transformer/proto/message/action.ts +++ b/src/core/packet/transformer/proto/message/action.ts @@ -1,5 +1,5 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; -import { PushMsgBody } from "@/core/packet/transformer/proto"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { PushMsgBody } from '@/core/packet/transformer/proto'; export const LongMsgResult = { action: ProtoField(2, () => LongMsgAction) diff --git a/src/core/packet/transformer/proto/message/c2c.ts b/src/core/packet/transformer/proto/message/c2c.ts index e3025754..cc99f6f2 100644 --- a/src/core/packet/transformer/proto/message/c2c.ts +++ b/src/core/packet/transformer/proto/message/c2c.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const C2C = { uin: ProtoField(1, ScalarType.UINT32, true), diff --git a/src/core/packet/transformer/proto/message/component.ts b/src/core/packet/transformer/proto/message/component.ts index a6bb7749..3299f0ef 100644 --- a/src/core/packet/transformer/proto/message/component.ts +++ b/src/core/packet/transformer/proto/message/component.ts @@ -1,5 +1,5 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; -import { Elem } from "@/core/packet/transformer/proto"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { Elem } from '@/core/packet/transformer/proto'; export const Attr = { codePage: ProtoField(1, ScalarType.INT32), diff --git a/src/core/packet/transformer/proto/message/element.ts b/src/core/packet/transformer/proto/message/element.ts index ab419029..2e674860 100644 --- a/src/core/packet/transformer/proto/message/element.ts +++ b/src/core/packet/transformer/proto/message/element.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const Elem = { text: ProtoField(1, () => Text, true), diff --git a/src/core/packet/transformer/proto/message/group.ts b/src/core/packet/transformer/proto/message/group.ts index c483850f..ceaef2b2 100644 --- a/src/core/packet/transformer/proto/message/group.ts +++ b/src/core/packet/transformer/proto/message/group.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const GroupRecallMsg = { type: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/transformer/proto/message/groupAdmin.ts b/src/core/packet/transformer/proto/message/groupAdmin.ts index 42030063..7f0df482 100644 --- a/src/core/packet/transformer/proto/message/groupAdmin.ts +++ b/src/core/packet/transformer/proto/message/groupAdmin.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const GroupAdminExtra = { adminUid: ProtoField(1, ScalarType.STRING), diff --git a/src/core/packet/transformer/proto/message/message.ts b/src/core/packet/transformer/proto/message/message.ts index 3b5a6be2..24200ca1 100644 --- a/src/core/packet/transformer/proto/message/message.ts +++ b/src/core/packet/transformer/proto/message/message.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; import { C2C, ForwardHead, @@ -8,7 +8,7 @@ import { ResponseGrp, RichText, Trans0X211, WPATmp -} from "@/core/packet/transformer/proto"; +} from '@/core/packet/transformer/proto'; export const ContentHead = { type: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/transformer/proto/message/notify.ts b/src/core/packet/transformer/proto/message/notify.ts index 3b246780..5e573e59 100644 --- a/src/core/packet/transformer/proto/message/notify.ts +++ b/src/core/packet/transformer/proto/message/notify.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const FriendRecall = { info: ProtoField(1, () => FriendRecallInfo), diff --git a/src/core/packet/transformer/proto/message/routing.ts b/src/core/packet/transformer/proto/message/routing.ts index 619e395b..0af33197 100644 --- a/src/core/packet/transformer/proto/message/routing.ts +++ b/src/core/packet/transformer/proto/message/routing.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const ForwardHead = { field1: ProtoField(1, ScalarType.UINT32, true), diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0XE37_800.ts b/src/core/packet/transformer/proto/oidb/Oidb.0XE37_800.ts index 8496fd5d..58f5904a 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0XE37_800.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0XE37_800.ts @@ -1,5 +1,5 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; -import { OidbSvcTrpcTcp0XE37_800_1200Metadata } from "@/core/packet/transformer/proto"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { OidbSvcTrpcTcp0XE37_800_1200Metadata } from '@/core/packet/transformer/proto'; export const OidbSvcTrpcTcp0XE37_800 = { subCommand: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0XFE1_2.ts b/src/core/packet/transformer/proto/oidb/Oidb.0XFE1_2.ts index 679fcd69..c4ec293a 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0XFE1_2.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0XFE1_2.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const OidbSvcTrpcTcp0XFE1_2 = { uin: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0x6D6.ts b/src/core/packet/transformer/proto/oidb/Oidb.0x6D6.ts index 657cea98..be61b443 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0x6D6.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0x6D6.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const OidbSvcTrpcTcp0x6D6 = { file: ProtoField(1, () => OidbSvcTrpcTcp0x6D6Upload, true), diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts b/src/core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts index 2fc08f6e..e96dd951 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; //设置群头衔 OidbSvcTrpcTcp.0x8fc_2 diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0x9067_202.ts b/src/core/packet/transformer/proto/oidb/Oidb.0x9067_202.ts index b500bcc8..8ebf3367 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0x9067_202.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0x9067_202.ts @@ -1,5 +1,5 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; -import { MultiMediaReqHead } from "./common/Ntv2.RichMediaReq"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { MultiMediaReqHead } from './common/Ntv2.RichMediaReq'; //Req export const OidbSvcTrpcTcp0X9067_202 = { diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0x929.ts b/src/core/packet/transformer/proto/oidb/Oidb.0x929.ts index 7bcd587f..0f5837b4 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0x929.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0x929.ts @@ -1,5 +1,5 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; -import { MsgInfo } from "@/core/packet/transformer/proto"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { MsgInfo } from '@/core/packet/transformer/proto'; export const OidbSvcTrpcTcp0X929D_0 = { diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0xE07.ts b/src/core/packet/transformer/proto/oidb/Oidb.0xE07.ts index f94bd18e..4ec47095 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0xE07.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0xE07.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const OidbSvcTrpcTcp0xE07_0 = { version: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0xE37_1200.ts b/src/core/packet/transformer/proto/oidb/Oidb.0xE37_1200.ts index 1c0e55d3..70dbc934 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0xE37_1200.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0xE37_1200.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const OidbSvcTrpcTcp0XE37_1200 = { subCommand: ProtoField(1, ScalarType.UINT32, true), diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0xE37_1700.ts b/src/core/packet/transformer/proto/oidb/Oidb.0xE37_1700.ts index 12fb9c5c..8fbe5a34 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0xE37_1700.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0xE37_1700.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const OidbSvcTrpcTcp0XE37_1700 = { command: ProtoField(1, ScalarType.UINT32, true), diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0xEB7.ts b/src/core/packet/transformer/proto/oidb/Oidb.0xEB7.ts index 43eec544..c7c7ed80 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0xEB7.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0xEB7.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const OidbSvcTrpcTcp0XEB7_Body = { uin: ProtoField(1, ScalarType.STRING), diff --git a/src/core/packet/transformer/proto/oidb/Oidb.0xED3_1.ts b/src/core/packet/transformer/proto/oidb/Oidb.0xED3_1.ts index 46c47957..fa071cba 100644 --- a/src/core/packet/transformer/proto/oidb/Oidb.0xED3_1.ts +++ b/src/core/packet/transformer/proto/oidb/Oidb.0xED3_1.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; // Send Poke export const OidbSvcTrpcTcp0XED3_1 = { diff --git a/src/core/packet/transformer/proto/oidb/OidbBase.ts b/src/core/packet/transformer/proto/oidb/OidbBase.ts index fb5c94eb..5557d755 100644 --- a/src/core/packet/transformer/proto/oidb/OidbBase.ts +++ b/src/core/packet/transformer/proto/oidb/OidbBase.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const OidbSvcTrpcTcpBase = { command: ProtoField(1, ScalarType.UINT32), diff --git a/src/core/packet/transformer/proto/oidb/common/Ntv2.RichMediaReq.ts b/src/core/packet/transformer/proto/oidb/common/Ntv2.RichMediaReq.ts index a85fd55c..66f60203 100644 --- a/src/core/packet/transformer/proto/oidb/common/Ntv2.RichMediaReq.ts +++ b/src/core/packet/transformer/proto/oidb/common/Ntv2.RichMediaReq.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; export const NTV2RichMediaReq = { ReqHead: ProtoField(1, () => MultiMediaReqHead), diff --git a/src/core/packet/transformer/proto/oidb/common/Ntv2.RichMediaResp.ts b/src/core/packet/transformer/proto/oidb/common/Ntv2.RichMediaResp.ts index 72c12ed7..d63e81a2 100644 --- a/src/core/packet/transformer/proto/oidb/common/Ntv2.RichMediaResp.ts +++ b/src/core/packet/transformer/proto/oidb/common/Ntv2.RichMediaResp.ts @@ -1,5 +1,5 @@ -import { ProtoField, ScalarType } from "@napneko/nap-proto-core"; -import { CommonHead, MsgInfo, PicUrlExtInfo, VideoExtInfo } from "@/core/packet/transformer/proto"; +import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { CommonHead, MsgInfo, PicUrlExtInfo, VideoExtInfo } from '@/core/packet/transformer/proto'; export const NTV2RichMediaResp = { diff --git a/src/core/packet/transformer/system/FetchRkey.ts b/src/core/packet/transformer/system/FetchRkey.ts index 76507bc6..b461e4fb 100644 --- a/src/core/packet/transformer/system/FetchRkey.ts +++ b/src/core/packet/transformer/system/FetchRkey.ts @@ -1,7 +1,7 @@ -import * as proto from "@/core/packet/transformer/proto"; -import { NapProtoMsg } from "@napneko/nap-proto-core"; -import { OidbPacket, PacketTransformer } from "@/core/packet/transformer/base"; -import OidbBase from "@/core/packet/transformer/oidb/oidbBase"; +import * as proto from '@/core/packet/transformer/proto'; +import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base'; +import OidbBase from '@/core/packet/transformer/oidb/oidbBase'; class FetchRkey extends PacketTransformer { constructor() { diff --git a/src/core/packet/utils/crypto/hash.ts b/src/core/packet/utils/crypto/hash.ts index 6f2eae88..d80d3c49 100644 --- a/src/core/packet/utils/crypto/hash.ts +++ b/src/core/packet/utils/crypto/hash.ts @@ -2,7 +2,7 @@ import * as crypto from 'crypto'; import * as stream from 'stream'; import * as fs from 'fs'; -import { CalculateStreamBytesTransform } from "@/core/packet/utils/crypto/sha1StreamBytesTransform"; +import { CalculateStreamBytesTransform } from '@/core/packet/utils/crypto/sha1StreamBytesTransform'; function sha1Stream(readable: stream.Readable) { return new Promise((resolve, reject) => { diff --git a/src/core/packet/utils/crypto/sha1StreamBytesTransform.ts b/src/core/packet/utils/crypto/sha1StreamBytesTransform.ts index 95f743fa..172186ee 100644 --- a/src/core/packet/utils/crypto/sha1StreamBytesTransform.ts +++ b/src/core/packet/utils/crypto/sha1StreamBytesTransform.ts @@ -1,5 +1,5 @@ -import * as stream from "node:stream"; -import { Sha1Stream } from "@/core/packet/utils/crypto/sha1Stream"; +import * as stream from 'node:stream'; +import { Sha1Stream } from '@/core/packet/utils/crypto/sha1Stream'; export class CalculateStreamBytesTransform extends stream.Transform { private readonly blockSize = 1024 * 1024; diff --git a/src/core/packet/utils/helper/miniAppHelper.ts b/src/core/packet/utils/helper/miniAppHelper.ts index 66b9642a..2f3acd06 100644 --- a/src/core/packet/utils/helper/miniAppHelper.ts +++ b/src/core/packet/utils/helper/miniAppHelper.ts @@ -4,12 +4,12 @@ import { MiniAppRawData, MiniAppReqCustomParams, MiniAppReqTemplateParams -} from "@/core/packet/entities/miniApp"; +} from '@/core/packet/entities/miniApp'; -type MiniAppTemplateNameList = "bili" | "weibo"; +type MiniAppTemplateNameList = 'bili' | 'weibo'; export abstract class MiniAppInfo { - static readonly sdkId: string = "V1_PC_MINISDK_99.99.99_1_APP_A"; + static readonly sdkId: string = 'V1_PC_MINISDK_99.99.99_1_APP_A'; template: MiniAppReqTemplateParams; private static readonly appMap = new Map(); @@ -26,17 +26,17 @@ export abstract class MiniAppInfo { constructor() { super({ sdkId: MiniAppInfo.sdkId, - appId: "1109937557", + appId: '1109937557', scene: 1, templateType: 1, businessType: 0, verType: 3, shareType: 0, - versionId: "cfc5f7b05b44b5956502edaecf9d2240", + versionId: 'cfc5f7b05b44b5956502edaecf9d2240', withShareTicket: 0, - iconUrl: "https://miniapp.gtimg.cn/public/appicon/51f90239b78a2e4994c11215f4c4ba15_200.jpg" + iconUrl: 'https://miniapp.gtimg.cn/public/appicon/51f90239b78a2e4994c11215f4c4ba15_200.jpg' }); - MiniAppInfo.appMap.set("bili", this); + MiniAppInfo.appMap.set('bili', this); } }; @@ -44,17 +44,17 @@ export abstract class MiniAppInfo { constructor() { super({ sdkId: MiniAppInfo.sdkId, - appId: "1109224783", + appId: '1109224783', scene: 1, templateType: 1, businessType: 0, verType: 3, shareType: 0, - versionId: "e482a3cc4e574d9b772e96ba6eec9ba2", + versionId: 'e482a3cc4e574d9b772e96ba6eec9ba2', withShareTicket: 0, - iconUrl: "https://miniapp.gtimg.cn/public/appicon/35bbb44dc68e65194cfacfb206b8f1f7_200.jpg" + iconUrl: 'https://miniapp.gtimg.cn/public/appicon/35bbb44dc68e65194cfacfb206b8f1f7_200.jpg' }); - MiniAppInfo.appMap.set("weibo", this); + MiniAppInfo.appMap.set('weibo', this); } }; } @@ -76,7 +76,7 @@ export class MiniAppInfoHelper { view: rawData.appView, meta: rawData.metaData, miniappShareOrigin: 3, - miniappOpenRefer: "10002", + miniappOpenRefer: '10002', }; } diff --git a/src/core/services/NodeIKernelMSFService.ts b/src/core/services/NodeIKernelMSFService.ts index c5b975fa..b280819d 100644 --- a/src/core/services/NodeIKernelMSFService.ts +++ b/src/core/services/NodeIKernelMSFService.ts @@ -1,4 +1,4 @@ -import { GeneralCallResult } from "./common"; +import { GeneralCallResult } from './common'; export interface NodeIKernelMSFService { getServerTime(): string; diff --git a/src/core/services/NodeIO3MiscService.ts b/src/core/services/NodeIO3MiscService.ts index 7d0e80d9..e90f892f 100644 --- a/src/core/services/NodeIO3MiscService.ts +++ b/src/core/services/NodeIO3MiscService.ts @@ -1,4 +1,4 @@ -import { NodeIO3MiscListener } from "@/core/listeners/NodeIO3MiscListener"; +import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener'; export interface NodeIO3MiscService { get(): NodeIO3MiscService; diff --git a/src/core/types/element.ts b/src/core/types/element.ts index e6c71c57..e2210d28 100644 --- a/src/core/types/element.ts +++ b/src/core/types/element.ts @@ -1,4 +1,4 @@ -import { ElementType, MessageElement, NTGrayTipElementSubTypeV2, PicSubType, PicType, TipAioOpGrayTipElement, TipGroupElement, NTVideoType, FaceType } from "./msg"; +import { ElementType, MessageElement, NTGrayTipElementSubTypeV2, PicSubType, PicType, TipAioOpGrayTipElement, TipGroupElement, NTVideoType, FaceType } from './msg'; type ElementFullBase = Omit; diff --git a/src/onebot/action/extends/GetAiCharacters.ts b/src/onebot/action/extends/GetAiCharacters.ts index f9df0fbe..00ef15c9 100644 --- a/src/onebot/action/extends/GetAiCharacters.ts +++ b/src/onebot/action/extends/GetAiCharacters.ts @@ -1,6 +1,6 @@ import { ActionName } from '@/onebot/action/router'; -import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; -import { AIVoiceChatType } from "@/core/packet/entities/aiChat"; +import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; +import { AIVoiceChatType } from '@/core/packet/entities/aiChat'; import { Type, Static } from '@sinclair/typebox'; const SchemaData = Type.Object({ diff --git a/src/onebot/action/extends/GetMiniAppArk.ts b/src/onebot/action/extends/GetMiniAppArk.ts index 138f5b8f..93bd28e4 100644 --- a/src/onebot/action/extends/GetMiniAppArk.ts +++ b/src/onebot/action/extends/GetMiniAppArk.ts @@ -1,7 +1,7 @@ import { ActionName } from '@/onebot/action/router'; -import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; -import { MiniAppInfo, MiniAppInfoHelper } from "@/core/packet/utils/helper/miniAppHelper"; -import { MiniAppData, MiniAppRawData, MiniAppReqCustomParams, MiniAppReqParams } from "@/core/packet/entities/miniApp"; +import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; +import { MiniAppInfo, MiniAppInfoHelper } from '@/core/packet/utils/helper/miniAppHelper'; +import { MiniAppData, MiniAppRawData, MiniAppReqCustomParams, MiniAppReqParams } from '@/core/packet/entities/miniApp'; import { Static, Type } from '@sinclair/typebox'; const SchemaData = Type.Union([ diff --git a/src/onebot/action/extends/GetRkey.ts b/src/onebot/action/extends/GetRkey.ts index aa38c6d0..33cf5a21 100644 --- a/src/onebot/action/extends/GetRkey.ts +++ b/src/onebot/action/extends/GetRkey.ts @@ -1,5 +1,5 @@ import { ActionName } from '@/onebot/action/router'; -import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; +import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; export class GetRkey extends GetPacketStatusDepends> { actionName = ActionName.GetRkey; diff --git a/src/onebot/action/extends/GetUserStatus.ts b/src/onebot/action/extends/GetUserStatus.ts index 56c36b7f..12719cb6 100644 --- a/src/onebot/action/extends/GetUserStatus.ts +++ b/src/onebot/action/extends/GetUserStatus.ts @@ -1,5 +1,5 @@ import { ActionName } from '@/onebot/action/router'; -import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; +import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { Static, Type } from '@sinclair/typebox'; const SchemaData = Type.Object({ diff --git a/src/onebot/action/extends/SetSpecialTittle.ts b/src/onebot/action/extends/SetSpecialTittle.ts index 5c862e57..cb17e777 100644 --- a/src/onebot/action/extends/SetSpecialTittle.ts +++ b/src/onebot/action/extends/SetSpecialTittle.ts @@ -1,5 +1,5 @@ import { ActionName } from '@/onebot/action/router'; -import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; +import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { Static, Type } from '@sinclair/typebox'; const SchemaData = Type.Object({ diff --git a/src/onebot/action/file/GetGroupFileUrl.ts b/src/onebot/action/file/GetGroupFileUrl.ts index d1209588..e4e10e90 100644 --- a/src/onebot/action/file/GetGroupFileUrl.ts +++ b/src/onebot/action/file/GetGroupFileUrl.ts @@ -1,6 +1,6 @@ import { ActionName } from '@/onebot/action/router'; import { FileNapCatOneBotUUID } from '@/common/file-uuid'; -import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; +import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { Static, Type } from '@sinclair/typebox'; const SchemaData = Type.Object({ diff --git a/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts b/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts index 2e61f13d..bfdc75b7 100644 --- a/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts +++ b/src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts @@ -18,7 +18,7 @@ export class GoCQHTTPGetModelShow extends OneBotAction { } return [{ variants: { - model_show: "napcat", + model_show: 'napcat', need_pay: false } }]; diff --git a/src/onebot/action/group/GetAiRecord.ts b/src/onebot/action/group/GetAiRecord.ts index 15e1f094..64d1f765 100644 --- a/src/onebot/action/group/GetAiRecord.ts +++ b/src/onebot/action/group/GetAiRecord.ts @@ -1,6 +1,6 @@ import { ActionName } from '@/onebot/action/router'; -import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; -import { AIVoiceChatType } from "@/core/packet/entities/aiChat"; +import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; +import { AIVoiceChatType } from '@/core/packet/entities/aiChat'; import { Static, Type } from '@sinclair/typebox'; const SchemaData = Type.Object({ diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index 408a51ce..3745102b 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -46,7 +46,7 @@ class GetGroupMemberInfo extends OneBotAction { const member = await this.getGroupMemberInfo(payload, uid, isNocache); if (!member) { - this.core.context.logger.logDebug(`获取群成员详细信息失败, 只能返回基础信息`); + this.core.context.logger.logDebug('获取群成员详细信息失败, 只能返回基础信息'); } return OB11Construct.groupMember(payload.group_id.toString(), member); diff --git a/src/onebot/action/group/GroupPoke.ts b/src/onebot/action/group/GroupPoke.ts index 27a91c75..5bdda381 100644 --- a/src/onebot/action/group/GroupPoke.ts +++ b/src/onebot/action/group/GroupPoke.ts @@ -1,5 +1,5 @@ import { ActionName } from '@/onebot/action/router'; -import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; +import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; import { Static, Type } from '@sinclair/typebox'; const SchemaData = Type.Object({ diff --git a/src/onebot/action/group/SendGroupAiRecord.ts b/src/onebot/action/group/SendGroupAiRecord.ts index 38aa1e8c..2dfa3a78 100644 --- a/src/onebot/action/group/SendGroupAiRecord.ts +++ b/src/onebot/action/group/SendGroupAiRecord.ts @@ -1,8 +1,8 @@ import { ActionName } from '@/onebot/action/router'; -import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; -import { uriToLocalFile } from "@/common/file"; -import { ChatType, Peer } from "@/core"; -import { AIVoiceChatType } from "@/core/packet/entities/aiChat"; +import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus'; +import { uriToLocalFile } from '@/common/file'; +import { ChatType, Peer } from '@/core'; +import { AIVoiceChatType } from '@/core/packet/entities/aiChat'; import { Static, Type } from '@sinclair/typebox'; const SchemaData = Type.Object({ diff --git a/src/onebot/action/index.ts b/src/onebot/action/index.ts index 439c8b55..ea430d63 100644 --- a/src/onebot/action/index.ts +++ b/src/onebot/action/index.ts @@ -85,9 +85,9 @@ import { GetRkey } from './extends/GetRkey'; import { SetSpecialTittle } from './extends/SetSpecialTittle'; import { GetGroupShutList } from './group/GetGroupShutList'; import { GetGroupMemberList } from './group/GetGroupMemberList'; -import { GetGroupFileUrl } from "@/onebot/action/file/GetGroupFileUrl"; -import { GetPacketStatus } from "@/onebot/action/packet/GetPacketStatus"; -import { FriendPoke } from "@/onebot/action/user/FriendPoke"; +import { GetGroupFileUrl } from '@/onebot/action/file/GetGroupFileUrl'; +import { GetPacketStatus } from '@/onebot/action/packet/GetPacketStatus'; +import { FriendPoke } from '@/onebot/action/user/FriendPoke'; import { GetCredentials } from './system/GetCredentials'; import { SendGroupSign, SetGroupSign } from './extends/SetGroupSign'; import { GoCQHTTPGetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain'; @@ -95,15 +95,15 @@ import { GoCQHTTPCheckUrlSafely } from './go-cqhttp/GoCQHTTPCheckUrlSafely'; import { GoCQHTTPGetModelShow } from './go-cqhttp/GoCQHTTPGetModelShow'; import { GoCQHTTPSetModelShow } from './go-cqhttp/GoCQHTTPSetModelShow'; import { GoCQHTTPDeleteFriend } from './go-cqhttp/GoCQHTTPDeleteFriend'; -import { GetMiniAppArk } from "@/onebot/action/extends/GetMiniAppArk"; -import { GetAiRecord } from "@/onebot/action/group/GetAiRecord"; -import { SendGroupAiRecord } from "@/onebot/action/group/SendGroupAiRecord"; -import { GetAiCharacters } from "@/onebot/action/extends/GetAiCharacters"; +import { GetMiniAppArk } from '@/onebot/action/extends/GetMiniAppArk'; +import { GetAiRecord } from '@/onebot/action/group/GetAiRecord'; +import { SendGroupAiRecord } from '@/onebot/action/group/SendGroupAiRecord'; +import { GetAiCharacters } from '@/onebot/action/extends/GetAiCharacters'; import { GetGuildList } from './guild/GetGuildList'; import { GetGuildProfile } from './guild/GetGuildProfile'; import { GetClientkey } from './extends/GetClientkey'; import { SendPacket } from './extends/SendPacket'; -import { SendPoke } from "@/onebot/action/packet/SendPoke"; +import { SendPoke } from '@/onebot/action/packet/SendPoke'; export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) { diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index bf24a18a..c391724e 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/src/onebot/action/msg/SendMsg.ts @@ -11,10 +11,10 @@ import { decodeCQCode } from '@/onebot/helper/cqcode'; import { MessageUnique } from '@/common/message-unique'; import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendArkElement, SendMessageElement } from '@/core'; import { OneBotAction } from '@/onebot/action/OneBotAction'; -import { ForwardMsgBuilder } from "@/common/forward-msg-builder"; -import { stringifyWithBigInt } from "@/common/helper"; -import { PacketMsg } from "@/core/packet/message/message"; -import { rawMsgWithSendMsg } from "@/core/packet/message/converter"; +import { ForwardMsgBuilder } from '@/common/forward-msg-builder'; +import { stringifyWithBigInt } from '@/common/helper'; +import { PacketMsg } from '@/core/packet/message/message'; +import { rawMsgWithSendMsg } from '@/core/packet/message/converter'; export interface ReturnDataType { message_id: number; @@ -174,7 +174,7 @@ export class SendMsgBase extends OneBotAction { if (getSpecialMsgNum({ message: OB11Data }, OB11MessageDataType.node)) { const uploadReturnData = await this.uploadForwardedNodesPacket(msgPeer, OB11Data as OB11MessageNode[], node.data.source, node.data.news, node.data.summary, node.data.prompt, { user_id: (node.data.user_id ?? node.data.uin)?.toString() ?? parentMeta?.user_id ?? this.core.selfInfo.uin, - nickname: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? "QQ用户", + nickname: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? 'QQ用户', }, dp + 1); sendElements = uploadReturnData?.finallySendElements ? [uploadReturnData.finallySendElements] : []; } else { @@ -184,7 +184,7 @@ export class SendMsgBase extends OneBotAction { const packetMsgElements: rawMsgWithSendMsg = { senderUin: Number((node.data.user_id ?? node.data.uin) ?? parentMeta?.user_id) || +this.core.selfInfo.uin, - senderName: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? "QQ用户", + senderName: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? 'QQ用户', groupId: msgPeer.chatType === ChatType.KCHATTYPEGROUP ? +msgPeer.peerUid : undefined, time: Number(node.data.time) || Date.now(), msg: sendElements, @@ -219,7 +219,7 @@ export class SendMsgBase extends OneBotAction { return { finallySendElements: { elementType: ElementType.ARK, - elementId: "", + elementId: '', arkElement: { bytesData: JSON.stringify(forwardJson), }, diff --git a/src/onebot/action/packet/GetPacketStatus.ts b/src/onebot/action/packet/GetPacketStatus.ts index caab75ff..c0ecf08e 100644 --- a/src/onebot/action/packet/GetPacketStatus.ts +++ b/src/onebot/action/packet/GetPacketStatus.ts @@ -7,8 +7,8 @@ export abstract class GetPacketStatusDepends extends OneBotAction undefined, - [OB11MessageDataType.contact]: async ({ data: { type = "qq", id } }, context) => { - if (type === "qq") { + [OB11MessageDataType.contact]: async ({ data: { type = 'qq', id } }, context) => { + if (type === 'qq') { const arkJson = await this.core.apis.UserApi.getBuddyRecommendContactArkJson(id.toString(), ''); return this.ob11ToRawConverters.json({ data: { data: arkJson.arkMsg }, type: OB11MessageDataType.json }, context); - } else if (type === "group") { + } else if (type === 'group') { const arkJson = await this.core.apis.GroupApi.getGroupRecommendContactArkJson(id.toString()); return this.ob11ToRawConverters.json({ data: { data: arkJson.arkJson }, diff --git a/src/onebot/api/user.ts b/src/onebot/api/user.ts index ae8f43fe..769e60bc 100644 --- a/src/onebot/api/user.ts +++ b/src/onebot/api/user.ts @@ -1,7 +1,7 @@ import { GrayTipRovokeElement, NapCatCore, RawMessage } from '@/core'; import { NapCatOneBot11Adapter } from '@/onebot'; import { OB11ProfileLikeEvent } from '@/onebot/event/notice/OB11ProfileLikeEvent'; -import { decodeProfileLikeTip } from "@/core/helper/adaptDecoder"; +import { decodeProfileLikeTip } from '@/core/helper/adaptDecoder'; export class OneBotUserApi { obContext: NapCatOneBot11Adapter; @@ -15,12 +15,12 @@ export class OneBotUserApi { async parseLikeEvent(wrappedBody: Uint8Array): Promise { const likeTip = decodeProfileLikeTip(wrappedBody); if (likeTip?.msgType !== 0 || likeTip?.subType !== 203) return; - this.core.context.logger.logDebug("收到点赞通知消息"); + this.core.context.logger.logDebug('收到点赞通知消息'); const likeMsg = likeTip.content.msg; if (!likeMsg) return; const detail = likeMsg.detail; if (!detail) return; - const times = detail.txt.match(/\d+/) ?? "0"; + const times = detail.txt.match(/\d+/) ?? '0'; return new OB11ProfileLikeEvent( this.core, Number(detail.uin), diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index be562a5a..0227661f 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -23,7 +23,7 @@ export class OB11Construct { ...rawFriend.baseInfo, ...rawFriend.coreInfo, user_id: parseInt(rawFriend.coreInfo.uin), - nickname: rawFriend.coreInfo.nick ?? "", + nickname: rawFriend.coreInfo.nick ?? '', remark: rawFriend.coreInfo.remark ?? rawFriend.coreInfo.nick, sex: this.sex(rawFriend.baseInfo.sex), level: 0, diff --git a/src/onebot/index.ts b/src/onebot/index.ts index feacf3be..fe9d48dc 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -50,7 +50,7 @@ import { } from './config/config'; import { OB11Message } from './types'; import { OB11PluginAdapter } from './network/plugin'; -import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; +import { IOB11NetworkAdapter } from '@/onebot/network/adapter'; import { OB11HttpSSEServerAdapter } from './network/http-server-sse'; //OneBot实现类 @@ -82,7 +82,7 @@ export class NapCatOneBot11Adapter { this.networkManager = new OB11NetworkManager(); } async creatOneBotLog(ob11Config: OneBotConfig) { - let log = `[network] 配置加载\n`; + let log = '[network] 配置加载\n'; for (const key of ob11Config.network.httpServers) { log += `HTTP服务: ${key.host}:${key.port}, : ${key.enable ? '已启动' : '未启动'}\n`; } diff --git a/src/onebot/network/adapter.ts b/src/onebot/network/adapter.ts index b2578455..a8a49451 100644 --- a/src/onebot/network/adapter.ts +++ b/src/onebot/network/adapter.ts @@ -1,9 +1,9 @@ -import { NetworkAdapterConfig } from "@/onebot/config/config"; -import { LogWrapper } from "@/common/log"; -import { NapCatCore } from "@/core"; -import { NapCatOneBot11Adapter } from "@/onebot"; -import { ActionMap } from "@/onebot/action"; -import { OB11EmitEventContent, OB11NetworkReloadType } from "@/onebot/network/index"; +import { NetworkAdapterConfig } from '@/onebot/config/config'; +import { LogWrapper } from '@/common/log'; +import { NapCatCore } from '@/core'; +import { NapCatOneBot11Adapter } from '@/onebot'; +import { ActionMap } from '@/onebot/action'; +import { OB11EmitEventContent, OB11NetworkReloadType } from '@/onebot/network/index'; export abstract class IOB11NetworkAdapter { name: string; diff --git a/src/onebot/network/http-client.ts b/src/onebot/network/http-client.ts index a346d0d8..91911227 100644 --- a/src/onebot/network/http-client.ts +++ b/src/onebot/network/http-client.ts @@ -6,7 +6,7 @@ import { NapCatOneBot11Adapter } from '..'; import { RequestUtil } from '@/common/request'; import { HttpClientConfig } from '@/onebot/config/config'; import { ActionMap } from '@/onebot/action'; -import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; +import { IOB11NetworkAdapter } from '@/onebot/network/adapter'; import json5 from 'json5'; export class OB11HttpClientAdapter extends IOB11NetworkAdapter { diff --git a/src/onebot/network/http-server.ts b/src/onebot/network/http-server.ts index f4f5b207..c9a125e3 100644 --- a/src/onebot/network/http-server.ts +++ b/src/onebot/network/http-server.ts @@ -6,8 +6,8 @@ import { OB11Response } from '@/onebot/action/OneBotAction'; import { ActionMap } from '@/onebot/action'; import cors from 'cors'; import { HttpServerConfig } from '@/onebot/config/config'; -import { NapCatOneBot11Adapter } from "@/onebot"; -import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; +import { NapCatOneBot11Adapter } from '@/onebot'; +import { IOB11NetworkAdapter } from '@/onebot/network/adapter'; import json5 from 'json5'; export class OB11HttpServerAdapter extends IOB11NetworkAdapter { @@ -119,7 +119,7 @@ export class OB11HttpServerAdapter extends IOB11NetworkAdapter async handleRequest(req: Request, res: Response) { if (!this.isEnable) { - this.core.context.logger.log(`[OneBot] [HTTP Server Adapter] Server is closed`); + this.core.context.logger.log('[OneBot] [HTTP Server Adapter] Server is closed'); return res.json(OB11Response.error('Server is closed', 200)); } diff --git a/src/onebot/network/index.ts b/src/onebot/network/index.ts index 464b8b6a..13dcf325 100644 --- a/src/onebot/network/index.ts +++ b/src/onebot/network/index.ts @@ -1,7 +1,7 @@ import { OneBotEvent } from '@/onebot/event/OneBotEvent'; import { OB11Message } from '@/onebot'; import { NetworkAdapterConfig } from '@/onebot/config/config'; -import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; +import { IOB11NetworkAdapter } from '@/onebot/network/adapter'; export type OB11EmitEventContent = OneBotEvent | OB11Message; export enum OB11NetworkReloadType { diff --git a/src/onebot/network/plugin.ts b/src/onebot/network/plugin.ts index 16683cf0..717276d9 100644 --- a/src/onebot/network/plugin.ts +++ b/src/onebot/network/plugin.ts @@ -4,7 +4,7 @@ import { NapCatCore } from '@/core'; import { PluginConfig } from '../config/config'; import { plugin_onmessage } from '@/plugin'; import { ActionMap } from '../action'; -import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; +import { IOB11NetworkAdapter } from '@/onebot/network/adapter'; export class OB11PluginAdapter extends IOB11NetworkAdapter { constructor( diff --git a/src/onebot/network/websocket-client.ts b/src/onebot/network/websocket-client.ts index 3f6cc1d3..d6e4e1c2 100644 --- a/src/onebot/network/websocket-client.ts +++ b/src/onebot/network/websocket-client.ts @@ -7,8 +7,8 @@ import { OB11Response } from '@/onebot/action/OneBotAction'; import { ActionMap } from '@/onebot/action'; import { LifeCycleSubType, OB11LifeCycleEvent } from '@/onebot/event/meta/OB11LifeCycleEvent'; import { WebsocketClientConfig } from '@/onebot/config/config'; -import { NapCatOneBot11Adapter } from "@/onebot"; -import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; +import { NapCatOneBot11Adapter } from '@/onebot'; +import { IOB11NetworkAdapter } from '@/onebot/network/adapter'; import json5 from 'json5'; export class OB11WebSocketClientAdapter extends IOB11NetworkAdapter { diff --git a/src/onebot/network/websocket-server.ts b/src/onebot/network/websocket-server.ts index f2e4ca25..d4ac3dd5 100644 --- a/src/onebot/network/websocket-server.ts +++ b/src/onebot/network/websocket-server.ts @@ -10,8 +10,8 @@ import { IncomingMessage } from 'http'; import { ActionMap } from '@/onebot/action'; import { LifeCycleSubType, OB11LifeCycleEvent } from '@/onebot/event/meta/OB11LifeCycleEvent'; import { WebsocketServerConfig } from '@/onebot/config/config'; -import { NapCatOneBot11Adapter } from "@/onebot"; -import { IOB11NetworkAdapter } from "@/onebot/network/adapter"; +import { NapCatOneBot11Adapter } from '@/onebot'; +import { IOB11NetworkAdapter } from '@/onebot/network/adapter'; import json5 from 'json5'; export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter { diff --git a/src/onebot/types/message.ts b/src/onebot/types/message.ts index 6d9aabd0..8f311e87 100644 --- a/src/onebot/types/message.ts +++ b/src/onebot/types/message.ts @@ -102,7 +102,7 @@ export interface OB11MessageText { export interface OB11MessageContext { type: OB11MessageDataType.contact; data: { - type: "qq" | "group"; + type: 'qq' | 'group'; id: string; }; } diff --git a/src/plugin/index.ts b/src/plugin/index.ts index 4b070b7b..bf518971 100644 --- a/src/plugin/index.ts +++ b/src/plugin/index.ts @@ -1,7 +1,7 @@ -import { NapCatOneBot11Adapter, OB11Message } from "@/onebot"; -import { NapCatCore } from "@/core"; -import { ActionMap } from "@/onebot/action"; -import { OB11PluginAdapter } from "@/onebot/network/plugin"; +import { NapCatOneBot11Adapter, OB11Message } from '@/onebot'; +import { NapCatCore } from '@/core'; +import { ActionMap } from '@/onebot/action'; +import { OB11PluginAdapter } from '@/onebot/network/plugin'; export const plugin_onmessage = async (adapter: string, core: NapCatCore, obCtx: NapCatOneBot11Adapter, message: OB11Message, action: ActionMap, instance: OB11PluginAdapter) => { if (message.raw_message === 'ping') { diff --git a/src/shell/base.ts b/src/shell/base.ts index b2d5a243..46a380e0 100644 --- a/src/shell/base.ts +++ b/src/shell/base.ts @@ -273,7 +273,7 @@ export async function NCoreInitShell() { const o3Service = wrapper.NodeIO3MiscService.get(); o3Service.addO3MiscListener(new NodeIO3MiscListener()); - logger.log(`[NapCat] [Core] NapCat.Core Version: ` + napCatVersion); + logger.log('[NapCat] [Core] NapCat.Core Version: ' + napCatVersion); InitWebUi(logger, pathWrapper).then().catch(e => logger.logError(e)); const engine = wrapper.NodeIQQNTWrapperEngine.get(); diff --git a/src/shell/napcat.ts b/src/shell/napcat.ts index f2a05426..c2913eba 100644 --- a/src/shell/napcat.ts +++ b/src/shell/napcat.ts @@ -1,3 +1,3 @@ -import { NCoreInitShell } from "./base"; +import { NCoreInitShell } from './base'; NCoreInitShell(); \ No newline at end of file diff --git a/src/universal/napcat.ts b/src/universal/napcat.ts index d5fd0d5b..a4559d0c 100644 --- a/src/universal/napcat.ts +++ b/src/universal/napcat.ts @@ -1,6 +1,6 @@ -import { NCoreInitShell } from "@/shell/base"; -export * from "@/framework/napcat"; -export * from "@/shell/base"; +import { NCoreInitShell } from '@/shell/base'; +export * from '@/framework/napcat'; +export * from '@/shell/base'; interface LiteLoaderGlobal extends Global { LiteLoader?: unknown; diff --git a/src/webui/src/api/Proxy.ts b/src/webui/src/api/Proxy.ts index f211ab5c..aa5404ff 100644 --- a/src/webui/src/api/Proxy.ts +++ b/src/webui/src/api/Proxy.ts @@ -1,10 +1,10 @@ -import { RequestHandler } from "express"; -import { RequestUtil } from "@/common/request"; -import { sendError, sendSuccess } from "../utils/response"; +import { RequestHandler } from 'express'; +import { RequestUtil } from '@/common/request'; +import { sendError, sendSuccess } from '../utils/response'; export const GetProxyHandler: RequestHandler = async (req, res) => { let { url } = req.query; - if (url && typeof url === "string") { + if (url && typeof url === 'string') { url = decodeURIComponent(url); const responseText = await RequestUtil.HttpGetText(url); res.send(sendSuccess(res, responseText)); diff --git a/src/webui/src/api/Status.ts b/src/webui/src/api/Status.ts index 4ca75efd..5566bd6a 100644 --- a/src/webui/src/api/Status.ts +++ b/src/webui/src/api/Status.ts @@ -1,5 +1,5 @@ import { RequestHandler } from 'express'; -import { SystemStatus, statusHelperSubscription } from "@/core/helper/status"; +import { SystemStatus, statusHelperSubscription } from '@/core/helper/status'; export const StatusRealTimeHandler: RequestHandler = async (req, res) => { res.setHeader('Content-Type', 'text/event-stream'); diff --git a/src/webui/src/router/Base.ts b/src/webui/src/router/Base.ts index 38a35292..0ec78532 100644 --- a/src/webui/src/router/Base.ts +++ b/src/webui/src/router/Base.ts @@ -1,6 +1,6 @@ import { Router } from 'express'; import { PackageInfoHandler, QQVersionHandler } from '../api/BaseInfo'; -import { StatusRealTimeHandler } from "@webapi/api/Status"; +import { StatusRealTimeHandler } from '@webapi/api/Status'; import { GetProxyHandler } from '../api/Proxy'; const router = Router(); diff --git a/src/webui/src/types/data.d.ts b/src/webui/src/types/data.d.ts index 2eb6c4a8..fb9a644e 100644 --- a/src/webui/src/types/data.d.ts +++ b/src/webui/src/types/data.d.ts @@ -1,5 +1,5 @@ import type { LoginListItem, SelfInfo } from '@/core'; -import type { OneBotConfig } from "@/onebot/config/config"; +import type { OneBotConfig } from '@/onebot/config/config'; interface LoginRuntimeType { LoginCurrentTime: number;