@zhin.js/plugin-rss 1.1.9 → 1.1.11

package/src/poll.ts

@@ -1,3 +1,5 @@
+import { resolveLocale, type Locale } from 'zhin.js/i18n';
+import { rssMessages as t } from './i18n.js';
 /**
  * Feed poll helpers: detect new items; optional OutboundHost push to subscribers.
  */
@@ -9,8 +11,8 @@ function ts(): string {
   return new Date().toISOString();
 }
 
-export function formatNewItems(feedTitle: string, items: FeedItem[], maxItems: number): string {
-  const lines = [`${feedTitle} 有 ${items.length} 条新内容：`];
+export function formatNewItems(feedTitle: string, items: FeedItem[], maxItems: number, locale: Locale = 'zh-CN'): string {
+  const lines = [t(locale, 'newItems', { title: feedTitle, count: items.length })];
   for (const item of items.slice(0, maxItems)) {
     lines.push('');
     lines.push(`${item.title}`);
@@ -18,7 +20,7 @@ export function formatNewItems(feedTitle: string, items: FeedItem[], maxItems: n
     if (item.link) lines.push(item.link);
   }
   if (items.length > maxItems) {
-    lines.push(`\n...还有 ${items.length - maxItems} 条，请查看源站`);
+    lines.push(t(locale, 'moreSource', { count: items.length - maxItems }));
   }
   return lines.join('\n');
 }
@@ -45,7 +47,7 @@ export interface CheckResult {
   readonly pushed: number;
 }
 
-async function pushToSubscribers(runtime: RssRuntime, feedUrl: string, content: string): Promise<number> {
+async function pushToSubscribers(runtime: RssRuntime, feedUrl: string, feedTitle: string, items: FeedItem[]): Promise<number> {
   const push = runtime.outbound;
   const Subs = getRssSubs(runtime.db);
   if (!push || !Subs) return 0;
@@ -66,7 +68,8 @@ async function pushToSubscribers(runtime: RssRuntime, feedUrl: string, content:
         endpointKey,
         channelType,
         channelId,
-        content,
+        locale: resolveLocale(sub.locale),
+        content: formatNewItems(feedTitle, items, runtime.config.maxItems, resolveLocale(sub.locale)),
       });
       pushed += 1;
     } catch {
@@ -82,11 +85,13 @@ async function pushToSubscribers(runtime: RssRuntime, feedUrl: string, content:
  */
 export async function checkSubscriptions(runtime: RssRuntime, options: {
   urls: readonly string[];
+  locale?: Locale;
 }): Promise<CheckResult> {
+  const locale = resolveLocale(options.locale);
   const Seen = getRssSeen(runtime.db);
   const Subs = getRssSubs(runtime.db);
   if (!Seen || !Subs) {
-    return { text: 'RSS 数据库尚未就绪', totalNew: 0, pushed: 0 };
+    return { text: t(locale, 'databaseUnavailable'), totalNew: 0, pushed: 0 };
   }
 
   const parts: string[] = [];
@@ -100,26 +105,26 @@ export async function checkSubscriptions(runtime: RssRuntime, options: {
       const seenGuids = new Set(seenRows.map((r) => String(r.item_guid ?? '')));
       const newItems = items.filter((item) => item.guid && !seenGuids.has(item.guid));
       if (newItems.length === 0) {
-        parts.push(`${title || url}: 无新内容`);
+        parts.push(t(locale, 'noNew', { title: title || url }));
         continue;
       }
       await markItemsSeen(runtime, url, newItems);
       totalNew += newItems.length;
-      const body = formatNewItems(title || url, newItems, runtime.config.maxItems);
+      const body = formatNewItems(title || url, newItems, runtime.config.maxItems, locale);
       parts.push(body);
-      pushed += await pushToSubscribers(runtime, url, body);
+      pushed += await pushToSubscribers(runtime, url, title || url, newItems);
     } catch (e) {
-      parts.push(`${url}: 检查失败 — ${(e as Error).message}`);
+      parts.push(t(locale, 'checkFailed', { url, error: (e as Error).message }));
     }
   }
 
-  if (parts.length === 0) return { text: '没有可检查的订阅', totalNew: 0, pushed: 0 };
+  if (parts.length === 0) return { text: t(locale, 'nothingToCheck'), totalNew: 0, pushed: 0 };
   const pushNote = runtime.outbound
-    ? (pushed > 0 ? `，已推送 ${pushed} 个会话` : '，无出站推送')
-    : '（未装配 OutboundHost，仅本地标记）';
+    ? (pushed > 0 ? t(locale, 'pushed', { count: pushed }) : t(locale, 'notPushed'))
+    : t(locale, 'localOnly');
   const header = totalNew > 0
-    ? `检查完成，共 ${totalNew} 条新内容${pushNote}`
-    : '检查完成，暂无新内容';
+    ? t(locale, 'checked', { count: totalNew, pushNote })
+    : t(locale, 'checkedEmpty');
   return { text: `${header}\n\n${parts.join('\n\n')}`, totalNew, pushed };
 }
 
@@ -149,10 +154,11 @@ export async function cleanOldSeen(runtime: RssRuntime): Promise<void> {
  * Poll all unique feed URLs across subscriptions.
  */
 export async function pollAllFeeds(runtime: RssRuntime): Promise<CheckResult> {
+  const locale = resolveLocale(runtime.locale);
   const Subs = getRssSubs(runtime.db);
-  if (!Subs) return { text: 'RSS 数据库尚未就绪', totalNew: 0, pushed: 0 };
+  if (!Subs) return { text: t(locale, 'databaseUnavailable'), totalNew: 0, pushed: 0 };
   const all = await Subs.select();
   const urls = [...new Set(all.map((s) => String(s.url ?? '')).filter(Boolean))];
-  if (urls.length === 0) return { text: '暂无任何 RSS 订阅', totalNew: 0, pushed: 0 };
-  return checkSubscriptions(runtime, { urls });
+  if (urls.length === 0) return { text: t(locale, 'noFeeds'), totalNew: 0, pushed: 0 };
+  return checkSubscriptions(runtime, { urls, locale });
 }

package/src/quiet-hours.ts

@@ -1,3 +1,10 @@
+import { adminText, type AdminTextKey } from './admin-i18n.js';
+
+export class LocalizedQuietHoursError extends TypeError {
+  readonly messageKey: AdminTextKey;
+  constructor(messageKey: AdminTextKey) { super(adminText('zh-CN', messageKey)); this.messageKey = messageKey; }
+}
+
 export type RssQuietHours = {
   readonly timezone: string;
   readonly start: string;
@@ -8,13 +15,13 @@ export type RssQuietHours = {
 export function parseQuietHours(parameters: Readonly<Record<string, unknown>>): RssQuietHours | undefined {
   const values = [parameters.quietTimezone, parameters.quietStart, parameters.quietEnd];
   if (values.every(value => value === undefined || (typeof value === 'string' && !value.trim()))) return undefined;
-  if (!values.every(value => typeof value === 'string' && value.trim())) throw new TypeError('静默时区、开始和结束时间须全部填写；三项全部留空关闭静默');
+  if (!values.every(value => typeof value === 'string' && value.trim())) throw new LocalizedQuietHoursError('quietFields');
   const [timezone, start, end] = values.map(value => (value as string).trim());
-  if (timezone.length > 128 || !/^[A-Za-z][A-Za-z0-9_+/-]*$/u.test(timezone)) throw new TypeError('请填写有效 IANA 时区，如 Asia/Shanghai；不能使用 +08:00 等偏移');
+  if (timezone.length > 128 || !/^[A-Za-z][A-Za-z0-9_+/-]*$/u.test(timezone)) throw new LocalizedQuietHoursError('quietZoneOffset');
   try { new Intl.DateTimeFormat('en-GB', { timeZone: timezone }).format(0); }
-  catch { throw new TypeError('请填写有效 IANA 时区，如 Asia/Shanghai'); }
+  catch { throw new LocalizedQuietHoursError('quietZone'); }
   if (!/^([01]\d|2[0-3]):[0-5]\d$/u.test(start) || !/^([01]\d|2[0-3]):[0-5]\d$/u.test(end) || start === end) {
-    throw new TypeError('静默时间须为 HH:mm（24 小时制），开始和结束不能相同');
+    throw new LocalizedQuietHoursError('quietClock');
   }
   return Object.freeze({ timezone, start, end });
 }

package/src/runtime.ts

@@ -1,3 +1,4 @@
+import type { Locale } from 'zhin.js/i18n';
 import { createToken } from 'zhin.js';
 import type { RssConfig } from './feed.js';
 import type { RssMemoryDb } from './memory-store.js';
@@ -9,9 +10,11 @@ export type RssOutboundPush = (input: {
   readonly channelType: ChannelInfo['channelType'];
   readonly channelId: string;
   readonly content: string;
+  readonly locale?: Locale;
 }) => Promise<void>;
 
 export interface RssRuntime {
+  readonly locale?: Locale;
   readonly db: RssMemoryDb;
   readonly config: Readonly<RssConfig>;
   readonly outbound: RssOutboundPush | null;

package/src/storage.ts

@@ -10,9 +10,10 @@ const child = { id: { type: 'text', length: 80, primary: true }, task_id: { type
 const codec: RelationalStateCodec = {
   key: ADMIN_RSS_STATE_KEY,
   header: { table: 'admin_rss_book', definition: { version: { type: 'integer', nullable: true }, revision: text } },
+  addColumns: { [tasks]: ['locale', 'detail_key'] },
   tables: {
     [tasks]: { id: { type: 'text', length: 36, primary: true }, position: { type: 'integer', nullable: false }, ...TASK_TARGET_COLUMNS,
-      creation: text, version: text, url: text, state: text, created_at: time, claim_id: text, last_check_at: time, last_run_at: time, detail: text,
+      creation: text, version: text, locale: text, url: text, state: text, created_at: time, claim_id: text, last_check_at: time, last_run_at: time, detail: text, detail_key: text,
       seen_known: { type: 'boolean', nullable: false }, quiet_timezone: text, quiet_start: text, quiet_end: text,
       pending_kind: text, pending_from: time, pending_to: time, pending_count: { type: 'integer', nullable: true },
       pending_capped: { type: 'boolean', nullable: true } },
@@ -25,8 +26,8 @@ const codec: RelationalStateCodec = {
     if (![1, 2].includes(book.version) || !Array.isArray(book.tasks) || !Array.isArray(book.receipts)) throw new Error('Unsupported RSS book; original state was preserved');
     return { header: { version: book.version, revision: book.revision }, rows: {
       [tasks]: book.tasks.map((task, position) => ({ id: task.id, position, ...encodeTaskTarget(task.target),
-        creation: task.creation, version: task.version, url: encodeStorageIdentity(task.url), state: task.state, created_at: task.createdAt,
-        claim_id: task.claimId, last_check_at: task.lastCheckAt, last_run_at: task.lastRunAt, detail: encodeStorageIdentity(task.detail),
+        creation: task.creation, version: task.version, locale: task.locale ?? 'zh-CN', url: encodeStorageIdentity(task.url), state: task.state, created_at: task.createdAt,
+        claim_id: task.claimId, last_check_at: task.lastCheckAt, last_run_at: task.lastRunAt, detail: encodeStorageIdentity(task.detail), detail_key: task.detailKey ?? null,
         seen_known: task.seen !== null, quiet_timezone: task.quiet?.timezone ?? null, quiet_start: task.quiet?.start ?? null, quiet_end: task.quiet?.end ?? null,
         pending_kind: task.pending === undefined ? 'absent' : task.pending === null ? 'null' : 'value',
         pending_from: task.pending?.from ?? null, pending_to: task.pending?.to ?? null,
@@ -40,8 +41,8 @@ const codec: RelationalStateCodec = {
   decode(header, rows) {
     return { version: Number(header.version), revision: String(header.revision), receipts: decodeTaskReceipts(rows[receipts]!),
       tasks: rows[tasks]!.map(row => ({ id: String(row.id), target: decodeTaskTarget(row), creation: String(row.creation), version: String(row.version),
-        url: decodeStorageIdentity(row.url), state: String(row.state), createdAt: Number(row.created_at), claimId: row.claim_id == null ? null : String(row.claim_id),
-        lastCheckAt: row.last_check_at == null ? null : Number(row.last_check_at), lastRunAt: row.last_run_at == null ? null : Number(row.last_run_at), detail: decodeStorageIdentity(row.detail),
+        url: decodeStorageIdentity(row.url), locale: row.locale == null ? 'zh-CN' : String(row.locale), state: String(row.state), createdAt: Number(row.created_at), claimId: row.claim_id == null ? null : String(row.claim_id),
+        lastCheckAt: row.last_check_at == null ? null : Number(row.last_check_at), lastRunAt: row.last_run_at == null ? null : Number(row.last_run_at), detail: decodeStorageIdentity(row.detail), ...(row.detail_key == null ? {} : { detailKey: String(row.detail_key) }),
         seen: row.seen_known ? rows[seen]!.filter(item => item.task_id === row.id).map(item => decodeStorageIdentity(item.item_key)) : null,
         ...(row.quiet_timezone == null ? {} : { quiet: { timezone: String(row.quiet_timezone), start: String(row.quiet_start), end: String(row.quiet_end) } }),
         ...(row.pending_kind === 'absent' ? {} : { pending: row.pending_kind === 'null' ? null : {