@goodandready/dsh-subscriptions 0.7.9 → 0.7.10

package/bin/dsh-subscriptions.mjs

@@ -105,6 +105,8 @@ export function formatDoctor(payload) {
   lines.push('doctor: ' + (doctorFailed(payload) ? 'degraded' : 'ok'))
   lines.push('errors: ' + errors + ' conflicts: ' + conflicts)
   lines.push('key-rotation: ' + (kr.available ? (kr.healthyKeys + '/' + kr.totalKeys + ' healthy keys') : ('unavailable' + (kr.reason ? ' (' + kr.reason + ')' : ''))))
+  const snapshots = diag.vaultSnapshots || {}
+  lines.push('snapshots: ' + (snapshots.count || 0) + ' (' + (snapshots.bytes || 0) + ' bytes)')
   for (const row of (sources.providers || [])) lines.push(row.provider + ': ' + (row.selected || 'none'))
   return lines.join('\n')
 }

package/lib/health-report.js

@@ -0,0 +1,21 @@
+// #745: health is about having a usable source, not about uptime alone.
+export function assessHealth({ accounts = [], sources = null, snapshots = null, webhookUrl = '', ollama = false } = {}) {
+  const list = Array.isArray(accounts) ? accounts : []
+  const connectedAccounts = list.filter((a) => a && a.configured).length
+  const sourceRows = sources && Array.isArray(sources.providers) ? sources.providers : []
+  const selectedSources = sourceRows.filter((row) => row && row.selected).length
+  const keyRotation = Boolean(sources && sources.keyRotation && sources.keyRotation.available)
+  const ok = connectedAccounts > 0 || keyRotation || Boolean(ollama)
+  return {
+    ok,
+    status: ok ? 'healthy' : 'degraded',
+    checks: {
+      connectedAccounts,
+      keyRotation,
+      ollama: Boolean(ollama),
+      webhook: Boolean(webhookUrl),
+      snapshots: snapshots ? Number(snapshots.count) || 0 : 0,
+      selectedSources,
+    },
+  }
+}

package/lib/metrics.js

@@ -0,0 +1,62 @@
+// #744: Prometheus text exposition. No secrets, labels escaped, deterministic order.
+function label(value) {
+  return String(value == null ? '' : value).replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n')
+}
+
+function add(lines, name, help, type, samples) {
+  lines.push('# HELP ' + name + ' ' + help)
+  lines.push('# TYPE ' + name + ' ' + type)
+  for (const sample of samples) lines.push(name + (sample.labels ? '{' + sample.labels + '}' : '') + ' ' + sample.value)
+}
+
+export function formatMetrics({ accounts = [], rows = [], alerts = [], sources = null } = {}) {
+  const lines = []
+  const accountRows = Array.isArray(accounts) ? accounts : []
+  add(lines, 'dsh_subscriptions_connected_accounts', 'Accounts with a configured credential.', 'gauge', [
+    { value: accountRows.filter((a) => a && a.configured).length },
+  ])
+  const configured = []
+  const usage = []
+  const cooldown = []
+  for (const account of accountRows) {
+    if (!account || !account.provider) continue
+    const labels = 'provider="' + label(account.provider) + '",index="' + label(account.index || 1) + '"'
+    configured.push({ labels, value: account.configured ? 1 : 0 })
+    if (account.usagePercent != null) usage.push({ labels, value: Number(account.usagePercent) })
+    const until = Number(account.cooldownUntil) || 0
+    cooldown.push({ labels, value: until > Date.now() ? Math.round((until - Date.now()) / 1000) : 0 })
+  }
+  add(lines, 'dsh_subscriptions_account_configured', '1 when the slot has a credential.', 'gauge', configured)
+  add(lines, 'dsh_subscriptions_account_usage_percent', 'Last observed quota usage.', 'gauge', usage)
+  add(lines, 'dsh_subscriptions_account_cooldown_seconds', 'Remaining cooldown.', 'gauge', cooldown)
+
+  const selected = []
+  for (const row of (sources && Array.isArray(sources.providers) ? sources.providers : [])) {
+    if (!row || !row.selected) continue
+    selected.push({ labels: 'provider="' + label(row.provider) + '",source="' + label(row.selected) + '"', value: 1 })
+  }
+  add(lines, 'dsh_subscriptions_source_selected', 'Selected source for a provider.', 'gauge', selected)
+
+  const byRequest = new Map()
+  for (const row of (Array.isArray(rows) ? rows : [])) {
+    const provider = row && row.provider ? row.provider : 'unknown'
+    const status = row && row.status != null ? row.status : 'unknown'
+    const key = provider + '|' + status
+    byRequest.set(key, (byRequest.get(key) || 0) + 1)
+  }
+  add(lines, 'dsh_subscriptions_requests_total', 'Recorded requests by provider and status.', 'counter',
+    [...byRequest.entries()].sort().map(([key, value]) => {
+      const [provider, status] = key.split('|')
+      return { labels: 'provider="' + label(provider) + '",status="' + label(status) + '"', value }
+    }))
+
+  const bySeverity = new Map()
+  for (const alert of (Array.isArray(alerts) ? alerts : [])) {
+    const severity = alert && alert.severity ? alert.severity : 'warn'
+    bySeverity.set(severity, (bySeverity.get(severity) || 0) + 1)
+  }
+  add(lines, 'dsh_subscriptions_alerts_total', 'Recent alerts by severity.', 'counter',
+    [...bySeverity.entries()].sort().map(([severity, value]) => ({ labels: 'severity="' + label(severity) + '"', value })))
+
+  return lines.join('\n') + '\n'
+}

