dsh-vaultwarden 0.9.2 → 0.9.3

package/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to `dsh-vaultwarden` are documented here.
 The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.9.3] — 2026-10-21
+
+### 修复
+
+- 修复首次加载后侧栏一直停在占位块、下方留一大片空白的问题。根因是「读取资料夹」与「读取侧栏统计」被放在同一个 `Promise.all` 里：后者决定侧栏画什么，前者只用于「移动到文件夹」，但前者一旦挂住，就会把已经返回的统计一起扣住，侧栏因此永远停在"加载中"，而列表早已渲染出全部条目。
+- 两次读取改为各自结算：各带自己的超时，谁先到谁先渲染，互不等待。资料夹读取超时 5 秒，侧栏统计 6 秒（且整条重试链共用一个上限，不是每次尝试各算一遍）。
+- 统计读取失败时侧栏落到三个结构项并退出忙碌态，不再保留永远不会兑现的占位块。
+- 占位骨架条的颜色由背景层色改为宿主边框色：原先在白底面板上几乎不可见，一片空白看起来像空盒子而不是"加载中"。
+
 ## [0.9.2] — 2026-10-21
 
 ### 变更

package/lib/client.js

@@ -396,7 +396,7 @@ const nextOffsetOf = (payload, fallback) => {
      * `scripts/build.sh` stamps both constants from package.json on every
      * build, so this fallback is never hand-maintained and cannot drift.
      */
-    const BUILD_VERSION = '0.9.2'
+    const BUILD_VERSION = '0.9.3'
     const BUILD_REPOSITORY = 'https://github.com/BuvkB/dsh-vaultwarden'
     /**
      * Turn a package.json repository url into something a browser can open.
@@ -1709,7 +1709,13 @@ const nextOffsetOf = (payload, fallback) => {
        * The pulse is in the stylesheet, so a reader who asked for reduced motion
        * gets a static bar rather than a blinking one.
        */
-      skeletonBar: { height: 10, borderRadius: 999, background: TOKEN.bg2, flex: 'none' },
+      // The host's border colour, not `bg2`. `bg2` is a layer tint (#f5f5f5 on
+      // a white surface), and a bar painted in it is invisible on the panel's
+      // own background: the rail then reads as an empty box rather than as
+      // "still loading". The border token is by definition visible against the
+      // surface it borders, in both themes, and no browser-support question
+      // attaches to it the way it would to a colour mix.
+      skeletonBar: { height: 10, borderRadius: 999, background: TOKEN.border, flex: 'none' },
       /** A skeleton line: bar + optional label column, one per field row. */
       skeletonField: { display: 'grid', gridTemplateColumns: '92px minmax(0, 1fr) 28px', gap: 12, alignItems: 'center' },
       /** The list's own placeholder row: avatar tile + two bars + the chevron slot. */
@@ -2732,6 +2738,34 @@ const nextOffsetOf = (payload, fallback) => {
       return /load failed|failed to fetch|networkerror|network error|fetch failed/i.test(text)
     }
 
+    /**
+     * Put a ceiling on one read.
+     *
+     * A promise that never settles is worse than one that rejects: `await`
+     * simply waits, so a request the host never answers — a request dropped by a
+     * captive portal, a socket the phone's radio parked until the tab wakes —
+     * leaves the sidebar shimmering with no rows and no error, which is the
+     * one failure mode the reader cannot act on. The timeout turns that into an
+     * ordinary rejection so the caller's existing fallback runs.
+     *
+     * Silent by construction: the timeout rejects with the same shape a failed
+     * call would (no host code), so callers cannot tell a slow host from a
+     * dropped one, and neither can the reader — who is told the counts are
+     * unknown, not which of a dozen network faults produced that.
+     */
+    const withTimeout = (promise, ms, label) =>
+      new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+          const error = new Error(`${label} 超时`)
+          error.code = 'timeout'
+          reject(error)
+        }, ms)
+        promise.then(
+          (value) => { clearTimeout(timer); resolve(value) },
+          (failure) => { clearTimeout(timer); reject(failure) },
+        )
+      })
+
     /** Build the RPC caller over the authenticated `/api` channel. */
     const makeInvoke = (connection) => async (method, args = {}) => {
       if (!connection || typeof connection.rpc?.call !== 'function') {
@@ -2781,6 +2815,30 @@ const nextOffsetOf = (payload, fallback) => {
      * meantime, which is a worse bug than the one this fixes.
      */
     const CLIPBOARD_TTL_MS = 20000
+    /**
+     * Ceiling on the sidebar's overview read, in milliseconds.
+     *
+     * A read that never settles is worse than one that rejects: `await` simply
+     * waits, so a request the host never answers — dropped by a captive portal,
+     * or a socket the phone's radio parked until the tab wakes — would leave the
+     * sidebar shimmering with no rows and no error, which is the one failure
+     * mode the reader cannot act on. The timeout turns that into an ordinary
+     * rejection so the caller's existing fallback runs.
+     *
+     * Long enough that a merely slow network still gets its counts, short enough
+     * that the rail settles into its structural places when the answer is simply
+     * not coming: the sidebar is furniture, and a count that never arrives must
+     * not hold the shape of the panel hostage.
+     */
+    const OVERVIEW_TIMEOUT_MS = 6000
+    /**
+     * The same ceiling for the other read that describes a place rather than a
+     * row. Shorter than the overview's, because nothing waits on it: the folder
+     * list only feeds the move-to-folder step, so a slow answer is better
+     * dropped than kept open — but it still must not stay open forever, which
+     * is exactly how the sidebar used to get stuck.
+     */
+    const READ_TIMEOUT_MS = 5000
     /**
      * Write `text` to the clipboard and schedule its removal.
      *
@@ -5075,15 +5133,52 @@ const nextOffsetOf = (payload, fallback) => {
           // either method, or a read that fails, leaves the sidebar on the one
           // place that needs no counts at all.
           await readVault(nextQuery, { quiet: Boolean(paintedSection ?? painted), identity, section: view })
-          const [folderPayload, overviewPayload] = await Promise.all([
-            invoke('folders').catch(() => null),
-            invoke('overview').catch((failure) => ({ failed: failure })),
-          ])
-          setFolders(Array.isArray(folderPayload?.folders) ? folderPayload.folders : [])
-          if (overviewPayload && !overviewPayload.failed) {
-            openCache.overview = { key: identity, overview: overviewPayload, at: Date.now() }
-            setOverview(overviewPayload)
-          }
+          // These two reads are settled INDEPENDENTLY, not awaited together.
+          //
+          // They used to sit in one Promise.all, which made the slower read the
+          // gate for the faster one: the rail is drawn from `overview`, and
+          // `folders` only feeds the move-to-folder step, but a folders call
+          // that never settled held the already-arrived overview hostage. The
+          // panel then showed its rows (readVault had finished) under a rail
+          // stuck on its ghost block, forever — the list said 428 entries and
+          // the sidebar still said "loading". That is the reported bug, and no
+          // amount of retrying or timing out the overview can fix it, because
+          // the overview had already succeeded.
+          //
+          // So each read gets its own ceiling and its own landing. Whatever
+          // arrives is applied at once; whatever does not is dropped on the
+          // floor by its own timer. Nothing here waits for anything else.
+          const foldersRead = withTimeout(invoke('folders'), READ_TIMEOUT_MS, 'folders')
+            .then((payload) => setFolders(Array.isArray(payload?.folders) ? payload.folders : []))
+            .catch(() => { /* an older host, or a read that failed: keep the folders on screen */ })
+          // Retry once: a single transient failure on a slow network used to
+          // leave the rail shimmering with no rows and no way to get them — the
+          // panel looked broken rather than busy. One quiet retry covers the
+          // dropped first attempt without doubling the cost of a host that
+          // genuinely lacks the method.
+          //
+          // ONE ceiling over the chain, not one per attempt: bounding each try
+          // separately makes the worst case the sum of them (two six-second
+          // waits), and the sum is exactly the case this exists for — a request
+          // that never answers, where the retry cannot help because the first
+          // one is still open. A single timer covers both attempts and the gap
+          // between them.
+          const overviewRead = withTimeout(invoke('overview').catch(() => invoke('overview')), OVERVIEW_TIMEOUT_MS, 'overview')
+            .then((payload) => {
+              openCache.overview = { key: identity, overview: payload, at: Date.now() }
+              setOverview(payload)
+            })
+            .catch(() => {
+              // Nothing arrived: stop pretending the rail is loading. An empty
+              // overview renders the three structural places and lets the nav
+              // fall out of its busy state, which is honest — the counts are
+              // unknown, but the rail is not stuck. A rail that kept claiming
+              // to be busy while the list underneath was already full is the
+              // shape of a hung panel, which is the one thing this file spends
+              // its length trying to avoid.
+              setOverview({ failed: true, sections: [], types: [], folderList: [], folderCount: 0, unfiled: 0 })
+            })
+          await Promise.all([foldersRead, overviewRead])
         },
         [invoke, readVault],
       )
