Merge branch 'dev'

Author: linyuchen

.github/workflows/publish.yml

@@ -26,10 +26,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           registry-url: 'https://registry.npmjs.org'

doc/更新日志.txt

@@ -1,3 +1,9 @@
+V8.1.9
+更新时间 2026-08-20
+
+* 修复 sign-proxy.win-x64.node 被杀毒软件误报为病毒导致无法启动
+
+=================
 V8.1.8
 更新时间 2026-08-14
 

package-dist.json

@@ -1 +1 @@
-{"name":"llonebot-dist","version":"8.1.8","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}
+{"name":"llonebot-dist","version":"8.1.9","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}

src/common/utils/environment.ts

@@ -27,4 +27,28 @@ export function getSpecifiedUin(argv: string[] = process.argv): string | undefin
         if (a.startsWith('--qq=')) return a.slice('--qq='.length)
     }
     return undefined
+}
+
+export type Cdn = 'cf' | 'china'
+
+/**
+ * 解析接入点 CDN, 传给 SignProxy init。
+ * 优先级: argv `--cdn china` / `--cdn=china` > 环境变量 CDN > 默认 cf。
+ * 环境变量名 (CDN/cdn) 与值 (china/CHINA/...) 都大小写无关。
+ * cf (默认) = api-auth.luckylillia.com; china = llbot-api-auth.wumiao.wang。
+ * 非 cf/china 的值回退到 cf (SignProxy 侧还会再校验一次并对非法值报错)。
+ */
+export function getCdn(argv: string[] = process.argv, env: NodeJS.ProcessEnv = process.env): Cdn {
+    let raw: string | undefined
+    for (let i = 0; i < argv.length; i++) {
+        const a = argv[i]
+        if (a === '--cdn' && i + 1 < argv.length) { raw = argv[i + 1]; break }
+        if (a.startsWith('--cdn=')) { raw = a.slice('--cdn='.length); break }
+    }
+    // argv 未指定时回退环境变量; 变量名大小写无关 (CDN / cdn / Cdn 均可)
+    if (raw === undefined) {
+        const key = Object.keys(env).find(k => k.toLowerCase() === 'cdn')
+        if (key) raw = env[key]
+    }
+    return raw?.trim().toLowerCase() === 'china' ? 'china' : 'cf'
 }

src/common/utils/file.ts

@@ -4,7 +4,7 @@ import fsPromise from 'node:fs/promises'
 import path from 'node:path'
 import * as fileType from 'file-type'
 import { imageSizeFromFile } from '../image-size/lib/fromFile'
-import { TEMP_DIR } from '../globalVars'
+import { selfInfo, TEMP_DIR } from '../globalVars'
 import { randomUUID, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
 import { Context } from 'cordis'
@@ -195,7 +195,7 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean, fi
       } else if (fileCache[0].elementType === ElementType.Ptt) {
         url = await ctx.ntFileApi.getPttUrl(fileCache[0].fileUuid, isGroup)
       } else if (fileCache[0].elementType === ElementType.File) {
-        url = (await ctx.ntFileApi.getFileUrl(fileCache[0].fileUuid, isGroup, isGroup ? +fileCache[0].peerUid : undefined)).url
+        url = (await ctx.ntFileApi.getFileUrl(fileCache[0].fileUuid, isGroup, isGroup ? fileCache[0].peerUid : selfInfo.uid)).url
       }
       if (url) {
         return await uri2local(ctx, url, needExt, fileName)

src/common/utils/sign.ts

@@ -32,7 +32,7 @@ export class MusicSign {
     })
     const data = await resp.text()
     if (!resp.ok) throw new Error(data)
-    this.ctx.logger.info('音乐消息生成成功', data)
+    this.ctx.logger.info('音乐消息生成内容:', data)
     return data
   }
 }

src/main/qqProtocol/direct-lib/client.ts

