dsh-token-gauge 0.1.3 → 0.1.4

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);
@@ -948,17 +947,32 @@ function GaugeTab() {
   return import_react.default.createElement("div", { ref: gaugeRef, className: "tg-tab-root" });
 }
 var name = PLUGIN_ID;
-var inject = ["betterSidebar"];
 function apply(ctx) {
-  if (!ctx.betterSidebar || typeof ctx.betterSidebar.registerTab !== "function") {
-    console.warn(`[${PLUGIN_ID}] ctx.betterSidebar \u4E0D\u53EF\u7528\uFF0C\u65E0\u6CD5\u6CE8\u518C\u4FA7\u8FB9\u680F Tab\uFF08\u8BF7\u786E\u8BA4 dsh-better-sidebar \u5DF2\u5B89\u88C5\u5E76\u5728 web profile \u4E2D\u542F\u7528\uFF09`);
-    return;
+  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);
+      });
+    }
   }
-  ctx.betterSidebar.registerTab({
-    id: PLUGIN_ID,
-    title: "Token \u4EEA\u8868\u76D8",
-    single: true,
-    component: GaugeTab
-  });
 }
 ; return module.exports; } });

package/package.json

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

package/src/client.ts

@@ -204,16 +204,38 @@ function GaugeTab(): React.ReactElement {
 }
 
 export const name = PLUGIN_ID
-export const inject = ['betterSidebar']
+// 注意：不要声明 `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 {
-  if (!ctx.betterSidebar || typeof ctx.betterSidebar.registerTab !== 'function') {
-    console.warn(`[${PLUGIN_ID}] ctx.betterSidebar 不可用，无法注册侧边栏 Tab（请确认 dsh-better-sidebar 已安装并在 web profile 中启用）`)
-    return
+  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,
+    })
+    return true
+  }
+  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)
+      })
+    }
   }
-  ctx.betterSidebar.registerTab({
-    id: PLUGIN_ID,
-    title: 'Token 仪表盘',
-    single: true,
-    component: GaugeTab,
-  })
 }