@@ -6109,6 +6204,14 @@ const nextOffsetOf = (payload, fallback) => {
             navPlaceholders(t),
           )
         }
+        // The read failed and no retry is coming: the rail keeps its three
+        // structural places and stops claiming to be busy. Ghosts here would be
+        // a placeholder for something that is never going to arrive, which is
+        // the shape of a hung panel — the one thing this file spends its length
+        // trying to avoid.
+        if (overview.failed) {
+          return h('nav', { 'data-vw-nav': '', style: S.nav, 'aria-label': t('navSections') }, places)
+        }
         const types = overview.types ?? []
         if (types.length) {
           places.push(h('div', { key: 'g-types', 'data-vw-nav-group': 'types', style: S.navGroup }, `${t('sectionTypes')} (${types.length})`))
@@ -6145,7 +6248,7 @@ const nextOffsetOf = (payload, fallback) => {
       const refreshOverview = async () => {
         const identity = cacheKey(openCache.config?.config)
         try {
-          const payload = await invoke('overview')
+          const payload = await withTimeout(invoke('overview'), OVERVIEW_TIMEOUT_MS, 'overview')
           openCache.overview = { key: identity, overview: payload, at: Date.now() }
           setOverview(payload)
         } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vaultwarden",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Vaultwarden/Bitwarden real-time sync for DeepSeek Harness: WebSocket push notifications, on-disk vault cache with revision probing, read/write tools and an entry browser panel. Independent implementation; see THIRD-PARTY-NOTICES.md.",
   "repository": {
     "type": "git",