karin-plugin-qgroup-file2openlist 0.0.25 → 0.0.26

package/README.md

@@ -1,4 +1,10 @@
-# Karin TypeScript 插件开发模板
+# Karin Oplist Plugin  
+
+省流：群文件自动备份、网盘自动备份
+```
+pnpm add  karin-plugin-qgroup-file2openlist -w  
+pnpm install  
+```
 
 ## 📖 目录
 
@@ -44,6 +50,7 @@ TypeScript 插件开发流程现在更加简单，无需手动克隆模板仓库
 - `openlistBaseUrl`：例如 `http://127.0.0.1:5244`
 - `openlistUsername` / `openlistPassword`：用于 WebDAV BasicAuth 登录
 - `openlistTargetDir`：目标目录（例：`/挂载目录/QQ群文件`）
+- `resourceLimits.transferConcurrency`：全局传输并发上限（所有下载+上传共享；生产环境建议 1，避免同时传输吃满内存；<=0 不限制）
 - `groupSyncDefaults`：群同步默认策略（并发、单文件超时、重试等）
 - `groupSyncTargets`：同步对象群配置（每群可单独覆盖目录/并发/同步时段等）
 

package/config/config.json

@@ -4,6 +4,9 @@
   "openlistUsername": "",
   "openlistPassword": "",
   "openlistTargetDir": "/",
+  "resourceLimits": {
+    "transferConcurrency": 1
+  },
   "groupSyncDefaults": {
     "mode": "incremental",
     "flat": false,

package/lib/apps/groupFiles.backup.js

@@ -6,12 +6,12 @@ import "../chunk-PBBZ5KAD.js";
 import "../chunk-QB3GSENE.js";
 import {
   handleGroupFileUploadedAutoBackup
-} from "../chunk-BU2GD6GJ.js";
-import "../chunk-WJNM5RHT.js";
+} from "../chunk-BWVJMEKK.js";
+import "../chunk-5QW7XYQX.js";
 import {
   backupOpenListToOpenListCore,
   formatErrorMessage
-} from "../chunk-N5HMQFRM.js";
+} from "../chunk-YVFRUAZO.js";
 import {
   config
 } from "../chunk-DA4U55JC.js";

package/lib/apps/groupFiles.js

@@ -1,12 +1,12 @@
 import {
   exportGroupFilesToDisk,
   syncGroupFilesToOpenListCore
-} from "../chunk-BU2GD6GJ.js";
-import "../chunk-WJNM5RHT.js";
+} from "../chunk-BWVJMEKK.js";
+import "../chunk-5QW7XYQX.js";
 import {
   formatErrorMessage,
   normalizePosixPath
-} from "../chunk-N5HMQFRM.js";
+} from "../chunk-YVFRUAZO.js";
 import {
   config
 } from "../chunk-DA4U55JC.js";

package/lib/apps/groupSyncConfig.js

@@ -1,9 +1,9 @@
 import {
   handleGroupSyncConfigCommand
-} from "../chunk-KFOQIZ6H.js";
-import "../chunk-BU2GD6GJ.js";
-import "../chunk-WJNM5RHT.js";
-import "../chunk-N5HMQFRM.js";
+} from "../chunk-I2I6ZPJU.js";
+import "../chunk-BWVJMEKK.js";
+import "../chunk-5QW7XYQX.js";
+import "../chunk-YVFRUAZO.js";
 import "../chunk-DA4U55JC.js";
 import "../chunk-IZS467MR.js";
 

package/lib/apps/opCommands.js

