@goodandready/dsh-subscriptions 0.4.0 → 0.4.2

package/lib/index.js

@@ -3,12 +3,11 @@ 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 { registerCustomVendor } from './vendors/index.js'
 import { registerCustomProviderIds, registerDisplayName } from './refs.js'
 import { createSubscriptionsService } from './subscriptions.js'
 import { encryptWithPassphrase, decryptWithPassphrase } from './crypto.js'
@@ -106,7 +105,7 @@ export function apply(ctx, config) {
       try { ctx.log && ctx.log.warn && ctx.log.warn('[dsh-subscriptions] customVendors: ' + String(e && e.message || e)) } catch {}
       return
     }
-    clearCustomProviders()
+    clearCustomVendors()
     for (const profile of profiles) {
       try {
         const vendor = createVendorFromProfile(profile)

package/lib/refs.js

@@ -1,5 +1,4 @@
-// Встроенные провайдеры. Кастомные из Config добавляются динамически через
-// registerCustomProviderIds и попадают в тот же список.
+// Встроенные провайдеры + динамические из Config.customVendors.
 export const BUILTIN_PROVIDERS = Object.freeze([
   'codex',
   'claude',
@@ -7,49 +6,32 @@ export const BUILTIN_PROVIDERS = Object.freeze([
   'antigravity',
 ])
 
-const dynamic = new Set()
+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)) dynamic.add(id)
+    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, ...dynamic]
+  return [...BUILTIN_PROVIDERS, ...dynamicIds]
 }
 
-// Обратно-совместимый доступ: массив читается на момент вызова.
-export const PROVIDERS = new Proxy([], {
-  get(_t, prop) {
-    if (prop === 'length') return listProviders().length
-    if (prop === Symbol.iterator) return listProviders()[Symbol.iterator]
-    const i = Number(prop)
-    return Number.isInteger(i) ? listProviders()[i] : undefined
-  },
-  has() { return true },
-})
-
-const DISPLAY_EXTRA = {}
-
 export function registerDisplayName(id, name) {
-  if (id && name) DISPLAY_EXTRA[id] = name
+  if (id && name) displayExtra[id] = name
 }
 
-const KNOWN_CACHE = new Map()
-
 export function isProvider(value) {
-  if (KNOWN_CACHE.has(value)) return KNOWN_CACHE.get(value)
-  let result
-  try {
-    const { isProvider: check } = require('./vendors/index.js')
-    result = Boolean(check(value))
-  } catch {
-    // require недоступен в этом контексте — используем списки
-    result = BUILTIN_PROVIDERS.includes(value) || dynamic.has(value)
-  }
-  KNOWN_CACHE.set(value, result)
-  return result
+  return BUILTIN_PROVIDERS.includes(value) || dynamicIds.has(value)
 }
 
 const DISPLAY = {
@@ -60,7 +42,7 @@ const DISPLAY = {
 }
 
 export function displayName(provider) {
-  return DISPLAY[provider] || DISPLAY_EXTRA[provider] || provider
+  return DISPLAY[provider] || displayExtra[provider] || provider
 }
 
 export function oauthRef(provider, index) {

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.4.0",
+  "version": "0.4.2",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",