oicq-icalingua-plus-plus 1.26.28 → 1.26.29

package/index.d.ts

@@ -960,7 +960,13 @@ export interface FlashTransferMetadata {
     file_count?: number;
 }
 
-export type FlashTransferUploadInput = MediaFile | { file: MediaFile; name?: string };
+export interface FlashTransferUploadDirectory {
+    name: string;
+    /** 虚拟目录的子项；文件仍从各自的源路径读取 */
+    children: FlashTransferUploadInput[];
+}
+
+export type FlashTransferUploadInput = MediaFile | { file: MediaFile; name?: string } | FlashTransferUploadDirectory;
 
 export interface FlashTransferUploadSource {
     name: string;

package/lib/message/qfile.js

@@ -251,7 +251,7 @@ class FlashTransfer {
     }
 
     /**
-     * 本地文件、目录或 Buffer 的完整上传；直到文件同步和任务提交均成功才返回。
+     * 本地文件、目录、虚拟目录或 Buffer 的完整上传；直到文件同步和任务提交均成功才返回。
      * @param {import("../../").FlashTransferUploadInput | import("../../").FlashTransferUploadInput[]} files
      * @param {string} [name]
      * @param {(percentage: string) => void} [callback]
@@ -274,7 +274,7 @@ class FlashTransfer {
         let task;
         let stage = "hash";
         /**
-         * @param {import("../../").MediaFile} file
+         * @param {import("../../").MediaFile | import("../../").FlashTransferUploadDirectory} file
          * @param {string} [file_name]
          * @param {string} [parent_id]
          * @param {number} [depth=1]
@@ -283,9 +283,15 @@ class FlashTransfer {
         const collect = async (file, file_name, parent_id = "", depth = 1) => {
             if (file_name !== undefined)
                 file_name = checkString(file_name, "file name");
+            const virtual = !!file && typeof file === "object" && "children" in file;
+            if (virtual) {
+                if (!Array.isArray(file.children))
+                    throw new TypeError("directory children must be an array");
+                file_name = checkString(file_name || file.name, "directory name");
+            }
             const binary = file instanceof Uint8Array || file instanceof ArrayBuffer || file instanceof SharedArrayBuffer;
             let stat;
-            if (!binary) {
+            if (!virtual && !binary) {
                 if (typeof file !== "string")
                     throw new TypeError("upload source must be a local path or binary data");
                 file = path.resolve(file);
@@ -298,17 +304,19 @@ class FlashTransfer {
                 cli_fileid, parent_id, depth,
                 name: file_name || (!binary ? path.basename(file) : ""),
                 cli_file_index: metadata.length + 1,
-                is_dir: !!stat?.isDirectory(),
+                is_dir: virtual || !!stat?.isDirectory(),
                 file_size: 0,
                 file_count: 0,
             };
             metadata.push(meta);
             if (meta.is_dir) {
                 meta.file_type = 25;
-                const children = await fs.promises.readdir(file, { withFileTypes: true });
-                children.sort((a, b) => a.name.localeCompare(b.name));
+                const children = virtual ? file.children : (await fs.promises.readdir(file, { withFileTypes: true }))
+                    .sort((a, b) => a.name.localeCompare(b.name))
+                    .map(child => ({ file: path.join(file, child.name), name: child.name }));
                 for (const child of children) {
-                    const entry = await collect(path.join(file, child.name), child.name, cli_fileid, depth + 1);
+                    const input = child && typeof child === "object" && "file" in child ? child : { file: child };
+                    const entry = await collect(input.file, input.name, cli_fileid, depth + 1);
                     meta.file_size += entry.file_size;
                     ++meta.file_count;
                 }

package/package.json

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