@@ -5,7 +5,7 @@ import {
   resolveOpltMapping,
   withOpltUser,
   writeOpltData
-} from "../chunk-TL3HO4ZL.js";
+} from "../chunk-WQFR5LF3.js";
 import {
   buildActionCard,
   replyImages
@@ -20,7 +20,7 @@ import {
   normalizePosixPath,
   readJsonSafe,
   writeJsonSafe
-} from "../chunk-N5HMQFRM.js";
+} from "../chunk-YVFRUAZO.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-WJNM5RHT.js";
+} from "../chunk-5QW7XYQX.js";
 import {
   backupOpenListToOpenListCore,
   formatErrorMessage,
   normalizePosixPath,
   readJsonSafe,
   writeJsonSafe
-} from "../chunk-N5HMQFRM.js";
+} from "../chunk-YVFRUAZO.js";
 import "../chunk-DA4U55JC.js";
 import {
   dir

package/lib/apps/scheduler.js

@@ -1,12 +1,12 @@
 import {
   runNightlyOpltBackup
-} from "../chunk-TL3HO4ZL.js";
+} from "../chunk-WQFR5LF3.js";
 import {
   runNightlyGroupBackup
-} from "../chunk-KFOQIZ6H.js";
-import "../chunk-BU2GD6GJ.js";
-import "../chunk-WJNM5RHT.js";
-import "../chunk-N5HMQFRM.js";
+} from "../chunk-I2I6ZPJU.js";
+import "../chunk-BWVJMEKK.js";
+import "../chunk-5QW7XYQX.js";
+import "../chunk-YVFRUAZO.js";
 import {
   config
 } from "../chunk-DA4U55JC.js";

package/lib/{chunk-WJNM5RHT.js → chunk-5QW7XYQX.js}

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

package/lib/{chunk-BU2GD6GJ.js → chunk-BWVJMEKK.js}

@@ -2,7 +2,7 @@ import {
   readGroupSyncState,
   withGroupSyncLock,
   writeGroupSyncState
-} from "./chunk-WJNM5RHT.js";
+} from "./chunk-5QW7XYQX.js";
 import {
   buildOpenListAuthHeader,
   buildOpenListDavBaseUrl,
@@ -16,7 +16,7 @@ import {
   runWithConcurrency,
   safePathSegment,
   webdavPropfindListNames
-} from "./chunk-N5HMQFRM.js";
+} from "./chunk-YVFRUAZO.js";
 import {
   config,
   time

package/lib/{chunk-KFOQIZ6H.js → chunk-I2I6ZPJU.js}

@@ -1,11 +1,11 @@
 import {
   syncGroupFilesToOpenListCore
-} from "./chunk-BU2GD6GJ.js";
+} from "./chunk-BWVJMEKK.js";
 import {
   normalizePosixPath,
   readJsonSafe,
   writeJsonSafe
-} from "./chunk-N5HMQFRM.js";
+} from "./chunk-YVFRUAZO.js";
 import {
   config
 } from "./chunk-DA4U55JC.js";

package/lib/{chunk-TL3HO4ZL.js → chunk-WQFR5LF3.js}

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

package/lib/{chunk-N5HMQFRM.js → chunk-YVFRUAZO.js}

