@dijkspicy/opencode-stats-reporter 0.1.0 → 0.1.1

package/README.md

@@ -20,10 +20,11 @@
 
 ```bash
 npm i -g @dijkspicy/opencode-stats-reporter
-opencode-stats-reporter config set --gateway https://<你的网关> --key <你的 API Key>
 opencode-stats-reporter web start          # 打开 http://127.0.0.1:8787
 ```
 
+- **无需单独填网关和 Key**：默认自动从 opencode 配置读取——取所选模型对应 provider 的 `options.baseURL` / `options.apiKey`（Key 不在配置里时回退到 opencode 凭据存储 `auth.json`）；也可显式覆盖：`opencode-stats-reporter config set --gateway <url> --key <key>`，或环境变量 `OPENCODE_STATS_GATEWAY` / `OPENCODE_STATS_API_KEY`（优先级：本工具配置 > 环境变量 > opencode 推导）；
+
 - 本地服务同时做三件事：托管静态面板、把 `/v1/usage/*` 与 `/v1/models` **反代**到你的网关（Key 只保存在服务端）、并在本地 SQLite 存储会话用量；
 - 浏览器只与 `localhost` 通信，因此**没有 CORS 问题，上游 Key 也不会进入浏览器**；
 - 会话上报插件，**推荐用 opencode 自带的插件命令安装**（走 npm，随包更新）：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dijkspicy/opencode-stats-reporter",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "本地一体化 MaaS 用量看板：托管静态面板、反代用量接口、本地存储会话用量",
   "type": "module",
   "main": "./contrib/opencode-session-reporter/plugin-server.ts",
@@ -26,5 +26,9 @@
   "scripts": {
     "test": "node --test test/*.test.js"
   },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
   "license": "Apache-2.0"
 }

package/src/cli.js

@@ -2,6 +2,7 @@ import fs from "node:fs"
 import path from "node:path"
 import { spawn } from "node:child_process"
 import { readConfig, setConfig, maskKey } from "./config.js"
+import { resolveGateway } from "./opencode-config.js"
 import { dbFile, panelDir, pluginSource, opencodePluginsDir, PKG_ROOT } from "./paths.js"
 import { Store } from "./store.js"
 import { createServer } from "./server.js"
@@ -63,8 +64,14 @@ function cmdConfig(argv) {
   }
   if (sub === "get") {
     const cfg = readConfig()
-    console.log("gatewayBaseUrl: " + (cfg.gatewayBaseUrl || "(未设置)"))
-    console.log("apiKey: " + maskKey(cfg.apiKey))
+    console.log("显式配置 gatewayBaseUrl: " + (cfg.gatewayBaseUrl || "(未设置)"))
+    console.log("显式配置 apiKey: " + maskKey(cfg.apiKey))
+    const r = resolveGateway({ fileConfig: cfg })
+    if (r.ok) {
+      console.log("生效网关: " + r.config.gatewayBaseUrl + "（来源: " + r.source + (r.providerId ? "，provider=" + r.providerId : "") + "）")
+    } else {
+      console.log("生效网关: (未能解析，请先 `config set` 或确保 opencode 配置含 provider baseURL/apiKey)")
+    }
     return
   }
   throw new Error("用法: opencode-stats-reporter config set|get")
