dsh-token-gauge 0.1.9 → 0.1.10

package/lib/client.mjs

@@ -32,7 +32,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var client_exports = {};
 __export(client_exports, {
   apply: () => apply,
-  inject: () => inject,
   name: () => name
 });
 module.exports = __toCommonJS(client_exports);
@@ -1006,25 +1005,49 @@ var GaugeIcon = (size) => {
 };
 var TAB_ORDER = 90;
 var name = PLUGIN_ID;
-var inject = ["slots"];
+function findOurTab(snap) {
+  if (!snap) return null;
+  const trees = [snap.splits, snap.bottomSplits];
+  for (const tree of trees) {
+    if (!tree) continue;
+    const stack = [tree];
+    while (stack.length) {
+      const node = stack.pop();
+      if (!node) continue;
+      if (Array.isArray(node.tabs)) {
+        for (const t2 of node.tabs) if (t2 && t2.type === PLUGIN_ID) return t2;
+      }
+      if (Array.isArray(node.children)) stack.push(...node.children);
+      if (node.splits) stack.push(node.splits);
+      if (node.bottomSplits) stack.push(node.bottomSplits);
+    }
+  }
+  return null;
+}
 function apply(ctx) {
   let unregisterTab = null;
-  let overlayDispose = void 0;
-  let registeredViaBetter = false;
+  let mountedOverlay = false;
+  let slotsService = null;
   let fallbackTimer = void 0;
-  const tryMountOverlay = (reason) => {
-    if (registeredViaBetter || overlayDispose !== void 0) return;
+  let openTimer = null;
+  const stopSlots = ctx.inject(["slots"], (slotsCtx) => {
+    slotsService = slotsCtx.slots;
+  });
+  const mountOverlay = (reason) => {
+    if (mountedOverlay || unregisterTab) return;
+    if (!slotsService || typeof slotsService.register !== "function") return;
     console.warn(`[dsh-token-gauge] ${reason}\uFF0C\u4EEA\u8868\u76D8\u6539\u4E3A\u53F3\u4E0B\u89D2\u6D6E\u5C42\u663E\u793A\uFF08\u4ECD\u53EF\u7528\uFF09\u3002`);
     try {
-      overlayDispose = ctx.slots.register(
+      const d = slotsService.register(
         { name: "shell.overlay", id: PLUGIN_ID, order: 100, label: "Token \u4EEA\u8868\u76D8" },
         () => import_react.default.createElement(GaugePanel)
       );
+      if (typeof d === "function") mountedOverlay = true;
     } catch (e) {
       console.error("[dsh-token-gauge] \u6D6E\u5C42\u515C\u5E95\u4E5F\u5931\u8D25", e);
     }
   };
-  const disposeSidebar = ctx.inject(["betterSidebar"], (sidebarCtx) => {
+  const stopSidebar = ctx.inject(["betterSidebar"], (sidebarCtx) => {
     const sidebar = sidebarCtx.betterSidebar;
     if (!sidebar || typeof sidebar.registerTab !== "function") return;
     unregisterTab = sidebar.registerTab({
@@ -1035,25 +1058,41 @@ function apply(ctx) {
       icon: GaugeIcon,
       component: () => import_react.default.createElement(GaugeTab)
     });
-    registeredViaBetter = true;
     if (typeof fallbackTimer !== "undefined") clearTimeout(fallbackTimer);
-    try {
-      if (typeof sidebar.openTab === "function") sidebar.openTab({ type: PLUGIN_ID, single: true });
-    } catch (e) {
-    }
+    let attempts = 0;
+    openTimer = setInterval(() => {
+      attempts++;
+      const snap = sidebar.getSnapshot?.();
+      const sid = snap?.sessionId;
+      if (sid !== void 0 && typeof sidebar.openTab === "function") {
+        try {
+          sidebar.openTab({ type: PLUGIN_ID });
+        } catch {
+        }
+      }
+      if (sid !== void 0 && findOurTab(snap)) {
+        clearInterval(openTimer);
+        openTimer = null;
+        return;
+      }
+      if (attempts >= 45) {
+        clearInterval(openTimer);
+        openTimer = null;
+        mountOverlay("better-sidebar \u5DF2\u6CE8\u518C\u4F46\u4F1A\u8BDD\u59CB\u7EC8\u672A\u5C31\u7EEA");
+      }
+    }, 800);
     return () => {
       if (unregisterTab) unregisterTab();
     };
   });
   fallbackTimer = setTimeout(() => {
-    if (!registeredViaBetter) {
-      tryMountOverlay("\u672A\u53D6\u5F97 dsh-better-sidebar \u670D\u52A1\uFF08\u8BF7\u786E\u8BA4\u5176\u5DF2\u5B89\u88C5\u5E76\u542F\u7528\uFF09");
-    }
-  }, 3e4);
+    if (!unregisterTab) mountOverlay("\u672A\u53D6\u5F97 dsh-better-sidebar \u670D\u52A1\uFF08\u8BF7\u786E\u8BA4\u5176\u5DF2\u5B89\u88C5\u5E76\u542F\u7528\uFF09");
+  }, 8e3);
   return () => {
     if (typeof fallbackTimer !== "undefined") clearTimeout(fallbackTimer);
-    if (typeof disposeSidebar === "function") disposeSidebar();
-    if (typeof overlayDispose === "function") overlayDispose();
+    if (openTimer) clearInterval(openTimer);
+    if (typeof stopSidebar === "function") stopSidebar();
+    if (typeof stopSlots === "function") stopSlots();
   };
 }
 ; return module.exports; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-token-gauge",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "DSH 机车风格 Token 用量/费用仪表盘侧边栏插件（稳定版 0.1.1-rc.x 兼容）",
   "type": "module",
   "main": "lib/index.mjs",

package/src/client.ts

@@ -4,8 +4,9 @@
 // 通过同域 HTTP 与 Host 半边通信：
 //   GET  /plugins/dsh-token-gauge/state -> 完整 State(JSON)
 //   POST /plugins/dsh-token-gauge/cmd   -> {type,payload} -> 更新后 State
-// 优先把仪表盘注册到 dsh-better-sidebar 的右侧工作台 Tab（停靠侧边栏）；若 better-sidebar
-// 未就绪，回退到官方 shell.overlay 浮层（双模式，保证仪表盘永远可见）。
+// 优先把仪表盘注册到 dsh-better-sidebar 的右侧工作台 Tab（停靠侧边栏），注册后轮询
+// openTab 直到会话就绪并自动打开激活（解决“已挂载却未显示”：session 未就绪时 openTab
+// 会静默 no-op）；若 better-sidebar 始终不可用，回退到官方 shell.overlay 浮层兜底。
 // 为避免与运行时 React 产生双实例 hook 冲突，本组件不调用任何 hook，
 // 仅在 ref 回调里挂载一次原生 DOM 仪表盘，并自行轮询刷新。
 // ============================================================================
@@ -275,34 +276,61 @@ const TAB_ORDER = 90
 
 export const name = PLUGIN_ID
 
-// slots 是 layout 提供的框架级服务（root 早期即就绪），用于浮层兜底，可安全声明顶层 inject。
-// 注意：betterSidebar 是兄弟 bundle 提供的服务，不用顶层 inject（会触发 pending），改用
-// apply 内的 ctx.inject 软注入回调。
-export const inject = ['slots']
+// 不声明顶层 inject（避免 pending 导致插件加载失败）。better-sidebar（兄弟 bundle 服务）
+// 与 slots（框架级浮层服务）都用 apply 内的 ctx.inject 软注入回调按需获取。
+
+// 在 better-sidebar 快照里查找我们的 Tab 是否已打开（按 type 判定，single 单例）。
+function findOurTab(snap: any): any {
+  if (!snap) return null
+  const trees = [snap.splits, snap.bottomSplits]
+  for (const tree of trees) {
+    if (!tree) continue
+    const stack: any[] = [tree]
+    while (stack.length) {
+      const node = stack.pop()
+      if (!node) continue
+      if (Array.isArray(node.tabs)) {
+        for (const t of node.tabs) if (t && t.type === PLUGIN_ID) return t
+      }
+      if (Array.isArray(node.children)) stack.push(...node.children)
+      if (node.splits) stack.push(node.splits)
+      if (node.bottomSplits) stack.push(node.bottomSplits)
+    }
+  }
+  return null
+}
 
 export function apply(ctx: any): (() => void) | void {
   let unregisterTab: (() => void) | null = null
-  let overlayDispose: unknown = void 0
-  let registeredViaBetter = false
+  let mountedOverlay = false
+  let slotsService: any = null
   let fallbackTimer: any = void 0
+  let openTimer: any = null
+
+  // 取得框架级 slots（仅用于浮层兜底）。若平台不提供 slots，浮层兜底不可用，但侧边栏主路径不受影响。
+  const stopSlots = ctx.inject(['slots'], (slotsCtx: any) => {
+    slotsService = slotsCtx.slots
+  })
 
-  // 浮层兜底：把仪表盘挂到官方 shell.overlay（全程右下角 33vh），保证即使 better-sidebar
-  // 缺失/未启用，仪表盘也始终可见。
-  const tryMountOverlay = (reason: string): void => {
-    if (registeredViaBetter || overlayDispose !== void 0) return
+  // 浮层兜底：把仪表盘挂到官方 shell.overlay（右下角 33vh），仅当 better-sidebar 不可用或会话始终未就绪时。
+  const mountOverlay = (reason: string): void => {
+    if (mountedOverlay || unregisterTab) return // 已注册到侧边栏则不再叠加浮层
+    if (!slotsService || typeof slotsService.register !== 'function') return
     console.warn(`[dsh-token-gauge] ${reason}，仪表盘改为右下角浮层显示（仍可用）。`)
     try {
-      overlayDispose = ctx.slots.register(
+      const d = slotsService.register(
         { name: 'shell.overlay', id: PLUGIN_ID, order: 100, label: 'Token 仪表盘' },
         () => React.createElement(GaugePanel),
       )
+      if (typeof d === 'function') mountedOverlay = true
     } catch (e) {
       console.error('[dsh-token-gauge] 浮层兜底也失败', e)
     }
   }
 
-  // 主路径：注册到 better-sidebar 右侧工作台 Tab（停靠侧边栏，带图标、靠前排序）
-  const disposeSidebar = ctx.inject(['betterSidebar'], (sidebarCtx: any) => {
+  // 主路径：注册到 better-sidebar 右侧工作台 Tab（停靠侧边栏），并轮询 openTab 直到会话就绪，
+  // 让仪表盘自动打开并成为当前可见页（“已挂载但未显示”的根因是 session 未就绪时 openTab 静默 no-op）。
+  const stopSidebar = ctx.inject(['betterSidebar'], (sidebarCtx: any) => {
     const sidebar = sidebarCtx.betterSidebar
     if (!sidebar || typeof sidebar.registerTab !== 'function') return
     unregisterTab = sidebar.registerTab({
@@ -313,29 +341,46 @@ export function apply(ctx: any): (() => void) | void {
       icon: GaugeIcon,
       component: () => React.createElement(GaugeTab),
     })
-    registeredViaBetter = true
     if (typeof fallbackTimer !== 'undefined') clearTimeout(fallbackTimer)
-    // 会话就绪时尝试自动打开 Tab（未就绪会静默 no-op，用户也可从「+ 新建 Tab」菜单手动打开）
-    try {
-      if (typeof sidebar.openTab === 'function') sidebar.openTab({ type: PLUGIN_ID, single: true })
-    } catch (e) {
-      /* ignore */
-    }
+    let attempts = 0
+    openTimer = setInterval(() => {
+      attempts++
+      const snap = sidebar.getSnapshot?.()
+      const sid = snap?.sessionId
+      // session 已就绪才尝试打开（未就绪时 openTab 会静默 no-op）
+      if (sid !== undefined && typeof sidebar.openTab === 'function') {
+        try {
+          sidebar.openTab({ type: PLUGIN_ID })
+        } catch {
+          /* ignore */
+        }
+      }
+      if (sid !== undefined && findOurTab(snap)) {
+        clearInterval(openTimer)
+        openTimer = null
+        return
+      }
+      if (attempts >= 45) {
+        // 约 36s 仍未打开（极端：会话始终未建立）→ 浮层兜底，保证可见
+        clearInterval(openTimer)
+        openTimer = null
+        mountOverlay('better-sidebar 已注册但会话始终未就绪')
+      }
+    }, 800)
     return () => {
       if (unregisterTab) unregisterTab()
     }
   })
 
-  // 兜底：30s 内 better-sidebar 仍未就绪 → 浮层
+  // 兜底：8s 内 better-sidebar 仍未就绪 → 浮层
   fallbackTimer = setTimeout(() => {
-    if (!registeredViaBetter) {
-      tryMountOverlay('未取得 dsh-better-sidebar 服务（请确认其已安装并启用）')
-    }
-  }, 30000)
+    if (!unregisterTab) mountOverlay('未取得 dsh-better-sidebar 服务（请确认其已安装并启用）')
+  }, 8000)
 
   return () => {
     if (typeof fallbackTimer !== 'undefined') clearTimeout(fallbackTimer)
-    if (typeof disposeSidebar === 'function') (disposeSidebar as () => void)()
-    if (typeof overlayDispose === 'function') (overlayDispose as () => void)()
+    if (openTimer) clearInterval(openTimer)
+    if (typeof stopSidebar === 'function') stopSidebar()
+    if (typeof stopSlots === 'function') stopSlots()
   }
 }