@@ -51,7 +51,7 @@ var fetchTextSafely = async (res, maxLen = 500) => {
 
 // src/model/openlist/backup.ts
 import path from "path";
-import { logger } from "node-karin";
+import { logger as logger2 } from "node-karin";
 
 // src/model/shared/concurrency.ts
 var runWithConcurrency = async (items, concurrency, fn) => {
@@ -178,6 +178,76 @@ var buildOpenListAuthHeader = (username, password) => {
 // src/model/openlist/api.ts
 import { Readable } from "stream";
 import { setTimeout as sleep } from "timers/promises";
+
+// src/model/shared/transferLimiter.ts
+import { logger } from "node-karin";
+var active = 0;
+var queue = [];
+var lastQueueLogAt = 0;
+var clampInt = (value, min, max) => Math.min(max, Math.max(min, Math.floor(value)));
+var cachedLimit = 1;
+var cachedAt = 0;
+var CACHE_MS = 1e3;
+var getGlobalTransferConcurrencyLimit = () => {
+  const now = Date.now();
+  if (now - cachedAt < CACHE_MS) return cachedLimit;
+  cachedAt = now;
+  try {
+    const cfg = config();
+    const raw = cfg?.resourceLimits?.transferConcurrency;
+    if (raw === void 0 || raw === null || raw === "") return cachedLimit = 1;
+    const n = typeof raw === "number" ? raw : Number(raw);
+    if (!Number.isFinite(n)) return cachedLimit = 1;
+    if (n <= 0) return cachedLimit = Number.POSITIVE_INFINITY;
+    return cachedLimit = clampInt(n, 1, 50);
+  } catch {
+    return cachedLimit = 1;
+  }
+};
+var logQueue = () => {
+  if (!queue.length) return;
+  const now = Date.now();
+  if (now - lastQueueLogAt < 3e4) return;
+  lastQueueLogAt = now;
+  const limit = getGlobalTransferConcurrencyLimit();
+  const limitText = Number.isFinite(limit) ? String(limit) : "\u65E0\u9650\u5236";
+  const first = queue[0];
+  const waitedMs = first ? Math.max(0, now - first.enqueuedAt) : 0;
+  logger.warn(`[\u4F20\u8F93\u9650\u6D41] \u961F\u5217\u4E2D=${queue.length} \u8FD0\u884C\u4E2D=${active} \u4E0A\u9650=${limitText} \u6700\u65E9\u7B49\u5F85=${waitedMs}ms${first?.label ? ` label=${first.label}` : ""}`);
+};
+var drain = () => {
+  const limit = getGlobalTransferConcurrencyLimit();
+  while (active < limit && queue.length) {
+    active++;
+    queue.shift().resolve();
+  }
+  logQueue();
+};
+var acquire = async (label) => {
+  const limit = getGlobalTransferConcurrencyLimit();
+  if (active < limit && queue.length === 0) {
+    active++;
+    return;
+  }
+  await new Promise((resolve) => {
+    queue.push({ resolve, label, enqueuedAt: Date.now() });
+    drain();
+  });
+};
+var release = () => {
+  active = Math.max(0, active - 1);
+  drain();
+};
+var withGlobalTransferLimit = async (label, fn) => {
+  await acquire(label);
+  try {
+    return await fn();
+  } finally {
+    release();
+  }
+};
+
+// src/model/openlist/api.ts
 var openlistApiReadJson = async (res) => {
   try {
     return await res.json();
@@ -374,62 +444,64 @@ var downloadAndUploadByOpenListApiPut = async (params) => {
   const { sourceUrl, sourceHeaders, targetBaseUrl, targetToken, targetPath, timeoutMs } = params;
   const apiBaseUrl = buildOpenListApiBaseUrl(targetBaseUrl);
   if (!apiBaseUrl) throw new Error("\u76EE\u6807 OpenList API \u5730\u5740\u4E0D\u6B63\u786E\uFF0C\u8BF7\u68C0\u67E5\u76EE\u6807 OpenList \u5730\u5740");
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    let downloadRes;
+  await withGlobalTransferLimit(`downloadAndUploadByOpenListApiPut:${targetPath}`, async () => {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
     try {
-      downloadRes = await fetch(sourceUrl, {
-        headers: sourceHeaders,
-        redirect: "follow",
-        signal: controller.signal
-      });
-    } catch (error) {
-      if (isAbortError(error)) throw new Error("\u6E90\u7AEF\u8BFB\u53D6\u8D85\u65F6");
-      throw new Error(`\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: ${formatErrorMessage(error)}`);
-    }
-    if (!downloadRes.ok) {
-      const body = await fetchTextSafely(downloadRes);
-      throw new Error(`\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: ${downloadRes.status} ${downloadRes.statusText}${body ? ` - ${body}` : ""}`);
-    }
-    if (!downloadRes.body) throw new Error("\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: \u54CD\u5E94\u4F53\u4E3A\u7A7A");
-    const headers = {
-      "File-Path": encodeURIComponent(normalizePosixPath(targetPath))
-    };
-    const authToken = String(targetToken ?? "").trim();
-    if (authToken) headers.Authorization = authToken;
-    const contentType = downloadRes.headers.get("content-type");
-    const contentLength = downloadRes.headers.get("content-length");
-    if (contentType) headers["Content-Type"] = contentType;
-    if (contentLength) headers["Content-Length"] = contentLength;
-    const sourceStream = Readable.fromWeb(downloadRes.body);
-    let putRes;
-    try {
-      putRes = await fetch(`${apiBaseUrl}/fs/put`, {
-        method: "PUT",
-        headers,
-        body: sourceStream,
-        // @ts-expect-error Node fetch streaming body requires duplex
-        duplex: "half",
-        redirect: "follow",
-        signal: controller.signal
-      });
-    } catch (error) {
-      if (isAbortError(error)) throw new Error("\u76EE\u6807\u7AEF\u5199\u5165\u8D85\u65F6\uFF08\u8BF7\u68C0\u67E5\u5BF9\u7AEF OpenList \u8FDE\u63A5/\u6743\u9650\uFF09");
-      throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: ${formatErrorMessage(error)}`);
-    }
-    if (!putRes.ok) {
-      const body = await fetchTextSafely(putRes);
-      throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: ${putRes.status} ${putRes.statusText}${body ? ` - ${body}` : ""}`);
-    }
-    const json = await openlistApiReadJson(putRes);
-    if (typeof json?.code === "number" && json.code !== 200) {
-      const msg = json?.message ? ` - ${json.message}` : "";
-      throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: code=${json.code}${msg}`);
+      let downloadRes;
+      try {
+        downloadRes = await fetch(sourceUrl, {
+          headers: sourceHeaders,
+          redirect: "follow",
+          signal: controller.signal
+        });
+      } catch (error) {
+        if (isAbortError(error)) throw new Error("\u6E90\u7AEF\u8BFB\u53D6\u8D85\u65F6");
+        throw new Error(`\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: ${formatErrorMessage(error)}`);
+      }
+      if (!downloadRes.ok) {
+        const body = await fetchTextSafely(downloadRes);
+        throw new Error(`\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: ${downloadRes.status} ${downloadRes.statusText}${body ? ` - ${body}` : ""}`);
+      }
+      if (!downloadRes.body) throw new Error("\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: \u54CD\u5E94\u4F53\u4E3A\u7A7A");
+      const headers = {
+        "File-Path": encodeURIComponent(normalizePosixPath(targetPath))
+      };
+      const authToken = String(targetToken ?? "").trim();
+      if (authToken) headers.Authorization = authToken;
+      const contentType = downloadRes.headers.get("content-type");
+      const contentLength = downloadRes.headers.get("content-length");
+      if (contentType) headers["Content-Type"] = contentType;
+      if (contentLength) headers["Content-Length"] = contentLength;
+      const sourceStream = Readable.fromWeb(downloadRes.body);
+      let putRes;
+      try {
+        putRes = await fetch(`${apiBaseUrl}/fs/put`, {
+          method: "PUT",
+          headers,
+          body: sourceStream,
+          // @ts-expect-error Node fetch streaming body requires duplex
+          duplex: "half",
+          redirect: "follow",
+          signal: controller.signal
+        });
+      } catch (error) {
+        if (isAbortError(error)) throw new Error("\u76EE\u6807\u7AEF\u5199\u5165\u8D85\u65F6\uFF08\u8BF7\u68C0\u67E5\u5BF9\u7AEF OpenList \u8FDE\u63A5/\u6743\u9650\uFF09");
+        throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: ${formatErrorMessage(error)}`);
+      }
+      if (!putRes.ok) {
+        const body = await fetchTextSafely(putRes);
+        throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: ${putRes.status} ${putRes.statusText}${body ? ` - ${body}` : ""}`);
+      }
+      const json = await openlistApiReadJson(putRes);
+      if (typeof json?.code === "number" && json.code !== 200) {
+        const msg = json?.message ? ` - ${json.message}` : "";
+        throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: code=${json.code}${msg}`);
+      }
+    } finally {
+      clearTimeout(timer);
     }
-  } finally {
-    clearTimeout(timer);
-  }
+  });
 };
 
 // src/model/openlist/webdav.ts
