Compare commits

...
10 Commits
Author SHA1 Message Date
手瓜一十雪 6be6023236 Merge pull request #679 from wu-yafeng/main
Build Action / Build-LiteLoader (push) Canceled after 0s
Build Action / Build-Shell (push) Canceled after 0s
Build Release / check-version (push) Canceled after 0s
Build Release / Build-LiteLoader (push) Canceled after 0s
Build Release / Build-Shell (push) Canceled after 0s
Build Release / release-napcat (push) Canceled after 0s
fix #678
2024-12-31 22:41:34 +08:00
WuYafeng 42cee0d018 在没有写入权限时记录warn日志 2024-12-31 22:38:01 +08:00
WuYafeng 041f725748 Update config.ts 2024-12-31 22:25:05 +08:00
WuYafeng 0594d61631 Update config.ts 2024-12-31 22:20:34 +08:00
Mlikiowa 15cae6b765 release: v4.2.63 2024-12-31 13:52:37 +00:00
pk5ls20 b984116c35 fix: #677
Build Release / check-version (push) Canceled after 0s
Build Release / Build-LiteLoader (push) Canceled after 0s
Build Release / Build-Shell (push) Canceled after 0s
Build Release / release-napcat (push) Canceled after 0s
Build Action / Build-LiteLoader (push) Canceled after 0s
Build Action / Build-Shell (push) Canceled after 0s
2024-12-31 21:34:45 +08:00
Mlikiowa 13bda6e3f4 release: v4.2.62 2024-12-31 08:35:55 +00:00
手瓜一十雪 c0d18549d1 fix
Build Release / check-version (push) Canceled after 0s
Build Release / Build-LiteLoader (push) Canceled after 0s
Build Release / Build-Shell (push) Canceled after 0s
Build Release / release-napcat (push) Canceled after 0s
Build Action / Build-LiteLoader (push) Canceled after 0s
Build Action / Build-Shell (push) Canceled after 0s
2024-12-31 15:09:08 +08:00
手瓜一十雪 3caff72fce fix: cache trace 2024-12-31 13:10:58 +08:00
Mlikiowa 1313e9c3f4 release: v4.2.61 2024-12-30 15:59:33 +00:00
9 changed files with 22 additions and 129 deletions

No files matched your search

