karin-plugin-qgroup-file2openlist 0.0.27 → 0.0.28

package/lib/apps/groupFiles.backup.js

@@ -6,12 +6,12 @@ import "../chunk-PBBZ5KAD.js";
 import "../chunk-QB3GSENE.js";
 import {
   handleGroupFileUploadedAutoBackup
-} from "../chunk-R4MRR5TI.js";
-import "../chunk-DDV3OZXB.js";
+} from "../chunk-ZXZMBJN3.js";
+import "../chunk-AAKFRFSO.js";
 import {
   backupOpenListToOpenListCore,
   formatErrorMessage
-} from "../chunk-GDVU2T6R.js";
+} from "../chunk-HSFFULJR.js";
 import {
   config
 } from "../chunk-DA4U55JC.js";

package/lib/apps/groupFiles.js

@@ -1,12 +1,12 @@
 import {
   exportGroupFilesToDisk,
   syncGroupFilesToOpenListCore
-} from "../chunk-R4MRR5TI.js";
-import "../chunk-DDV3OZXB.js";
+} from "../chunk-ZXZMBJN3.js";
+import "../chunk-AAKFRFSO.js";
 import {
   formatErrorMessage,
   normalizePosixPath
-} from "../chunk-GDVU2T6R.js";
+} from "../chunk-HSFFULJR.js";
 import {
   config
 } from "../chunk-DA4U55JC.js";

package/lib/apps/groupSyncConfig.js

@@ -1,9 +1,9 @@
 import {
   handleGroupSyncConfigCommand
-} from "../chunk-P5FZDWLZ.js";
-import "../chunk-R4MRR5TI.js";
-import "../chunk-DDV3OZXB.js";
-import "../chunk-GDVU2T6R.js";
+} from "../chunk-H2TAMQ7I.js";
+import "../chunk-ZXZMBJN3.js";
+import "../chunk-AAKFRFSO.js";
+import "../chunk-HSFFULJR.js";
 import "../chunk-DA4U55JC.js";
 import "../chunk-IZS467MR.js";
 

package/lib/apps/opCommands.js

@@ -5,7 +5,7 @@ import {
   resolveOpltMapping,
   withOpltUser,
   writeOpltData
-} from "../chunk-5HRWYTEM.js";
+} from "../chunk-GAVQ23XT.js";
 import {
   buildActionCard,
   replyImages
@@ -20,7 +20,7 @@ import {
   normalizePosixPath,
   readJsonSafe,
   writeJsonSafe
-} from "../chunk-GDVU2T6R.js";
+} from "../chunk-HSFFULJR.js";
 import {
   config
 } from "../chunk-DA4U55JC.js";

package/lib/apps/ownerUi.js

@@ -4,14 +4,14 @@ import {
 import "../chunk-QB3GSENE.js";
 import {
   readGroupSyncState
-} from "../chunk-DDV3OZXB.js";
+} from "../chunk-AAKFRFSO.js";
 import {
   backupOpenListToOpenListCore,
   formatErrorMessage,
   normalizePosixPath,
   readJsonSafe,
   writeJsonSafe
-} from "../chunk-GDVU2T6R.js";
+} from "../chunk-HSFFULJR.js";
 import "../chunk-DA4U55JC.js";
 import {
   dir

package/lib/apps/scheduler.js

@@ -1,12 +1,12 @@
 import {
   runNightlyOpltBackup
-} from "../chunk-5HRWYTEM.js";
+} from "../chunk-GAVQ23XT.js";
 import {
   runNightlyGroupBackup
-} from "../chunk-P5FZDWLZ.js";
-import "../chunk-R4MRR5TI.js";
-import "../chunk-DDV3OZXB.js";
-import "../chunk-GDVU2T6R.js";
+} from "../chunk-H2TAMQ7I.js";
+import "../chunk-ZXZMBJN3.js";
+import "../chunk-AAKFRFSO.js";
+import "../chunk-HSFFULJR.js";
 import {
   config
 } from "../chunk-DA4U55JC.js";