package/lib/routes/metrics.js

@@ -0,0 +1,33 @@
+import { getRecentAlerts } from '../alerts.js'
+import { isLoopback, isTrustedSettingsRequest } from '../http.js'
+import { formatMetrics } from '../metrics.js'
+import { collectSourceChain } from './sources.js'
+
+export function registerMetricsRoutes(ctx, state) {
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-subscriptions/metrics',
+    handler: async (req, res) => {
+      if (req.method !== 'GET') {
+        res.writeHead(405, { 'content-type': 'text/plain; charset=utf-8' })
+        res.end('method not allowed\n')
+        return
+      }
+      if (!isLoopback(req) && !isTrustedSettingsRequest(req, ctx)) {
+        res.writeHead(403, { 'content-type': 'text/plain; charset=utf-8' })
+        res.end('forbidden\n')
+        return
+      }
+      const accounts = await state.accountsView().catch(() => [])
+      const sources = await collectSourceChain(state, req.socket && req.socket.localPort)
+      const text = formatMetrics({
+        accounts,
+        rows: typeof state.history?.all === 'function' ? state.history.all() : [],
+        alerts: getRecentAlerts(1000),
+        sources,
+      })
+      res.writeHead(200, { 'content-type': 'text/plain; version=0.0.4; charset=utf-8' })
+      res.end(text)
+    },
+  }), 'dsh-subscriptions: /metrics')
+}

package/lib/routes/sources.js

@@ -1,8 +1,33 @@
 import { isTrustedSettingsRequest, safeJsonHandler, writeJson } from '../http.js'
 import { buildSourceChain, readKeyRotationStatus, subscriptionCandidate } from '../key-rotation-bridge.js'
 