@@ -588,59 +660,61 @@ var webdavHeadExists = async (params) => {
 };
 var copyWebDavToWebDav = async (params) => {
   const { sourceDavBaseUrl, sourceAuth, sourcePath, targetDavBaseUrl, targetAuth, targetPath, timeoutMs } = params;
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const sourceUrl = `${sourceDavBaseUrl}${encodePathForUrl(sourcePath)}`;
-    const targetUrl = `${targetDavBaseUrl}${encodePathForUrl(targetPath)}`;
-    let downloadRes;
-    try {
-      const downloadHeaders = {};
-      const authHeader = String(sourceAuth ?? "").trim();
-      if (authHeader) downloadHeaders.Authorization = authHeader;
-      downloadRes = await fetch(sourceUrl, {
-        method: "GET",
-        headers: downloadHeaders,
-        redirect: "follow",
-        signal: controller.signal
-      });
-    } catch (error) {
-      if (isAbortError(error)) throw new Error("\u6E90\u7AEF\u8BFB\u53D6\u8D85\u65F6");
-      throw new Error(`\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: ${formatErrorMessage(error)}`);
-    }
-    if (!downloadRes.ok) {
-      const body = await fetchTextSafely(downloadRes);
-      throw new Error(`\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: ${downloadRes.status} ${downloadRes.statusText}${body ? ` - ${body}` : ""}`);
-    }
-    if (!downloadRes.body) throw new Error("\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: \u54CD\u5E94\u4F53\u4E3A\u7A7A");
-    const headers = { Authorization: targetAuth };
-    const contentType = downloadRes.headers.get("content-type");
-    const contentLength = downloadRes.headers.get("content-length");
-    if (contentType) headers["Content-Type"] = contentType;
-    if (contentLength) headers["Content-Length"] = contentLength;
-    const sourceStream = Readable2.fromWeb(downloadRes.body);
-    let putRes;
+  await withGlobalTransferLimit(`copyWebDavToWebDav:${sourcePath}=>${targetPath}`, async () => {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
     try {
-      putRes = await fetch(targetUrl, {
-        method: "PUT",
-        headers,
-        body: sourceStream,
-        // @ts-expect-error Node fetch streaming body requires duplex
-        duplex: "half",
-        redirect: "follow",
-        signal: controller.signal
-      });
-    } catch (error) {
-      if (isAbortError(error)) throw new Error("\u76EE\u6807\u7AEF\u5199\u5165\u8D85\u65F6\uFF08\u8BF7\u68C0\u67E5\u5BF9\u7AEF OpenList \u8FDE\u63A5/\u6743\u9650\uFF09");
-      throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: ${formatErrorMessage(error)}`);
-    }
-    if (!putRes.ok) {
-      const body = await fetchTextSafely(putRes);
-      throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: ${putRes.status} ${putRes.statusText}${body ? ` - ${body}` : ""}`);
+      const sourceUrl = `${sourceDavBaseUrl}${encodePathForUrl(sourcePath)}`;
+      const targetUrl = `${targetDavBaseUrl}${encodePathForUrl(targetPath)}`;
+      let downloadRes;
+      try {
+        const downloadHeaders = {};
+        const authHeader = String(sourceAuth ?? "").trim();
+        if (authHeader) downloadHeaders.Authorization = authHeader;
+        downloadRes = await fetch(sourceUrl, {
+          method: "GET",
+          headers: downloadHeaders,
+          redirect: "follow",
+          signal: controller.signal
+        });
+      } catch (error) {
+        if (isAbortError(error)) throw new Error("\u6E90\u7AEF\u8BFB\u53D6\u8D85\u65F6");
+        throw new Error(`\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: ${formatErrorMessage(error)}`);
+      }
+      if (!downloadRes.ok) {
+        const body = await fetchTextSafely(downloadRes);
+        throw new Error(`\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: ${downloadRes.status} ${downloadRes.statusText}${body ? ` - ${body}` : ""}`);
+      }
+      if (!downloadRes.body) throw new Error("\u6E90\u7AEF\u8BFB\u53D6\u5931\u8D25: \u54CD\u5E94\u4F53\u4E3A\u7A7A");
+      const headers = { Authorization: targetAuth };
+      const contentType = downloadRes.headers.get("content-type");
+      const contentLength = downloadRes.headers.get("content-length");
+      if (contentType) headers["Content-Type"] = contentType;
+      if (contentLength) headers["Content-Length"] = contentLength;
+      const sourceStream = Readable2.fromWeb(downloadRes.body);
+      let putRes;
+      try {
+        putRes = await fetch(targetUrl, {
+          method: "PUT",
+          headers,
+          body: sourceStream,
+          // @ts-expect-error Node fetch streaming body requires duplex
+          duplex: "half",
+          redirect: "follow",
+          signal: controller.signal
+        });
+      } catch (error) {
+        if (isAbortError(error)) throw new Error("\u76EE\u6807\u7AEF\u5199\u5165\u8D85\u65F6\uFF08\u8BF7\u68C0\u67E5\u5BF9\u7AEF OpenList \u8FDE\u63A5/\u6743\u9650\uFF09");
+        throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: ${formatErrorMessage(error)}`);
+      }
+      if (!putRes.ok) {
+        const body = await fetchTextSafely(putRes);
+        throw new Error(`\u76EE\u6807\u7AEF\u5199\u5165\u5931\u8D25: ${putRes.status} ${putRes.statusText}${body ? ` - ${body}` : ""}`);
+      }
+    } finally {
+      clearTimeout(timer);
     }
-  } finally {
-    clearTimeout(timer);
-  }
+  });
 };
 var createWebDavDirEnsurer = (davBaseUrl, auth, timeoutMs) => {
   const ensured = /* @__PURE__ */ new Map();
@@ -695,58 +769,60 @@ var createWebDavDirEnsurer = (davBaseUrl, auth, timeoutMs) => {
 };
 var downloadAndUploadByWebDav = async (params) => {
   const { sourceUrl, sourceHeaders, targetUrl, auth, timeoutMs, rateLimitBytesPerSec } = params;
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    let downloadRes;
+  await withGlobalTransferLimit(`downloadAndUploadByWebDav:${targetUrl}`, async () => {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
     try {
-      downloadRes = await fetch(sourceUrl, {
-        headers: sourceHeaders,
-        redirect: "follow",
-        signal: controller.signal
-      });
-    } catch (error) {
-      if (isAbortError(error)) throw new Error("\u4E0B\u8F7D\u8D85\u65F6");
-      throw new Error(`\u4E0B\u8F7D\u8BF7\u6C42\u5931\u8D25: ${formatErrorMessage(error)}`);
-    }
-    if (!downloadRes.ok) {
-      const body = await fetchTextSafely(downloadRes);
-      throw new Error(`\u4E0B\u8F7D\u5931\u8D25: ${downloadRes.status} ${downloadRes.statusText}${body ? ` - ${body}` : ""}`);
-    }
-    if (!downloadRes.body) throw new Error("\u4E0B\u8F7D\u5931\u8D25: \u54CD\u5E94\u4F53\u4E3A\u7A7A");
-    const headers = {
-      Authorization: auth
-    };
-    const contentType = downloadRes.headers.get("content-type");
-    const contentLength = downloadRes.headers.get("content-length");
-    if (contentType) headers["Content-Type"] = contentType;
-    if (contentLength) headers["Content-Length"] = contentLength;
-    let bodyStream = Readable2.fromWeb(downloadRes.body);
-    const throttle = createThrottleTransform(rateLimitBytesPerSec || 0);
-    if (throttle) bodyStream = bodyStream.pipe(throttle);
-    let putRes;
-    try {
-      putRes = await fetch(targetUrl, {
-        method: "PUT",
-        headers,
-        body: bodyStream,
-        // @ts-expect-error Node fetch streaming body requires duplex
-        duplex: "half",
-        redirect: "follow",
-        signal: controller.signal
-      });
-    } catch (error) {
-      if (isAbortError(error)) throw new Error("\u4E0A\u4F20\u8D85\u65F6\uFF08\u8BF7\u68C0\u67E5 OpenList \u8FDE\u63A5/\u6743\u9650\uFF09");
-      throw new Error(`\u4E0A\u4F20\u8BF7\u6C42\u5931\u8D25: ${formatErrorMessage(error)}`);
-    }
-    if (!putRes.ok) {
-      const body = await fetchTextSafely(putRes);
-      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}` : ""}`);
+      let downloadRes;
+      try {
+        downloadRes = await fetch(sourceUrl, {
+          headers: sourceHeaders,
+          redirect: "follow",
+          signal: controller.signal
+        });
+      } catch (error) {
+        if (isAbortError(error)) throw new Error("\u4E0B\u8F7D\u8D85\u65F6");
+        throw new Error(`\u4E0B\u8F7D\u8BF7\u6C42\u5931\u8D25: ${formatErrorMessage(error)}`);
+      }
+      if (!downloadRes.ok) {
+        const body = await fetchTextSafely(downloadRes);
+        throw new Error(`\u4E0B\u8F7D\u5931\u8D25: ${downloadRes.status} ${downloadRes.statusText}${body ? ` - ${body}` : ""}`);
+      }
+      if (!downloadRes.body) throw new Error("\u4E0B\u8F7D\u5931\u8D25: \u54CD\u5E94\u4F53\u4E3A\u7A7A");
+      const headers = {
+        Authorization: auth
+      };
+      const contentType = downloadRes.headers.get("content-type");
+      const contentLength = downloadRes.headers.get("content-length");
+      if (contentType) headers["Content-Type"] = contentType;
+      if (contentLength) headers["Content-Length"] = contentLength;
+      let bodyStream = Readable2.fromWeb(downloadRes.body);
+      const throttle = createThrottleTransform(rateLimitBytesPerSec || 0);
+      if (throttle) bodyStream = bodyStream.pipe(throttle);
+      let putRes;
+      try {
+        putRes = await fetch(targetUrl, {
+          method: "PUT",
+          headers,
+          body: bodyStream,
+          // @ts-expect-error Node fetch streaming body requires duplex
+          duplex: "half",
+          redirect: "follow",
+          signal: controller.signal
+        });
+      } catch (error) {
+        if (isAbortError(error)) throw new Error("\u4E0A\u4F20\u8D85\u65F6\uFF08\u8BF7\u68C0\u67E5 OpenList \u8FDE\u63A5/\u6743\u9650\uFF09");
+        throw new Error(`\u4E0A\u4F20\u8BF7\u6C42\u5931\u8D25: ${formatErrorMessage(error)}`);
+      }
+      if (!putRes.ok) {
+        const body = await fetchTextSafely(putRes);
+        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}` : ""}`);
+      }
+    } finally {
+      clearTimeout(timer);
     }
-  } finally {
-    clearTimeout(timer);
-  }
+  });
 };
 
 // src/model/openlist/backup.ts
@@ -1153,7 +1229,7 @@ var backupOpenListToOpenListCore = async (params) => {
         ok++;
       } catch (error) {
         fail++;
-        logger.error(error);
+        logger2.error(error);
         if (allowAutoFallback) {
           const msg = formatErrorMessage(error);
           if (targetTransport === "webdav" && /401|403|MKCOL|PUT/i.test(msg)) targetTransport = "api";

package/package.json

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