karin-plugin-qgroup-file2openlist 0.0.30 → 0.0.31

package/config/config.json

@@ -13,7 +13,7 @@
     "flat": false,
     "urlConcurrency": 3,
     "transferConcurrency": 3,
-    "fileTimeoutSec": 3000,
+    "fileTimeoutSec": 30000,
     "retryTimes": 2,
     "retryDelayMs": 1500,
     "progressReportEvery": 10,

package/lib/apps/groupFiles.backup.js

@@ -6,7 +6,7 @@ import "../chunk-PBBZ5KAD.js";
 import "../chunk-QB3GSENE.js";
 import {
   handleGroupFileUploadedAutoBackup
-} from "../chunk-KB5N77CR.js";
+} from "../chunk-2Z6KEH2L.js";
 import "../chunk-YQPHJTEB.js";
 import {
   backupOpenListToOpenListCore,

package/lib/apps/groupFiles.js

@@ -1,7 +1,7 @@
 import {
   exportGroupFilesToDisk,
   syncGroupFilesToOpenListCore
-} from "../chunk-KB5N77CR.js";
+} from "../chunk-2Z6KEH2L.js";
 import "../chunk-YQPHJTEB.js";
 import {
   formatErrorMessage,

package/lib/apps/groupSyncConfig.js

@@ -1,7 +1,7 @@
 import {
   handleGroupSyncConfigCommand
-} from "../chunk-CE6KVBH4.js";
-import "../chunk-KB5N77CR.js";
+} from "../chunk-DR4WWLFE.js";
+import "../chunk-2Z6KEH2L.js";
 import "../chunk-YQPHJTEB.js";
 import "../chunk-NWUWEQLH.js";
 import "../chunk-DA4U55JC.js";

package/lib/apps/scheduler.js

