@anyul/koishi-plugin-rss 5.2.3 → 5.2.4

package/lib/utils/legacy-config.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeBasicConfig = normalizeBasicConfig;
+exports.normalizeSubscriptionArg = normalizeSubscriptionArg;
+exports.getRuntimeBasicConfig = getRuntimeBasicConfig;
+exports.getResendUpdatedContent = getResendUpdatedContent;
+exports.shouldMergeVideo = shouldMergeVideo;
+exports.getNextUpdateTime = getNextUpdateTime;
+exports.setNextUpdateTime = setNextUpdateTime;
+function normalizeBasicConfig(basic) {
+    const normalized = { ...(basic || {}) };
+    const mergeVideo = normalized.mergeVideo ?? normalized.margeVideo;
+    const resendUpdatedContent = normalized.resendUpdatedContent ?? normalized.resendUpdataContent;
+    if (mergeVideo !== undefined) {
+        normalized.mergeVideo = mergeVideo;
+        normalized.margeVideo = mergeVideo;
+    }
+    if (resendUpdatedContent !== undefined) {
+        normalized.resendUpdatedContent = resendUpdatedContent;
+        normalized.resendUpdataContent = resendUpdatedContent;
+    }
+    return normalized;
+}
+function normalizeSubscriptionArg(arg) {
+    const normalized = { ...(arg || {}) };
+    const nextUpdateTime = getNextUpdateTime(normalized);
+    if (nextUpdateTime !== undefined) {
+        setNextUpdateTime(normalized, nextUpdateTime);
+    }
+    return normalized;
+}
+function getRuntimeBasicConfig(config) {
+    return normalizeBasicConfig(config.basic);
+}
+function getResendUpdatedContent(config) {
+    const basic = getRuntimeBasicConfig(config);
+    return basic.resendUpdatedContent ?? 'disable';
+}
+function shouldMergeVideo(config) {
+    const basic = getRuntimeBasicConfig(config);
+    return basic.mergeVideo === true;
+}
+function getNextUpdateTime(arg) {
+    const value = arg?.nextUpdateTime ?? arg?.nextUpdataTime;
+    const parsed = typeof value === 'number' ? value : Number(value);
+    return Number.isFinite(parsed) ? parsed : undefined;
+}
+function setNextUpdateTime(target, nextUpdateTime) {
+    if (nextUpdateTime === undefined) {
+        delete target.nextUpdateTime;
+        delete target.nextUpdataTime;
+        return;
+    }
+    target.nextUpdateTime = nextUpdateTime;
+    target.nextUpdataTime = nextUpdateTime;
+}

package/lib/utils/logger.js

@@ -136,6 +136,52 @@ function emitLog(type, content) {
     }
     logger.info(content);
 }
