koishi-plugin-share-links-analysis 0.8.2 → 0.8.3

package/lib/index.js

@@ -133,21 +133,6 @@ async function reportMetric(ctx, config, payload) {
         }
     });
 }
-async function sendResult(ctx, session, config, result, logger) {
-    if (!session.channel) {
-        return await (0, utils_1.sendResult_plain)(ctx, session, config, result, logger);
-    }
-    switch (config.useForward) {
-        case "plain":
-            return await (0, utils_1.sendResult_plain)(ctx, session, config, result, logger);
-        case 'forward':
-            return await (0, utils_1.sendResult_forward)(ctx, session, config, result, logger, false);
-        case "mixed":
-            return await (0, utils_1.sendResult_forward)(ctx, session, config, result, logger, true);
-        default:
-            return { downloadTime: 0, sendTime: 0 };
-    }
-}
 function apply(ctx, config) {
     // 数据库模型定义
     ctx.model.extend('sla_cookie_cache', {
@@ -335,9 +320,8 @@ function apply(ctx, config) {
             }
             // === 性能统计变量 ===
             const startTotal = Date.now();
+            const timeStats = { downloadTime: 0, sendTime: 0 };
             let parseTime = 0;
-            let downloadTime = 0;
-            let sendTime = 0;
             let isCache = false;
             let status = "success";
             let errorMsg = "";
@@ -417,9 +401,7 @@ function apply(ctx, config) {
                 // === 逻辑结束 ===
                 if (result) {
                     lastProcessedUrls[channelId][link.url] = Date.now();
-                    const stats = await sendResult(ctx, session, config, result, logger);
-                    downloadTime = stats.downloadTime;
-                    sendTime = stats.sendTime;
+                    await (0, utils_1.sendResult)(ctx, session, config, result, logger, timeStats);
                 }
                 else {
                     status = "failed";
@@ -465,8 +447,8 @@ function apply(ctx, config) {
                     // === Metrics (数值/指标) ===
                     time_total_ms: totalTime,
                     time_parse_ms: parseTime,
-                    time_download_ms: downloadTime,
-                    time_send_ms: sendTime,
+                    time_download_ms: timeStats.downloadTime,
+                    time_send_ms: timeStats.sendTime,
                     // 系统负载指标
                     memory_rss_mb: parseFloat(rssMB), // 当前进程内存占用
                     concurrent_tasks: pendingChecks.size, // 当前正在进行的并发解析数

package/lib/parsers/bilibili.js

@@ -8,11 +8,11 @@ const utils_1 = require("../utils");
 exports.name = "bilibili";
 const linkRules = [
     {
-        pattern: /(?:https?:\/\/)?(?:www\.bilibili\.com\/video\/)(([ab]v[0-9a-zA-Z]+))/gi,
+        pattern: /(?:https?:\/\/)?www\.bilibili\.com\/video\/([ab]v[0-9a-zA-Z]+)/gi,
         type: "video",
     },
     {
-        pattern: /(?:https?:\/\/)?(?:b23\.tv\/([0-9a-zA-Z]+))/gi,
+        pattern: /(?:https?:\/\/)?b23\.tv\/([0-9a-zA-Z]+)/gi,
         type: "short",
     },
 ];

package/lib/parsers/xiaoheihe.js

@@ -151,7 +151,7 @@ async function process(ctx, config, link, session) {
                 const mainContent = container.querySelector('.image-text__content')?.textContent?.trim() || '';
                 contentBlocks.push({ type: 'text', content: mainContent });
                 // 图片（轮播图）
-                container.querySelectorAll('.header-image__item-image img').forEach((img, index) => {
+                container.querySelectorAll('.header-image__item-image img').forEach((img) => {
                     const src = img.src.replace(/\?.*$/, '');
                     contentBlocks.push({ type: 'image', content: src });
                 });

package/lib/parsers/xiaohongshu.js

@@ -11,15 +11,15 @@ const utils_1 = require("../utils");
 exports.name = "xiaohongshu";
 const linkRules = [
     {
-        pattern: /(?:https?:\/\/)?(?:www\.xiaohongshu\.com\/discovery\/item\/)([\w?=&\-.%]+)/gi,
+        pattern: /(?:https?:\/\/)?www\.xiaohongshu\.com\/discovery\/item\/([\w?=&\-.%]+)/gi,
         type: "discovery",
     },
     {
-        pattern: /(?:https?:\/\/)?(?:www\.xiaohongshu\.com\/explore\/)([\w?=&\-.%]+)/gi,
+        pattern: /(?:https?:\/\/)?www\.xiaohongshu\.com\/explore\/([\w?=&\-.%]+)/gi,
         type: "explore",
     },
     {
-        pattern: /(?:https?:\/\/)?(?:xhslink\.com\/(?:\w\/)?)([0-9a-zA-Z]+)/gi,
+        pattern: /(?:https?:\/\/)?xhslink\.com\/(?:\w\/)?([0-9a-zA-Z]+)/gi,
         type: "short",
     },
 ];

package/lib/types.d.ts

@@ -46,10 +46,6 @@ export interface PluginConfig {
     reportEnabled: boolean;
     reportUrl: string;
 }
-export interface SendResultStats {
-    downloadTime: number;
-    sendTime: number;
-}
 export interface BilibiliVideoInfo {
     data: {
         bvid: string;

package/lib/types.js

@@ -1,4 +1,3 @@
 "use strict";
 // src/types.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-let session_global;

package/lib/utils.d.ts

@@ -1,4 +1,4 @@
-import { ParsedInfo, PluginConfig, SendResultStats } from './types';
+import { ParsedInfo, PluginConfig } from './types';
 import { Context, Logger, Session } from "koishi";
 import { Agent as HttpAgent } from 'http';
 import { Agent as HttpsAgent } from 'https';
@@ -19,5 +19,15 @@ export declare function getEffectiveSettings(ctx: Context, guildId: string | und
     nsfw: boolean;
 }>;
 export declare function isUserAdmin(session: Session, userId: string): Promise<boolean>;
-export declare function sendResult_plain(ctx: Context, session: Session, config: PluginConfig, result: ParsedInfo, logger: Logger): Promise<SendResultStats>;
-export declare function sendResult_forward(ctx: Context, session: Session, config: PluginConfig, result: ParsedInfo, logger: Logger, mixed_sending?: boolean): Promise<SendResultStats>;
+export declare function sendResult(ctx: Context, session: Session, config: PluginConfig, result: ParsedInfo, logger: Logger, statsRef: {
+    downloadTime: number;
+    sendTime: number;
+}): Promise<void>;
+export declare function sendResult_plain(ctx: Context, session: Session, config: PluginConfig, result: ParsedInfo, logger: Logger, statsRef: {
+    downloadTime: number;
+    sendTime: number;
+}): Promise<void>;
+export declare function sendResult_forward(ctx: Context, session: Session, config: PluginConfig, result: ParsedInfo, logger: Logger, mixed_sending: boolean | undefined, statsRef: {
+    downloadTime: number;
+    sendTime: number;
+}): Promise<void>;

package/lib/utils.js

@@ -43,6 +43,7 @@ exports.getProxyAgent = getProxyAgent;
 exports.getFileSize = getFileSize;
 exports.getEffectiveSettings = getEffectiveSettings;
 exports.isUserAdmin = isUserAdmin;
+exports.sendResult = sendResult;
 exports.sendResult_plain = sendResult_plain;
 exports.sendResult_forward = sendResult_forward;
 const koishi_1 = require("koishi");
@@ -261,7 +262,6 @@ async function tryHeadRequest(url, proxy, userAgent, logger) {
             timeout: 10000,
             headers: {
                 'User-Agent': userAgent,
-                'Referer': 'https://www.bilibili.com/'
             }
         }, (res) => {
             const len = res.headers['content-length'];
@@ -286,7 +286,6 @@ async function tryHeadRequest(url, proxy, userAgent, logger) {
     });
 }
 async function tryGetRequestForSize(url, proxy, userAgent, logger) {
-    proxy = undefined;
     return new Promise((resolve) => {
         const u = new url_1.URL(url);
         const agent = getProxyAgent(proxy, url);
@@ -372,10 +371,27 @@ async function isUserAdmin(session, userId) {
         return true;
     }
 }
-async function sendResult_plain(ctx, session, config, result, logger) {
+async function sendResult(ctx, session, config, result, logger, statsRef // 新增参数
+) {
+    if (!session.channel) {
+        await sendResult_plain(ctx, session, config, result, logger, statsRef);
+        return;
+    }
+    switch (config.useForward) {
+        case "plain":
+            await sendResult_plain(ctx, session, config, result, logger, statsRef);
+            break;
+        case 'forward':
+            await sendResult_forward(ctx, session, config, result, logger, false, statsRef);
+            break;
+        case "mixed":
+            await sendResult_forward(ctx, session, config, result, logger, true, statsRef);
+            break;
+    }
+}
+// 2. 修改 sendResult_plain
+async function sendResult_plain(ctx, session, config, result, logger, statsRef) {
     logger.debug('进入普通发送');
-    let downloadTime = 0; // 下载耗时计时
-    let sendTime = 0; // 发送耗时计时
     const localDownloadDir = config.localDownloadDir;
     const onebotReadDir = config.onebotReadDir;
     let mediaCoverUrl = result.coverUrl;
@@ -397,7 +413,7 @@ async function sendResult_plain(ctx, session, config, result, logger) {
                 logger.warn(`封面下载失败: ${result.coverUrl}`, e);
                 mediaCoverUrl = result.coverUrl;
             }
-            downloadTime += Date.now() - t; // 累加耗时
+            statsRef.downloadTime += Date.now() - t; // 累加耗时
         }
         else {
             mediaCoverUrl = result.coverUrl;
@@ -424,7 +440,7 @@ async function sendResult_plain(ctx, session, config, result, logger) {
                 urlMap[remoteUrl] = remoteUrl;
             }
         }));
-        downloadTime += Date.now() - t; // 累加耗时
+        statsRef.downloadTime += Date.now() - t; // 累加耗时
         mediaMainbody = result.mainbody;
         for (const [remote, local] of Object.entries(urlMap)) {
             const escaped = remote.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -457,7 +473,7 @@ async function sendResult_plain(ctx, session, config, result, logger) {
             if (config.Max_size !== undefined) {
                 const t = Date.now();
                 const sizeBytes = await getFileSize(remoteUrl, proxy, config.userAgent, logger);
-                downloadTime += Date.now() - t;
+                statsRef.downloadTime += Date.now() - t;
                 const maxBytes = config.Max_size * 1024 * 1024;
                 if (sizeBytes !== null && sizeBytes > maxBytes) {
                     shouldSend = false;
@@ -474,7 +490,7 @@ async function sendResult_plain(ctx, session, config, result, logger) {
                     if (config.usingLocal) {
                         const t = Date.now();
                         localUrl = await downloadAndMapUrl(ctx, remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger, config.enableCache);
-                        downloadTime += Date.now() - t;
+                        statsRef.downloadTime += Date.now() - t;
                     }
                     if (!localUrl)
                         continue;
@@ -506,13 +522,11 @@ async function sendResult_plain(ctx, session, config, result, logger) {
     }
     const tSend = Date.now(); // 发送计时开始
     await Promise.all(sendPromises);
-    sendTime = Date.now() - tSend; // 计算发送耗时
-    return { downloadTime, sendTime }; // 返回统计
+    statsRef.sendTime = Date.now() - tSend; // 计算发送耗时
 }
-async function sendResult_forward(ctx, session, config, result, logger, mixed_sending = false) {
+async function sendResult_forward(ctx, session, config, result, logger, mixed_sending = false, statsRef // 接收引用
+) {
     logger.debug(mixed_sending ? '进入混合发送' : '进入合并发送');
-    let downloadTime = 0;
-    let sendTime = 0;
     const localDownloadDir = config.localDownloadDir;
     const onebotReadDir = config.onebotReadDir;
     let mediaCoverUrl = result.coverUrl;
@@ -533,7 +547,7 @@ async function sendResult_forward(ctx, session, config, result, logger, mixed_se
                 logger.warn('封面下载失败', e);
                 mediaCoverUrl = '';
             }
-            downloadTime += Date.now() - t;
+            statsRef.downloadTime += Date.now() - t;
         }
         else {
             mediaCoverUrl = result.coverUrl;
@@ -552,7 +566,7 @@ async function sendResult_forward(ctx, session, config, result, logger, mixed_se
                 catch (e) {
                     logger.warn(`正文图片下载失败: ${url}`, e);
                 }
-                downloadTime += Date.now() - t;
+                statsRef.downloadTime += Date.now() - t;
             }
             else {
                 urlMap[url] = url;
@@ -623,7 +637,7 @@ async function sendResult_forward(ctx, session, config, result, logger, mixed_se
             if (config.Max_size !== undefined) {
                 const t = Date.now();
                 const sizeBytes = await getFileSize(remoteUrl, proxy, config.userAgent, logger);
-                downloadTime += Date.now() - t;
+                statsRef.downloadTime += Date.now() - t;
                 const maxBytes = config.Max_size * 1024 * 1024;
                 if (sizeBytes !== null && sizeBytes > maxBytes) {
                     shouldInclude = false;
@@ -650,7 +664,7 @@ async function sendResult_forward(ctx, session, config, result, logger, mixed_se
                     if (config.usingLocal) {
                         const t = Date.now();
                         localUrl = await downloadAndMapUrl(ctx, remoteUrl, proxy, config.userAgent, localDownloadDir, onebotReadDir, logger, config.enableCache);
-                        downloadTime += Date.now() - t;
+                        statsRef.downloadTime += Date.now() - t;
                     }
                     if (!localUrl)
                         continue;
@@ -712,9 +726,8 @@ async function sendResult_forward(ctx, session, config, result, logger, mixed_se
             });
         }
     }
-    if (forwardNodes.length === 0 && extraSendPromises.length === 0) {
-        return { downloadTime, sendTime };
-    }
+    if (forwardNodes.length === 0 && extraSendPromises.length === 0)
+        return;
     logger.debug(`解析结果: \n ${JSON.stringify(result, null, 2)}`);
     if (!(session.onebot && session.onebot._request))
         throw new Error("Onebot is not defined");
@@ -736,7 +749,6 @@ async function sendResult_forward(ctx, session, config, result, logger, mixed_se
     if (promises.length > 0) {
         const tSend = Date.now();
         await Promise.all(promises);
-        sendTime = Date.now() - tSend;
+        statsRef.sendTime = Date.now() - tSend;
     }
-    return { downloadTime, sendTime };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "koishi-plugin-share-links-analysis",
   "description": "自用插件",
   "license": "MIT",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [