@goodandready/dsh-subscriptions 0.6.40 → 0.6.43

package/lib/vendors/claude-cli.js

@@ -18,7 +18,8 @@ export async function readClaudeCredentials(home) {
         accessToken: oauth.accessToken || oauth.access_token,
         refreshToken: oauth.refreshToken || oauth.refresh_token || '',
         expiresAt: oauth.expiresAt || (oauth.expires_in ? Date.now() + oauth.expires_in * 1000 : Date.now() + 3600000),
-        subscriptionType: oauth.subscriptionType || 'Claude Code'
+        subscriptionType: oauth.subscriptionType || 'Claude Code',
+        email: oauth.email || json.email || 'Claude Code CLI User',
       }
     }
     return null

package/lib/vendors/codex.js

@@ -1,3 +1,4 @@
+import { isTimeoutError } from "../http.js"
 import { randomUUID, createHash } from 'node:crypto'
 import { buildAuthorizeUrl } from '../oauth.js'
 import { codexResponsesBody, modelCatalog } from '../messages.js'
@@ -203,14 +204,15 @@ export async function usage(blob, cfg, fetchImpl) {
     const snap = asUsageSnapshot(deepestUsedPercent(json))
     if (snap) snap.windows = usageWindows(json)
     return snap
-  } catch {
+  } catch (err) {
+    if (isTimeoutError(err)) throw err
     return null
   }
 }
 
 export async function* streamOnce({ blob, options, fetchImpl, headers, config, signal }) {
   const base = (config.baseUrl || defaults().baseUrl).replace(/\/$/, '')
-  const body = codexResponsesBody(options, INSTRUCTIONS, config)
+  const body = /** @type {Record<string, any>} */ (codexResponsesBody(options, INSTRUCTIONS, config))
   const sessionId = deriveSessionId(options)
 
   // Prompt Cache Affinity

package/lib/vendors/cody.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'cody'
 const CODY_API_BASE = 'https://sourcegraph.com/.api'
@@ -42,9 +41,7 @@ export async function listModels() {
 
 export async function usage(blob) {
   if (blob && (blob.accessToken || blob.token)) {
-    const snap = asUsageSnapshot(15)
-    if (snap) snap.plan = 'Cody Pro'
-    return snap
+    return { usedPercent: null, plan: 'Cody Pro', timestamp: Date.now() }
   }
   return null
 }

package/lib/vendors/copilot.js

@@ -2,7 +2,6 @@ import { LlmError } from "@deepseek-ai/dsh-llm"
 import { openaiMessages, openaiTools, modelCatalog } from "../messages.js"
 import { fetchWithTimeout } from "../http.js"
 import { openaiChatStream, readJson, httpError } from "../wire.js"
-import { asUsageSnapshot } from "../usage.js"
 
 export const id = "copilot"
 
@@ -268,9 +267,14 @@ export async function usage(blob, config, fetchImpl) {
     })
     if (!res.ok) return null
     const user = await readJson(res)
-    const snap = asUsageSnapshot(10)
-    if (snap) snap.plan = user && user.plan ? user.plan.name : "Copilot"
-    return snap
+    const usedPercent = user && typeof user.used_percent === "number" && Number.isFinite(user.used_percent)
+      ? user.used_percent
+      : null
+    return {
+      usedPercent,
+      plan: user && user.plan ? (user.plan.name || String(user.plan)) : "Copilot",
+      timestamp: Date.now(),
+    }
   } catch {
     return null
   }
