oicq-icalingua-plus-plus 1.22.13 → 1.22.15

package/index.d.ts

@@ -934,6 +934,7 @@ export class Client extends EventEmitter {
 
     /** 私聊 */
     _sendPrivateMsg(user_id: number, message: Sendable, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>;
+    sendFile(user_id: number, file: MediaFile, name?: string, process?: (percentage: string) => void): Promise<Ret<{ message_id: string }>>;
     /** 群聊 */
     sendGroupMsg(group_id: number, message: Sendable, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>;
     /** 群临时会话，大多数时候可以使用私聊达到同样效果 */

package/lib/client.js

@@ -351,6 +351,9 @@ class Client extends EventEmitter {
     _sendPrivateMsg(user_id, message = "", auto_escape = false) {
         return this._useProtocol(chat.sendMsg, [user_id, message, auto_escape, 0]);
     }
+    sendFile(user_id, file, name, process) {
+        return this._useProtocol(chat.sendFile, [user_id, file, name, process]);
+    }
     sendGroupMsg(group_id, message = "", auto_escape = false) {
         return this._useProtocol(chat.sendMsg, [group_id, message, auto_escape, 1]);
     }

package/lib/message/builder.js

@@ -161,10 +161,11 @@ class Builder {
      * @param {number} target 
      * @param {0|1|2} type //0私聊 1群聊 2讨论组
      */
-    constructor(c, target, type) {
+    constructor(c, target, type, file = null) {
         this.c = c;
         this.target = target;
         this.type = type;
+        this.file = file;
     }
 
     /**
@@ -845,7 +846,7 @@ class Builder {
         if (tasks.length > 0)
             var rsp = await Promise.race(tasks);
 
-        if (!this.elems.length) {
+        if (!this.elems.length && this.file === null) {
             if (rsp) return rsp;
             throw new Error("empty message");
         }
@@ -867,6 +868,9 @@ class Builder {
         } else {
             let user_id = this.target;
             routing = { 1: { 1: user_id } };
+            if (this.file !== null) {
+                routing = { 15: { 1: user_id, 2: 4 } };
+            }
             if (this.c.sl.has(user_id)) {
                 try {
                     const group_id = this.c.sl.get(user_id).group_id;
@@ -910,7 +914,7 @@ class Builder {
         return pb.encode({
             1: this.routing,
             2: content,
-            3: { 1: rich },
+            3: this.file !== null ? this.file : { 1: rich },
             4: this.seq,
             5: this.random,
             6: this.type > 0 ? null : this.c.buildSyncCookie(),

package/lib/message/chat.js

@@ -8,8 +8,11 @@ const { getC2CMsgs, getGroupMsgs, getLastSeq } = require("./history");
 const { parseC2CMsg, parseGroupMsg, parseForwardMsg } = require("./parser");
 const common = require("../common");
 const pb = require("../algo/pb");
+const fs = require("fs");
+const path = require("path");
 const { parseC2CMessageId, parseGroupMessageId, genMessageUuid, genRandom } = common;
 const { ImageBuilder, uploadImages, buildImageFileParam } = require("./image");
+const { highwayHttpUpload } = require("../service");
 
 //send msg----------------------------------------------------------------------------------------------------
 
@@ -47,6 +50,119 @@ function sendMsg(target, message, escape, type) {
     return builder.buildAndSend(message, escape);
 }
 
+async function sendFile(user_id, file, filename, callback) {
+    let filesize, filemd5, filesha, filestream
+    if (file instanceof Uint8Array) {
+        if (!Buffer.isBuffer(file))
+            file = Buffer.from(file)
+        filesize = file.length
+        filemd5 = md5(file), filesha = sha(file)
+        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)
+        filename = filename ? String(filename) : path.basename(file)
+        filestream = fs.createReadStream(file, { highWaterMark: 524288 })
+    }
+    const body1700 = pb.encode({
+        1: 1700,
+        2: 6,
+        19: {
+            10: this.uin,
+            20: user_id,
+            30: filesize,
+            40: filename,
+            50: filemd5,
+            60: filesha,
+            70: "/storage/emulated/0/Android/data/com.tencent.mobileqq/Tencent/QQfile_recv/" + filename,
+            80: 0,
+            90: 0,
+            100: 0,
+            110: filemd5,
+        },
+        101: 3,
+        102: 104,
+        200: 1,
+    })
+    const payload = await this.sendUni("OfflineFilleHandleSvr.pb_ftn_CMD_REQ_APPLY_UPLOAD_V3-1700", body1700)
+    const rsp1700 = pb.decode(payload)[19]
+
+    if (rsp1700[10] !== 0)
+        throw new Error(`${rsp1700[10]}, ${rsp1700[20]}`)
+
+    const fid = rsp1700[90].toBuffer()
+
+    if (!rsp1700[110]) {
+        const ext = pb.encode({
+            1: 100,
+            2: 2,
+            100: {
+                100: {
+                    1: 3,
+                    100: this.uin,
+                    200: user_id,
+                    400: 0,
+                    700: payload,
+                },
+                200: {
+                    100: filesize,
+                    200: filemd5,
+                    300: filesha,
+                    400: filemd5,
+                    600: fid,
+                    700: rsp1700[220].toBuffer(),
+                },
+                300: {
+                    100: 2,
+                    200: String(this.apk.subid),
+                    300: 2,
+                    400: "d92615c5",
+                    600: 4,
+                },
+                400: {
+                    100: filename,
+                },
+            },
+            200: 1
+        })
+        await highwayHttpUpload.call(this, filestream, {
+            md5: filemd5,
+            size: filesize,
+            cmdid: 69, // CmdID.OfflineFile,
+            ext, callback
+        })
+    }
+
+    const body800 = pb.encode({
+        1: 800,
+        2: 7,
+        10: {
+            10: this.uin,
+            20: user_id,
+            30: fid,
+        },
+        101: 3,
+        102: 104,
+    })
+    await this.sendUni("OfflineFilleHandleSvr.pb_ftn_CMD_REQ_UPLOAD_SUCC-800", body800)
+    const proto3 = {
+        2: {
+            1: {
+                1: 0,
+                3: fid,
+                4: filemd5,
+                5: filename,
+                6: filesize,
+                9: 1,
+            }
+        }
+    }
+    const builder = new Builder(this, user_id, 0, proto3);
+    return builder.buildAndSend('', false);
+}
+
 //recall----------------------------------------------------------------------------------------------------
 
 /**
@@ -272,5 +388,5 @@ async function preloadImages(files = []) {
 module.exports = {
     sendMsg, sendTempMsg, recallMsg, reportReaded,
     getOneMsg, getMsgs, getForwardMsg,
-    preloadImages
+    preloadImages, sendFile
 };

package/lib/service.js

@@ -12,6 +12,7 @@ const { randomBytes } = require("crypto");
 const tea = require("./algo/tea");
 const pb = require("./algo/pb");
 const { md5, NOOP, BUF0} = require("./common");
+const axios = require("axios").default;
 const MAX_UPLOAD_SIZE = 31457280;
 
 /**
@@ -150,6 +151,123 @@ function highwayUploadStream(readable, obj, ip, port) {
     });
 }
 
+const __ = Buffer.from([41])
+
+function highwayHttpUpload(readable, obj) {
+    const agent = new http.Agent({ maxSockets: 10 })
+    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
+    obj.ticket = this.storage.sig_session
+
+    const tasks = new Set()
+    const controller = new AbortController();
+    require("events").setMaxListeners(233, controller.signal);
+    let finished = 0
+
+    readable.on("data", data => {
+        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, __])
+            const task = new Promise((resolve, reject) => {
+                axios.post(url, buf, {
+                    responseType: "arraybuffer",
+                    httpAgent: agent,
+                    //cancelToken: c.token,
+                    signal: controller.signal,
+                    headers: {
+                        "Content-Length": String(buf.length)
+                    }
+                }).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) {
+                        reject(`${rsp[3]}, unknown highway error"`)
+                        return
+                    }
+                    ++finished
+                    percentage = (finished / tasks.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) {
+                        controller.abort()
+                        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)
+                        reject("文件校验未通过，上传失败")
+                    resolve(undefined)
+                }).catch(err => {
+                    if (err instanceof axios.Cancel === false) {
+                        reject(err)
+                    }
+                    resolve(undefined)
+                })
+            })
+            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)
+            })
+        })
+    })
+}
+
 const ERROR_SIZE_TOO_BIG = new Error("文件体积超过30MB，拒绝下载");
 
 class DownloadTransform extends stream.Transform {
@@ -200,5 +318,5 @@ function downloadFromWeb(url, headers, redirect = 0) {
 }
 
 module.exports = {
-    downloadFromWeb, highwayUploadStream, int32ip2str, MAX_UPLOAD_SIZE,
+    downloadFromWeb, highwayUploadStream, int32ip2str, highwayHttpUpload, MAX_UPLOAD_SIZE,
 };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.22.13",
-  "app_version": "1.22.13",
-  "upday": "2022/12/14",
+  "version": "1.22.15",
+  "app_version": "1.22.15",
+  "upday": "2022/12/24",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",
@@ -21,6 +21,7 @@
   "author": "The Icalingua++ Authors",
   "license": "MPL-2.0",
   "dependencies": {
+    "axios": "^1.2.1",
     "jsqr": "^1.4.0",
     "log4js": "^6.3.0",
     "long": "^4.0.0",