@anyul/koishi-plugin-rss 5.3.4 → 5.3.10

package/lib/core/subscription-store.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubscriptionStore = void 0;
+/**
+ * 订阅数据访问仓储（Repository）。
+ *
+ * 设计目的：`rssOwl` 是订阅核心表，原本被命令层（subscription-create /
+ * subscription-edit / subscription-management / web-monitor）的 15 处
+ * 直接 `ctx.database.*('rssOwl', ...)` 调用散落访问，违反「命令层只复用
+ * 核心函数」的分层约定。本类作为该表的唯一封装，命令层通过依赖注入拿到
+ * 实例，不再直接触碰 `ctx.database`，与 `NotificationQueueStore` /
+ * `MessageCacheManager` 的既有分层保持一致。
+ *
+ * 注意：feeder（`core/feeder.ts`）也在核心层直接读写 `rssOwl`，那是核心层
+ * 对自身数据的合法访问，不强制走本仓储；强制收口会破坏 feeder 作为纯函数
+ * 的可测试性（见 5.3.8 的 disposed 评估取舍）。
+ */
+class SubscriptionStore {
+    ctx;
+    constructor(ctx) {
+        this.ctx = ctx;
+    }
+    /**
+     * 按群组查询订阅列表（命令层最常用的读取入口）。
+     */
+    async findByGuild(platform, guildId) {
+        return this.ctx.database.get('rssOwl', { platform, guildId });
+    }
+    /**
+     * 按 群组 + URL 查询（用于编辑推送目标时判断目标群是否已有同源订阅）。
+     */
+    async findByGuildAndUrl(platform, guildId, url) {
+        return this.ctx.database.get('rssOwl', { platform, guildId, url });
+    }
+    /**
+     * 创建一条订阅，返回含生成主键的完整行。
+     */
+    async create(data) {
+        return this.ctx.database.create('rssOwl', data);
+    }
+    /**
+     * 按主键更新任意字段。
+     */
+    async update(id, patch) {
+        await this.ctx.database.set('rssOwl', id, patch);
+    }
+    /**
+     * 按主键删除单条订阅。
+     */
+    async remove(id) {
+        await this.ctx.database.remove('rssOwl', { id });
+    }
+    /**
+     * 删除某个群组的全部订阅（rsso.remove --all）。
+     */
+    async removeAllByGuild(platform, guildId) {
+        await this.ctx.database.remove('rssOwl', { platform, guildId });
+    }
+}
+exports.SubscriptionStore = SubscriptionStore;

package/lib/index.d.ts

@@ -4,8 +4,5 @@ export * from './types';
 export { templateList } from './config';
 import type { Config } from './types';
 export declare const name = "@anyul/koishi-plugin-rss";
-export declare const inject: {
-    required: string[];
-    optional: string[];
-};
+export declare const using: string[];
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inject = exports.name = exports.templateList = exports.Config = void 0;
+exports.using = exports.name = exports.templateList = exports.Config = void 0;
 exports.apply = apply;
 // Export types and config
 var config_1 = require("./config");
@@ -31,13 +31,16 @@ const commands_1 = require("./commands");
 // Import core modules
 const item_processor_1 = require("./core/item-processor");
 const feeder_1 = require("./core/feeder");
+const subscription_store_1 = require("./core/subscription-store");
 const message_cache_1 = require("./utils/message-cache");
 const message_cache_service_1 = require("./services/message-cache-service");
 const notification_queue_1 = require("./core/notification-queue");
 // Import database and constants
 const database_1 = require("./database");
 const constants_1 = require("./constants");
-exports.inject = { required: ["database"], optional: ["puppeteer", "censor", "assets", "server", "ffmpeg"] };
+// Koishi 4.11+ 约定：必需服务用 `using` 声明（替代旧 `inject`）。
+// 可选服务（puppeteer/censor/assets/server/ffmpeg）不在此声明，代码内统一用可选链访问。
+exports.using = ['database'];
 function apply(ctx, config) {
     // Setup database
     (0, database_1.setupDatabase)(ctx);
@@ -65,6 +68,8 @@ function apply(ctx, config) {
     const commandRuntime = (0, commands_1.createCommandRuntimeDeps)(ctx, config, $http, processor);
     // Initialize notification queue manager
     const queueManager = new notification_queue_1.NotificationQueueManager(ctx, config);
+    // Initialize subscription repository (rssOwl 表的唯一封装)
+    const subscriptionStore = new subscription_store_1.SubscriptionStore(ctx);
     // Initialize message cache
     if (config.cache?.enabled) {
         (0, message_cache_1.initMessageCache)(ctx, config, config.cache.maxSize || 100);
@@ -77,8 +82,12 @@ function apply(ctx, config) {
     });
     ctx.on('dispose', async () => {
         (0, feeder_1.stopFeeder)(config);
-        if (config.basic.imageMode === 'File') {
-            (0, media_1.delCache)(config);
+        // 销毁消息缓存单例：避免热重载后复用持有旧 ctx 的实例（P1-2）
+        if (config.cache?.enabled) {
+            (0, message_cache_1.disposeMessageCache)();
+        }
+        if (config.basic?.imageMode === 'File') {
+            await (0, media_1.delCache)(config);
         }
     });
     // ============================================
@@ -87,6 +96,7 @@ function apply(ctx, config) {
     (0, commands_1.registerSubscriptionManagementCommands)({
         ctx,
         config,
+        store: subscriptionStore,
         parsePubDate: commandRuntime.parsePubDate,
         parseQuickUrl: commandRuntime.parseQuickUrl,
         getRssData: commandRuntime.getRssData,
@@ -96,6 +106,7 @@ function apply(ctx, config) {
     (0, commands_1.registerSubscriptionCreateCommand)({
         ctx,
         config,
+        store: subscriptionStore,
         usage: constants_1.usage,
         quickList: constants_1.quickList,
         parseQuickUrl: commandRuntime.parseQuickUrl,
@@ -109,6 +120,7 @@ function apply(ctx, config) {
     (0, commands_1.registerWebMonitorCommands)({
         ctx,
         config,
+        store: subscriptionStore,
         debug: commandRuntime.debug,
         mixinArg: commandRuntime.mixinArg,
         getRssData: commandRuntime.getRssData,
@@ -119,6 +131,7 @@ function apply(ctx, config) {
     (0, commands_1.registerSubscriptionEditCommand)({
         ctx,
         config,
+        store: subscriptionStore,
     });
     (0, commands_1.registerManagementCommands)({
         ctx,