@goodandready/dsh-subscriptions 0.6.41 → 0.6.44

package/lib/vendor-factory.js

@@ -69,7 +69,8 @@ export function createVendorFromProfile(profile) {
         code_verifier: pkce.verifier,
       }
       const req = tokenStyle === "json" ? jsonTokenRequest : formTokenRequest
-      const json = await req(profile.tokenUrl, params, fetchImpl)
+      const tokenFetch = (u, i, o) => fetchWithTimeout(fetchImpl || fetch, u, i, { timeoutMs: 30000, ...(o || {}) })
+      const json = await req(profile.tokenUrl, params, tokenFetch)
       const blob = tokenBlobFromOAuth(json)
       return { ...blob, email: blob.email || emailFromToken(blob.accessToken), label: blob.label || name }
     },
@@ -80,7 +81,8 @@ export function createVendorFromProfile(profile) {
         refresh_token: blob.refreshToken,
       }
       const req = tokenStyle === "json" ? jsonTokenRequest : formTokenRequest
-      const json = await req(profile.tokenUrl, params, fetchImpl)
+      const tokenFetch = (u, i, o) => fetchWithTimeout(fetchImpl || fetch, u, i, { timeoutMs: 30000, ...(o || {}) })
+      const json = await req(profile.tokenUrl, params, tokenFetch)
       return tokenBlobFromOAuth(json, { label: blob.label, email: blob.email })
     },
     async listModels(blob, cfg, fetchImpl) {
@@ -112,7 +114,7 @@ export function createVendorFromProfile(profile) {
     async* streamOnce({ blob, options, fetchImpl, headers, config, signal }) {
       const body = codexResponsesBody(options, "")
       if (!body.instructions) delete body.instructions
-      const res = await (fetchImpl || fetch)(`${base}/responses`, {
+      const res = await fetchWithTimeout(fetchImpl || fetch, `${base}/responses`, {
         method: "POST",
         headers: {
           ...headers,
@@ -122,7 +124,7 @@ export function createVendorFromProfile(profile) {
         },
         body: JSON.stringify(body),
         signal,
-      })
+      }, { timeoutMs: 60000, stream: true })
       if (!res.ok) throw httpError(res.status, await res.text())
       yield* codexResponsesStream(res.body)
     },

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/copilot.js

@@ -296,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/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/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/qwen.js

@@ -57,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/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.41",
+  "version": "0.6.44",
   "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"
   }
 }