oicq-icalingua-plus-plus 1.26.6 → 1.26.7

package/index.d.ts

@@ -56,6 +56,23 @@ export interface ConfBot {
 
     /** 使用NT上线包，部分消息暂未支持 */
     useNT?: boolean,
+
+    /** 指定APK信息，覆盖默认的协议参数 */
+    apk_info?: {
+        id?: string,
+        name?: string,
+        version?: string,
+        ver?: string,
+        sign?: Buffer,
+        buildtime?: number,
+        appid?: number,
+        subid?: number,
+        bitmap?: number,
+        sigmap?: number,
+        sdkver?: string,
+        ssover?: number,
+        qua?: string,
+    }
 }
 
 export interface Statistics {

package/lib/client.js

@@ -263,11 +263,15 @@ class Client extends EventEmitter {
             data_dir: path.join(require.main ? require.main.path : process.cwd(), "data"),
             ffmpeg_path: "ffmpeg",
             ffprobe_path: "ffprobe",
+            apk_info: {},
             ...config
         };
         this.config = config;
         this.dir = createDataDir(config.data_dir, uin);
         this.apk = getApkInfo(config.platform);
+        if (config.apk_info) {
+            Object.assign(this.apk, config.apk_info);
+        }
         if (this.config.useNT && this.apk.ssover < 20) this.apk.ssover = 20;
         this.logger = log4js.getLogger(`[${platforms[config.platform] ||
             ((config.platform % 2 === 1 ? "Android_" : "aPad_") + this.apk.ver)

package/lib/core/friendlist.js

@@ -85,13 +85,12 @@ async function initFL() {
     this.sync_finished = false;
     const tmp = this.fl;
     this.fl = new Map;
-    let start = 0, limit = 150;
+    let start = 0, limit = 100;
     while (1) {
         try {
             const total = await _initFL.call(this, start, limit, tmp);
             start += limit;
-            if (start + limit > total) limit = total - start;
-            if (start >= total) break;
+            if (start > total) break;
         } catch (e) {
             this.logger.debug(e);
             this.logger.warn("加载好友列表出现异常，未加载完成。");

package/lib/message/parser.js

@@ -612,28 +612,18 @@ class Parser {
 
         data.file = buildImageFileParam(md5, size, width, height, imgType);
 
-        if (ntPath && storeId === 1) {
+        if (ntPath) {
             data.url = `https://${elem[1][2][3]}${ntPath}&spec=0`;
         } else {
             data.url = `https://gchat.qpic.cn/gchatpic_new/0/0-0-${md5.toUpperCase()}/0`;
         }
-        if (timestamp() - time > 60 * 60 || !(await checkImgUrl(data.url))) {
-            // 图片地址失效，尝试发包获取
-            let newURL = null;
-            if (dm) { //私聊
-                newURL = await getNTPicURL.call(this.c, imgInfo, String(this.uid), true);
-            } else { //群聊
-                newURL = await getNTPicURL.call(this.c, imgInfo, this.gid);
-            }
-            if (newURL) {
-                data.url = newURL;
-            }
+        if (storeId === 1 && fileid) {
+            data.url = await getNTPicURLbyFileid.call(this.c, fileid);
+        } else if (storeId === 0) {
+            data.url = `https://gchat.qpic.cn/gchatpic_new/0/0-0-${md5.toUpperCase()}/0`;
         }
         // QQNT 图片容错，某些 QQNT 的机器人会发出 appid 异常的图片
         data.url = data.url.replace("multimedia.nt.qq.com.cn", "gchat.qpic.cn"); //这个host下面似乎不检查rkey有效期
-        if (!(await checkImgUrl(data.url))) {
-            data.url = await getNTPicURLbyFileid.call(this.c, fileid);
-        }
         this.isNTImg = true;
         return data;
     }

package/lib/message/ptt.js

@@ -300,8 +300,10 @@ async function _uploadPtt(target, buf) {
         4: md5,
         5: md5.toString("hex") + ".amr",
         6: buf.length,
+        8: 0,
         11: 1,
         18: fid,
+        19: seconds,
         29: codec,
         30: Buffer.from([8, 0, 40, 0, 56, 0]),
     });

package/lib/service.js

@@ -187,9 +187,9 @@ function highwayHttpUpload(readable, obj) {
     const limit = 524288
     obj.ticket = this.storage.sig_session
 
+    const MAX_QUEUED = 3  // 队列中最多保留的分块数，控制内存上限（3×512KB≈1.5MB）
     let seq = 1
     let offset = 0
-    let totalChunks = 0
     let readEnded = false
 
     // 顺序队列：每读到一个完整分块就推入，drain 循环逐个串行上传
@@ -230,37 +230,40 @@ function highwayHttpUpload(readable, obj) {
         return Buffer.concat([header, head, chunk, __])
     }
 
-    // 读取流 → 分块 → 入队
+    // 读取流 → 分块 → 入队（带背压：队列满时暂停读取）
     readable.on("data", data => {
         if (errFlag || quickDone) return
         let _offset = 0
         while (_offset < data.length) {
             const chunk = data.slice(_offset, limit + _offset)
             _offset += chunk.length
-            ++totalChunks
             const buf = buildBuf(chunk, offset + _offset - chunk.length)
-            queue.push(buf)
+            queue.push({ buf, chunkLen: chunk.length })
             if (notify) { notify(); notify = null }
         }
         offset += data.length
+        // 队列积压过多，暂停读取，等上传消化后再恢复
+        if (queue.length >= MAX_QUEUED) {
+            readable.pause()
+        }
     })
 
     readable.on("err", err => { errFlag = err })
 
     // 串行 drain 循环：逐个从队列取分块上传
     const drain = async () => {
-        let finished = 0
+        let uploadedBytes = 0
         while (true) {
             while (queue.length === 0) {
                 if (errFlag) return
                 if (readEnded) {
                     // 流已结束且队列为空，检查是否全部完成
-                    if (finished >= totalChunks) return
+                    if (uploadedBytes >= obj.size) return
                 }
                 // 等待新分块入队
                 await new Promise(r => { notify = r })
             }
-            const buf = queue.shift()
+            const { buf, chunkLen } = queue.shift()
             const r = await axios.post(url, buf, {
                 responseType: "arraybuffer",
                 httpAgent: agent,
@@ -280,8 +283,8 @@ function highwayHttpUpload(readable, obj) {
             if (rsp?.[3] !== 0) {
                 throw new Error(`${rsp[3]}, unknown highway error`)
             }
-            ++finished
-            const percentage = (finished / totalChunks * 100).toFixed(2)
+            uploadedBytes += chunkLen
+            const percentage = (uploadedBytes / obj.size * 100).toFixed(2)
             this.logger.debug(`highway(http) chunk uploaded (${percentage}%)`)
             if (typeof obj.callback === "function")
                 obj.callback(percentage)
@@ -294,6 +297,10 @@ function highwayHttpUpload(readable, obj) {
                     obj.callback("100.00")
                 return
             }
+            // 队列消化后恢复读取
+            if (queue.length < MAX_QUEUED && readable.isPaused()) {
+                readable.resume()
+            }
         }
     }
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.26.6",
-  "app_version": "1.26.6",
+  "version": "1.26.7",
+  "app_version": "1.26.7",
   "upday": "2026/07/18",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",