@@ -1,4 +1,4 @@
-import { getLogger } from '@/common/logger'
+import { getLogger, isDebugEnabled } from '@/common/logger'
 import { TcpConnection } from './connection'
 import { buildServicePacket, buildServicePacket13, parseServicePacket, EncryptType, PacketContext, SsoPacket } from './packet'
 import { generateEcdhKeyPair, EcdhKeyPair } from './ecdh'
@@ -23,6 +23,8 @@ export interface DirectClientConfig {
   dataDir?: string
   /** 当前账号 uin, 可选. */
   uin?: number
+  /** 接入点 CDN: 'cf' (默认) / 'china'. 传给 SignProxy 决定 base_url + TLS pin. */
+  cdn?: string
 }
 
 const DEFAULT_CONFIG: DirectClientConfig = {
@@ -63,6 +65,12 @@ export class DirectProtocolClient extends EventEmitter {
   private signTokenRefreshInflight: Promise<void> | null = null
   private signTokenLastFetchAt = 0
   private heartbeatAliveTimer: NodeJS.Timeout | null = null
+  // 计时诊断: 按 seq 记响应帧「进 handlePacket」的时刻, 拆 wire vs parse.
+  private frameArriveAt: Map<number, number> = new Map()
+  // event loop lag 采样: setInterval 期望 50ms 一跳, 实测跳间隔 - 50 = 主线程被阻塞的量.
+  private maxLoopLag = 0
+  private loopLagTimer: NodeJS.Timeout | null = null
+  private lastLoopTick = 0
 
   constructor(config: Partial<DirectClientConfig> = {}) {
     super()
@@ -96,6 +104,7 @@ export class DirectProtocolClient extends EventEmitter {
       authToken: this.config.authToken,
       machineGuid: this.guid,
       uin: this.config.uin,
+      cdn: this.config.cdn,
       sendPacket: async ({ cmd, body }) => {
         const resp = (await this.sendCommand(cmd, Buffer.from(body))).payload
         logger.debug(`[relay] ${cmd}: req=${body.length}B resp=${resp.length}B hex=%h`, resp)
@@ -111,6 +120,7 @@ export class DirectProtocolClient extends EventEmitter {
     await this.ensureSignSetup()
     await this.conn.connect({ useIPv6: this.config.useIPv6 })
     this.emit('connected')
+    this.startLoopLagMonitor()
 
     // Send initial heartbeat (required before other commands)
     await this.sendHeartbeat()
@@ -135,6 +145,28 @@ export class DirectProtocolClient extends EventEmitter {
     }
   }
 
+  // 诊断用: 每 50ms 一跳, 记录实际间隔超出 50ms 的部分 = 主线程被同步阻塞的时长.
+  // native signRequest 若是同步阻塞调用, 会在这里体现, 且会推迟响应帧回调 (灌进 wire/netRTT).
+  // 只在 --debug 下开: 常驻 50ms setInterval 在生产会白费 CPU.
+  private startLoopLagMonitor(): void {
+    if (this.loopLagTimer || !isDebugEnabled()) return
+    const EXPECT = 50
+    this.lastLoopTick = Date.now()
+    this.loopLagTimer = setInterval(() => {
+      const now = Date.now()
+      const lag = now - this.lastLoopTick - EXPECT
+      if (lag > this.maxLoopLag) this.maxLoopLag = lag
+      this.lastLoopTick = now
+    }, EXPECT)
+    this.loopLagTimer.unref?.()
+  }
+
+  private takeMaxLoopLag(): number {
+    const v = this.maxLoopLag
+    this.maxLoopLag = 0
+    return v
+  }
+
 
   async sendHeartbeat(): Promise<void> {
     const seq = this.nextSeq()
@@ -727,14 +759,20 @@ export class DirectProtocolClient extends EventEmitter {
     const ctx = this.getPacketContext()
     const enc = encryptType ?? (this.session ? EncryptType.EncryptD2Key : EncryptType.EncryptEmpty)
 
+    const t0 = Date.now()
+    let tTokenDone = t0
+    let tSignDone = t0
+
     let signResult: SignResult | null = null
     if (this.config.authToken && this.SIGN_ALLOWLIST.has(cmd)) {
       // uin 优先 session (登录成功后), 未登录时 fallback 到构造时传的 config.uin.
       // 快速登录场景 session 解不开时 session 为 null, 但 config.uin 已从明文元数据 / -q 拿到,
       // 缺了它 sign 服务器会 400 'missing uin' 直接拒
       const uin = this.session?.uin ? Number(this.session.uin) : (this.config.uin || undefined)
       await this.ensureSignTokenFresh(uin)
+      tTokenDone = Date.now()
       signResult = await requestSign(cmd, payload, seq, this.guid, AppInfo.qua, uin, this.session?.signToken12B)
+      tSignDone = Date.now()
       if (signResult?.token.length === 0) {
         signResult.token = Buffer.from(this.session?.signToken12B ?? '')
       }
@@ -753,25 +791,41 @@ export class DirectProtocolClient extends EventEmitter {
       logger.debug(`[SSO send] ${cmd} seq=${seq} frame=${packet.length}B hex=%h`, packet)
     }
 
+    const tSendStart = Date.now()
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
         this.pendingPackets.delete(seq)
         reject(new Error(`Command ${cmd} timed out after ${timeout}ms`))
       }, timeout)
 
-      this.pendingPackets.set(seq, { resolve, reject, timeout: timer })
+      const finish = (fn: (v: any) => void) => (v: any) => {
+        if (isDebugEnabled()) {
+          const tDone = Date.now()
+          const arrive = this.frameArriveAt.get(seq)
+          this.frameArriveAt.delete(seq)
+          const wire = arrive ? arrive - tSendStart : -1   // send -> 字节到达 socket (网络+服务端+event-loop 投递)
+          const parse = arrive ? tDone - arrive : -1        // 字节到达 -> resolve (解密/解析, 纯本地)
+          logger.debug(
+            `[timing] ${cmd} seq=${seq}: token=${tTokenDone - t0}ms sign=${tSignDone - tTokenDone}ms wire=${wire}ms parse=${parse}ms netRTT=${tDone - tSendStart}ms maxLoopLag=${this.takeMaxLoopLag()}ms total=${tDone - t0}ms`
+          )
+        }
+        fn(v)
+      }
+
+      this.pendingPackets.set(seq, { resolve: finish(resolve), reject: finish(reject), timeout: timer })
       this.conn.send(packet)
     })
   }
 
   private handlePacket(frame: Buffer): void {
+    const tArrive = Date.now()
     const d2Key = this.session?.d2Key || Buffer.alloc(16)
     const parsed = parseServicePacket(frame, d2Key)
     if (!parsed) {
       this.emit('error', new Error('Failed to parse incoming packet'))
       return
     }
-
+    if (isDebugEnabled()) this.frameArriveAt.set(parsed.seq, tArrive)
     const pending = this.pendingPackets.get(parsed.seq)
     if (pending) {
       clearTimeout(pending.timeout)

src/main/qqProtocol/direct-lib/sign-proxy/index.ts

@@ -97,6 +97,8 @@ export interface InitArgs {
   machineGuidHex: string
   /** 当前账号 uin, 可选; 没有就等登录完成 SignProxy 自己绑. */
   uin?: number
+  /** 接入点 CDN: "cf" (默认) / "china". 决定 base_url + TLS pin. 不传按 cf. */
+  cdn?: string
 }
 
 /** 发包回调入参: 把 body relay 给 QQ 的 cmd. */

src/main/qqProtocol/direct-lib/sign-proxy/sign-proxy.package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucky-lillia/sign-proxy-loader",
-  "version": "0.1.0-20260711155903",
+  "version": "0.1.0-20260813171147",
   "private": true,
   "description": "Loader for the bundled lucky-lillia-sign-proxy .node. Bump version on every .node sync so Bot copies to a fresh path (the running process locks the prior file).",
   "main": "index.ts"