dsh-foxy-weibo 0.2.2 → 0.2.4

package/lib/client.js

@@ -213,6 +213,10 @@ window.__ModuleLoader__.load({
           const data = await request('/run', { method: 'POST', body: '{}' })
           setStatus(data.status)
           const result = data.result || {}
+          if (result.error) {
+            setError(`检查失败：${result.error}`)
+            return
+          }
           setNotice(
             result.skipped === 'disabled'
               ? '未开始：自动浏览已关闭'
@@ -220,7 +224,8 @@ window.__ModuleLoader__.load({
                 ? '正在运行，请稍候'
                 : result.skipped === 'no-target'
                   ? '未开始：请先填写监控账号 UID'
-                  : `运行完成：检查 ${result.checked || 0} 条，回复 ${result.replied || 0} 条` +
+                  : `运行完成：博文 ${result.posts || 0} 篇、评论 ${result.comments || 0} 条，` +
+                    `处理 ${result.checked || 0} 条，回复 ${result.replied || 0} 条` +
                     (result.previewed ? `，预览 ${result.previewed} 条` : '') +
                     `，跳过 ${result.skipped || 0} 条`,
           )
@@ -233,12 +238,17 @@ window.__ModuleLoader__.load({
           const data = await request('/check-now', { method: 'POST', body: '{}' })
           setStatus(data.status)
           const result = data.result || {}
+          if (result.error) {
+            setError(`检查失败：${result.error}`)
+            return
+          }
           setNotice(
             result.skipped === 'no-target'
               ? '未开始：请先填写监控账号 UID'
               : result.skipped === 'busy'
                 ? '正在运行，请稍候'
-                : `检查完成：检查 ${result.checked || 0} 条评论，预览 ${result.previewed || 0} 条，跳过 ${result.skipped || 0} 条` +
+                : `检查完成：博文 ${result.posts || 0} 篇、评论 ${result.comments || 0} 条，` +
+                  `待处理 ${result.checked || 0} 条，预览 ${result.previewed || 0} 条，跳过 ${result.skipped || 0} 条` +
                   (result.errors ? `，失败 ${result.errors} 条` : ''),
           )
         } catch (e) { setError(e.message) } finally { setBusy('') }
@@ -251,12 +261,16 @@ window.__ModuleLoader__.load({
           const data = await request('/reply-now', { method: 'POST', body: '{}' })
           setStatus(data.status)
           const result = data.result || {}
+          if (result.error) {
+            setError(`回复失败：${result.error}`)
+            return
+          }
           setNotice(
             result.replied > 0
               ? `已立即回复 ${result.replied} 条，可在下方日志查看`
               : result.skipped === 'no-target'
                 ? '未开始：请先填写监控账号 UID'
-                : '没有可立即回复的评论（可能已处理或模型选择跳过）',
+                : `已浏览 ${result.posts || 0} 篇博文、${result.comments || 0} 条评论，但没有可立即回复的新评论（可能已处理或模型选择跳过）`,
           )
         } catch (e) { setError(e.message) } finally { setBusy('') }
       }
@@ -325,8 +339,8 @@ window.__ModuleLoader__.load({
                 h('option', { value: 'off' }, '仅检查，不回复'),
                 h('option', { value: 'auto' }, '自动回复'),
               )),
-            h(Field, { label: '每轮检查博文数', hint: '范围 1–20' },
-              h('input', { type: 'number', min: 1, max: 20, value: settings.maxPostsPerRun, onChange: (e) => setField('maxPostsPerRun', e.target.value) })),
+            h(Field, { label: '浏览范围（博文条数）', hint: '按时间倒序检查；1–100，填 100 即尽量浏览全部' },
+              h('input', { type: 'number', min: 1, max: 100, value: settings.maxPostsPerRun, onChange: (e) => setField('maxPostsPerRun', e.target.value) })),
             h(Field, { label: '每日回复上限', hint: '0–10，同时限制评论' },
               h('input', { type: 'number', min: 0, max: 10, value: settings.maxCommentsPerDay, onChange: (e) => setField('maxCommentsPerDay', e.target.value) })),
           ),

package/lib/index.js

@@ -164,12 +164,6 @@ async function scanOwnComments(ctx, config, state, log, force = false, options =
   const forceReply = options.forceReply === true
   const canReply = !previewOnly && (forceReply || config.replyMode === 'auto')
   const targetCid = String(options.cid || '').trim()
-  const targetUid = String(config.targetUid || '').trim()
-  if (!targetUid) return { skipped: 'no-target' }
-  const loginUid = String(config.accountUid || '').trim()
-  const maxPosts = Math.max(1, Math.min(20, Number(config.maxPostsPerRun) || 5))
-  const maxReplies = Math.max(1, Math.min(8, Number(options.maxReplies ?? config.maxCommentsPerDay) || 1))
-  const ignoreQuota = forceReply
   const result = {
     mode: options.mode || 'own-comments',
     checked: 0,
@@ -177,11 +171,36 @@ async function scanOwnComments(ctx, config, state, log, force = false, options =
     previewed: 0,
     skipped: 0,
     errors: 0,
+    posts: 0,
+    comments: 0,
     items: [],
   }
+  const targetUid = String(config.targetUid || '').trim()
+  if (!targetUid) return { skipped: 'no-target' }
+  let loginUid = String(config.accountUid || '').trim()
+  if (config.cookie) {
+    const account = await fetchAccount(config.cookie)
+    if (!account.uid) {
+      return {
+        ...result,
+        errors: 1,
+        error: '微博登录态无效，请重新扫码登录后再检查',
+      }
+    }
+    if (!loginUid) loginUid = account.uid
+  } else {
+    return { ...result, errors: 1, error: '请先扫码登录微博账号' }
+  }
+  const maxPosts = Math.max(1, Math.min(100, Number(config.maxPostsPerRun) || 5))
+  const maxReplies = Math.max(1, Math.min(8, Number(options.maxReplies ?? config.maxCommentsPerDay) || 1))
+  const ignoreQuota = forceReply
   let posts = []
   try {
-    posts = await fetchTimeline(targetUid, config)
+    posts = await fetchTimeline(targetUid, config, {
+      maxPosts,
+      maxPages: Math.ceil(maxPosts / 10) + 1,
+    })
+    result.posts = posts.length
   } catch (error) {
     return { ...result, errors: 1, error: error?.message || String(error) }
   }
@@ -196,6 +215,7 @@ async function scanOwnComments(ctx, config, state, log, force = false, options =
       log(`[foxy-weibo] 读取评论失败 ${post.id}：${error?.message || error}`)
       continue
     }
+    result.comments += comments.length
     for (const comment of comments) {
       if (targetCid && String(comment.cid) !== targetCid) continue
       if (canReply && result.replied >= maxReplies) break

package/lib/settings.js

@@ -97,7 +97,7 @@ function clampNumber(key, value, fallback) {
   const n = Number(value)
   if (!Number.isFinite(n)) return fallback
   if (key === 'intervalMinutes') return Math.max(5, Math.min(24 * 60, Math.round(n)))
-  if (key === 'maxPostsPerRun') return Math.max(1, Math.min(20, Math.round(n)))
+  if (key === 'maxPostsPerRun') return Math.max(1, Math.min(100, Math.round(n)))
   if (key === 'maxCommentsPerDay') return Math.max(0, Math.min(10, Math.round(n)))
   return n
 }

package/lib/weibo.js

@@ -100,11 +100,11 @@ export function normalizePost(raw) {
   }
 }
 
-async function fetchWebTimeline(uid, config = {}) {
+async function fetchWebTimeline(uid, config = {}, page = 1) {
   const target = String(uid || '').trim()
   const url =
     `https://weibo.com/ajax/statuses/mymblog?uid=${encodeURIComponent(target)}` +
-    `&page=1&feature=0`
+    `&page=${Math.max(1, page)}&feature=0`
   const response = await fetch(url, { headers: headersFor(config, false) })
   if (!response.ok) throw new WeiboError(`读取微博失败：HTTP ${response.status}`, 'HTTP')
   const text = await response.text()
@@ -122,39 +122,70 @@ async function fetchWebTimeline(uid, config = {}) {
   return list.map(normalizePost).filter((post) => post.id && post.text)
 }
 
-export async function fetchTimeline(uid, config = {}) {
+function uniquePosts(posts) {
+  const seen = new Set()
+  const out = []
+  for (const post of posts) {
+    const key = post.id || post.mid
+    if (!key || seen.has(key)) continue
+    seen.add(key)
+    out.push(post)
+  }
+  return out
+}
+
+export async function fetchTimeline(uid, config = {}, options = {}) {
   const target = String(uid || '').trim()
   if (!/^\d{5,20}$/.test(target)) throw new WeiboError('微博 UID 格式不正确', 'BAD_UID')
-  const url =
-    `https://m.weibo.cn/api/container/getIndex?type=uid&value=${encodeURIComponent(target)}` +
-    `&containerid=107603${encodeURIComponent(target)}&page=1`
-  try {
-    const response = await fetch(url, { headers: headersFor(config, true) })
-    if (!response.ok) throw new WeiboError(`读取微博失败：HTTP ${response.status}`, 'HTTP')
-    const json = await readJson(response)
-    const cards = Array.isArray(json?.data?.cards) ? json.data.cards : []
-    return cards
-      .filter((card) => card?.mblog)
-      .map((card) => normalizePost(card.mblog))
-      .filter((post) => post.id && post.text)
-  } catch (error) {
-    if (config.cookie) {
-      try {
-        return await fetchWebTimeline(target, config)
-      } catch (webError) {
-        throw new WeiboError(
-          `${error.message}；备用接口也失败：${webError.message}`,
-          'FETCH_FAILED',
-          webError.detail,
-        )
+  const maxPosts = Math.max(1, Math.min(100, Number(options.maxPosts) || 20))
+  const maxPages = Math.max(1, Math.min(20, Number(options.maxPages) || Math.ceil(maxPosts / 10) + 1))
+  const collected = []
+
+  for (let page = 1; page <= maxPages && collected.length < maxPosts; page += 1) {
+    const url =
+      `https://m.weibo.cn/api/container/getIndex?type=uid&value=${encodeURIComponent(target)}` +
+      `&containerid=107603${encodeURIComponent(target)}&page=${page}`
+    try {
+      const response = await fetch(url, { headers: headersFor(config, true) })
+      if (!response.ok) throw new WeiboError(`读取微博失败：HTTP ${response.status}`, 'HTTP')
+      const json = await readJson(response)
+      const cards = Array.isArray(json?.data?.cards) ? json.data.cards : []
+      const posts = uniquePosts(
+        cards
+          .filter((card) => card?.mblog)
+          .map((card) => normalizePost(card.mblog))
+          .filter((post) => post.id && post.text),
+      )
+      if (!posts.length) break
+      collected.push(...posts)
+      if (posts.length < 10) break
+    } catch (error) {
+      if (config.cookie) {
+        try {
+          const posts = uniquePosts(await fetchWebTimeline(target, config, page))
+          if (!posts.length) break
+          collected.push(...posts)
+          if (posts.length < 10) break
+          continue
+        } catch (webError) {
+          if (collected.length) break
+          throw new WeiboError(
+            `${error.message}；备用接口也失败：${webError.message}`,
+            'FETCH_FAILED',
+            webError.detail,
+          )
+        }
       }
+      if (collected.length) break
+      throw new WeiboError(
+        `${error.message}；微博接口可能要求登录 Cookie（设置 → Foxy-weibo → 微博 Cookie）`,
+        'LOGIN_REQUIRED',
+        error.detail,
+      )
     }
-    throw new WeiboError(
-      `${error.message}；微博接口可能要求登录 Cookie（设置 → Foxy-weibo → 微博 Cookie）`,
-      'LOGIN_REQUIRED',
-      error.detail,
-    )
   }
+
+  return uniquePosts(collected).slice(0, maxPosts)
 }
 
 function normalizeComment(raw) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-foxy-weibo",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Foxy's Weibo transport for DeepSeek Harness: follow users, read posts, comment, reply, and remember events.",
   "type": "module",
   "main": "lib/index.js",
@@ -48,3 +48,5 @@
     "test": "node test/test-weibo.cjs && node test/test-client.cjs"
   }
 }
+
+