oicq-icalingua-plus-plus 1.24.13 → 1.24.16

package/lib/message/chat.js

@@ -147,18 +147,20 @@ async function sendJsonMsg(target, json, group, sign) {
  * @returns {import("../ref").ProtocolResponse}
  */
 async function sendFile(user_id, file, filename, callback) {
-    let filesize, filemd5, filesha, filestream
+    let filesize, filemd5, filesha, filestream, _10MMd5
     if (file instanceof Uint8Array) {
         if (!Buffer.isBuffer(file))
             file = Buffer.from(file)
         filesize = file.length
         filemd5 = md5(file), filesha = common.sha1(file)
+        _10MMd5 = md5(file.subarray(0, 10002432))
         filename = filename ? String(filename) : ("file" + filemd5.toString("hex"))
         filestream = Readable.from(file, { objectMode: false, highWaterMark: 524288 })
     } else {
         file = String(file)
         filesize = (await fs.promises.stat(file)).size
         ;[filemd5, filesha] = await common.fileHash(file)
+        _10MMd5 = await common.md5Stream(fs.createReadStream(file, { start: 0, end: 10002431 }))
         filename = filename ? String(filename) : path.basename(file)
         filestream = fs.createReadStream(file, { highWaterMark: 524288 })
     }
@@ -170,7 +172,7 @@ async function sendFile(user_id, file, filename, callback) {
             20: user_id,
             30: filesize,
             40: filename,
-            50: filemd5,
+            50: _10MMd5,
             60: filesha,
             70: "/storage/emulated/0/Android/data/com.tencent.mobileqq/Tencent/QQfile_recv/" + filename,
             80: 0,
@@ -206,7 +208,7 @@ async function sendFile(user_id, file, filename, callback) {
                     100: filesize,
                     200: filemd5,
                     300: filesha,
-                    400: filemd5,
+                    400: _10MMd5,
                     600: fid,
                     700: rsp1700[220].toBuffer(),
                 },
@@ -252,7 +254,7 @@ async function sendFile(user_id, file, filename, callback) {
             1: {
                 1: 0,
                 3: fid,
-                4: filemd5,
+                4: _10MMd5,
                 5: filename,
                 6: filesize,
                 9: 1,

package/lib/message/ptt.js

@@ -302,6 +302,7 @@ async function _uploadPtt(target, buf) {
         6: buf.length,
         11: 1,
         18: fid,
+        29: codec,
         30: Buffer.from([8, 0, 40, 0, 56, 0]),
     });
 }

package/lib/service.js

@@ -169,7 +169,7 @@ function highwayHttpUpload(readable, obj) {
     let offset = 0, limit = 524288
     obj.ticket = this.storage.sig_session
 
-    const tasks = new Set()
+    const bufs = new Set()
     const controller = new AbortController();
     require("events").setMaxListeners(233, controller.signal);
     let finished = 0
@@ -208,11 +208,20 @@ function highwayHttpUpload(readable, obj) {
             _.writeUInt32BE(head.length, 1)
             _.writeUInt32BE(chunk.length, 5)
             const buf = Buffer.concat([_, head, chunk, __])
-            const task = new Promise((resolve, reject) => {
-                axios.post(url, buf, {
+            bufs.add(buf)
+        }
+        offset += data.length
+    })
+
+    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,
-                    //cancelToken: c.token,
                     signal: controller.signal,
                     headers: {
                         "Content-Length": String(buf.length),
@@ -235,41 +244,28 @@ function highwayHttpUpload(readable, obj) {
                         return
                     }
                     ++finished
-                    percentage = (finished / tasks.size * 100).toFixed(2)
+                    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 < tasks.size && rsp[7]?.toBuffer().length > 0) {
+                    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 >= tasks.size && !rsp[7]?.toBuffer().length)
+                    if (finished >= bufs.size && !rsp[7]?.toBuffer().length)
                         reject("文件校验未通过，上传失败")
-                    resolve(undefined)
                 }).catch(err => {
                     if (err instanceof axios.Cancel === false) {
                         reject(err)
                     }
-                    resolve(undefined)
+                    flag = true
                 })
-            })
-            tasks.add(task)
-        }
-        offset += data.length
-    })
-
-    return new Promise((resolve, reject) => {
-        readable.on("err", reject)
-        .on("end", () => {
-            Promise.all(tasks).then(resolve).catch(err => {
-                if (err instanceof axios.Cancel === false) {
-                    controller.abort()
-                    reject(err)
-                }
-                resolve(undefined)
-            })
+            }
+            resolve(undefined)
         })
     })
 }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.24.13",
-  "app_version": "1.24.13",
-  "upday": "2024/05/23",
+  "version": "1.24.16",
+  "app_version": "1.24.16",
+  "upday": "2024/05/26",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",