+1 -1
View File
@@ -4,7 +4,7 @@
"name": "NapCatQQ",
"slug": "NapCat.Framework",
"description": "高性能的 OneBot 11 协议实现",
"version": "4.2.60",
"version": "4.2.63",
"icon": "./logo.png",
"authors": [
{
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "napcat",
"private": true,
"type": "module",
"version": "4.2.60",
"version": "4.2.63",
"scripts": {
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
-116
View File
@@ -1,116 +0,0 @@
import * as net from 'net';
import * as https from 'https';
export const cloudflareIps = [
'103.21.244.0/22',
'103.22.200.0/22',
'103.31.4.0/22',
'104.16.0.0/13',
'104.24.0.0/14',
'108.162.192.0/18',
'131.0.72.0/22',
'141.101.64.0/18',
'162.158.0.0/15',
'172.64.0.0/13',
'173.245.48.0/20',
'188.114.96.0/20',
'190.93.240.0/20',
'197.234.240.0/22',
'198.41.128.0/17'
];
// 将IP地址转换为整数
const ipToInt = (ip: string): number => ip.split('.').reduce((acc, octet) => (acc << 8) + Number(octet), 0) >>> 0;
// 将整数转换为IP地址
const intToIp = (int: number): string => `${(int >>> 24) & 0xFF}.${(int >>> 16) & 0xFF}.${(int >>> 8) & 0xFF}.${int & 0xFF}`;
// 解析CIDR范围
const parseCIDR = (cidr: string): string[] => {
const [base, maskLength] = cidr.split('/');
const baseIP = ipToInt(base);
return Array.from({ length: 1 << (32 - Number(maskLength)) }, (_, i) => intToIp(baseIP + i))
.filter(ip => !ip.endsWith('.0')); // 排除以 .0 结尾的 IP 地址
}
// 解析IP地址和IP范围
const parseIPs = (ipList: string[]): string[] => ipList.flatMap(ip => ip.includes('/') ? parseCIDR(ip) : net.isIP(ip) ? [ip] : []);
// 检查URL的HTTP连接性
const checkUrl = (ip: string, domain: string): Promise<boolean> => new Promise((resolve) => {
const options = {
hostname: ip,
port: 443,
method: 'GET',
path: '/',
timeout: 2000,
headers: {
'Host': domain,
"User-Agent": 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.2128.93 Safari/537.36'
}
};
const req = https.request(options, (res) => {
res.on('data', (data) => {
//console.log('[NetWork] [Scan] Checking Data! ', domain, ' --> ', ip, data.toString());
});
if (res.statusCode && res.statusCode > 0 && res.statusCode < 500) {
console.log('[NetWork] [Scan] Checking Connect! ', domain, ' --> ', ip);
resolve(true);
} else {
console.log('[NetWork] [Scan] Checking Failed! ', domain, ' --> ', ip, ' Status Code: ', res.statusCode);
resolve(false);
}
});
req.on('error', () => {
console.log('[NetWork] [Scan] Checking Error! ', domain, ' --> ', ip);
resolve(false);
});
req.on('timeout', () => {
req.destroy();
console.log('[NetWork] [Scan] Checking Timeout! ', domain, ' --> ', ip);
resolve(false);
});
req.end();
});
// 检查特定域名的HTTP连接性
const checkDomainConnectivity = async (ip: string, domains: string[]): Promise<boolean> => {
const checkPromises = domains.map(domain => checkUrl(ip, domain));
const results = await Promise.all(checkPromises);
return results.some(result => result);
}
export const optimizeCloudflareIPs = async (ipList: string[], domains: string[]): Promise<string | undefined> => {
if ((await Promise.all(domains.map(domain => checkUrl(domain, domain)))).every(result => result)) return undefined;
for (const ip of parseIPs(ipList)) {
if (await checkDomainConnectivity(ip, domains)) return ip;
}
return undefined;
}
export const findRealHost = async () => {
const domains = ['umami.napneko.icu', 'rkey.napneko.icu'];
const ip = await optimizeCloudflareIPs(cloudflareIps, domains);
return {
'umami.napneko.icu': ip ?? 'umami.napneko.icu',
'rkey.napneko.icu': ip ?? 'rkey.napneko.icu'
};
}
type Cache = {
[key: string]: string;
};
let cache: Cache = {
'cached': '',
'umami.napneko.icu': 'umami.napneko.icu',
'rkey.napneko.icu': 'rkey.napneko.icu'
};
export const getDomainIp = async (domain: string) => {
if (!cache.cached) {
cache = { cached: 'cached', ...(await findRealHost()) };
}
console.log('[NetWork] [Cache] ', domain, ' --> ', cache[domain] ?? domain);
return cache[domain] ?? domain;
}
+7 -3
View File
@@ -12,6 +12,7 @@ export class UmamiTraceCore {
ua: string = '';
workname: string = 'default';
bootTime = Date.now();
cache: string = '';
init(qqversion: string, guid: string, workname: string) {
this.qqversion = qqversion;
this.workname = workname;
@@ -101,7 +102,8 @@ export class UmamiTraceCore {
headers: {
"Host": "umami.napneko.icu",
"Content-Type": "application/json",
"User-Agent": this.ua
"User-Agent": this.ua,
...(this.cache ? { 'x-umami-cache': this.cache } : {})
}
};
@@ -110,9 +112,11 @@ export class UmamiTraceCore {
});
res.on('data', (data) => {
if (!this.cache) {
this.cache = data.toString();
}
});
}).on('error', () => {} );
}).on('error', () => { });
request.write(JSON.stringify({ type, payload }));
request.end();
+1 -1
View File
@@ -1 +1 @@
export const napCatVersion = '4.2.60';
export const napCatVersion = '4.2.63';
+1 -1
View File
@@ -21,7 +21,7 @@ export class PacketOperationContext {
}
async GroupPoke(groupUin: number, uin: number) {
const req = trans.SendPoke.build(groupUin, uin);
const req = trans.SendPoke.build(uin, groupUin);
await this.context.client.sendOidbPacket(req);
}
+1 -1
View File
@@ -14,6 +14,6 @@ export class GroupPoke extends GetPacketStatusDepends<Payload, any> {
payloadSchema = SchemaData;
async _handle(payload: Payload) {
await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.user_id, +payload.group_id);
await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
}
}
+3 -3
View File
@@ -15,9 +15,9 @@ export class SendPoke extends GetPacketStatusDepends<Payload, any> {
async _handle(payload: Payload) {
if (payload.group_id) {
this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
} else {
this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
}
}
}
}
+7 -2
View File
@@ -90,7 +90,7 @@ export class WebUiConfigWrapper {
try {
const configPath = resolve(webUiPathWrapper.configPath, './webui.json');
if (!await fs.access(configPath, constants.R_OK).then(() => true).catch(() => false)) {
if (!await fs.access(configPath, constants.F_OK).then(() => true).catch(() => false)) {
await fs.writeFile(configPath, JSON.stringify(defaultconfig, null, 4));
}
@@ -101,7 +101,12 @@ export class WebUiConfigWrapper {
if (!parsedConfig.prefix.startsWith('/')) parsedConfig.prefix = '/' + parsedConfig.prefix;
if (parsedConfig.prefix.endsWith('/')) parsedConfig.prefix = parsedConfig.prefix.slice(0, -1);
// 配置已经被操作过了,还是回写一下吧,不然新配置不会出现在配置文件里
await fs.writeFile(configPath, JSON.stringify(parsedConfig, null, 4));
if (await fs.access(configPath, constants.W_OK).then(() => true).catch(() => false)) {
await fs.writeFile(configPath, JSON.stringify(parsedConfig, null, 4));
}
else {
console.warn(`文件: ${configPath} 没有写入权限, 配置的更改部分可能会在重启后还原.`);
}
// 不希望回写的配置放后面
// 查询主机地址是否可用