oicq-icalingua-plus-plus 1.26.5 → 1.26.6

package/lib/message/face.js

@@ -391,6 +391,18 @@ const map = {
     468: "/失眠",
     469: "/坚毅",
     470: "/马到成功",
+    472: "/心动",
+    474: "/给你一拳",
+    475: "/干饭",
+    476: "/不是吧",
+    477: "/你懂的",
+    478: "/对的对的",
+    479: "/不对不对",
+    480: "/散味儿",
+    481: "/学习",
+    482: "/热化了",
+    483: "/略",
+    484: "/比爱心",
 };
 
 const FACE_OLD_BUF = Buffer.from([0x00, 0x01, 0x00, 0x04, 0x52, 0xCC, 0xF5, 0xD0]);

package/lib/service.js

@@ -176,117 +176,138 @@ function highwayUploadStream(readable, obj, ip, port) {
 }
 
 const __ = Buffer.from([41])
-// TODO: 优化内存占用
 function highwayHttpUpload(readable, obj) {
-    const agent = new http.Agent({ maxSockets: 10 })
+    const agent = new http.Agent({ maxSockets: 1 })
     const ip = this.storage.ip
     const port = this.storage.port
     if (!port) throw new Error("没有上传通道，如果你刚刚登录，请等待几秒")
 
     console.log(`highway(http) ip:${ip} port:${port}`)
     const url = "http://" + ip + ":" + port + "/cgi-bin/httpconn?htcmd=0x6FF0087&uin=" + this.uin
-    let seq = 1
-    let offset = 0, limit = 524288
+    const limit = 524288
     obj.ticket = this.storage.sig_session
 
-    const bufs = new Set()
-    const controller = new AbortController();
-    require("events").setMaxListeners(233, controller.signal);
-    let finished = 0
+    let seq = 1
+    let offset = 0
+    let totalChunks = 0
+    let readEnded = false
+
+    // 顺序队列：每读到一个完整分块就推入，drain 循环逐个串行上传
+    const queue = []
+    let notify = null    // 用于队列非空时唤醒 drain
+    let errFlag = null   // 记录首个错误，终止后续上传
+    let quickDone = false
 
+    const buildBuf = (chunk, chunkOffset) => {
+        const head = pb.encode({
+            1: {
+                1: 1,
+                2: String(this.uin),
+                3: "PicUp.DataUp",
+                4: seq++,
+                5: 0,
+                6: this.apk.subid,
+                8: obj.cmdid,
+            },
+            2: {
+                1: 0,
+                2: obj.size,
+                3: chunkOffset,
+                4: chunk.length,
+                6: obj.ticket,
+                8: md5(chunk),
+                9: obj.md5,
+                10: 0,
+                13: 0,
+            },
+            3: obj.ext,
+            4: Date.now()
+        })
+        const header = Buffer.allocUnsafe(9)
+        header.writeUInt8(40)
+        header.writeUInt32BE(head.length, 1)
+        header.writeUInt32BE(chunk.length, 5)
+        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)
-            const head = pb.encode({
-                1: {
-                    1: 1,
-                    2: String(this.uin),
-                    3: "PicUp.DataUp",
-                    4: seq++,
-                    5: 0,
-                    6: this.apk.subid,
-                    8: obj.cmdid,
-                },
-                2: {
-                    1: 0,
-                    2: obj.size,
-                    3: offset + _offset,
-                    4: chunk.length,
-                    6: obj.ticket,
-                    8: md5(chunk),
-                    9: obj.md5,
-                    10: 0,
-                    13: 0,
-                },
-                3: obj.ext,
-                4: Date.now()
-            })
             _offset += chunk.length
-            const _ = Buffer.allocUnsafe(9)
-            _.writeUInt8(40)
-            _.writeUInt32BE(head.length, 1)
-            _.writeUInt32BE(chunk.length, 5)
-            const buf = Buffer.concat([_, head, chunk, __])
-            bufs.add(buf)
+            ++totalChunks
+            const buf = buildBuf(chunk, offset + _offset - chunk.length)
+            queue.push(buf)
+            if (notify) { notify(); notify = null }
         }
         offset += data.length
     })
 