package/lib/{chunk-DDV3OZXB.js → chunk-AAKFRFSO.js}

@@ -1,7 +1,7 @@
 import {
   readJsonSafe,
   writeJsonSafe
-} from "./chunk-GDVU2T6R.js";
+} from "./chunk-HSFFULJR.js";
 import {
   dir
 } from "./chunk-IZS467MR.js";

package/lib/{chunk-5HRWYTEM.js → chunk-GAVQ23XT.js}

@@ -4,7 +4,7 @@ import {
   normalizePosixPath,
   readJsonSafe,
   writeJsonSafe
-} from "./chunk-GDVU2T6R.js";
+} from "./chunk-HSFFULJR.js";
 import {
   config
 } from "./chunk-DA4U55JC.js";

package/lib/{chunk-P5FZDWLZ.js → chunk-H2TAMQ7I.js}

@@ -1,11 +1,11 @@
 import {
   syncGroupFilesToOpenListCore
-} from "./chunk-R4MRR5TI.js";
+} from "./chunk-ZXZMBJN3.js";
 import {
   normalizePosixPath,
   readJsonSafe,
   writeJsonSafe
-} from "./chunk-GDVU2T6R.js";
+} from "./chunk-HSFFULJR.js";
 import {
   config
 } from "./chunk-DA4U55JC.js";

package/lib/{chunk-GDVU2T6R.js → chunk-HSFFULJR.js}

