@guojinpeng/dsh-cost-meter 0.1.3 → 0.1.5

package/dist/index.js

@@ -1,9 +1,6 @@
 // src/index.js
-import { copyFileSync, existsSync, mkdirSync as mkdirSync2, readFileSync as readFileSync2, renameSync as renameSync2, statSync, writeFileSync as writeFileSync2 } from "fs";
-import { homedir } from "os";
-import { dirname as dirname2, join } from "path";
-import { z } from "zod";
-import { createHash } from "crypto";
+import { copyFileSync as copyFileSync2, existsSync as existsSync2 } from "fs";
+import { dirname as dirname3, join as join2 } from "path";
 
 // src/pricing.js
 var RATE_KEYS = ["input", "output", "cacheRead", "cacheWrite"];
@@ -119,7 +116,7 @@ function createHistoryModels(sessionQuery, { readConfig: readConfig2, writeConfi
       let missing;
       do {
         missing = Object.fromEntries([...models].filter(needsPrice).map((key) => [key, zeroRate()]));
-        if (!initializedOnce || Object.keys(missing).length) {
+        if (Object.keys(missing).length || !initializedOnce && !Object.keys(config.pricing).length) {
           initializedOnce = true;
           try {
             Object.assign(initialized, (await initializePrices({ ...config, pricing: missing })).config.pricing);
@@ -294,14 +291,10 @@ var PLUGIN_ID = "guojinpeng/dsh-cost-meter";
 var HTTP_BASE = "/guojinpeng/dsh-cost-meter";
 var PROJECTION_KEY = "guojinpengCostUsage";
 
-// src/index.js
-import { lastAssistantStreamChunk } from "@deepseek-ai/dsh-llm";
-import { deriveTurnTokenUsage } from "@deepseek-ai/dsh-token-meter/client";
-var inject = ["sessionProjections"];
-var name = PLUGIN_ID;
-var TURN_RETENTION = 200;
-var CONFIG_ROUTE = `${HTTP_BASE}/config`;
-var MAX_BODY_BYTES = 1024 * 1024;
+// src/server/config-store.js
+import { copyFileSync, existsSync, mkdirSync as mkdirSync2, readFileSync as readFileSync2, renameSync as renameSync2, statSync, writeFileSync as writeFileSync2 } from "fs";
+import { homedir } from "os";
+import { dirname as dirname2, join } from "path";
 var STAT_INTERVAL_MS = 1e3;
 var CONFIG_DIR_NAME = "dsh-cost-meter";
 var CONFIG_FILE_NAME = "config.json";
@@ -383,6 +376,84 @@ function seedConfigFile(logger) {
     );
   }
 }
+
+// src/server/projection.js
+import { deriveTurnTokenUsage } from "@deepseek-ai/dsh-token-meter/client";
+
+// src/server/schemas.js
+import { z } from "zod";
+var int = z.number().int().nonnegative();
+var bucketSchema = z.object({
+  uncachedInputTokens: int,
+  outputTokens: int,
+  cacheReadTokens: int,
+  cacheWriteTokens: int
+}).strict();
+var routeSchema = z.object({ provider: z.string(), model: z.string() }).strict();
+var lastSlotSchema = z.object({ turn: int, step: int, buckets: bucketSchema, route: routeSchema.nullable() }).strict();
+var turnRecordSchema = z.object({
+  totalTokens: int,
+  tokens: bucketSchema,
+  byRoute: z.record(z.string(), bucketSchema),
+  recovered: z.boolean()
+}).strict();
+var stateSchema = z.object({
+  totals: bucketSchema,
+  byRoute: z.record(z.string(), bucketSchema),
+  last: lastSlotSchema.nullable(),
+  buffer: z.array(z.any()),
+  bufferTurn: z.number().int().nullable(),
+  turns: z.record(z.string(), turnRecordSchema),
+  skippedTurns: int
+}).strict();
+var wireTokensSchema = z.object({ input: int, output: int, read: int, write: int }).strict();
+var wireTurnSchema = z.object({
+  micros: int,
+  totalTokens: int,
+  route: z.string(),
+  tokens: wireTokensSchema,
+  bucketMicros: wireTokensSchema,
+  priced: z.boolean(),
+  recovered: z.boolean()
+}).strict();
+var wireRouteSchema = z.object({ route: z.string(), micros: int, totalTokens: int, priced: z.boolean() }).strict();
+var viewSchema = z.object({
+  accounting: z.object({
+    totals: bucketSchema,
+    byRoute: z.record(z.string(), bucketSchema),
+    turns: z.record(z.string(), turnRecordSchema),
+    skippedTurns: int
+  }).strict(),
+  currency: z.string(),
+  cnyPerUsd: z.number(),
+  totalMicros: int,
+  totalTokens: int,
+  tokens: wireTokensSchema,
+  bucketMicros: wireTokensSchema,
+  cacheHitPct: z.number().nullable(),
+  skippedTurns: int,
+  unpricedTokens: int,
+  showDock: z.boolean(),
+  showTurn: z.boolean(),
+  routes: z.array(wireRouteSchema),
+  turns: z.record(z.string(), wireTurnSchema)
+}).strict();
+var rateSchema = z.object({
+  input: z.number().nonnegative(),
+  output: z.number().nonnegative(),
+  cacheRead: z.number().nonnegative(),
+  cacheWrite: z.number().nonnegative()
+}).strict();
+var configInputSchema = z.object({
+  currency: z.enum(["USD", "CNY"]),
+  cnyPerUsd: z.number().positive(),
+  showDockChip: z.boolean(),
+  showTurnChip: z.boolean(),
+  pricing: z.record(z.string(), rateSchema)
+}).strict();
+
+// src/server/usage-events.js
+import { lastAssistantStreamChunk } from "@deepseek-ai/dsh-llm";
 function zeroBuckets() {
   return { uncachedInputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 };
 }
@@ -471,62 +542,34 @@ function compactEvent(event) {
   if (sample !== void 0) compact.stream = [{ type: "chunk", chunk: { type: "usage", usage: sample } }];
   return { type, data: compact };
 }
-var int = z.number().int().nonnegative();
-var bucketSchema = z.object({
-  uncachedInputTokens: int,
-  outputTokens: int,
-  cacheReadTokens: int,
-  cacheWriteTokens: int
-}).strict();
-var routeSchema = z.object({ provider: z.string(), model: z.string() }).strict();
-var lastSlotSchema = z.object({ turn: int, step: int, buckets: bucketSchema, route: routeSchema.nullable() }).strict();
-var turnRecordSchema = z.object({
-  totalTokens: int,
-  tokens: bucketSchema,
-  byRoute: z.record(z.string(), bucketSchema),
-  recovered: z.boolean()
-}).strict();
-var stateSchema = z.object({
-  totals: bucketSchema,
-  byRoute: z.record(z.string(), bucketSchema),
-  last: lastSlotSchema.nullable(),
-  buffer: z.array(z.any()),
-  bufferTurn: z.number().int().nullable(),
-  turns: z.record(z.string(), turnRecordSchema),
-  skippedTurns: int
-}).strict();
-var wireTokensSchema = z.object({ input: int, output: int, read: int, write: int }).strict();
-var wireTurnSchema = z.object({
-  micros: int,
-  totalTokens: int,
-  route: z.string(),
-  tokens: wireTokensSchema,
-  bucketMicros: wireTokensSchema,
-  priced: z.boolean(),
-  recovered: z.boolean()
-}).strict();
-var wireRouteSchema = z.object({ route: z.string(), micros: int, totalTokens: int, priced: z.boolean() }).strict();
-var viewSchema = z.object({
-  accounting: z.object({
-    totals: bucketSchema,
-    byRoute: z.record(z.string(), bucketSchema),
-    turns: z.record(z.string(), turnRecordSchema),
-    skippedTurns: int
-  }).strict(),
-  currency: z.string(),
-  cnyPerUsd: z.number(),
-  totalMicros: int,
-  totalTokens: int,
-  tokens: wireTokensSchema,
-  bucketMicros: wireTokensSchema,
-  cacheHitPct: z.number().nullable(),
-  skippedTurns: int,
-  unpricedTokens: int,
-  showDock: z.boolean(),
-  showTurn: z.boolean(),
-  routes: z.array(wireRouteSchema),
-  turns: z.record(z.string(), wireTurnSchema)
-}).strict();
+function recoverBuckets(aggregate) {
+  const input = aggregate.uncachedInputTokens;
+  const output = aggregate.outputTokens;
+  const prompt = Math.max(0, aggregate.totalTokens - output);
+  let read = typeof aggregate.cacheReadTokens === "number" ? aggregate.cacheReadTokens : null;
+  let write = typeof aggregate.cacheWriteTokens === "number" ? aggregate.cacheWriteTokens : null;
+  const recovered = read === null || write === null;
+  if (read === null && write === null) {
+    read = Math.max(0, prompt - input);
+    write = 0;
+  } else if (read === null) {
+    read = Math.max(0, prompt - input - write);
+  } else if (write === null) {
+    write = Math.max(0, prompt - input - read);
+  }
+  return {
+    buckets: {
+      uncachedInputTokens: input,
+      outputTokens: output,
+      cacheReadTokens: read,
+      cacheWriteTokens: write
+    },
+    recovered
+  };
+}
+
+// src/server/projection.js
+var TURN_RETENTION = 200;
 function initialState() {
   return {
     totals: zeroBuckets(),
@@ -597,31 +640,6 @@ function applySample(state, event) {
     last: { turn, step, buckets, route: nextRoute }
   };
 }
-function recoverBuckets(aggregate) {
-  const input = aggregate.uncachedInputTokens;
-  const output = aggregate.outputTokens;
-  const prompt = Math.max(0, aggregate.totalTokens - output);
-  let read = typeof aggregate.cacheReadTokens === "number" ? aggregate.cacheReadTokens : null;
-  let write = typeof aggregate.cacheWriteTokens === "number" ? aggregate.cacheWriteTokens : null;
-  const recovered = read === null || write === null;
-  if (read === null && write === null) {
-    read = Math.max(0, prompt - input);
-    write = 0;
-  } else if (read === null) {
-    read = Math.max(0, prompt - input - write);
-  } else if (write === null) {
-    write = Math.max(0, prompt - input - read);
-  }
-  return {
-    buckets: {
-      uncachedInputTokens: input,
-      outputTokens: output,
-      cacheReadTokens: read,
-      cacheWriteTokens: write
-    },
-    recovered
-  };
-}
 function turnBucketsByRoute(events) {
   var _a;
   let byRoute = {};
@@ -725,6 +743,11 @@ function createCostUsageProjection(readResolvedConfig = readConfig) {
 function configSignature(config) {
   return JSON.stringify([config.currency, config.cnyPerUsd, config.showDockChip, config.showTurnChip, config.pricing]);
 }
+
+// src/server/config-handler.js
+import { createHash } from "crypto";
+import { z as z2 } from "zod";
+var MAX_BODY_BYTES = 1024 * 1024;
 function respond(res, status, payload) {
   res.writeHead(status, {
     "content-type": "application/json; charset=utf-8",
@@ -749,19 +772,6 @@ function readBody(req, limit) {
   });
 }
 var revisionOf = (config) => createHash("sha256").update(JSON.stringify(config)).digest("hex");
-var rateSchema = z.object({
-  input: z.number().nonnegative(),
-  output: z.number().nonnegative(),
-  cacheRead: z.number().nonnegative(),
-  cacheWrite: z.number().nonnegative()
-}).strict();
-var configInputSchema = z.object({
-  currency: z.enum(["USD", "CNY"]),
-  cnyPerUsd: z.number().positive(),
-  showDockChip: z.boolean(),
-  showTurnChip: z.boolean(),
-  pricing: z.record(z.string(), rateSchema)
-}).strict();
 async function configPayload(history) {
   const config = await history.config();
   return { config, models: history.list(), revision: revisionOf(config), path: CONFIG_PATH };
@@ -813,18 +823,23 @@ function createConfigHandler(connection, history, prices = createModelsDev()) {
         history.save(next);
         respond(res, 200, { ...await configPayload(history), ...report ? { report } : {} });
       } catch (error) {
-        respond(res, error instanceof z.ZodError ? 400 : 502, { error: error.message });
+        respond(res, error instanceof z2.ZodError ? 400 : 502, { error: error.message });
       }
       return;
     }
     respond(res, 405, { error: "method not allowed" });
   };
 }
+
+// src/index.js
+var inject = ["sessionProjections"];
+var name = PLUGIN_ID;
+var CONFIG_ROUTE = `${HTTP_BASE}/config`;
 function apply(ctx) {
   seedConfigFile(ctx.logger);
   ctx.sessionProjections.register(createCostUsageProjection());
   ctx.inject(["sessionQuery"], (queryCtx) => {
-    const prices = createModelsDev(void 0, join(dirname2(CONFIG_PATH), "data", "models.dev.json"));
+    const prices = createModelsDev(void 0, join2(dirname3(CONFIG_PATH), "data", "models.dev.json"));
     const history = createHistoryModels(queryCtx.sessionQuery, {
       readConfig,
       writeConfig,
@@ -835,7 +850,7 @@ function apply(ctx) {
       },
       backupConfig: () => {
         const backup = `${CONFIG_PATH}.v0.1.1.bak`;
-        if (existsSync(CONFIG_PATH) && !existsSync(backup)) copyFileSync(CONFIG_PATH, backup);
+        if (existsSync2(CONFIG_PATH) && !existsSync2(backup)) copyFileSync2(CONFIG_PATH, backup);
       }
     });
     queryCtx.on("session/event", (_session, event) => {
@@ -851,7 +866,10 @@ function apply(ctx) {
     queryCtx.inject(["webServer", "connection"], (webCtx) => {
       const handler = createConfigHandler(webCtx.connection, history, prices);
       for (const path of [CONFIG_ROUTE, `${HTTP_BASE}/pricing/sync`]) {
-        webCtx.effect(() => webCtx.webServer.register({ kind: "exact", path, handler }), `guojinpeng/dsh-cost-meter: ${path}`);
+        webCtx.effect(
+          () => webCtx.webServer.register({ kind: "exact", path, handler }),
+          `guojinpeng/dsh-cost-meter: ${path}`
+        );
       }
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guojinpeng/dsh-cost-meter",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "description": "DSH 会话和每轮费用估算插件，支持 models.dev 价格同步与自定义模型单价。配置位于 ~/.dsh/guojinpeng/dsh-cost-meter/config.json。",
   "license": "MIT",
@@ -33,9 +33,9 @@
     "cordis.patch.yml"
   ],
   "scripts": {
-    "build": "tsup src/index.js src/client.js --format esm --out-dir dist --clean --no-splitting",
+    "build": "tsup src/index.js src/client.js --format esm --out-dir dist --clean --no-splitting --loader .css=text",
     "prepack": "npm run build",
-    "pack:release": "node scripts/pack-release.js",
+    "pack:release": "npm pack",
     "test": "node --test tests/*.test.js"
   },
   "dsh": {