@@ -292,6 +296,7 @@ export async function* streamOnce({ blob, options, fetchImpl, headers, config, s
 
   if (!copilotToken) throw new LlmError("GitHub Copilot not authenticated", "AUTH")
 
+  /** @type {Record<string, any>} */
   const body = {
     model: options.model || "claude-3.7-sonnet",
     messages: openaiMessages(options),

package/lib/vendors/cursor.js

@@ -175,6 +175,7 @@ export async function* streamOnce({ blob, options, fetchImpl, headers, config, s
   const token = blob && (blob.accessToken || blob.access_token)
   if (!token) throw new LlmError('Cursor not authenticated', 'AUTH')
 
+  /** @type {Record<string, any>} */
   const body = {
     model: options.model || 'composer-2',
     messages: openaiMessages(options),

package/lib/vendors/ernie.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, readJson, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'ernie'
 export const ERNIE_OAUTH_URL = 'https://aip.baidubce.com/oauth/2.0/token'
@@ -51,10 +50,7 @@ async function refreshErnieToken(apiKey, secretKey, fetchImpl) {
   return readJson(res)
 }
 
-export async function usage(blob) {
-  if (blob && (blob.accessToken || blob.apiKey)) {
-    return asUsageSnapshot(20)
-  }
+export async function usage() {
   return null
 }
 

package/lib/vendors/glm.js

@@ -84,6 +84,7 @@ export async function* streamOnce({ blob, options, fetchImpl, headers, config, s
   const token = blob && (blob.accessToken || blob.access_token)
   if (!token) throw new LlmError('GLM not authenticated', 'AUTH')
 
+  /** @type {Record<string, any>} */
   const body = {
     model: options.model || 'glm-4-plus',
     messages: openaiMessages(options),

package/lib/vendors/jetbrains.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'jetbrains'
 const JETBRAINS_API_BASE = 'https://api.jetbrains.ai'
@@ -42,10 +41,7 @@ export async function listModels() {
   return JETBRAINS_MODELS
 }
 
-export async function usage(blob) {
-  if (blob && (blob.accessToken || blob.token)) {
-    return asUsageSnapshot(30)
-  }
+export async function usage() {
   return null
 }
 

package/lib/vendors/kimi.js

@@ -88,6 +88,7 @@ export async function* streamOnce({ blob, options, fetchImpl, headers, config, s
   const token = blob && (blob.accessToken || blob.access_token)
   if (!token) throw new LlmError('Kimi not authenticated', 'AUTH')
 
+  /** @type {Record<string, any>} */
   const body = {
     model: options.model || 'kimi-for-coding',
     messages: openaiMessages(options),

package/lib/vendors/kiro.js

@@ -87,6 +87,7 @@ export async function* streamOnce({ blob, options, fetchImpl, headers, config, s
   const token = blob && (blob.accessToken || blob.access_token)
   if (!token) throw new LlmError('AWS Kiro not authenticated', 'AUTH')
 
+  /** @type {Record<string, any>} */
   const body = {
     model: options.model || 'claude-sonnet-5',
     messages: openaiMessages(options),

package/lib/vendors/perplexity.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'perplexity'
 const PERPLEXITY_API_BASE = 'https://api.perplexity.ai'
@@ -44,9 +43,7 @@ export async function listModels() {
 
 export async function usage(blob) {
   if (blob && (blob.accessToken || blob.apiKey)) {
-    const snap = asUsageSnapshot(18)
-    if (snap) snap.plan = 'Perplexity Pro'
-    return snap
+    return { usedPercent: null, plan: 'Perplexity Pro', timestamp: Date.now() }
   }
   return null
 }

package/lib/vendors/qwen.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages, openaiTools } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'qwen'
 const QWEN_API_BASE = 'https://dashscope.aliyuncs.com/compatible-mode/v1'
@@ -49,10 +48,7 @@ export async function listModels() {
   return QWEN_MODELS
 }
 
-export async function usage(blob) {
-  if (blob && (blob.accessToken || blob.apiKey)) {
-    return asUsageSnapshot(15)
-  }
+export async function usage() {
   return null
 }
 
@@ -61,6 +57,7 @@ export async function* streamOnce({ blob, options, fetchImpl, headers, config, s
   const key = blob && (blob.accessToken || blob.apiKey)
   if (!key) throw new LlmError('Qwen API Key or Token is required', 'AUTH')
 
+  /** @type {Record<string, any>} */
   const body = {
     model: options.model || 'qwen-2.5-coder-32b-instruct',
     messages: openaiMessages(options),

package/lib/vendors/replit.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'replit'
 const REPLIT_API_BASE = 'https://replit.com/api/v1/ai'
@@ -37,9 +36,7 @@ export async function listModels() {
 
 export async function usage(blob) {
   if (blob && (blob.accessToken || blob.token)) {
-    const snap = asUsageSnapshot(25)
-    if (snap) snap.plan = 'Replit Core'
-    return snap
+    return { usedPercent: null, plan: 'Replit Core', timestamp: Date.now() }
   }
   return null
 }

package/lib/vendors/spark.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'spark'
 const SPARK_API_BASE = 'https://spark-api-open.xf-yun.com/v1'
@@ -42,10 +41,7 @@ export async function listModels() {
   return SPARK_MODELS
 }
 
-export async function usage(blob) {
-  if (blob && (blob.accessToken || blob.apiKey)) {
-    return asUsageSnapshot(12)
-  }
+export async function usage() {
   return null
 }
 

package/lib/wire.js

@@ -1,9 +1,16 @@
+import { fetchWithTimeout } from "./http.js"
 import { iterateSse, jsonSse } from './sse.js'
 import { validationFromHttpError, validationRequiredError, googleRateLimitMessage, googleLicenseMessage } from './google-validation.js'
 
+/**
+ * @param {number} status
+ * @param {string} [bodyText]
+ * @param {string} [code]
+ * @returns {Error & { status?: number, code?: string }}
+ */
 export function httpError(status, bodyText, code) {
   const snippet = String(bodyText || '').slice(0, 400)
-  const err = new Error(snippet ? `vendor http ${status}: ${snippet}` : `vendor http ${status}`)
+  const err = /** @type {Error & { status?: number, code?: string }} */ (new Error(snippet ? `vendor http ${status}: ${snippet}` : `vendor http ${status}`))
   err.status = status
   if (code) {
     err.code = code
@@ -401,25 +408,19 @@ export async function* googleStream(body) {
 }
 
 export async function formTokenRequest(url, params, fetchImpl, headers, { timeoutMs = 25000 } = {}) {
-  const impl = fetchImpl || fetch
-  const timeoutSignal = AbortSignal.timeout(timeoutMs)
-  const res = await impl(url, {
+  const res = await fetchWithTimeout(fetchImpl || fetch, url, {
     method: 'POST',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded', Accept: 'application/json', ...(headers || {}) },
     body: new URLSearchParams(params),
-    signal: timeoutSignal,
-  })
+  }, { timeoutMs })
   return readJson(res)
 }
 
 export async function jsonTokenRequest(url, body, fetchImpl, headers, { timeoutMs = 25000 } = {}) {
-  const impl = fetchImpl || fetch
-  const timeoutSignal = AbortSignal.timeout(timeoutMs)
-  const res = await impl(url, {
+  const res = await fetchWithTimeout(fetchImpl || fetch, url, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json', Accept: 'application/json', ...(headers || {}) },
     body: JSON.stringify(body),
-    signal: timeoutSignal,
-  })
+  }, { timeoutMs })
   return readJson(res)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.40",
+  "version": "0.6.43",
   "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",
@@ -54,10 +54,10 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2 || ^0.2.0-rc.1",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2 || ^0.2.0-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2 || ^0.2.0-rc.1",
-    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2 || ^0.2.0-rc.1 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2 || ^0.2.0-rc.1 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2 || ^0.2.0-rc.1 || ^0.2.0-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2 || ^0.2.0-rc.1 || ^0.2.0-rc.2",
     "@deepseek-ai/schemastery": "^3.18.4"
   },
   "publishConfig": {
@@ -68,9 +68,14 @@
     "undici": "^8.10.1"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
+    "@deepseek-ai/cordis": "^4.0.4",
+    "@deepseek-ai/dsh-credentials": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.2.0-rc.2",
+    "@deepseek-ai/schemastery": "^3.18.4",
     "@types/node": "^22.20.2",
-    "typescript": "^7.0.2",
-    "@deepseek-ai/schemastery": "^3.18.4"
+    "eslint": "^10.4.0",
+    "typescript": "^7.0.2"
   }
 }