@@ -43,11 +43,59 @@ var formatErrorMessage = (error) => {
 var isAbortError = (error) => {
   return Boolean(error && typeof error === "object" && "name" in error && error.name === "AbortError");
 };
+var drainResponseBody = async (res) => {
+  try {
+    const body = res.body;
+    if (!body) return;
+    const reader = body.getReader();
+    while (true) {
+      const { done } = await reader.read();
+      if (done) break;
+    }
+  } catch {
+    try {
+      await res.body?.cancel();
+    } catch {
+    }
+  }
+};
 var fetchTextSafely = async (res, maxLen = 500) => {
   try {
-    const text = await res.text();
-    return text.slice(0, maxLen);
+    const maxBytes = Math.max(0, Math.floor(maxLen) || 0);
+    if (!maxBytes) {
+      await res.body?.cancel();
+      return "";
+    }
+    const body = res.body;
+    if (!body) return "";
+    const reader = body.getReader();
+    const chunks = [];
+    let total = 0;
+    while (total < maxBytes) {
+      const { value, done } = await reader.read();
+      if (done) break;
+      if (!value || value.byteLength <= 0) continue;
+      const remaining = maxBytes - total;
+      if (value.byteLength <= remaining) {
+        chunks.push(value);
+        total += value.byteLength;
+        continue;
+      }
+      chunks.push(value.slice(0, remaining));
+      total += remaining;
+      break;
+    }
+    try {
+      await reader.cancel();
+    } catch {
+    }
+    if (!chunks.length) return "";
+    return Buffer.concat(chunks.map((c) => Buffer.from(c))).toString("utf8");
   } catch {
+    try {
+      await res.body?.cancel();
+    } catch {
+    }
     return "";
   }
 };
@@ -548,6 +596,7 @@ var downloadAndUploadByOpenListApiPut = async (params) => {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
     let tmpFilePath;
+    let uploadFileStream;
     try {
       let downloadRes;
       try {
@@ -585,7 +634,8 @@ var downloadAndUploadByOpenListApiPut = async (params) => {
           await streamToFile(Readable.fromWeb(downloadRes.body), tmpFilePath, { signal: controller.signal });
           const stat = await fs3.promises.stat(tmpFilePath);
           headers["Content-Length"] = String(stat.size);
-          body = fs3.createReadStream(tmpFilePath);
+          uploadFileStream = fs3.createReadStream(tmpFilePath);
+          body = uploadFileStream;
         } else {
           body = Readable.fromWeb(downloadRes.body);
         }
@@ -619,6 +669,15 @@ var downloadAndUploadByOpenListApiPut = async (params) => {
       throw error;
     } finally {
       clearTimeout(timer);
+      if (uploadFileStream) {
+        await new Promise((resolve) => {
+          try {
+            uploadFileStream.close(() => resolve());
+          } catch {
+            resolve();
+          }
+        });
+      }
       if (tmpFilePath) await safeUnlink(tmpFilePath);
     }
   });
@@ -659,49 +718,6 @@ var isRetryableWebDavError = (error) => {
   return /ECONNRESET|ETIMEDOUT|EAI_AGAIN|ENOTFOUND|ECONNREFUSED|UND_ERR|socket hang up/i.test(msg);
 };
 var webdavMkcolOk = (status) => status === 201 || status === 405;
-var webdavPropfindListNames = async (params) => {
-  const { davBaseUrl, auth, dirPath, timeoutMs } = params;
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const url = `${davBaseUrl}${encodePathForUrl(dirPath)}`;
-    const body = `<?xml version="1.0" encoding="utf-8" ?>
-<d:propfind xmlns:d="DAV:">
-  <d:prop>
-    <d:displayname />
-  </d:prop>
-</d:propfind>`;
-    const res = await fetch(url, {
-      method: "PROPFIND",
-      headers: {
-        Authorization: auth,
-        Depth: "1",
-        "Content-Type": "application/xml; charset=utf-8"
-      },
-      body,
-      redirect: "follow",
-      signal: controller.signal
-    });
-    if (!res.ok) return /* @__PURE__ */ new Set();
-    const text = await res.text();
-    if (!text) return /* @__PURE__ */ new Set();
-    const names = /* @__PURE__ */ new Set();
-    const hrefRegex = /<d:href>([^<]+)<\/d:href>/gi;
-    let match;
-    while (match = hrefRegex.exec(text)) {
-      const href = match[1] ?? "";
-      const decoded = decodeURIComponent(href);
-      const cleaned = decoded.replace(/\/+$/, "");
-      const base = cleaned.split("/").filter(Boolean).pop();
-      if (base) names.add(base);
-    }
-    return names;
-  } catch {
-    return /* @__PURE__ */ new Set();
-  } finally {
-    clearTimeout(timer);
-  }
-};
 var webdavPropfindListEntries = async (params) => {
   const { davBaseUrl, auth, dirPath, timeoutMs } = params;
   const controller = new AbortController();
@@ -729,7 +745,13 @@ var webdavPropfindListEntries = async (params) => {
       redirect: "follow",
       signal: controller.signal
     });
-    if (!res.ok) return [];
+    if (!res.ok) {
+      try {
+        await res.body?.cancel();
+      } catch {
+      }
+      return [];
+    }
     const text = await res.text();
     if (!text) return [];
     const out = [];
@@ -786,6 +808,7 @@ var copyWebDavToWebDav = async (params) => {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
     let tmpFilePath;
+    let uploadFileStream;
     try {
       const sourceUrl = `${sourceDavBaseUrl}${encodePathForUrl(sourcePath)}`;
       const targetUrl = `${targetDavBaseUrl}${encodePathForUrl(targetPath)}`;
@@ -824,7 +847,8 @@ var copyWebDavToWebDav = async (params) => {
           await streamToFile(Readable2.fromWeb(downloadRes.body), tmpFilePath, { signal: controller.signal });
           const stat = await fs4.promises.stat(tmpFilePath);
           headers["Content-Length"] = String(stat.size);
-          body = fs4.createReadStream(tmpFilePath);
+          uploadFileStream = fs4.createReadStream(tmpFilePath);
+          body = uploadFileStream;
         } else {
           body = Readable2.fromWeb(downloadRes.body);
         }
@@ -845,6 +869,7 @@ var copyWebDavToWebDav = async (params) => {
         const body = await fetchTextSafely(putRes);
         throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: ${putRes.status} ${putRes.statusText}${body ? ` - ${body}` : ""}`);
       }
+      await drainResponseBody(putRes);
     } catch (error) {
       try {
         controller.abort();
@@ -853,6 +878,15 @@ var copyWebDavToWebDav = async (params) => {
       throw error;
     } finally {
       clearTimeout(timer);
+      if (uploadFileStream) {
+        await new Promise((resolve) => {
+          try {
+            uploadFileStream.close(() => resolve());
+          } catch {
+            resolve();
+          }
+        });
+      }
       if (tmpFilePath) await safeUnlink(tmpFilePath);
     }
   });
@@ -893,6 +927,7 @@ var createWebDavDirEnsurer = (davBaseUrl, auth, timeoutMs) => {
             const body = await fetchTextSafely(res);
             throw new Error(`MKCOL \u5931\u8D25: ${current} -> ${res.status} ${res.statusText}${body ? ` - ${body}` : ""}`);
           }
+          await drainResponseBody(res);
         } finally {
           clearTimeout(timer);
         }
@@ -914,6 +949,7 @@ var downloadAndUploadByWebDav = async (params) => {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
     let tmpFilePath;
+    let uploadFileStream;
     try {
       let downloadRes;
       try {
@@ -949,7 +985,8 @@ var downloadAndUploadByWebDav = async (params) => {
           await streamToFile(Readable2.fromWeb(downloadRes.body), tmpFilePath, { signal: controller.signal });
           const stat = await fs4.promises.stat(tmpFilePath);
           headers["Content-Length"] = String(stat.size);
-          bodyStream = fs4.createReadStream(tmpFilePath);
+          uploadFileStream = fs4.createReadStream(tmpFilePath);
+          bodyStream = uploadFileStream;
         } else {
           bodyStream = Readable2.fromWeb(downloadRes.body);
         }
@@ -973,6 +1010,7 @@ var downloadAndUploadByWebDav = async (params) => {
         const hint = putRes.status === 401 ? "\uFF08\u8D26\u53F7/\u5BC6\u7801\u9519\u8BEF\uFF0C\u6216\u672A\u5F00\u542F WebDAV\uFF09" : putRes.status === 403 ? "\uFF08\u6CA1\u6709 WebDAV \u7BA1\u7406/\u5199\u5165\u6743\u9650\uFF0C\u6216\u76EE\u6807\u76EE\u5F55\u4E0D\u53EF\u5199/\u4E0D\u5728\u7528\u6237\u53EF\u8BBF\u95EE\u8303\u56F4\uFF09" : "";
         throw new Error(`\u4E0A\u4F20\u5931\u8D25: ${putRes.status} ${putRes.statusText}${hint}${body ? ` - ${body}` : ""}`);
       }
+      await drainResponseBody(putRes);
     } catch (error) {
       try {
         controller.abort();
@@ -981,6 +1019,15 @@ var downloadAndUploadByWebDav = async (params) => {
       throw error;
     } finally {
       clearTimeout(timer);
+      if (uploadFileStream) {
+        await new Promise((resolve) => {
+          try {
+            uploadFileStream.close(() => resolve());
+          } catch {
+            resolve();
+          }
+        });
+      }
       if (tmpFilePath) await safeUnlink(tmpFilePath);
     }
   });
@@ -1381,7 +1428,7 @@ export {
   ensureDir,
   readJsonSafe,
   writeJsonSafe,
-  webdavPropfindListNames,
+  webdavHeadExists,
   createWebDavDirEnsurer,
   downloadAndUploadByWebDav,
   runWithConcurrency,

package/lib/{chunk-R4MRR5TI.js → chunk-ZXZMBJN3.js}

@@ -2,7 +2,7 @@ import {
   readGroupSyncState,
   withGroupSyncLock,
   writeGroupSyncState
-} from "./chunk-DDV3OZXB.js";
+} from "./chunk-AAKFRFSO.js";
 import {
   buildOpenListAuthHeader,
   buildOpenListDavBaseUrl,
@@ -15,8 +15,8 @@ import {
   runWithAdaptiveConcurrency,
   runWithConcurrency,
   safePathSegment,
-  webdavPropfindListNames
-} from "./chunk-GDVU2T6R.js";
+  webdavHeadExists
+} from "./chunk-HSFFULJR.js";
 import {
   config,
   time
@@ -461,24 +461,18 @@ var syncGroupFilesToOpenListCore = async (params) => {
       return !ok;
     }) : candidates;
     if (mode === "incremental" && needSync.length) {
-      const dirs = Array.from(new Set(
-        needSync.map(({ remotePath }) => normalizePosixPath(path2.posix.dirname(remotePath)))
-      ));
-      const namesByDir = /* @__PURE__ */ new Map();
-      await runWithConcurrency(dirs, 3, async (dirPath) => {
-        const names = await webdavPropfindListNames({
+      const existsResults = new Array(needSync.length).fill(false);
+      const existsConcurrency = 10;
+      await runWithConcurrency(needSync, existsConcurrency, async ({ remotePath }, index) => {
+        existsResults[index] = await webdavHeadExists({
           davBaseUrl,
           auth,
-          dirPath,
+          filePath: remotePath,
           timeoutMs: webdavTimeoutMs
         });
-        namesByDir.set(dirPath, names);
       });
-      needSync = needSync.filter(({ remotePath }) => {
-        const dirPath = normalizePosixPath(path2.posix.dirname(remotePath));
-        const base = path2.posix.basename(remotePath);
-        const names = namesByDir.get(dirPath);
-        if (names && names.has(base)) {
+      needSync = needSync.filter((_it, index) => {
+        if (existsResults[index]) {
           skipped++;
           return false;
         }
@@ -687,13 +681,15 @@ var handleGroupFileUploadedAutoBackup = (e) => {
         const normalized = direct ? normalizeGroupFileRelativePath(direct) : "";
         if (normalized) item.path = normalized;
         const bot = e?.bot;
-        if (bot && !item.path.includes("/")) {
+        const resolvePathEnabled = typeof targetCfg?.uploadBackupResolvePath === "boolean" ? Boolean(targetCfg.uploadBackupResolvePath) : true;
+        const resolvePathMaxFolders = typeof targetCfg?.uploadBackupResolvePathMaxFolders === "number" ? Math.max(1, Math.floor(Number(targetCfg.uploadBackupResolvePathMaxFolders)) || 1) : 4e3;
+        if (resolvePathEnabled && bot && !item.path.includes("/")) {
           try {
             const found = await locateGroupFileByIdWithRetry(bot, groupId, fid, {
               retries: 3,
               delayMs: 1200,
               timeoutMs: 15e3,
-              maxFolders: 4e3,
+              maxFolders: resolvePathMaxFolders,
               expectedName: name,
               expectedSize: size
             });
@@ -705,6 +701,8 @@ var handleGroupFileUploadedAutoBackup = (e) => {
           } catch (error) {
             logger3.debug(`[\u7FA4\u4E0A\u4F20\u5907\u4EFD][${groupId}] \u83B7\u53D6\u7FA4\u5185\u6587\u4EF6\u8DEF\u5F84\u5931\u8D25\uFF0C\u5C06\u9000\u5316\u4E3A\u6839\u76EE\u5F55: ${formatErrorMessage(error)}`);
           }
+        } else if (!resolvePathEnabled && bot && !item.path.includes("/")) {
+          logger3.debug(`[\u7FA4\u4E0A\u4F20\u5907\u4EFD][${groupId}] uploadBackupResolvePath=false\uFF0C\u5DF2\u8DF3\u8FC7\u7FA4\u6587\u4EF6\u5939\u8DEF\u5F84\u89E3\u6790\uFF1A${name}`);
         }
       }
       const resolveUrl = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-qgroup-file2openlist",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "author": "429",
   "type": "module",
   "description": "karin plugin for QGroupFile backup",