@goodandready/dsh-subscriptions 0.3.1 → 0.4.2

package/lib/index.js

@@ -3,10 +3,12 @@ import { PROVIDERS, oauthRef, isProvider, displayName, droppedCredentialRefs } f
 import { createPkce } from './pkce.js'
 import { parseCallbackInput, requestOrigin, webCallbackUri } from './oauth.js'
 import { writeJson, writeHtml, readBody, isTrustedSettingsRequest, queryOf } from './http.js'
-import { getVendor } from './vendors/index.js'
+import { getVendor, registerCustomVendor, clearCustomVendors } from './vendors/index.js'
 import { SubscriptionAdapter } from './adapter.js'
 import { generateOnce, SIZES as IMAGE_SIZES } from './images.js'
 import { parseBlob } from './blob.js'
+import { createVendorFromProfile, validateProfile } from './vendor-factory.js'
+import { registerCustomProviderIds, registerDisplayName } from './refs.js'
 import { createSubscriptionsService } from './subscriptions.js'
 import { encryptWithPassphrase, decryptWithPassphrase } from './crypto.js'
 import { quotaSnapshot } from './ratelimit.js'
@@ -64,6 +66,9 @@ export const Config = z.object({
   antigravityClientId: z.string().default(''),
   antigravityClientSecret: z.string().default(''),
   antigravityRedirectUri: z.string().default(''),
+  customVendors: z.array(z.any()).default([])
+    .description('Declarative OpenAI-Responses-compatible providers. See README.'),
+
 })
 
 function publicConfig(cfg) {
@@ -90,7 +95,32 @@ export function apply(ctx, config) {
     })
   })
 
+  // Регистрация кастомных вендоров из Config. Вызывается при старте и при
+  // каждой смене конфига (replace) — реестр пересобирается с нуля.
+  function syncCustomVendors() {
+    let profiles
+    try {
+      profiles = (live().customVendors || []).map(validateProfile)
+    } catch (e) {
+      try { ctx.log && ctx.log.warn && ctx.log.warn('[dsh-subscriptions] customVendors: ' + String(e && e.message || e)) } catch {}
+      return
+    }
+    clearCustomVendors()
+    for (const profile of profiles) {
+      try {
+        const vendor = createVendorFromProfile(profile)
+        registerCustomVendor(vendor)
+        registerCustomProviderIds([profile.id])
+        if (profile.displayName) registerDisplayName(profile.id, profile.displayName)
+      } catch (e) {
+        try { ctx.log && ctx.log.warn && ctx.log.warn('[dsh-subscriptions] customVendors[' + profile.id + ']: ' + String(e && e.message || e)) } catch {}
+      }
+    }
+  }
+
   const live = () => Config(structuredClone(getConfig() ?? {})) ?? config