@@ -74,10 +81,17 @@ async function cmdWeb(argv) {
   const sub = argv[0]
   if (sub !== "start") throw new Error("用法: opencode-stats-reporter web start")
   const flags = parseFlags(argv.slice(1))
-  const cfg = readConfig()
-  if (!cfg.gatewayBaseUrl || !cfg.apiKey) {
-    throw new Error("尚未配置上游网关，请先运行: opencode-stats-reporter config set --gateway <url> --key <key>")
+  // 上游配置：显式 config.json > 环境变量 > 从 opencode 配置推导（无需手填）
+  const resolved = resolveGateway({ fileConfig: readConfig() })
+  if (!resolved.ok) {
+    throw new Error(
+      "未能确定上游网关。请任选其一：\n" +
+      "  a) 直接使用 opencode 配置（确保 opencode 里某个 provider 有 baseURL 与 apiKey）\n" +
+      "  b) 显式配置: opencode-stats-reporter config set --gateway <url> --key <key>\n" +
+      "  c) 环境变量: OPENCODE_STATS_GATEWAY / OPENCODE_STATS_API_KEY",
+    )
   }
+  const cfg = resolved.config
   const port = Number(flags.port || DEFAULT_PORT)
   const host = String(flags.host || DEFAULT_HOST)
   const mode = String(flags.mode || process.env.SESSION_USAGE_MODE || "local")
@@ -95,7 +109,8 @@ async function cmdWeb(argv) {
 
   const url = `http://${host === "0.0.0.0" ? "127.0.0.1" : host}:${port}`
   console.log("本地看板已启动: " + url)
-  console.log("上游网关: " + cfg.gatewayBaseUrl)
+  console.log("上游网关: " + cfg.gatewayBaseUrl + "（来源: " + resolved.source +
+    (resolved.providerId ? "，provider=" + resolved.providerId : "") + "）")
   console.log("数据文件: " + dbFile())
   if (!loopback) console.warn("警告: 正在监听非回环地址 " + host + "，本机网络内可访问，请自行确认风险")
   if (flags.open) openBrowser(url)

package/src/opencode-config.js

@@ -0,0 +1,175 @@
+/**
+ * 从 opencode 自身配置推导上游网关与凭据，免去重复配置。
+ *
+ * 来源与优先级（后者仅在前者缺失时生效）：
+ *   1. 本工具显式配置（`config set` 写入的 config.json）
+ *   2. 环境变量覆盖：OPENCODE_STATS_GATEWAY / OPENCODE_STATS_API_KEY
+ *   3. opencode 配置：provider.<default>.options.baseURL + options.apiKey
+ *   4. opencode 凭据：<data>/opencode/auth.json 的 <provider>.key
+ *
+ * 注意：opencode 的 baseURL 指向 OpenAI 兼容根（形如 `https://host/v1`），
+ * 而本服务的面板按 `/v1/usage/*` 取路径，故推导网关根时需去掉末尾的 `/v1`。
+ */
+import fs from "node:fs"
+import os from "node:os"
+import path from "node:path"
+
+/** 字符串感知的 JSONC 去注释 + 去尾逗号，避免误伤 `https://` 里的 `//` */
+export function stripJsonc(text) {
+  let out = ""
+  let inStr = false
+  let quote = ""
+  for (let i = 0; i < text.length; i++) {
+    const c = text[i]
+    const next = text[i + 1]
+    if (inStr) {
+      out += c
+      if (c === "\\") {
+        out += next ?? ""
+        i++
+      } else if (c === quote) {
+        inStr = false
+      }
+      continue
+    }
+    if (c === '"' || c === "'") {
+      inStr = true
+      quote = c
+      out += c
+      continue
+    }
+    if (c === "/" && next === "/") {
+      while (i < text.length && text[i] !== "\n") i++
+      out += "\n"
+      continue
+    }
+    if (c === "/" && next === "*") {
+      i += 2
+      while (i < text.length && !(text[i] === "*" && text[i + 1] === "/")) i++
+      i++
+      continue
+    }
+    out += c
+  }
+  return out.replace(/,(\s*[}\]])/g, "$1")
+}
+
+export function parseJsonc(text) {
+  return JSON.parse(stripJsonc(text))
+}
+
+function opencodeConfigDir() {
+  return process.env.OPENCODE_CONFIG_DIR || path.join(os.homedir(), ".config", "opencode")
+}
+
+function opencodeDataDir() {
+  const base = process.env.XDG_DATA_HOME || path.join(os.homedir(), ".local", "share")
+  return path.join(base, "opencode")
+}
+
+function readConfigFiles() {
+  const explicit = process.env.OPENCODE_CONFIG
+  const candidates = explicit
+    ? [explicit]
+    : ["config.json", "opencode.json", "opencode.jsonc"].map((f) => path.join(opencodeConfigDir(), f))
+  const merged = {}
+  const readFrom = []
+  for (const f of candidates) {
+    try {
+      const obj = parseJsonc(fs.readFileSync(f, "utf8"))
+      if (obj && typeof obj === "object") {
+        Object.assign(merged, obj)
+        readFrom.push(f)
+      }
+    } catch {
+      /* 文件不存在或不可解析时跳过 */
+    }
+  }
+  return { config: merged, readFrom }
+}
+
+function readAuth() {
+  try {
+    const p = path.join(opencodeDataDir(), "auth.json")
+    const obj = JSON.parse(fs.readFileSync(p, "utf8"))
+    return obj && typeof obj === "object" ? obj : {}
+  } catch {
+    return {}
+  }
+}
+
+/** opencode baseURL → 本服务网关根（去掉末尾 /v1，因为面板路径自带 /v1 前缀） */
+export function gatewayRootFromBaseUrl(baseUrl) {
+  const trimmed = String(baseUrl).trim().replace(/\/+$/, "")
+  return trimmed.replace(/\/v1$/i, "")
+}
+
+function pickProvider(cfg) {
+  const providers = cfg.provider && typeof cfg.provider === "object" ? cfg.provider : {}
+  const ids = Object.keys(providers)
+  const modelId = typeof cfg.model === "string" && cfg.model.includes("/") ? cfg.model.split("/")[0] : null
+  if (modelId && providers[modelId]) return { id: modelId, provider: providers[modelId] }
+  const withBase = ids.filter((id) => providers[id] && providers[id].options && providers[id].options.baseURL)
+  if (withBase.length === 1) return { id: withBase[0], provider: providers[withBase[0]] }
+  return null
+}
+
+/**
+ * 解析出本服务所需的上游配置。
+ * @returns {{gatewayBaseUrl:string, apiKey:string, source:string, providerId?:string, model?:string}|null}
+ */
+export function discoverGatewayFromOpencode() {
+  const { config, readFrom } = readConfigFiles()
+  const picked = pickProvider(config)
+  if (!picked) return null
+  const opts = picked.provider.options || {}
+  if (!opts.baseURL) return null
+  const auth = readAuth()
+  const apiKey = (typeof opts.apiKey === "string" && opts.apiKey.trim()) || auth[picked.id]?.key || ""
+  if (!apiKey) return null
+  return {
+    gatewayBaseUrl: gatewayRootFromBaseUrl(opts.baseURL),
+    apiKey: String(apiKey),
+    source: "opencode 配置" + (readFrom.length ? ` (${readFrom.map((f) => path.basename(f)).join(", ")})` : ""),
+    providerId: picked.id,
+    model: typeof config.model === "string" ? config.model : undefined,
+  }
+}
+
+/**
+ * 生效配置（按来源整体选取，避免把 A 的网关和 B 的 Key 拼一起）：
+ *   1. 本工具显式配置（需成对齐全）
+ *   2. 环境变量（需成对齐全）
+ *   3. opencode 配置推导
+ * 选定来源后，允许环境变量做单项覆盖。
+ */
+export function resolveGateway({ fileConfig = {}, env = process.env } = {}) {
+  const discovered = discoverGatewayFromOpencode()
+  let config = null
+  let source = null
+
+  if (fileConfig.gatewayBaseUrl && fileConfig.apiKey) {
+    config = { gatewayBaseUrl: fileConfig.gatewayBaseUrl, apiKey: fileConfig.apiKey }
+    source = "本工具配置 (config.json)"
+  } else if (env.OPENCODE_STATS_GATEWAY && env.OPENCODE_STATS_API_KEY) {
+    config = { gatewayBaseUrl: env.OPENCODE_STATS_GATEWAY, apiKey: env.OPENCODE_STATS_API_KEY }
+    source = "环境变量"
+  } else if (discovered) {
+    config = { gatewayBaseUrl: discovered.gatewayBaseUrl, apiKey: discovered.apiKey }
+    source = discovered.source
+  }
+
+  if (!config) return { ok: false, source: null, discovered }
+
+  if (env.OPENCODE_STATS_GATEWAY) config.gatewayBaseUrl = env.OPENCODE_STATS_GATEWAY
+  if (env.OPENCODE_STATS_API_KEY) config.apiKey = env.OPENCODE_STATS_API_KEY
+
+  return {
+    ok: true,
+    config,
+    source,
+    providerId: discovered?.providerId,
+    model: discovered?.model,
+    discovered,
+  }
+}