dsh-token-gauge 0.1.5 → 0.1.6

package/lib/client.mjs

@@ -946,23 +946,82 @@ var gaugeRef = (el) => {
 function GaugeTab() {
   return import_react.default.createElement("div", { ref: gaugeRef, className: "tg-tab-root" });
 }
+var GaugeIcon = (size) => {
+  const s = typeof size === "number" && size > 0 ? size : 16;
+  const svgProps = {
+    width: s,
+    height: s,
+    viewBox: "0 0 16 16",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg",
+    "aria-hidden": "true"
+  };
+  const arc = import_react.default.createElement("path", {
+    d: "M2.6 11.6a5.6 5.6 0 1 1 10.8 0",
+    stroke: "currentColor",
+    strokeWidth: 1.5,
+    strokeLinecap: "round"
+  });
+  const needle = import_react.default.createElement("path", {
+    d: "M8 11.6 10.4 7.2",
+    stroke: "currentColor",
+    strokeWidth: 1.5,
+    strokeLinecap: "round"
+  });
+  return import_react.default.createElement("svg", svgProps, arc, needle);
+};
+var TAB_ORDER = 90;
 var name = PLUGIN_ID;
 function apply(ctx) {
-  const disposeSidebar = ctx.inject(["betterSidebar"], (sidebarCtx) => {
-    const sidebar = sidebarCtx.betterSidebar;
-    if (!sidebar || typeof sidebar.registerTab !== "function") return;
-    const unregister = sidebar.registerTab({
-      id: PLUGIN_ID,
-      title: "Token \u4EEA\u8868\u76D8",
-      single: true,
-      component: GaugeTab
+  let registered = false;
+  let unregister = void 0;
+  const register = (sidebar) => {
+    if (registered || !sidebar || typeof sidebar.registerTab !== "function") return;
+    registered = true;
+    try {
+      unregister = sidebar.registerTab({
+        id: PLUGIN_ID,
+        title: "Token \u4EEA\u8868\u76D8",
+        single: true,
+        order: TAB_ORDER,
+        icon: GaugeIcon,
+        component: GaugeTab
+      });
+    } catch (e) {
+      registered = false;
+    }
+  };
+  let disposeInject = void 0;
+  try {
+    disposeInject = ctx.inject(["betterSidebar"], (sidebarCtx) => {
+      register(sidebarCtx && sidebarCtx.betterSidebar);
     });
-    return () => {
-      if (typeof unregister === "function") unregister();
-    };
-  });
+  } catch (e) {
+  }
+  const tryRead = () => {
+    if (registered) return;
+    try {
+      const s = typeof ctx.get === "function" ? ctx.get("betterSidebar") : ctx.betterSidebar;
+      register(s);
+    } catch (e) {
+    }
+  };
+  tryRead();
+  let timer = void 0;
+  if (!registered) {
+    timer = setInterval(() => {
+      tryRead();
+      if (registered && timer !== void 0) clearInterval(timer);
+    }, 500);
+  }
+  const stop = setTimeout(() => {
+    if (timer !== void 0) clearInterval(timer);
+  }, 3e4);
   return () => {
-    if (typeof disposeSidebar === "function") disposeSidebar();
+    if (timer !== void 0) clearInterval(timer);
+    clearTimeout(stop);
+    if (typeof unregister === "function") unregister();
+    if (typeof disposeInject === "function") disposeInject();
   };
 }
 ; return module.exports; } });

package/package.json

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

package/src/client.ts

@@ -203,6 +203,39 @@ function GaugeTab(): React.ReactElement {
   return React.createElement('div', { ref: gaugeRef, className: 'tg-tab-root' })
 }
 
