dsh-token-gauge 0.1.4 → 0.1.6

package/lib/client.mjs

@@ -946,33 +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) {
-  let disposed = false;
-  const getSidebar = () => (typeof ctx.get === "function" ? ctx.get("betterSidebar") : void 0) || ctx.betterSidebar;
-  const tryRegister = () => {
-    if (disposed) return true;
-    const sidebar = getSidebar();
-    if (!sidebar || typeof sidebar.registerTab !== "function") return false;
-    sidebar.registerTab({
-      id: PLUGIN_ID,
-      title: "Token \u4EEA\u8868\u76D8",
-      single: true,
-      component: GaugeTab
-    });
-    return true;
-  };
-  if (!tryRegister()) {
-    const timer = setInterval(() => {
-      if (tryRegister()) clearInterval(timer);
-    }, 200);
-    setTimeout(() => clearInterval(timer), 15e3);
-    if (typeof ctx.on === "function") {
-      ctx.on("dispose", () => {
-        disposed = true;
-        clearInterval(timer);
+  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);
+    });
+  } 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 (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.4",
+  "version": "0.1.6",
   "description": "DSH 机车风格 Token 用量/费用仪表盘侧边栏插件（稳定版 0.1.1-rc.x 兼容）",
   "type": "module",
   "main": "lib/index.mjs",

package/src/client.ts

@@ -203,39 +203,117 @@ 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
-// 注意：不要声明 `inject: ['betterSidebar']`。
-// 在本机这个 DSH cordis 启动里，兄弟 bundle 通过 ctx.provide 提供的服务在单趟
-// boot 的激活检查点（assertEntriesActivated）之前不会被注入，导致插件被永久 defer
-// 在 pending（"waiting for service: betterSidebar"）。改为在 apply 内直接
-// ctx.get('betterSidebar') 取服务——bundles 顺序保证 better-sidebar 在本插件之前
-// apply，服务此时已在全局注册表中。再加短轮询兜底防顺序抖动。
-export function apply(ctx: any): void {
-  let disposed = false
-  const getSidebar = () =>
-    (typeof ctx.get === 'function' ? ctx.get('betterSidebar') : void 0) || ctx.betterSidebar
-  const tryRegister = (): boolean => {
-    if (disposed) return true
-    const sidebar = getSidebar()
-    if (!sidebar || typeof sidebar.registerTab !== 'function') return false
-    sidebar.registerTab({
-      id: PLUGIN_ID,
-      title: 'Token 仪表盘',
-      single: true,
-      component: GaugeTab,
+
+// 兄弟 bundle 提供的服务（betterSidebar）在本机这个 cordis 里两种读法都不行，必须用
+// ctx.inject 回调模式。原因（已实测坐实，见本文件末尾注释与 dsh-plugin-guide 官方
+// postmortem）：
+//   1) 插件级 `export const inject = ['betterSidebar']`
+//      -> cordis 把整插件 defer，单趟 boot 的 assertEntriesActivated 检查点在
+//         loader.await() 后跑，此时兄弟 bundle 的 provide 还没落到本 fiber，
+//         直接判 "pending (waiting for service: betterSidebar)"（0.1.3 实测）。
+//   2) apply 顶层 `ctx.get('betterSidebar')` 或 `ctx.betterSidebar`
+//      -> 0811 cordis 是「严格注入」：未声明 inject 直接读服务属性，走 ancestor-only
+//         fiber 遍历到 root 找不到就抛
+//         "cannot get property betterSidebar without inject"（0.1.4 实测）。
+// 正确姿势：插件级不声明任何 inject（插件立即激活，不 pending），改用
+// ctx.inject(['betterSidebar'], cb) —— 回调拿到的子上下文里 betterSidebar 是已注入的
+// 合法属性，读它不触发守卫；且注册被延迟到服务就绪那一刻（兄弟 bundle 提供得早或晚
+// 都能注册上）。生态插件 @linxin666/dsh-client-ui-aionui-panel 用的正是这个模式。
+export function apply(ctx: any): (() => void) | void {
+  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 true
+  } catch (e) {
+    /* 运行时无 ctx.inject：交由下面的轮询兜底 */
   }
-  if (!tryRegister()) {
-    const timer = setInterval(() => {
-      if (tryRegister()) clearInterval(timer)
-    }, 200)
-    setTimeout(() => clearInterval(timer), 15000)
-    if (typeof ctx.on === 'function') {
-      ctx.on('dispose', () => {
-        disposed = true
-        clearInterval(timer)
-      })
+
+  // 兜底：轮询读取。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
+  return () => {
+    if (timer !== void 0) clearInterval(timer as number)
+    clearTimeout(stop)
+    if (typeof unregister === 'function') (unregister as () => void)()
+    if (typeof disposeInject === 'function') (disposeInject as () => void)()
+  }
 }