@@ -3,8 +3,8 @@ import {
 } from "../chunk-VVJJTF2N.js";
 import {
   runNightlyGroupBackup
-} from "../chunk-CE6KVBH4.js";
-import "../chunk-KB5N77CR.js";
+} from "../chunk-DR4WWLFE.js";
+import "../chunk-2Z6KEH2L.js";
 import "../chunk-YQPHJTEB.js";
 import "../chunk-NWUWEQLH.js";
 import {

package/lib/apps/sendMsg.js

@@ -38,7 +38,7 @@ ${randomMsg}`;
   /** 谁可以触发这个插件 'all' | 'master' | 'admin' | 'group.owner' | 'group.admin' */
   permission: "all"
 });
-var forwardMessage = karin.command(/^#测试转发$/, async (e) => {
+var forwardMessage = karin.command(/^#测dscvdf试转发$/, async (e) => {
   if (!e.isPrivate) return false;
   const message = [
     segment.text("\u{1F31F} \u8FD9\u662F\u8F6C\u53D1\u7684\u7B2C\u4E00\u6761\u6D88\u606F \u{1F31F}"),
@@ -58,7 +58,7 @@ var forwardMessage = karin.command(/^#测试转发$/, async (e) => {
   /** 谁可以触发这个插件 'all' | 'master' | 'admin' | 'group.owner' | 'group.admin' */
   permission: "all"
 });
-var randomEmoji = karin.command(/^#随机表情$/, async (e) => {
+var randomEmoji = karin.command(/^#随机sdccasc表情$/, async (e) => {
   if (!e.isPrivate) return false;
   const emojiUrls = [
     "https://i.imgur.com/XaUdU2C.gif",
@@ -80,7 +80,7 @@ var randomEmoji = karin.command(/^#随机表情$/, async (e) => {
   name: "\u968F\u673A\u8868\u60C5\u5305demo",
   permission: "all"
 });
-var dailyQuote = karin.command(/^#每日一言$/, async (e) => {
+var dailyQuote = karin.command(/^#每日ds  cas一言$/, async (e) => {
   if (!e.isPrivate) return false;
   const quotes = [
     "\u4ECA\u5929\u4E5F\u662F\u5145\u6EE1\u5E0C\u671B\u7684\u4E00\u5929\uFF01\u52A0\u6CB9\uFF01\u2728",
@@ -103,7 +103,7 @@ var dailyQuote = karin.command(/^#每日一言$/, async (e) => {
   name: "\u6BCF\u65E5\u4E00\u8A00demo",
   permission: "all"
 });
-var weatherForecast = karin.command(/^#今日天气$/, async (e) => {
+var weatherForecast = karin.command(/^#今日 sdvsdv天气$/, async (e) => {
   if (!e.isPrivate) return false;
   const weathers = [
     "\u2600\uFE0F \u6674\u5929\uFF0C\u6E29\u5EA625\xB0C\uFF0C\u9002\u5408\u51FA\u95E8\u73A9\u800D~",

package/lib/{chunk-KB5N77CR.js → chunk-2Z6KEH2L.js}

@@ -103,7 +103,13 @@ var getGroupFileListCompat = async (bot, groupId, folderId) => {
   }
   throw new Error("\u5F53\u524D\u9002\u914D\u5668\u4E0D\u652F\u6301\u83B7\u53D6\u7FA4\u6587\u4EF6\u5217\u8868\uFF08getGroupFileList / getGroupRootFiles / getGroupFilesByFolder \u5747\u4E0D\u53EF\u7528\uFF09");
 };
-var resolveGroupFileUrl = async (bot, contact, groupId, file) => {
+var isRetryableResolveGroupFileUrlError = (error) => {
+  const msg = formatErrorMessage(error);
+  if (/缺少 fileId|群号无法转换为 number|未找到可用接口/.test(msg)) return false;
+  if (/不存在|not found|file not found/i.test(msg)) return false;
+  return /请求错误|sendApi|限流|频繁|风控|rate|limit|429|Too Many Requests|getFileUrl|nc_getFile|getGroupFileUrl|超时|timeout|ECONNRESET|ETIMEDOUT|EAI_AGAIN|ENOTFOUND|ECONNREFUSED|UND_ERR|socket hang up/i.test(msg);
+};
+var resolveGroupFileUrlOnce = async (bot, contact, groupId, file) => {
   if (!file.fileId) throw new Error("\u7F3A\u5C11 fileId");
   const reasons = [];
   if (typeof bot?.getFileUrl === "function") {
@@ -160,6 +166,27 @@ var resolveGroupFileUrl = async (bot, contact, groupId, file) => {
   }
   throw new Error(reasons[0] ?? "\u65E0\u6CD5\u83B7\u53D6\u4E0B\u8F7D URL\uFF08\u672A\u627E\u5230\u53EF\u7528\u63A5\u53E3\uFF09");
 };
+var resolveGroupFileUrl = async (bot, contact, groupId, file, options) => {
+  const retries = Math.max(0, Math.floor(options?.retries ?? 2));
+  const delayMs = Math.max(0, Math.floor(options?.delayMs ?? 1200));
+  const maxDelayMs = Math.max(delayMs, Math.floor(options?.maxDelayMs ?? 15e3));
+  let lastError;
+  for (let attempt = 0; attempt <= retries; attempt++) {
+    try {
+      return await resolveGroupFileUrlOnce(bot, contact, groupId, file);
+    } catch (error) {
+      lastError = error;
+      if (attempt >= retries) break;
+      if (!isRetryableResolveGroupFileUrlError(error)) break;
+      const backoff = delayMs * Math.pow(2, attempt);
+      const capped = Math.min(maxDelayMs, backoff);
+      const jittered = Math.floor(capped * (0.8 + Math.random() * 0.4));
+      if (jittered > 0) await sleep(jittered);
+    }
+  }
+  if (lastError) throw lastError;
+  throw new Error("\u65E0\u6CD5\u83B7\u53D6\u4E0B\u8F7D URL");
+};
 var collectAllGroupFiles = async (bot, groupId, startFolderId) => {
   const files = [];
   const visitedFolders = /* @__PURE__ */ new Set();
@@ -366,6 +393,34 @@ var MAX_FILE_TIMEOUT_SEC = 3e3;
 var MIN_FILE_TIMEOUT_SEC = 10;
 var DEFAULT_PROGRESS_REPORT_EVERY = 10;
 var MAX_TRANSFER_CONCURRENCY = 5;
+var createAsyncLimiter = (concurrency) => {
+  const limit = Math.max(1, Math.floor(concurrency) || 1);
+  let active = 0;
+  const queue = [];
+  const acquire = async () => {
+    if (active < limit) {
+      active++;
+      return;
+    }
+    await new Promise((resolve) => queue.push(resolve));
+  };
+  const release = () => {
+    const next = queue.shift();
+    if (next) {
+      next();
+      return;
+    }
+    active = Math.max(0, active - 1);
+  };
+  return async (fn) => {
+    await acquire();
+    try {
+      return await fn();
+    } finally {
+      release();
+    }
+  };
+};
 var buildRemotePathForItem = (item, targetDir, flat) => {
   const relativeParts = (flat ? [item.name] : item.path.split("/")).filter(Boolean).map(safePathSegment);
   return normalizePosixPath(path2.posix.join(targetDir, ...relativeParts));
@@ -483,24 +538,38 @@ var syncGroupFilesToOpenListCore = async (params) => {
       report && await report(`\u6CA1\u6709\u9700\u8981\u540C\u6B65\u7684\u6587\u4EF6\uFF08\u589E\u91CF\u6A21\u5F0F\u5DF2\u8DF3\u8FC7 ${skipped} \u6761\uFF09\u3002`);
       return { total: limitedList.length, skipped, urlOk: 0, ok: 0, fail: 0 };
     }
+    report && await report("\u5C06\u6309\u9700\u89E3\u6790\u4E0B\u8F7D URL\uFF08\u907F\u514D\u6279\u91CF\u9884\u53D6\u5BFC\u81F4 URL \u8FC7\u671F/\u89E6\u53D1\u9650\u6D41\uFF09");
     const urlErrors = [];
-    await runWithConcurrency(needSync, Math.max(1, Math.floor(urlConcurrency) || 1), async ({ item }) => {
-      try {
-        item.url = await resolveGroupFileUrl(bot, groupContact, groupId, item);
-      } catch (error) {
-        urlErrors.push({ fileId: item.fileId, path: item.path, message: formatErrorMessage(error) });
-      }
-    });
-    const withUrl = needSync.filter(({ item }) => typeof item.url === "string" && item.url).map((v) => v);
-    report && await report(`URL\u83B7\u53D6\u5B8C\u6210\uFF1A\u6210\u529F ${withUrl.length} / \u5931\u8D25 ${needSync.length - withUrl.length}\uFF08\u589E\u91CF\u8DF3\u8FC7 ${skipped}\uFF09`);
-    if (!withUrl.length) {
-      report && await report("\u6CA1\u6709\u53EF\u7528\u7684\u4E0B\u8F7D URL\uFF0C\u65E0\u6CD5\u540C\u6B65\u5230 OpenList");
-      return { total: limitedList.length, skipped, urlOk: 0, ok: 0, fail: 0 };
-    }
     const syncErrors = [];
+    const urlOkSet = /* @__PURE__ */ new Set();
     let okCount = 0;
     const shouldRefreshUrl = (message) => {
-      return /403|URL已过期|url已过期|url可能已失效|需要重新获取|下载超时/.test(message);
+      return /401|403|404|URL已过期|url已过期|url可能已失效|需要重新获取|下载超时/.test(message);
+    };
+    const resolveUrlWithLimit = createAsyncLimiter(Math.max(1, Math.floor(urlConcurrency) || 1));
+    const urlResolveOptions = {
+      retries: 2,
+      delayMs: retryDelayMs > 0 ? Math.floor(retryDelayMs) : void 0,
+      maxDelayMs: 2e4
+    };
+    const ensureItemUrl = async (item, remotePath) => {
+      const existing = typeof item.url === "string" ? item.url.trim() : "";
+      if (existing) {
+        urlOkSet.add(remotePath);
+        return existing;
+      }
+      try {
+        const url = await resolveUrlWithLimit(
+          () => resolveGroupFileUrl(bot, groupContact, groupId, item, urlResolveOptions)
+        );
+        const cleaned = typeof url === "string" ? url.trim() : "";
+        if (!cleaned) throw new Error("\u8FD4\u56DE\u7A7A URL");
+        item.url = cleaned;
+        urlOkSet.add(remotePath);
+        return cleaned;
+      } catch (error) {
+        throw new Error(`URL\u83B7\u53D6\u5931\u8D25: ${formatErrorMessage(error)}`);
+      }
     };
     const transferOne = async (sourceUrl, targetUrl, expectedSize) => {
       await downloadAndUploadByWebDav({
@@ -516,7 +585,7 @@ var syncGroupFilesToOpenListCore = async (params) => {
     const transferInitial = Math.min(MAX_TRANSFER_CONCURRENCY, Math.max(1, Math.floor(transferConcurrency) || 1));
     const adaptiveTransfer = effectiveRateLimitBytesPerSec <= 0;
     const transferFn = async ({ item, remotePath }, index) => {
-      logger2.info(`[\u7FA4\u6587\u4EF6\u540C\u6B65][${groupId}] \u540C\u6B65\u4E2D(${index + 1}/${withUrl.length}): ${item.path}`);
+      logger2.info(`[\u7FA4\u6587\u4EF6\u540C\u6B65][${groupId}] \u540C\u6B65\u4E2D(${index + 1}/${needSync.length}): ${item.path}`);
       const remoteDir = normalizePosixPath(path2.posix.dirname(remotePath));
       const targetUrl = `${davBaseUrl}${encodePathForUrl(remotePath)}`;
       let lastError;
@@ -525,8 +594,7 @@ var syncGroupFilesToOpenListCore = async (params) => {
       for (let attempt = 1; attempt <= attempts; attempt++) {
         try {
           await dirEnsurer.ensureDir(remoteDir);
-          const currentUrl = item.url;
-          if (!currentUrl) throw new Error("\u7F3A\u5C11\u4E0B\u8F7D URL");
+          const currentUrl = await ensureItemUrl(item, remotePath);
           await transferOne(currentUrl, targetUrl, item.size);
           okCount++;
           succeeded = true;
@@ -545,10 +613,7 @@ var syncGroupFilesToOpenListCore = async (params) => {
           const msg = formatErrorMessage(error);
           if (attempt < attempts) {
             if (shouldRefreshUrl(msg)) {
-              try {
-                item.url = await resolveGroupFileUrl(bot, groupContact, groupId, item);
-              } catch {
-              }
+              item.url = void 0;
             }
             const delay = Math.max(0, Math.floor(retryDelayMs) || 0) * Math.pow(2, attempt - 1);
             if (delay > 0) await new Promise((resolve) => setTimeout(resolve, delay));
@@ -557,19 +622,24 @@ var syncGroupFilesToOpenListCore = async (params) => {
         }
       }
       if (!succeeded && lastError) {
-        syncErrors.push({
-          path: item.path,
-          fileId: item.fileId,
-          message: formatErrorMessage(lastError)
-        });
+        const message = formatErrorMessage(lastError);
+        if (message.startsWith("URL\u83B7\u53D6\u5931\u8D25:")) {
+          urlErrors.push({ fileId: item.fileId, path: item.path, message });
+        } else {
+          syncErrors.push({
+            path: item.path,
+            fileId: item.fileId,
+            message
+          });
+        }
       }
       if (safeProgressReportEvery > 0 && (index + 1) % safeProgressReportEvery === 0) {
-        report && await report(`\u540C\u6B65\u8FDB\u5EA6\uFF1A${index + 1}/${withUrl.length}\uFF08\u6210\u529F ${okCount}\uFF09`);
+        report && await report(`\u540C\u6B65\u8FDB\u5EA6\uFF1A${index + 1}/${needSync.length}\uFF08\u6210\u529F ${okCount}\uFF09`);
       }
     };
     if (adaptiveTransfer) {
       logger2.info(`[\u7FA4\u6587\u4EF6\u540C\u6B65][${groupId}] \u672A\u914D\u7F6E\u9650\u901F\uFF0C\u5C06\u81EA\u9002\u5E94\u8C03\u6574\u4F20\u8F93\u5E76\u53D1\uFF08\u6700\u591A ${MAX_TRANSFER_CONCURRENCY}\uFF09`);
-      await runWithAdaptiveConcurrency(withUrl, {
+      await runWithAdaptiveConcurrency(needSync, {
         initial: transferInitial,
         max: MAX_TRANSFER_CONCURRENCY,
         fn: transferFn,
@@ -578,13 +648,13 @@ var syncGroupFilesToOpenListCore = async (params) => {
         }
       });
     } else {
-      await runWithConcurrency(withUrl, transferInitial, transferFn);
+      await runWithConcurrency(needSync, transferInitial, transferFn);
     }
     state.lastSyncAt = Date.now();
     writeGroupSyncState(groupId, state);
-    const failCount = withUrl.length - okCount;
+    const failCount = needSync.length - okCount;
     report && await report(`\u540C\u6B65\u5B8C\u6210\uFF1A\u6210\u529F ${okCount} / \u5931\u8D25 ${failCount}\uFF08\u589E\u91CF\u8DF3\u8FC7 ${skipped}\uFF09`);
-    if (failCount) {
+    if (syncErrors.length) {
       const preview = syncErrors.slice(0, 5).map((it) => `${it.path} (${it.fileId})
 ${it.message}`).join("\n\n");
       report && await report(`\u5931\u8D25\u793A\u4F8B\uFF08\u524D5\u6761\uFF09\uFF1A
@@ -596,7 +666,7 @@ ${it.message}`).join("\n\n");
       report && await report(`URL\u83B7\u53D6\u5931\u8D25\u793A\u4F8B\uFF08\u524D5\u6761\uFF09\uFF1A
 ${preview}`);
     }
-    return { total: limitedList.length, skipped, urlOk: withUrl.length, ok: okCount, fail: failCount };
+    return { total: limitedList.length, skipped, urlOk: urlOkSet.size, ok: okCount, fail: failCount };
   });
 };
 

package/lib/{chunk-CE6KVBH4.js → chunk-DR4WWLFE.js}

@@ -1,6 +1,6 @@
 import {
   syncGroupFilesToOpenListCore
-} from "./chunk-KB5N77CR.js";
+} from "./chunk-2Z6KEH2L.js";
 import {
   normalizePosixPath,
   readJsonSafe,

package/package.json

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