-export function registerSourcesRoutes(ctx, state) {
+export async function collectSourceChain(state, port) {
   const { accountsView, live } = state
+  let subscriptions = []
+  try {
+    const rows = await accountsView()
+    subscriptions = (rows || []).map(subscriptionCandidate)
+  } catch { /* keep the chain available */ }
+  const keyRotation = port
+    ? await readKeyRotationStatus({ baseUrl: 'http://127.0.0.1:' + port })
+    : { available: false, reason: 'no local port', providers: [], totalKeys: 0, healthyKeys: 0 }
+  const chain = buildSourceChain({
+    subscriptions,
+    keyRotation,
+    ollama: { available: live().ollamaFallback !== false },
+  })
+  return {
+    keyRotation: {
+      available: keyRotation.available,
+      reason: keyRotation.reason || null,
+      totalKeys: keyRotation.totalKeys,
+      healthyKeys: keyRotation.healthyKeys,
+    },
+    ...chain,
+  }
+}
+
+export function registerSourcesRoutes(ctx, state) {
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
@@ -16,30 +41,8 @@ export function registerSourcesRoutes(ctx, state) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
-      let subscriptions = []
-      try {
-        const rows = await accountsView()
-        subscriptions = (rows || []).map(subscriptionCandidate)
-      } catch { /* keep the chain available */ }
-      const port = req.socket && req.socket.localPort
-      const keyRotation = port
-        ? await readKeyRotationStatus({ baseUrl: 'http://127.0.0.1:' + port })
-        : { available: false, reason: 'no local port', providers: [], totalKeys: 0, healthyKeys: 0 }
-      const chain = buildSourceChain({
-        subscriptions,
-        keyRotation,
-        ollama: { available: live().ollamaFallback !== false },
-      })
-      writeJson(res, 200, {
-        ok: true,
-        keyRotation: {
-          available: keyRotation.available,
-          reason: keyRotation.reason || null,
-          totalKeys: keyRotation.totalKeys,
-          healthyKeys: keyRotation.healthyKeys,
-        },
-        ...chain,
-      })
+      const payload = await collectSourceChain(state, req.socket && req.socket.localPort)
+      writeJson(res, 200, { ok: true, ...payload })
     }),
   }), 'dsh-subscriptions: /sources')
 }

package/lib/routes/status.js

@@ -26,6 +26,9 @@ import { quotaSnapshot } from '../ratelimit.js'
 import { PROVIDERS, displayName, droppedCredentialRefs, isProvider, oauthRef } from '../refs.js'
 import { getVendor } from '../vendors/index.js'
 import { defaultErrorBuffer } from '../error-buffer.js'
+import { assessHealth } from '../health-report.js'
+import { defaultSnapshotStore } from '../vault-snapshots.js'
+import { collectSourceChain } from './sources.js'
 
 export function registerStatusRoutes(ctx, state) {
   const {
@@ -82,7 +85,16 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
       }
-      writeJson(res, 200, { ok: true, status: 'healthy', version: pkgVersion || 'unknown' })
+      const accounts = await accountsView().catch(() => [])
+      const sources = await collectSourceChain(state, req.socket && req.socket.localPort)
+      const health = assessHealth({
+        accounts,
+        sources,
+        snapshots: defaultSnapshotStore.stats(),
+        webhookUrl: live().webhookUrl,
+        ollama: live().ollamaFallback !== false,
+      })
+      writeJson(res, 200, { ok: true, status: health.status, version: pkgVersion || 'unknown', checks: health.checks })
     }),
   }), 'dsh-subscriptions: /health')
 
@@ -310,6 +322,8 @@ export function registerStatusRoutes(ctx, state) {
         report: await diagnosticsReport(),
         conflicts: getActiveConflicts(),
         route: buildRouteReport(last, accounts),
+        sources: await collectSourceChain(state, req.socket && req.socket.localPort),
+        vaultSnapshots: defaultSnapshotStore.stats(),
       })
     }),
   }), 'dsh-subscriptions: /diagnostics')

package/lib/routes.js

@@ -9,6 +9,7 @@ import { registerSourcesRoutes } from './routes/sources.js'
 import { registerPacksRoutes } from './routes/packs.js'
 import { registerWebhookRoutes } from './routes/webhook.js'
 import { registerVaultRoutes } from './routes/vault.js'
+import { registerMetricsRoutes } from './routes/metrics.js'
 import { registerPluginUpdater } from './updater.js'
 
 export function registerRoutes(ctx, state) {
@@ -117,4 +118,5 @@ function esc(x){return String(x==null?'':x).replace(/&/g,'&amp;').replace(/</g,'
   registerPacksRoutes(ctx)
   registerWebhookRoutes(ctx, state)
   registerVaultRoutes(ctx, state)
+  registerMetricsRoutes(ctx, state)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "description": "Use ChatGPT Codex, Claude, Grok, Antigravity, Kimi, GLM, Cursor, Kiro, Copilot, Qwen, ERNIE, Spark, JetBrains, Perplexity, Replit, and Cody subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",