dsh-plugin-usage 0.1.0 → 0.1.1

package/lib/client/index.js

@@ -1,6 +1,9 @@
 // Auto-generated module entry wrapping the shared client body
 // (source: src/client/index.js). Do not edit directly.
-export function apply(ctx) {
+// The shared body returns a plugin descriptor ({ inject, apply }) for the
+// dynamic-plugin runner; the static composition loader calls module apply()
+// directly, so this entry unwraps the descriptor and runs its apply.
+const _usagePlugin = (() => {
 // ============================================================================
 // Token 用量统计 — settings.section Client UI（纯 JS，动态插件沙箱）
 // 可用全局：React / ctx / styles / host / console；浏览器全局 Date / Intl 等。
@@ -960,7 +963,28 @@ const CSS = `
   font-size: 10px;
   color: var(--dsw-alias-label-tertiary);
 }
-`;
+`
+
+// RPC bridge: dynamic-plugin runs provide a `host` global; static (bundle)
+// installs provide ctx.get('connection').rpc. Keep one UI source for both.
+function hostCall(method, args) {
+  if (typeof host !== 'undefined' && host && typeof host.call === 'function') {
+    return Promise.resolve(host.call(method, args))
+  }
+  const connection = ctx.get('connection')
+  if (connection === undefined || connection.rpc === undefined) {
+    return Promise.reject(new Error('connection service unavailable'))
+  }
+  const name = String(method)
+  const slash = name.indexOf('/')
+  const channel = slash === -1 ? name : name.slice(0, slash)
+  const endpoint = slash === -1 ? name : name.slice(slash + 1)
+  return connection.rpc.call('/' + channel.replace(/^\/+/, ''), endpoint, args).then((res) => {
+    if (res && res.ok) return res.value
+    throw new Error((res && res.error && res.error.message) || ('RPC ' + method + ' failed'))
+  })
+}
+;
 const h = React.createElement
 
 /* ---------------------------------------------------------------------------
@@ -2098,7 +2122,7 @@ function StatsDashboard(props) {
   React.useEffect(() => {
     let current = true
     setStatus((s) => (s === 'ready' && data !== null ? 'refreshing' : 'loading'))
-    host.call('usage/query', {
+    hostCall('usage/query', {
       from: eff.from,
       to: eff.to,
       models: models.slice(),
@@ -2123,7 +2147,7 @@ function StatsDashboard(props) {
   // 价格表：进入页面拉一次 + 每次刷新同步
   React.useEffect(() => {
     let current = true
-    host.call('usage/prices').then((p) => {
+    hostCall('usage/prices').then((p) => {
       if (current && p && p.prices) setPrices(p)
     }, () => {})
     return () => { current = false }
@@ -2193,7 +2217,18 @@ function StatsDashboard(props) {
  * 注册：settings.section 页面
  * ------------------------------------------------------------------------- */
 function apply(ctx) {
-  ctx.effect(() => styles.insert(CSS), 'usage: styles')
+  ctx.effect(() => {
+    if (typeof styles !== 'undefined' && styles && typeof styles.insert === 'function') {
+      return styles.insert(CSS)
+    }
+    if (typeof document !== 'undefined') {
+      const el = document.createElement('style')
+      el.setAttribute('data-plugin', 'dsh-plugin-usage')
+      el.textContent = CSS
+      document.head.appendChild(el)
+      return () => { el.remove() }
+    }
+  }, 'usage: styles')
   ctx.effect(() => ctx.locale.register(NS, { zh: ZH, en: EN }), 'usage: dictionaries')
   const t0 = ctx.locale ? ctx.locale.bind(NS) : fallbackT
   const slots = ctx.get('slots')
@@ -2206,4 +2241,8 @@ function apply(ctx) {
 
 return { inject: ['locale'], apply }
 
+})();
+export const inject = _usagePlugin.inject ?? [];
+export function apply(ctx) {
+  return _usagePlugin.apply(ctx);
 }

package/lib/host/index.js

@@ -351,50 +351,75 @@ export function apply(ctx) {
         };
     }
     // ------------------------------------------------------------------- RPC
-    harness.handle(RPC_QUERY, (args) => query(args || {}));
-    harness.handle(RPC_PRICES, (args) => {
-        const incoming = (args && args.prices) || null;
-        if (incoming && typeof incoming === 'object') {
-            for (const [model, p] of Object.entries(incoming)) {
-                if (p && typeof p === 'object') {
-                    prices[model] = {
-                        inputPerM: Number(p.inputPerM) || 0,
-                        outputPerM: Number(p.outputPerM) || 0,
-                        cacheReadPerM: Number(p.cacheReadPerM) || 0,
-                        cacheWritePerM: Number(p.cacheWritePerM) || 0,
-                    };
+    // Static (bundle) installs expose the generic Connection RPC bridge (the
+    // browser half calls `connection.rpc.call('/usage', endpoint, args)`);
+    // dynamic-plugin runs expose `harness` directly. Support both from one file.
+    const usageHandlers = new Map();
+    const usageHarness = (() => {
+        if (typeof harness !== 'undefined' && harness && typeof harness.handle === 'function')
+            return harness;
+        const connection = ctx.get('connection');
+        if (connection === undefined || connection.rpc === undefined)
+            return null;
+        connection.rpc.handle('/usage', (endpoint, args) => {
+            const fn = usageHandlers.get(endpoint);
+            if (fn === undefined)
+                return { ok: false, error: `unknown endpoint: ${endpoint}` };
+            return fn(args);
+        }, { authority: 'loopback' });
+        return {
+            handle(method, fn) {
+                const name = String(method);
+                usageHandlers.set(name.indexOf('/') === -1 ? name : name.slice(name.indexOf('/') + 1), fn);
+            },
+        };
+    })();
+    if (usageHarness !== null) {
+        usageHarness.handle(RPC_QUERY, (args) => query(args || {}));
+        usageHarness.handle(RPC_PRICES, (args) => {
+            const incoming = (args && args.prices) || null;
+            if (incoming && typeof incoming === 'object') {
+                for (const [model, p] of Object.entries(incoming)) {
+                    if (p && typeof p === 'object') {
+                        prices[model] = {
+                            inputPerM: Number(p.inputPerM) || 0,
+                            outputPerM: Number(p.outputPerM) || 0,
+                            cacheReadPerM: Number(p.cacheReadPerM) || 0,
+                            cacheWritePerM: Number(p.cacheWritePerM) || 0,
+                        };
+                    }
                 }
             }
-        }
-        if (args && typeof args.currency === 'string')
-            currency = args.currency;
-        return { prices: Object.assign({}, prices), currency };
-    });
-    // ------------------------------------------------- client source loader
-    // The full dashboard UI lives in src/client/index.js (single source of
-    // truth). A dynamic plugin cannot import files, so the host reads the file
-    // and serves it to the browser half, which evaluates it with new Function.
-    const CLIENT_SOURCE_CANDIDATES = [
-        '/Users/ruanbw/projects/usage/src/client/index.js',
-        '/Users/ruanbw/projects/usage/lib/client/index.js',
-    ];
-    harness.handle('usage/client-source', async () => {
-        const fs = ctx.get('fs');
-        if (fs === undefined)
-            return { ok: false, error: 'fs service unavailable' };
-        for (const p of CLIENT_SOURCE_CANDIDATES) {
-            try {
-                const target = await fs.resolve(p);
-                const body = await fs.readText(target);
-                if (typeof body === 'string' && body.length > 0)
-                    return { ok: true, body };
-            }
-            catch (error) {
-                // try the next candidate
+            if (args && typeof args.currency === 'string')
+                currency = args.currency;
+            return { prices: Object.assign({}, prices), currency };
+        });
+        // ------------------------------------------------- client source loader
+        // The full dashboard UI lives in src/client/index.js (single source of
+        // truth). A dynamic plugin cannot import files, so the host reads the file
+        // and serves it to the browser half, which evaluates it with new Function.
+        const CLIENT_SOURCE_CANDIDATES = [
+            '/Users/ruanbw/projects/usage/src/client/index.js',
+            '/Users/ruanbw/projects/usage/lib/client/index.js',
+        ];
+        usageHarness.handle('usage/client-source', async () => {
+            const fs = ctx.get('fs');
+            if (fs === undefined)
+                return { ok: false, error: 'fs service unavailable' };
+            for (const p of CLIENT_SOURCE_CANDIDATES) {
+                try {
+                    const target = await fs.resolve(p);
+                    const body = await fs.readText(target);
+                    if (typeof body === 'string' && body.length > 0)
+                        return { ok: true, body };
+                }
+                catch (error) {
+                    // try the next candidate
+                }
             }
-        }
-        return { ok: false, error: 'client source not found (tried: ' + CLIENT_SOURCE_CANDIDATES.join(', ') + ')' };
-    });
+            return { ok: false, error: 'client source not found (tried: ' + CLIENT_SOURCE_CANDIDATES.join(', ') + ')' };
+        });
+    }
     // ---------------------------------------------------------------- startup
     runBackfill();
     // Live sessions every tick; persisted sessions on a slow cadence to keep

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-usage",
   "description": "Token usage statistics for DeepSeek Harness — daily/custom-range views, model filters, call counts and cost, inspired by CC Switch statistics.",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "MIT",
   "repository": {
     "type": "git",