diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 1cc2dba3..8885153f 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -3,7 +3,7 @@ module.exports = { 'es2021': true, 'node': true }, - 'ignorePatterns': ['src/core/'], + 'ignorePatterns': ['src/core/', 'src/core.lib/'], 'extends': [ 'eslint:recommended', 'plugin:@typescript-eslint/recommended' diff --git a/src/common/utils/umami.ts b/src/common/utils/umami.ts index b42968ad..d9ee320c 100644 --- a/src/common/utils/umami.ts +++ b/src/common/utils/umami.ts @@ -1,38 +1,38 @@ -import { request } from "https"; +import { request } from 'https'; export function noifyLoginStatus() { - let req = request( - { - hostname: 'napcat.wumiao.wang', - path: '/api/send', - port: 443, - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'User-Agent': `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Edg/124.0.0.0` - } - }, - (res) => { - //let data = ''; - res.on('data', (chunk) => { - //data += chunk; - }); - res.on('end', () => { - //console.log('Response:', data); - }); - } - ); - let StatesData = { - type: "event", - payload: { - "website": "952bf82f-8f49-4456-aec5-e17db5f27f7e", - "hostname": "napcat.demo.cn", - "screen": "1920x1080", - "language": "zh-CN", - "title": "OneBot.Login", - "url": "/login/onebot11", - "referrer": "https://napcat.demo.cn/login?type=onebot11" - } - }; - req.write(JSON.stringify(StatesData)); - req.end(); + const req = request( + { + hostname: 'napcat.wumiao.wang', + path: '/api/send', + port: 443, + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Edg/124.0.0.0' + } + }, + (res) => { + //let data = ''; + res.on('data', (chunk) => { + //data += chunk; + }); + res.on('end', () => { + //console.log('Response:', data); + }); + } + ); + const StatesData = { + type: 'event', + payload: { + 'website': '952bf82f-8f49-4456-aec5-e17db5f27f7e', + 'hostname': 'napcat.demo.cn', + 'screen': '1920x1080', + 'language': 'zh-CN', + 'title': 'OneBot.Login', + 'url': '/login/onebot11', + 'referrer': 'https://napcat.demo.cn/login?type=onebot11' + } + }; + req.write(JSON.stringify(StatesData)); + req.end(); } \ No newline at end of file diff --git a/src/common/utils/version.ts b/src/common/utils/version.ts index 27788efd..c81bc445 100644 --- a/src/common/utils/version.ts +++ b/src/common/utils/version.ts @@ -1,44 +1,44 @@ -import { get as httpsGet } from "node:https"; +import { get as httpsGet } from 'node:https'; function requestMirror(url: string): Promise { - return new Promise((resolve, reject) => { - httpsGet(url, (response) => { - let data = ''; - response.on('data', (chunk) => { - data += chunk; - }); + return new Promise((resolve, reject) => { + httpsGet(url, (response) => { + let data = ''; + response.on('data', (chunk) => { + data += chunk; + }); - response.on('end', () => { - try { - const parsedData = JSON.parse(data); - const version = parsedData.version; - resolve(version); - } catch (error) { - // 解析失败或无法访问域名,跳过 - resolve(undefined); - } - }); - }).on('error', (error) => { - // 请求失败,跳过 - resolve(undefined); - }); + response.on('end', () => { + try { + const parsedData = JSON.parse(data); + const version = parsedData.version; + resolve(version); + } catch (error) { + // 解析失败或无法访问域名,跳过 + resolve(undefined); + } + }); + }).on('error', (error) => { + // 请求失败,跳过 + resolve(undefined); }); + }); } export async function checkVersion(): Promise { - return new Promise(async (resolve, reject) => { - const MirrorList = + return new Promise(async (resolve, reject) => { + const MirrorList = [ - "https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json", - "https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json", - "https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json", - "https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json" + 'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json', + 'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json', + 'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json', + 'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json' ]; - for (const url of MirrorList) { - const version = await requestMirror(url); - if (version) { - resolve(version); - } - } - reject("get verison error!"); - }); + for (const url of MirrorList) { + const version = await requestMirror(url); + if (version) { + resolve(version); + } + } + reject('get verison error!'); + }); } \ No newline at end of file diff --git a/src/onebot11/action/go-cqhttp/GetForwardMsg.ts b/src/onebot11/action/go-cqhttp/GetForwardMsg.ts index faf6c247..0d520e61 100644 --- a/src/onebot11/action/go-cqhttp/GetForwardMsg.ts +++ b/src/onebot11/action/go-cqhttp/GetForwardMsg.ts @@ -38,6 +38,6 @@ export class GoCQHTTGetForwardMsgAction extends BaseAction { (msg).content = msg.message; delete (msg).message; }); - return {messages}; + return { messages }; } } diff --git a/src/onebot11/action/msg/SendMsg.ts b/src/onebot11/action/msg/SendMsg.ts index f5aa924a..3d6f1f63 100644 --- a/src/onebot11/action/msg/SendMsg.ts +++ b/src/onebot11/action/msg/SendMsg.ts @@ -160,7 +160,7 @@ export async function createSendElements(messageData: OB11MessageData[], group: // } // log("找到文件缓存", file); // } - const {path, isLocal, fileName, errMsg} = (await uri2local(file)); + const { path, isLocal, fileName, errMsg } = (await uri2local(file)); if (errMsg) { throw errMsg; } @@ -309,7 +309,7 @@ export class SendMsg extends BaseAction { if (this.getSpecialMsgNum(payload, OB11MessageDataType.node)) { try { const returnMsg = await this.handleForwardNode(peer, messages as OB11MessageNode[], group); - return {message_id: returnMsg!.id!}; + return { message_id: returnMsg!.id! }; } catch (e: any) { throw ('发送转发消息失败 ' + e.toString()); } @@ -317,8 +317,8 @@ export class SendMsg extends BaseAction { if (this.getSpecialMsgNum(payload, OB11MessageDataType.music)) { const music: OB11MessageCustomMusic = messages[0] as OB11MessageCustomMusic; if (music) { - const {url, audio, title, content, image} = music.data; - const selfPeer: Peer = {peerUid: selfInfo.uid, chatType: ChatType.friend}; + const { url, audio, title, content, image } = music.data; + const selfPeer: Peer = { peerUid: selfInfo.uid, chatType: ChatType.friend }; // 搞不定! // const musicMsg = await this.send(selfPeer, [this.genMusicElement(url, audio, title, content, image)], [], false) // 转发 @@ -329,12 +329,12 @@ export class SendMsg extends BaseAction { } } // log("send msg:", peer, sendElements) - const {sendElements, deleteAfterSentFiles} = await createSendElements(messages, group); + const { sendElements, deleteAfterSentFiles } = await createSendElements(messages, group); const returnMsg = await sendMsg(peer, sendElements, deleteAfterSentFiles); deleteAfterSentFiles.map(f => fs.unlink(f, () => { })); - const res = {message_id: returnMsg.id!}; + const res = { message_id: returnMsg.id! }; // console.log(res); return res; } @@ -452,7 +452,7 @@ export class SendMsg extends BaseAction { if (nodeMsg) { nodeMsgArray.push(nodeMsg); if (!srcPeer) { - srcPeer = {chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid}; + srcPeer = { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid }; } else if (srcPeer.peerUid !== nodeMsg.peerUid) { needSendSelf = true; srcPeer = selfPeer; @@ -501,7 +501,7 @@ export class SendMsg extends BaseAction { token: '5c1e4905f926dd3a64a4bd3841460351', type: 'normal' }, - extra: {app_type: 1, appid: 100497308, uin: selfInfo.uin}, + extra: { app_type: 1, appid: 100497308, uin: selfInfo.uin }, meta: { news: { action: '', diff --git a/src/onebot11/index.ts b/src/onebot11/index.ts index 6a8a7b4c..36b8b847 100644 --- a/src/onebot11/index.ts +++ b/src/onebot11/index.ts @@ -52,7 +52,7 @@ napCatCore.on('system.login.qrcode', (qrCodeData: { url: string, base64: string fs.writeFile(qrcodePath, qrCodeData.base64.split('data:image/png;base64')[1], 'base64').then(() => { console.log('二维码已保存到', qrcodePath); }); - qrcode.generate(qrCodeData.url, {small: true}, (res) => { + qrcode.generate(qrCodeData.url, { small: true }, (res) => { console.log(res); }); }); diff --git a/src/onebot11/main.ts b/src/onebot11/main.ts index 9beed7ed..8a811ebd 100644 --- a/src/onebot11/main.ts +++ b/src/onebot11/main.ts @@ -120,7 +120,7 @@ export class NapCatOnebot11 { } async postReceiveMsg(msgList: RawMessage[]) { - const {debug, reportSelfMessage} = ob11Config; + const { debug, reportSelfMessage } = ob11Config; for (const message of msgList) { // console.log("ob11 收到新消息", message) // if (message.senderUin !== selfInfo.uin){