@zhin.js/plugin-rss 1.1.16 → 1.1.18

package/lib/runtime.d.ts

@@ -20,5 +20,6 @@ export interface RssRuntime {
     readonly config: Readonly<RssConfig>;
     readonly outbound: RssOutboundPush | null;
 }
-export declare const rssRuntimeToken: import("zhin.js").Token<RssRuntime>;
+export declare const rssRuntimeStore: import("zhin.js").PluginStore<RssRuntime, unknown>;
+export declare const rssRuntimeToken: import("zhin.js").PluginStore<RssRuntime, unknown>;
 //# sourceMappingURL=runtime.d.ts.map

package/lib/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE;IACpC,qGAAqG;IACrG,QAAQ,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACjD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpB,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;CAC3C;AAED,eAAO,MAAM,eAAe,qCAG3B,CAAC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE;IACpC,qGAAqG;IACrG,QAAQ,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACjD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpB,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;CAC3C;AAED,eAAO,MAAM,eAAe,oDAG3B,CAAC;AACF,eAAO,MAAM,eAAe,oDAAkB,CAAC"}

package/lib/runtime.js

@@ -1,3 +1,4 @@
-import { createToken } from 'zhin.js';
-export const rssRuntimeToken = createToken('zhin.rss.runtime', 'Owner-scoped RSS runtime');
+import { definePluginStore } from 'zhin.js';
+export const rssRuntimeStore = definePluginStore('zhin.rss.runtime', 'Owner-scoped RSS runtime');
+export const rssRuntimeToken = rssRuntimeStore;
 //# sourceMappingURL=runtime.js.map