+    readable.on("err", err => { errFlag = err })
+
+    // 串行 drain 循环：逐个从队列取分块上传
+    const drain = async () => {
+        let finished = 0
+        while (true) {
+            while (queue.length === 0) {
+                if (errFlag) return
+                if (readEnded) {
+                    // 流已结束且队列为空，检查是否全部完成
+                    if (finished >= totalChunks) return
+                }
+                // 等待新分块入队
+                await new Promise(r => { notify = r })
+            }
+            const buf = queue.shift()
+            const r = await axios.post(url, buf, {
+                responseType: "arraybuffer",
+                httpAgent: agent,
+                headers: {
+                    "Content-Length": String(buf.length),
+                    "Content-Type": "application/octet-stream"
+                }
+            })
+            let rsp
+            try {
+                const respBuf = Buffer.from(r?.data)
+                const header = respBuf.slice(9, respBuf.length - 1)
+                rsp = pb.decode(header)
+            } catch (err) {
+                throw err
+            }
+            if (rsp?.[3] !== 0) {
+                throw new Error(`${rsp[3]}, unknown highway error`)
+            }
+            ++finished
+            const percentage = (finished / totalChunks * 100).toFixed(2)
+            this.logger.debug(`highway(http) chunk uploaded (${percentage}%)`)
+            if (typeof obj.callback === "function")
+                obj.callback(percentage)
+            // 快传：服务端已持有全部数据，跳过后续分块
+            if (rsp[7]?.toBuffer().length > 0) {
+                quickDone = true
+                this.logger.debug(`highway(http) can quick upload`)
+                this.logger.debug(`highway(http) chunk uploaded (100.00%)`)
+                if (typeof obj.callback === "function")
+                    obj.callback("100.00")
+                return
+            }
+        }
+    }
+
     return new Promise((resolve, reject) => {
         readable.on("err", reject)
-        .on("end", async() => {
-            let flag = false
-            for (const buf of bufs) {
-                if (flag) break
-                await axios.post(url, buf, {
-                    responseType: "arraybuffer",
-                    httpAgent: agent,
-                    signal: controller.signal,
-                    headers: {
-                        "Content-Length": String(buf.length),
-                        "Content-Type": "application/octet-stream"
-                    }
-                }).then(r => {
-                    let percentage, rsp
-                    try {
-                        const buf = Buffer.from(r?.data)
-                        const header = buf.slice(9, buf.length - 1)
-                        rsp = pb.decode(header)
-                    } catch (err) {
-                        this.logger.error(err)
-                        reject(err)
-                        return
-                    }
-                    if (rsp?.[3] !== 0) {
-                        controller.abort()
-                        reject(new Error(`${rsp[3]}, unknown highway error"`))
-                        return
-                    }
-                    ++finished
-                    percentage = (finished / bufs.size * 100).toFixed(2)
-                    this.logger.debug(`highway(http) chunk uploaded (${percentage}%)`)
-                    if (typeof obj.callback === "function" && percentage)
-                        obj.callback(percentage)
-                    if (finished < bufs.size && rsp[7]?.toBuffer().length > 0) {
-                        controller.abort()
-                        flag = true
-                        this.logger.debug(`highway(http) can quick upload`)
-                        this.logger.debug(`highway(http) chunk uploaded (100.00%)`)
-                        if (typeof obj.callback === "function")
-                            obj.callback("100.00")
-                    }
-                    if (finished >= bufs.size && !rsp[7]?.toBuffer().length)
-                        reject("文件校验未通过，上传失败")
-                }).catch(err => {
-                    if (err instanceof axios.Cancel === false) {
-                        reject(err)
-                    }
-                    flag = true
-                })
-            }
-            resolve(undefined)
+        readable.on("end", () => {
+            readEnded = true
+            // 流结束时唤醒 drain（如果它正在等待）
+            if (notify) { notify(); notify = null }
         })
+        drain().then(() => {
+            if (errFlag) reject(errFlag)
+            else resolve(undefined)
+        }).catch(reject)
     })
 }
 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.26.5",
-  "app_version": "1.26.5",
-  "upday": "2026/06/30",
+  "version": "1.26.6",
+  "app_version": "1.26.6",
+  "upday": "2026/07/18",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",