From 177cbe837d51916d21195684949b84c76161c1bf Mon Sep 17 00:00:00 2001
From: npmrun <1549469775@qq.com>
Date: Sat, 18 Apr 2026 23:32:53 +0800
Subject: [PATCH] feat(rss): enhance RSS feed management with sync metadata and
 improved next sync display

---
 app/pages/me/rss/index.vue      |  43 ++++++++++++++++++++++++++++++++++++++--
 packages/drizzle-pkg/db.sqlite  | Bin 143360 -> 143360 bytes
 server/api/me/rss/feeds.get.ts  |   8 +++++---
 server/api/me/rss/feeds.post.ts |  14 ++++++++++---
 server/service/rss/index.ts     |  40 +++++++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/app/pages/me/rss/index.vue b/app/pages/me/rss/index.vue
index 51e230d..6e99080 100644
--- a/app/pages/me/rss/index.vue
+++ b/app/pages/me/rss/index.vue
@@ -1,7 +1,16 @@
 <script setup lang="ts">
 definePageMeta({ title: 'RSS' })
 
-type Feed = { id: number; feedUrl: string; title: string | null; lastError: string | null }
+type Feed = {
+  id: number
+  feedUrl: string
+  title: string | null
+  lastError: string | null
+  lastFetchedAt: string | null
+  pollIntervalMinutes: number
+  nextSyncAt: string | null
+}
+type RssSyncMeta = { serverCheckIntervalMinutes: number }
 type Item = {
   id: number
   title: string | null
@@ -12,6 +21,7 @@ type Item = {
 }
 
 const feeds = ref<Feed[]>([])
+const syncMeta = ref<RssSyncMeta>({ serverCheckIntervalMinutes: 60 })
 const items = ref<Item[]>([])
 const feedUrl = ref('')
 const loading = ref(true)
@@ -38,6 +48,25 @@ const selectedFeedLabel = computed(() => {
   return f?.title || f?.feedUrl || '当前订阅'
 })
 
+function formatNextSync(iso: string) {
+  return new Date(iso).toLocaleString('zh-CN', { dateStyle: 'short', timeStyle: 'short' })
+}
+
+const earliestNextSyncLabel = computed(() => {
+  const dates = feeds.value.map((f) => f.nextSyncAt).filter(Boolean) as string[]
+  if (!dates.length) {
+    return null
+  }
+  return formatNextSync(dates.reduce((a, b) => (a < b ? a : b)))
+})
+
+function feedNextLine(f: Feed) {
+  if (!f.nextSyncAt) {
+    return '尚未完成首次抓取，后台将自动重试'
+  }
+  return `预计下次同步：${formatNextSync(f.nextSyncAt)}`
+}
+
 function countForFeed(feedId: number) {
   return items.value.filter((it) => it.feedId === feedId).length
 }
@@ -57,9 +86,10 @@ async function load() {
   loading.value = true
   try {
     const [f, i] = await Promise.all([
-      fetchData<{ feeds: Feed[] }>('/api/me/rss/feeds'),
+      fetchData<{ feeds: Feed[]; sync: RssSyncMeta }>('/api/me/rss/feeds'),
       fetchData<{ items: Item[] }>('/api/me/rss/items'),
     ])
+    syncMeta.value = f.sync
     feeds.value = f.feeds
     items.value = i.items
     if (selectedFeedId.value !== null && !feeds.value.some((x) => x.id === selectedFeedId.value)) {
@@ -128,6 +158,12 @@ async function copyUnlistedLink(it: Item) {
     <h1 class="text-2xl font-semibold">
       RSS 收件箱
     </h1>
+    <p v-if="!loading" class="text-sm text-muted -mt-4">
+      服务器约每 {{ syncMeta.serverCheckIntervalMinutes }} 分钟检查一次到期的订阅；添加新订阅后会立即抓取一次。
+      <template v-if="feeds.length && earliestNextSyncLabel">
+        当前全部订阅中，预计最早下次同步时间为 {{ earliestNextSyncLabel }}（按各源上次抓取时间推算，仅供参考）。
+      </template>
+    </p>
 
     <UCard>
       <div class="flex flex-col sm:flex-row gap-2">
@@ -186,6 +222,9 @@ async function copyUnlistedLink(it: Item) {
                 <div class="text-xs text-muted mt-0.5">
                   {{ countForFeed(f.id) }} 条
                 </div>
+                <div class="text-[11px] text-muted mt-1 leading-snug">
+                  {{ feedNextLine(f) }}
+                </div>
               </button>
               <div v-if="f.lastError" class="px-3 text-error text-xs">
                 {{ f.lastError }}
diff --git a/packages/drizzle-pkg/db.sqlite b/packages/drizzle-pkg/db.sqlite
index 31ab19f898954111beafc242456063a7808a451c..419db48c337984f33ce4858a84f1c469a1ff2d44 100644
GIT binary patch
delta 920
zcma)(e@IhN6vyw~d)KzCcQ=1vYsw}m!)i9&_BN3)v&ae)8Uzx7Z`<7(%(t<(DH1Ui
z5+Mld34vl1?GK}H+9Mx?1O@e1)Su=b{t7Atp@JYm`*CMKP}?6}4wrK-_nhzNoYS+Y
z?OD_gn&8Uy(k8ev*{*4@^G=t?Bk;V<<?=Xe&N{zftE(e5w%XdDC+K$)2jOer=<}nm
zrs3!v{?xQ`qhS?S{7;rL-l{h<_7<n|R6Jt9xCgMf2;f<);3C|tlv`Mws%219i3xR(
zKv-yv$1VzDV=@u-b`cUgE(*Q~2?T|RM10X`ga~4mVE;PLBCo-iGv}n3An{Hi(h?Sv
z2_o@!G1=iG@oe6K9RL7F@m8(WHnBuJxk<}4(_f)MR>~(tBGIn1Bovlt{eOr)S3*=)
zX+%;uLCy#rWclv3<&m-F5%t5+BPkINi=hqh_d6*8i-!Szi=W|P`~?7IpJf22tc(}t
zn!vVhSToa<^WX1DF$Ts8w~%V`nKIoUs@+swgC77qL$A$8skSU|^6Gd>PhZ>Jw2@e{
z3g+qD2KjQPq(Bh<_HgKvsY;WllP5A2T6>Gnn*AhCW(wtx8ICUc+`|cIDdwgC;<^ET
ziDlfzb>mX*KIfv_HgmFTzL%vMLHY5#?{GchfUdC6WCR9e1PBRIfLbsh1*L%WD>#1v
zj^2KAm5(KTk+6Tmchgb2(QBn`;g((J?3|;aBXwm;5A*HFjMrdVDc27{HQfkH7{<|8
zuRb{j+p?ZV-P;WBWj%-b;xzQI(4zimg=kO<^S=RV7MeM$Rll#nJxsv>Kn9@Gg?e?D
z`cL$q0LY~3*Wo*+G#>605+tkI*O;9s3)32y-sRPPMRT-32;S^kf(M~rO)o*7rE1kV
RS-dN7j6syeQJvP<e*zhXCprKC

delta 590
zcmZp8z|ru4V}dl}rin7njGHzlFxeYeq@-Gyq*|uwCR-XO>Y7-lB<m)brx@s(BpR3)
zCYzcX7+It+&OK`WfRS<TLhTsF&6DhZ@T(A`Yx6pP0eNQKFRwQr%ySTAWdH(!?SdB=
zU-C~j5D;YJLKEQO<zK_V#P@@Nznt&KW<`ZJe3O5yt7kK2WaBhfoqTt_xXkmu?x$-f
zJnNY8Z1dFOlA_GKbfA-Tzk<vOnY>}W3Wv_u7eKbA`Q(l3g(tsX&&Mnfx@Xe{Mg>uR
z1qN2WN(TNj{FC`3`6~Ig@vY`F1==CcH`(-FBTEJ=AH(Eb_mX%Ps+4~LnqbK(EGjy=
z@t&|;T1t9KbS&fC1vj!&3QCi5GLs=}2)Q}({yYOt?TOhycPKDxZxdkTHeglY|IN5$
zv!cKh#_dZS8O52I6*wff?{i^{1hGW7OL;J^1hE9SAM<9kU}2Qs{@<UGbpj6y;}Rg^
z3Fi3DdKaiWopE~kM@AjSj_pf6GMcdnDR6MNiLnSWaB`+M>W8<)w!}_P{KIIlUFI9(
zc_wM7%N7Eyl5C4$hA87rY}IbnhA8{%!YIhhgHR?ax;^+0;|gX`phE<?d4Yar<o?G1
nMDjqU9MJx^+(4_JzF?GKo}TcE@y7JG?-|*-5&9LDFc|;<v~s)|

diff --git a/server/api/me/rss/feeds.get.ts b/server/api/me/rss/feeds.get.ts
index 24be1eb..1e40ef5 100644
--- a/server/api/me/rss/feeds.get.ts
+++ b/server/api/me/rss/feeds.get.ts
@@ -1,7 +1,9 @@
-import { listFeedsForUser } from "#server/service/rss";
+import { listFeedsForUser, meRssInboxSyncMeta, toMeRssFeedDto } from "#server/service/rss";
 
 export default defineWrappedResponseHandler(async (event) => {
   const user = await event.context.auth.requireUser();
-  const feeds = await listFeedsForUser(user.id);
-  return R.success({ feeds });
+  const rows = await listFeedsForUser(user.id);
+  const feeds = rows.map(toMeRssFeedDto);
+  const sync = meRssInboxSyncMeta();
+  return R.success({ feeds, sync });
 });
diff --git a/server/api/me/rss/feeds.post.ts b/server/api/me/rss/feeds.post.ts
index 4e4b2ba..33da21e 100644
--- a/server/api/me/rss/feeds.post.ts
+++ b/server/api/me/rss/feeds.post.ts
@@ -1,12 +1,20 @@
-import { addFeed } from "#server/service/rss";
+import { addFeed, getFeedForUser, syncFeed, toMeRssFeedDto } from "#server/service/rss";
 import { RssUrlUnsafeError } from "#server/utils/rss-url";
 
 export default defineWrappedResponseHandler(async (event) => {
   const user = await event.context.auth.requireUser();
   const body = await readBody<{ feedUrl: string }>(event);
   try {
-    const feed = await addFeed(user.id, body.feedUrl);
-    return R.success({ feed });
+    const created = await addFeed(user.id, body.feedUrl);
+    if (!created) {
+      throw createError({ statusCode: 500, statusMessage: "订阅创建失败" });
+    }
+    await syncFeed(created.id);
+    const row = await getFeedForUser(user.id, created.id);
+    if (!row) {
+      throw createError({ statusCode: 500, statusMessage: "订阅创建后读取失败" });
+    }
+    return R.success({ feed: toMeRssFeedDto(row) });
   } catch (e) {
     if (e instanceof RssUrlUnsafeError) {
       throw createError({ statusCode: 400, statusMessage: e.message });
diff --git a/server/service/rss/index.ts b/server/service/rss/index.ts
index 2c533b1..b03f9ae 100644
--- a/server/service/rss/index.ts
+++ b/server/service/rss/index.ts
@@ -14,6 +14,46 @@ const DEFAULT_POLL_MINUTES = Number(process.env.RSS_SYNC_INTERVAL_MINUTES ?? 60)
 const FETCH_TIMEOUT_MS = Number(process.env.RSS_FETCH_TIMEOUT_MS ?? 15_000);
 const MAX_BODY_BYTES = Number(process.env.RSS_MAX_RESPONSE_BYTES ?? 2_000_000);
 
+export type MeRssFeedDto = {
+  id: number;
+  feedUrl: string;
+  title: string | null;
+  siteUrl: string | null;
+  lastError: string | null;
+  lastFetchedAt: string | null;
+  pollIntervalMinutes: number;
+  nextSyncAt: string | null;
+};
+
+export function toMeRssFeedDto(feed: (typeof rssFeeds.$inferSelect)): MeRssFeedDto {
+  const poll = feed.pollIntervalMinutes ?? DEFAULT_POLL_MINUTES;
+  const last = feed.lastFetchedAt;
+  const nextSyncAt = last ? new Date(last.getTime() + poll * 60_000).toISOString() : null;
+  return {
+    id: feed.id,
+    feedUrl: feed.feedUrl,
+    title: feed.title,
+    siteUrl: feed.siteUrl,
+    lastError: feed.lastError,
+    lastFetchedAt: last?.toISOString() ?? null,
+    pollIntervalMinutes: poll,
+    nextSyncAt,
+  };
+}
+
+export function meRssInboxSyncMeta() {
+  return { serverCheckIntervalMinutes: DEFAULT_POLL_MINUTES };
+}
+
+export async function getFeedForUser(userId: number, feedId: number) {
+  const [row] = await dbGlobal
+    .select()
+    .from(rssFeeds)
+    .where(and(eq(rssFeeds.id, feedId), eq(rssFeeds.userId, userId)))
+    .limit(1);
+  return row ?? null;
+}
+
 export async function listFeedsForUser(userId: number) {
   return dbGlobal.select().from(rssFeeds).where(eq(rssFeeds.userId, userId)).orderBy(desc(rssFeeds.id));
 }