package/lib/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAwBtC,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CACxC,kBAAkB,EAClB,0BAA0B,CAC3B,CAAC"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAwB5C,MAAM,CAAC,MAAM,eAAe,GAAG,iBAAiB,CAC9C,kBAAkB,EAClB,0BAA0B,CAC3B,CAAC;AACF,MAAM,CAAC,MAAM,eAAe,GAAG,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-rss",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "description": "RSS/Atom feed subscription plugin for Zhin.js (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
@@ -42,26 +42,25 @@
   "license": "MIT",
   "dependencies": {
     "rss-parser": "^3.13.0",
-    "@zhin.js/console-contract": "1.1.3",
-    "@zhin.js/page": "1.1.15",
-    "@zhin.js/client": "1.1.25",
-    "@zhin.js/tool": "1.1.16",
-    "@zhin.js/im-contract": "1.1.12",
-    "@zhin.js/skill": "1.1.14"
+    "@zhin.js/console-contract": "1.1.5",
+    "@zhin.js/im-contract": "1.1.13",
+    "@zhin.js/page": "1.1.17",
+    "@zhin.js/tool": "1.1.18",
+    "@zhin.js/skill": "1.1.16"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "zhin.js": "1.1.22"
+    "zhin.js": "1.1.24"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/command": "^1.1.15",
-    "@zhin.js/skill": "^1.1.14",
-    "zhin.js": "^1.1.22",
-    "@zhin.js/tool": "^1.1.16",
-    "@zhin.js/page": "^1.1.15"
+    "@zhin.js/command": "^1.1.17",
+    "@zhin.js/page": "^1.1.17",
+    "@zhin.js/skill": "^1.1.16",
+    "@zhin.js/tool": "^1.1.18",
+    "zhin.js": "^1.1.24"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {

package/pages/index/index.js

@@ -1,6 +1,5 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { definePage } from '@zhin.js/console-contract';
-import { createDeclarativePage } from '@zhin.js/client';
+import { definePage, createDeclarativePage } from '@zhin.js/console-contract';
 export const meta = definePage({
     title: 'RSS 订阅',
     titleI18n: { en: 'RSS Subscriptions' },
@@ -60,11 +59,11 @@ export default createDeclarativePage({
         {
             id: 'config',
             title: { zh: '配置详情', en: 'Configuration Details' },
-            entries: (data) => ({
-                pollCron: data.pollCron,
-                maxItemsPerPoll: String(data.maxItemsPerPoll),
-                fetchTimeoutMs: `${data.fetchTimeoutMs} ms`,
-            }),
+            entries: [
+                { label: 'pollCron', dataKey: 'pollCron' },
+                { label: 'maxItemsPerPoll', dataKey: 'maxItemsPerPoll' },
+                { label: 'fetchTimeoutMs', value: { $format: '{0} ms', args: ['fetchTimeoutMs'] } },
+            ],
         },
     ],
 });

package/pages/index/index.ts

@@ -1,5 +1,4 @@
-import { definePage } from '@zhin.js/console-contract';
-import { createDeclarativePage } from '@zhin.js/client';
+import { definePage, createDeclarativePage } from '@zhin.js/console-contract';
 
 export interface RssSubscriptionItem {
   readonly id: string;
@@ -82,11 +81,11 @@ export default createDeclarativePage<RssConsoleStatus>({
     {
       id: 'config',
       title: { zh: '配置详情', en: 'Configuration Details' },
-      entries: (data) => ({
-        pollCron: data.pollCron,
-        maxItemsPerPoll: String(data.maxItemsPerPoll),
-        fetchTimeoutMs: `${data.fetchTimeoutMs} ms`,
-      }),
+      entries: [
+        { label: 'pollCron', dataKey: 'pollCron' },
+        { label: 'maxItemsPerPoll', dataKey: 'maxItemsPerPoll' },
+        { label: 'fetchTimeoutMs', value: { $format: '{0} ms', args: ['fetchTimeoutMs'] } },
+      ],
     },
   ],
 });

package/plugin.js

@@ -1,15 +1,15 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { DataMigrationError, pluginDataMigrationProviderToken, TargetMigrationScopes, pluginTaskProviderToken } from 'zhin.js/plugin-runtime';
+import { DataMigrationError, TargetMigrationScopes } from 'zhin.js/plugin-runtime';
 import { createSubscriptionTargetMigration, subscriptionMigrationScope } from "./lib/target-migration.js";
 import { projectLocaleToken, resolveLocale } from 'zhin.js/i18n';
-import { definePlugin, logger, databaseHostToken, outboundHostToken, pluginConsoleRpcToken, scheduleHostToken, } from 'zhin.js';
+import { definePlugin, definePluginCapabilityGraph, logger, databaseHostToken, outboundHostToken, pluginConsoleRpcToken, pluginDataMigrationProviderToken, pluginTaskProviderToken, scheduleHostToken, } from 'zhin.js';
 import { createAdministratorRssState } from "./lib/storage.js";
 import { AdministratorRssTasks } from "./lib/admin-tasks.js";
 import { createRssConsoleRpc } from "./lib/console.js";
 import { resolveRssConfig } from "./lib/feed.js";
 import { createInMemoryRssDb, RSS_SEEN_TABLE, RSS_SUBS_TABLE, } from "./lib/db-store.js";
 import { cleanOldSeen, pollAllFeeds } from "./lib/poll.js";
-import { rssRuntimeToken } from "./lib/runtime.js";
+import { rssRuntimeStore } from "./lib/runtime.js";
 function defineRssTables(db) {
     db.define(RSS_SUBS_TABLE, {
         url: { type: 'text', nullable: false },
@@ -43,6 +43,21 @@ export default definePlugin({
     metadata: {
         displayName: 'RSS',
     },
+    capabilityGraph: definePluginCapabilityGraph({
+        provides: [
+            rssRuntimeStore,
+            pluginConsoleRpcToken,
+            pluginDataMigrationProviderToken,
+            pluginTaskProviderToken,
+        ],
+        injects: [databaseHostToken, outboundHostToken, scheduleHostToken, projectLocaleToken],
+        features: {
+            commands: ['rss-add/[url]', 'rss-check/[[url]]', 'rss-list', 'rss-preview/[url]', 'rss-remove/[url]'],
+            skills: ['rss'],
+            tools: ['skill/rss/rss_list_subscriptions', 'skill/rss/rss_preview_feed'],
+            pages: ['index'],
+        },
+    }),
     setup(context) {
         const config = resolveRssConfig(context.config.get());
         const database = context.resources.has(databaseHostToken) ? context.resources.use(databaseHostToken) : undefined;
@@ -52,8 +67,9 @@ export default definePlugin({
             return host;
         })() : createInMemoryRssDb();
         const migrationScopes = database ? new TargetMigrationScopes({ pending: scope => scope.startsWith('historical:') }) : undefined;
-        if (database && migrationScopes)
-            context.resources.provide(pluginDataMigrationProviderToken, createSubscriptionTargetMigration({ database, scopes: migrationScopes }));
+        const dataMigration = database && migrationScopes
+            ? createSubscriptionTargetMigration({ database, scopes: migrationScopes })
+            : undefined;
         const outbound = context.resources.has(outboundHostToken) ? context.resources.use(outboundHostToken) : undefined;
         let outboundPush = null;
         if (outbound) {
@@ -69,15 +85,20 @@ export default definePlugin({
                     await run();
             };
         }
-        const runtime = Object.freeze({
+        let projectLocale;
+        try {
+            projectLocale = context.resources.use(projectLocaleToken);
+        }
+        catch {
+            projectLocale = undefined;
+        }
+        const runtime = rssRuntimeStore.provide(context, Object.freeze({
             db,
             migrationScopes,
-            locale: resolveLocale(context.resources.use(projectLocaleToken)),
+            locale: resolveLocale(projectLocale),
             config: Object.freeze({ ...config }),
             outbound: outboundPush,
-        });
-        context.resources.provide(rssRuntimeToken, runtime);
-        context.resources.provide(pluginConsoleRpcToken, createRssConsoleRpc(runtime));
+        }));
         // Keep optional in-memory/chat-only installations working. Administrator tasks
         // must have the real durable state port, exact outbound and an active scheduler.
         let administrator;
@@ -92,36 +113,40 @@ export default definePlugin({
             catch { /* No persistent state port: no administrator provider. */ }
             if (state) {
                 administrator = new AdministratorRssTasks(createAdministratorRssState(database), outbound, config, undefined, runtime.locale);
-                context.resources.provide(pluginTaskProviderToken, administrator);
                 context.lifecycle.add(() => administrator?.stop());
             }
         }
-        if (!context.resources.has(scheduleHostToken))
-            return;
-        const schedule = context.resources.use(scheduleHostToken);
-        const dispose = schedule.register({
-            id: 'rss/poll_feeds',
-            cron: config.pollCron,
-            description: 'Poll RSS subscriptions',
-            async execute() {
-                // Both pools share this existing registration. A slow chat feed does not
-                // prevent administrator polling, and neither pool shares the other's cursor.
-                const results = await Promise.allSettled([pollAllFeeds(runtime), administrator?.tick()]);
-                // Keep the schedule lease until both pools drain, even if one fails.
-                for (const result of results)
-                    if (result.status === 'rejected')
-                        throw result.reason;
-            },
-        });
-        const disposeClean = schedule.register({
-            id: 'rss/clean_old_seen',
-            cron: '0 0 4 * * *',
-            description: 'Clean seen records older than 7 days',
-            async execute() {
-                await cleanOldSeen(runtime);
-            },
-        });
-        context.lifecycle.add(dispose);
-        context.lifecycle.add(disposeClean);
+        if (context.resources.has(scheduleHostToken)) {
+            const schedule = context.resources.use(scheduleHostToken);
+            const dispose = schedule.register({
+                id: 'rss/poll_feeds',
+                cron: config.pollCron,
+                description: 'Poll RSS subscriptions',
+                async execute() {
+                    // Both pools share this existing registration. A slow chat feed does not
+                    // prevent administrator polling, and neither pool shares the other's cursor.
+                    const results = await Promise.allSettled([pollAllFeeds(runtime), administrator?.tick()]);
+                    // Keep the schedule lease until both pools drain, even if one fails.
+                    for (const result of results)
+                        if (result.status === 'rejected')
+                            throw result.reason;
+                },
+            });
+            const disposeClean = schedule.register({
+                id: 'rss/clean_old_seen',
+                cron: '0 0 4 * * *',
+                description: 'Clean seen records older than 7 days',
+                async execute() {
+                    await cleanOldSeen(runtime);
+                },
+            });
+            context.lifecycle.add(dispose);
+            context.lifecycle.add(disposeClean);
+        }
+        return {
+            consoleRpc: createRssConsoleRpc(runtime),
+            ...(dataMigration ? { dataMigration } : {}),
+            ...(administrator ? { tasks: administrator } : {}),
+        };
     },
 });

package/src/runtime.ts

@@ -1,6 +1,6 @@
 import type { DeliveryTarget, TargetMigrationScopes } from 'zhin.js/plugin-runtime';
 import type { Locale } from 'zhin.js/i18n';
-import { createToken } from 'zhin.js';
+import { definePluginStore } from 'zhin.js';
 import type { RssConfig } from './feed.js';
 import type { RssMemoryDb } from './memory-store.js';
 import type { ChannelInfo } from './channel.js';
@@ -24,7 +24,8 @@ export interface RssRuntime {
   readonly outbound: RssOutboundPush | null;
 }
 
-export const rssRuntimeToken = createToken<RssRuntime>(
+export const rssRuntimeStore = definePluginStore<RssRuntime>(
   'zhin.rss.runtime',
   'Owner-scoped RSS runtime',
 );
+export const rssRuntimeToken = rssRuntimeStore;