+// 侧边栏图标：better-sidebar 以 `icon(size)` 形式调用（见其内置 tab：
+// `icon: (size) => jsx(Icon, { size })`），故这里接收数字尺寸。用 currentColor
+// 着色以自适应明暗主题，纯 SVG 零依赖。
+const GaugeIcon = (size?: number): any => {
+  const s = typeof size === 'number' && size > 0 ? size : 16
+  const svgProps: any = {
+    width: s,
+    height: s,
+    viewBox: '0 0 16 16',
+    fill: 'none',
+    xmlns: 'http://www.w3.org/2000/svg',
+    'aria-hidden': 'true',
+  }
+  // 仪表盘弧 + 指针
+  const arc = React.createElement('path', {
+    d: 'M2.6 11.6a5.6 5.6 0 1 1 10.8 0',
+    stroke: 'currentColor',
+    strokeWidth: 1.5,
+    strokeLinecap: 'round',
+  })
+  const needle = React.createElement('path', {
+    d: 'M8 11.6 10.4 7.2',
+    stroke: 'currentColor',
+    strokeWidth: 1.5,
+    strokeLinecap: 'round',
+  })
+  return React.createElement('svg', svgProps, arc, needle)
+}
+
+// 在「+ 新建 Tab」菜单里的排序位。内置 tab 用 20/91/110 等，order 缺省为 100
+// 会排到菜单最底部不易发现，这里显式给一个偏前的值。
+const TAB_ORDER = 90
+
 export const name = PLUGIN_ID
 
 // 兄弟 bundle 提供的服务（betterSidebar）在本机这个 cordis 里两种读法都不行，必须用
@@ -221,22 +254,66 @@ export const name = PLUGIN_ID
 // 合法属性，读它不触发守卫；且注册被延迟到服务就绪那一刻（兄弟 bundle 提供得早或晚
 // 都能注册上）。生态插件 @linxin666/dsh-client-ui-aionui-panel 用的正是这个模式。
 export function apply(ctx: any): (() => void) | void {
-  const disposeSidebar = ctx.inject(['betterSidebar'], (sidebarCtx: any) => {
-    const sidebar = sidebarCtx.betterSidebar
-    if (!sidebar || typeof sidebar.registerTab !== 'function') return
-    const unregister = sidebar.registerTab({
-      id: PLUGIN_ID,
-      title: 'Token 仪表盘',
-      single: true,
-      component: GaugeTab,
+  let registered = false
+  let unregister: unknown = void 0
+
+  // 注册一次即止（registerTab 对重复 id 会抛 "already registered"）
+  const register = (sidebar: any): void => {
+    if (registered || !sidebar || typeof sidebar.registerTab !== 'function') return
+    registered = true
+    try {
+      unregister = sidebar.registerTab({
+        id: PLUGIN_ID,
+        title: 'Token 仪表盘',
+        single: true,
+        order: TAB_ORDER,
+        icon: GaugeIcon,
+        component: GaugeTab,
+      })
+    } catch (e) {
+      registered = false // 失败则允许后续重试
+    }
+  }
+
+  // 主路径：ctx.inject 回调——服务就绪时触发，回调内读 sidebarCtx.betterSidebar 合法
+  let disposeInject: unknown = void 0
+  try {
+    disposeInject = ctx.inject(['betterSidebar'], (sidebarCtx: any) => {
+      register(sidebarCtx && sidebarCtx.betterSidebar)
     })
-    return () => {
-      if (typeof unregister === 'function') unregister()
+  } catch (e) {
+    /* 运行时无 ctx.inject：交由下面的轮询兜底 */
+  }
+
+  // 兜底：轮询读取。0811 严格注入下未声明 inject 时 ctx.get('betterSidebar')
+  // 会「抛异常」（而非返回 undefined），所以必须用 try/catch 包住读取。
+  const tryRead = (): void => {
+    if (registered) return
+    try {
+      const s = typeof ctx.get === 'function' ? ctx.get('betterSidebar') : ctx.betterSidebar
+      register(s)
+    } catch (e) {
+      /* 服务此刻不可达，下一轮再试 */
     }
-  })
+  }
+  tryRead()
+
+  let timer: unknown = void 0
+  if (!registered) {
+    timer = setInterval(() => {
+      tryRead()
+      if (registered && timer !== void 0) clearInterval(timer as number)
+    }, 500)
+  }
+  const stop = setTimeout(() => {
+    if (timer !== void 0) clearInterval(timer as number)
+  }, 30000)
 
-  // 返回插件级 disposer：卸载时一并撤掉未完成的注入
+  // 插件级 disposer
   return () => {
-    if (typeof disposeSidebar === 'function') disposeSidebar()
+    if (timer !== void 0) clearInterval(timer as number)
+    clearTimeout(stop)
+    if (typeof unregister === 'function') (unregister as () => void)()
+    if (typeof disposeInject === 'function') (disposeInject as () => void)()
   }
 }