+function filterContextFields(context, contextFields) {
+    if (!contextFields?.length) {
+        return context;
+    }
+    const filteredContext = {};
+    contextFields.forEach((field) => {
+        if (context[field] !== undefined) {
+            filteredContext[field] = context[field];
+        }
+    });
+    return filteredContext;
+}
+function formatContextValue(value) {
+    if (value instanceof Error) {
+        return value.message || value.name;
+    }
+    if (typeof value === 'object' && value !== null) {
+        try {
+            return JSON.stringify(value);
+        }
+        catch {
+            return String(value);
+        }
+    }
+    return String(value);
+}
+function formatTextLog(message, name, context, loggingConfig) {
+    const parts = [];
+    if (loggingConfig?.includeModule !== false && name) {
+        parts.push(`[${name}]`);
+    }
+    parts.push(message);
+    const textOutput = parts.filter(Boolean).join(' ').trim();
+    if (!context || Object.keys(context).length === 0) {
+        return textOutput;
+    }
+    const filteredContext = filterContextFields(context, loggingConfig?.contextFields);
+    if (Object.keys(filteredContext).length === 0) {
+        return textOutput;
+    }
+    const contextStr = Object.entries(filteredContext)
+        .sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey))
+        .map(([key, value]) => `${key}=${formatContextValue(value)}`)
+        .join(', ');
+    return `${textOutput}\n↳ ${contextStr}`;
+}
 /**
  * 增强的调试日志函数
  *
@@ -206,41 +252,16 @@ function debug(config, message, name = '', type = 'details', context) {
         }
         // 添加上下文信息
         if (loggingConfig.includeContext && context) {
-            // 如果指定了 contextFields，只包含这些字段
-            if (loggingConfig.contextFields && loggingConfig.contextFields.length > 0) {
-                const filteredContext = {};
-                loggingConfig.contextFields.forEach(field => {
-                    if (context[field] !== undefined) {
-                        filteredContext[field] = context[field];
-                    }
-                });
-                if (Object.keys(filteredContext).length > 0) {
-                    logEntry.context = filteredContext;
-                }
-            }
-            else if (Object.keys(context).length > 0) {
-                // 否则包含所有上下文
-                logEntry.context = context;
+            const filteredContext = filterContextFields(context, loggingConfig.contextFields);
+            if (Object.keys(filteredContext).length > 0) {
+                logEntry.context = filteredContext;
             }
         }
         // 输出结构化日志
         emitLog(type, JSON.stringify(logEntry));
     }
     else {
-        // 传统文本格式
-        let textOutput = formattedMessage;
-        // 添加模块前缀（如果有）
-        if (name) {
-            textOutput = `[${name}] ${textOutput}`;
-        }
-        // 如果有上下文且不使用结构化日志，在末尾添加简化的上下文信息
-        if (context && Object.keys(context).length > 0) {
-            const contextStr = Object.entries(context)
-                .map(([key, value]) => `${key}=${typeof value === 'object' ? JSON.stringify(value) : value}`)
-                .join(' ');
-            textOutput += ` | ${contextStr}`;
-        }
-        emitLog(type, textOutput);
+        emitLog(type, formatTextLog(formattedMessage, name, context, loggingConfig));
     }
 }
 /**

package/lib/utils/proxy.d.ts

@@ -0,0 +1,3 @@
+import type { AxiosRequestConfig } from 'axios';
+import type { Config } from '../types';
+export declare function buildAxiosProxyConfig(config: Config): Pick<AxiosRequestConfig, 'httpsAgent' | 'proxy'>;

package/lib/utils/proxy.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildAxiosProxyConfig = buildAxiosProxyConfig;
+const https_proxy_agent_1 = require("https-proxy-agent");
+function buildAxiosProxyConfig(config) {
+    if (!config.net?.proxyAgent?.enabled) {
+        return {};
+    }
+    const proxyUrl = `${config.net.proxyAgent.protocol}://${config.net.proxyAgent.host}:${config.net.proxyAgent.port}`;
+    return {
+        httpsAgent: new https_proxy_agent_1.HttpsProxyAgent(proxyUrl),
+        proxy: false,
+    };
+}

package/lib/utils/structured-logger.d.ts

@@ -1,6 +1,9 @@
 /**
- * 结构化日志系统
- * 提供统一的日志格式，支持 JSON 输出和性能监控
+ * 观测辅助日志包装层。
+ *
+ * 注意：当前插件主流程日志入口是 `src/utils/logger.ts` 中的
+ * `debug / debugInfo / debugError / createDebugWithContext`。
+ * 这里保留为可选的观测与兼容包装，不应作为新业务代码的首选入口。
  */
 import { Config } from '../types';
 /**
@@ -62,7 +65,8 @@ export declare class PerformanceTimer {
     };
 }
 /**
- * 结构化日志记录器类
+ * 结构化日志记录器类。
+ * 内部仍然回落到主日志入口，避免形成第二条日志主线。
  */
 export declare class StructuredLogger {
     private config;

package/lib/utils/structured-logger.js

@@ -1,7 +1,10 @@
 "use strict";
 /**
- * 结构化日志系统
- * 提供统一的日志格式，支持 JSON 输出和性能监控
+ * 观测辅助日志包装层。
+ *
+ * 注意：当前插件主流程日志入口是 `src/utils/logger.ts` 中的
+ * `debug / debugInfo / debugError / createDebugWithContext`。
+ * 这里保留为可选的观测与兼容包装，不应作为新业务代码的首选入口。
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructuredLogger = exports.PerformanceTimer = exports.LogLevel = void 0;
@@ -58,7 +61,8 @@ class PerformanceTimer {
 }
 exports.PerformanceTimer = PerformanceTimer;
 /**
- * 结构化日志记录器类
+ * 结构化日志记录器类。
+ * 内部仍然回落到主日志入口，避免形成第二条日志主线。
  */
 class StructuredLogger {
     config;
@@ -80,38 +84,41 @@ class StructuredLogger {
         if (this.enableJsonOutput) {
             return JSON.stringify(entry);
         }
-        // 文本格式
-        const parts = [
+        const header = [
             `[${entry.timestamp}]`,
             `[${entry.level.toUpperCase()}]`,
             entry.module ? `[${entry.module}]` : '',
             entry.message
         ].filter(Boolean).join(' ');
-        // 添加性能数据
+        const lines = [header];
+        if (entry.context && Object.keys(entry.context).length > 0) {
+            const contextStr = Object.entries(entry.context)
+                .map(([key, value]) => `${key}=${value}`)
+                .join(', ');
+            lines.push(`↳ context: ${contextStr}`);
+        }
+        if (entry.data && Object.keys(entry.data).length > 0) {
+            const dataStr = Object.entries(entry.data)
+                .map(([key, value]) => `${key}=${typeof value === 'object' ? JSON.stringify(value) : value}`)
+                .join(', ');
+            lines.push(`↳ data: ${dataStr}`);
+        }
         if (entry.performance) {
             const perfParts = [];
             if (entry.performance.duration) {
-                perfParts.push(`⏱️ ${entry.performance.duration}ms`);
+                perfParts.push(`duration=${entry.performance.duration}ms`);
             }
             if (entry.performance.memory) {
-                perfParts.push(`💾 ${entry.performance.memory.toFixed(2)}MB`);
+                perfParts.push(`memory=${entry.performance.memory.toFixed(2)}MB`);
             }
             if (perfParts.length > 0) {
-                return parts + '\n' + perfParts.join(' | ');
+                lines.push(`↳ performance: ${perfParts.join(', ')}`);
             }
         }
-        // 添加上下文数据
-        if (entry.context && Object.keys(entry.context).length > 0) {
-            const contextStr = Object.entries(entry.context)
-                .map(([key, value]) => `${key}=${value}`)
-                .join(', ');
-            return parts + `\n📍 ${contextStr}`;
-        }
-        // 添加错误信息
         if (entry.error) {
-            return parts + `\n❌ ${entry.error.name}: ${entry.error.message}`;
+            lines.push(`↳ error: ${entry.error.name}: ${entry.error.message}`);
         }
-        return parts;
+        return lines.join('\n');
     }
     /**
      * 记录日志

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@anyul/koishi-plugin-rss",
   "description": "Koishi RSS订阅器，支持多种RSS源、图片渲染、AI摘要等高级功能",
-  "version": "5.2.3",
+  "version": "5.2.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "author": "Anyuluo <anyul@email.com>",