+  syncCustomVendors()
+
   const store = createAccountStore({
     credentials: ctx.credentials,
     getConfig: live,
@@ -429,6 +459,7 @@ export function apply(ctx, config) {
         const parsed = Config(payload)
         const dropped = droppedCredentialRefs(live().slots, parsed.slots)
         await settingsApi.replace(parsed)
+        syncCustomVendors()
         for (const ref of dropped) await store.clearRef(ref)
         await syncAdapter()
         writeJson(res, 200, await configResponse())

package/lib/refs.js

@@ -1,11 +1,38 @@
-export const PROVIDERS = Object.freeze([
+// Встроенные провайдеры + динамические из Config.customVendors.
+export const BUILTIN_PROVIDERS = Object.freeze([
   'codex',
   'claude',
   'grok',
   'antigravity',
 ])
 
-const KNOWN = new Set(PROVIDERS)
+const dynamicIds = new Set()
+const displayExtra = {}
+
+export let PROVIDERS = [...BUILTIN_PROVIDERS]
+
+export function registerCustomProviderIds(ids) {
+  let changed = false
+  for (const id of ids || []) {
+    if (typeof id === 'string' && /^[a-z][a-z0-9_]*$/.test(id) && !dynamicIds.has(id)) {
+      dynamicIds.add(id)
+      changed = true
+    }
+  }
+  if (changed) PROVIDERS = listProviders()
+}
+
+export function listProviders() {
+  return [...BUILTIN_PROVIDERS, ...dynamicIds]
+}
+
+export function registerDisplayName(id, name) {
+  if (id && name) displayExtra[id] = name
+}
+
+export function isProvider(value) {
+  return BUILTIN_PROVIDERS.includes(value) || dynamicIds.has(value)
+}
 
 const DISPLAY = {
   codex: 'ChatGPT Codex',
@@ -14,24 +41,19 @@ const DISPLAY = {
   antigravity: 'Antigravity',
 }
 
-export function isProvider(value) {
-  return KNOWN.has(value)
-}
-
 export function displayName(provider) {
-  return DISPLAY[provider] || provider
+  return DISPLAY[provider] || displayExtra[provider] || provider
 }
 
 export function oauthRef(provider, index) {
-  if (!KNOWN.has(provider)) throw new Error(`unknown provider: ${provider}`)
   const n = Number(index)
   if (!Number.isInteger(n) || n < 1) throw new Error('account index must be an integer >= 1')
-  return `${provider.toUpperCase()}_OAUTH_${n}`
+  return `${String(provider).toUpperCase()}_OAUTH_${n}`
 }
 
 export function parseOauthRef(ref) {
   if (typeof ref !== 'string') return null
-  const match = /^(CODEX|CLAUDE|GROK|ANTIGRAVITY)_OAUTH_([1-9][0-9]*)$/.exec(ref)
+  const match = /^([A-Z][A-Z0-9_]*)_OAUTH_([1-9][0-9]*)$/.exec(ref)
   if (!match) return null
   return { provider: match[1].toLowerCase(), index: Number(match[2]) }
 }
@@ -39,7 +61,7 @@ export function parseOauthRef(ref) {
 export function droppedCredentialRefs(previousSlots, nextSlots) {
   const keep = new Set()
   for (const slot of nextSlots || []) {
-    if (!isProvider(slot.provider)) continue
+    if (!slot || !slot.provider) continue
     const index = Number(slot.index)
     if (!Number.isInteger(index) || index < 1) continue
     keep.add(oauthRef(slot.provider, index))
@@ -47,7 +69,7 @@ export function droppedCredentialRefs(previousSlots, nextSlots) {
   const out = []
   const seen = new Set()
   for (const slot of previousSlots || []) {
-    if (!isProvider(slot.provider)) continue
+    if (!slot || !slot.provider) continue
     const index = Number(slot.index)
     if (!Number.isInteger(index) || index < 1) continue
     const ref = oauthRef(slot.provider, index)

package/lib/vendor-factory.js

@@ -0,0 +1,154 @@
+// Фабрика вендоров из декларативного профиля.
+//
+// Покрывает семейство OpenAI-Responses-совместимых подписок: авторизация PKCE,
+// form- или json-токен-эндпоинт, каталог моделей, usage, стрим через /responses.
+// Нестандартные протоколы (Anthropic messages, Cloud Code Assist) фабрикой не
+// описываются — для них есть рукописные модули.
+//
+// Новый провайдер = запись customVendors в Config, не код.
+
+import { buildAuthorizeUrl } from "./oauth.js"
+import { codexResponsesBody, modelCatalog } from "./messages.js"
+import { formTokenRequest, jsonTokenRequest, codexResponsesStream, readJson, tokenBlobFromOAuth, httpError } from "./wire.js"
+import { emailFromToken } from "./jwt.js"
+import { asUsageSnapshot } from "./usage.js"
+
+function defaultModels(models) {
+  return modelCatalog("custom", (models || []).map((row) => (typeof row === "string" ? { id: row, name: row } : row)))
+}
+
+/**
+ * Собирает объект вендора из профиля. Профиль — данные из Config:
+ * { id, displayName, authUrl, tokenUrl, baseUrl, scope, tokenStyle,
+ *   clientId, redirectUri, modelsPath, models, usagePath, headers }
+ */
+export function createVendorFromProfile(profile) {
+  const id = String(profile.id)
+  const name = String(profile.displayName || profile.id)
+  const base = String(profile.baseUrl || "").replace(/\/$/, "")
+  const tokenStyle = profile.tokenStyle === "json" ? "json" : "form"
+
+  function identityHeaders(blob, extra) {
+    return {
+      Authorization: `Bearer ${blob.accessToken}`,
+      ...(profile.headers || {}),
+      ...(extra || {}),
+    }
+  }
+
+  return {
+    id,
+    providerInfo() {
+      return { id, name }
+    },
+    defaults() {
+      return {
+        clientId: profile.clientId || "",
+        redirectUri: profile.redirectUri || "",
+        baseUrl: base,
+        scope: profile.scope || "openid profile offline_access",
+        models: profile.models || [],
+      }
+    },
+    authorizeUrl(cfg, pkce) {
+      return buildAuthorizeUrl({
+        authUrl: profile.authUrl,
+        clientId: cfg.clientId,
+        redirectUri: cfg.redirectUri,
+        challenge: pkce.challenge,
+        state: pkce.state,
+        scope: cfg.scope || profile.scope || "openid profile offline_access",
+      })
+    },
+    async exchangeCode(cfg, pkce, code, fetchImpl) {
+      const params = {
+        grant_type: "authorization_code",
+        client_id: cfg.clientId,
+        code,
+        redirect_uri: cfg.redirectUri,
+        code_verifier: pkce.verifier,
+      }
+      const req = tokenStyle === "json" ? jsonTokenRequest : formTokenRequest
+      const json = await req(profile.tokenUrl, params, fetchImpl)
+      const blob = tokenBlobFromOAuth(json)
+      return { ...blob, email: blob.email || emailFromToken(blob.accessToken), label: blob.label || name }
+    },
+    async refresh(cfg, blob, fetchImpl) {
+      const params = {
+        grant_type: "refresh_token",
+        client_id: cfg.clientId,
+        refresh_token: blob.refreshToken,
+      }
+      const req = tokenStyle === "json" ? jsonTokenRequest : formTokenRequest
+      const json = await req(profile.tokenUrl, params, fetchImpl)
+      return tokenBlobFromOAuth(json, { label: blob.label, email: blob.email })
+    },
+    async listModels(blob, cfg, fetchImpl) {
+      const catalog = defaultModels(cfg.models || profile.models || [])
+      if (!profile.modelsPath) return catalog
+      try {
+        const res = await (fetchImpl || fetch)(`${base}${profile.modelsPath}`, {
+          headers: identityHeaders(blob, { Accept: "application/json" }),
+        })
+        const json = await readJson(res)
+        const rows = []
+        for (const entry of json.data || json.models || []) {
+          const slug = entry && (entry.slug || entry.id)
+          if (!slug) continue
+          rows.push({ id: slug, name: entry.display_name || entry.name || slug })
+        }
+        if (!rows.length) throw new Error("empty catalog")
+        return modelCatalog(id, rows)
+      } catch {
+        return catalog
+      }
+    },
+    async usage() {
+      // Универсального usage-эндпоинта у произвольных сервисов нет — квота
+      // наполняется из ratelimit-заголовков через adapter quotaFetch.
+      return null
+    },
+    check: undefined,
+    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`, {
+        method: "POST",
+        headers: {
+          ...headers,
+          ...identityHeaders(blob, config),
+          "Content-Type": "application/json",
+          Accept: "text/event-stream",
+        },
+        body: JSON.stringify(body),
+        signal,
+      })
+      if (!res.ok) throw httpError(res.status, await res.text())
+      yield* codexResponsesStream(res.body)
+    },
+  }
+}
+
+/** Валидирует профиль из Config; бросает при невалидных полях. */
+export function validateProfile(raw) {
+  const p = raw && typeof raw === "object" ? raw : {}
+  for (const key of ["id", "authUrl", "tokenUrl", "baseUrl", "clientId"]) {
+    if (!p[key] || typeof p[key] !== "string") throw new Error(`customVendors[${p.id || "?"}]: поле ${key} обязательно`)
+  }
+  if (!/^[a-z][a-z0-9_]*$/.test(p.id)) throw new Error(`customVendors: id "${p.id}" должен быть [a-z][a-z0-9_]*`)
+  if (p.tokenStyle && !["form", "json"].includes(p.tokenStyle)) throw new Error(`customVendors[${p.id}]: tokenStyle должен быть form|json`)
+  return {
+    id: p.id,
+    displayName: p.displayName || p.id,
+    authUrl: p.authUrl,
+    tokenUrl: p.tokenUrl,
+    baseUrl: p.baseUrl,
+    scope: p.scope || "",
+    tokenStyle: p.tokenStyle || "form",
+    clientId: p.clientId,
+    redirectUri: p.redirectUri || "",
+    modelsPath: p.modelsPath || "",
+    models: Array.isArray(p.models) ? p.models : [],
+    headers: p.headers && typeof p.headers === "object" ? p.headers : {},
+  }
+}

package/lib/vendors/index.js

@@ -2,12 +2,39 @@ import * as codex from './codex.js'
 import * as claude from './claude.js'
 import * as grok from './grok.js'
 import * as antigravity from './antigravity.js'
+import { createVendorFromProfile } from '../vendor-factory.js'
 
-export const vendors = {
-  codex,
-  claude,
-  grok,
-  antigravity,
+const builtins = { codex, claude, grok, antigravity }
+
+const customVendors = new Map()
+
+export function registerCustomVendor(vendor) {
+  if (!vendor || !vendor.id) throw new Error('custom vendor needs id')
+  customVendors.set(vendor.id, vendor)
+}
+
+export function clearCustomVendors() {
+  customVendors.clear()
+}
+
+const vendors = new Proxy({}, {
+  get(_t, prop) {
+    if (prop in builtins) return builtins[prop]
+    return customVendors.get(prop)
+  },
+  has(_t, prop) {
+    return prop in builtins || customVendors.has(prop)
+  },
+  ownKeys() {
+    return [...Reflect.ownKeys(builtins), ...customVendors.keys()]
+  },
+  getOwnPropertyDescriptor() {
+    return { enumerable: true, configurable: true }
+  },
+})
+
+export function isProvider(value) {
+  return Boolean(vendors[value])
 }
 
 export function getVendor(provider) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.3.1",
+  "version": "0.4.2",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",