@goodandready/dsh-subscriptions 0.6.7 → 0.6.9

package/lib/http.js

@@ -30,6 +30,13 @@ export function readBody(req, maxBytes = 64 * 1024) {
   })
 }
 
+export function isLoopback(value) {
+  const address = value?.toLowerCase().replace(/^\[|\]$/g, '')
+  return address === 'localhost' || address === 'localhost.' || address === '::1'
+    || address?.startsWith('127.') === true
+    || address?.startsWith('::ffff:127.') === true
+}
+
 /**
  * @param {import('node:http').IncomingMessage} request
  * @returns {boolean}

package/lib/relative-time.js

@@ -1,6 +1,6 @@
 /**
  * Format a future timestamp as a relative remaining duration down to the minute.
- * Supports en and ru.
+ * Supports en and zh.
  */
 
 export const RELATIVE_UNITS = {
@@ -12,6 +12,14 @@ export const RELATIVE_UNITS = {
     hour: '{n}h',
     day: '{n}d',
   },
+  zh: {
+    soon: '刚刚',
+    prefix: '',
+    suffix: '后',
+    minute: '{n}分',
+    hour: '{n}小时',
+    day: '{n}天',
+  },
   ru: {
     soon: 'только что',
     prefix: 'через ',
@@ -32,10 +40,10 @@ function fill(template, n) {
  * @param {number} [now]
  * @returns {string} human-readable remaining time, down to the minute
  */
-export function formatRelativeReset(resetAt, lang = 'ru', now = Date.now()) {
+export function formatRelativeReset(resetAt, lang = 'en', now = Date.now()) {
   if (typeof resetAt !== 'number' || !Number.isFinite(resetAt) || resetAt <= 0) return ''
   const delta = resetAt - now
-  const units = RELATIVE_UNITS[lang] || RELATIVE_UNITS.ru
+  const units = RELATIVE_UNITS[lang] || RELATIVE_UNITS.en
   if (delta <= 0) return units.soon
 
   const totalMinutes = Math.max(1, Math.round(delta / 60_000))

package/lib/routes/status.js

@@ -16,8 +16,8 @@ export function registerStatusRoutes(ctx, state) {
     store,
     history,
     diagnosticsReport,
-    pmL,
-    pmE,
+    pmL = (s) => s,
+    pmE = (s) => s,
   } = state
 
   async function configResponse() {
@@ -177,25 +177,27 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 400, { ok: false, error: { code: 'json', message: 'invalid json' } })
         return
       }
-      const provider = payload.provider
+      const provider = payload.provider || payload.vendor
+      const index = payload.index || (payload.accountIndex != null ? payload.accountIndex + 1 : 1)
       if (!isProvider(provider)) {
         writeJson(res, 200, { ok: false, provider, error: { code: 'provider', message: 'unknown provider' } })
         return
       }
-      const ref = oauthRef(provider, payload.index)
+      const t0 = Date.now()
+      const ref = oauthRef(provider, index)
       const info = await store.describeRef(ref)
       if (!info.configured) {
-        writeJson(res, 200, { ok: false, provider, index: payload.index, ref, error: { code: 'not_connected', message: 'not connected' } })
+        writeJson(res, 200, { ok: false, provider, index: index, ref, error: { code: 'not_connected', message: 'not connected' } })
         return
       }
       let blob
       try { blob = await store.loadBlob(ref) } catch (e) {
-        writeJson(res, 200, { ok: false, provider, index: payload.index, ref, error: { code: 'auth', message: String(e && e.message || e) } })
+        writeJson(res, 200, { ok: false, provider, index: index, ref, error: { code: 'auth', message: String(e && e.message || e) } })
         return
       }
       try { blob = await store.ensureFresh(provider, blob, ref) } catch (e) {
         writeJson(res, 200, {
-          ok: false, provider, index: payload.index, ref,
+          ok: false, provider, index: index, ref,
           email: pmE(blob.email), label: pmL(blob.label), expiresAt: blob.expiresAt || null,
           quota: info.quota || null,
           error: { code: 'refresh', message: String(e && e.message || e) },
@@ -204,12 +206,14 @@ export function registerStatusRoutes(ctx, state) {
       }
       const vendor = getVendor(provider)
       if (typeof vendor.check !== 'function') {
-        writeJson(res, 200, { ok: true, provider, index: payload.index, ref, email: pmE(blob.email), label: pmL(blob.label), expiresAt: blob.expiresAt || null, quota: info.quota || null })
+        writeJson(res, 200, { ok: true, provider, index: index, ref, email: pmE(blob.email), label: pmL(blob.label), expiresAt: blob.expiresAt || null, quota: info.quota || null })
         return
       }
       let capturedQuota = null
-      const probeFetch = async (url, init) => {
-        const res2 = await fetch(url, init)
+      const probeFetch = async (url, init = {}) => {
+        const timeoutSignal = AbortSignal.timeout(15_000)
+        const signal = init.signal ? AbortSignal.any([init.signal, timeoutSignal]) : timeoutSignal
+        const res2 = await fetch(url, { ...init, signal })
         try {
           const snap = quotaSnapshot(provider, res2.headers, null, Date.now())
           if (snap) { capturedQuota = snap; store.rememberQuota(ref, snap) }
@@ -218,10 +222,12 @@ export function registerStatusRoutes(ctx, state) {
       }
       try {
         await vendor.check(blob, vendorConfig(provider, live()), probeFetch)
-        writeJson(res, 200, { ok: true, provider, index: payload.index, ref, email: pmE(blob.email), label: pmL(blob.label), expiresAt: blob.expiresAt || null, quota: capturedQuota || info.quota || null, usagePercent: info.usagePercent ?? null })
+        const latencyMs = Date.now() - t0;
+        writeJson(res, 200, { ok: true, provider, index: index, ref, latencyMs, email: pmE(blob.email), label: pmL(blob.label), expiresAt: blob.expiresAt || null, quota: capturedQuota || info.quota || null, usagePercent: info.usagePercent ?? null })
       } catch (e) {
         writeJson(res, 200, {
-          ok: false, provider, index: payload.index, ref,
+          ok: false, provider, index: index, ref,
+          latencyMs: Date.now() - t0,
           email: pmE(blob.email), label: pmL(blob.label), expiresAt: blob.expiresAt || null,
           quota: capturedQuota || info.quota || null,
           error: { code: e && e.code ? e.code : 'VENDOR', message: String(e && e.message || e).slice(0, 300) },
@@ -318,8 +324,10 @@ export function registerStatusRoutes(ctx, state) {
       const vendor = getVendor(provider)
       if (typeof vendor.check === 'function') {
         let capturedQuota = null
-        const probeFetch = async (url, init) => {
-          const res2 = await fetch(url, init)
+        const probeFetch = async (url, init = {}) => {
+          const timeoutSignal = AbortSignal.timeout(15_000)
+          const signal = init.signal ? AbortSignal.any([init.signal, timeoutSignal]) : timeoutSignal
+          const res2 = await fetch(url, { ...init, signal })
           try {
             const snap = quotaSnapshot(provider, res2.headers, null, Date.now())
             if (snap) { capturedQuota = snap; store.rememberQuota(ref, snap) }

package/lib/routes.js

@@ -1,10 +1,11 @@
 import { publicConfig } from './config-schema.js'
 import { PROVIDERS, displayName } from './refs.js'
-import { escapeHtml, writeHtml, writeJson } from './http.js'
+import { escapeHtml, isLoopback, writeHtml, writeJson } from './http.js'
 import { registerStatusRoutes } from './routes/status.js'
 import { registerOauthRoutes } from './routes/oauth.js'
 import { registerAccountsRoutes } from './routes/accounts.js'
 import { registerProxyRoutes } from './routes/proxy.js'
+import { registerPluginUpdater } from './updater.js'
 
 export function registerRoutes(ctx, state) {
   const {
@@ -22,6 +23,11 @@ export function registerRoutes(ctx, state) {
     }
   }
 
+  ctx.effect(() => registerPluginUpdater(ctx, {
+    endpoint: '/dsh-subscriptions/update',
+    packageName: '@goodandready/dsh-subscriptions',
+    manifestUrl: new URL('../package.json', import.meta.url),
+  }), 'dsh-subscriptions: /update')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
@@ -32,7 +38,8 @@ export function registerRoutes(ctx, state) {
         return
       }
       const host = (req.headers.host || '').split(':')[0]
-      if (host !== 'localhost' && host !== '127.0.0.1') {
+      const remote = req.socket?.remoteAddress
+      if (!isLoopback(host) || (remote && !isLoopback(remote))) {
         writeHtml(res, 403, '<!doctype html><meta charset="utf-8"><p>Subscriptions overview is localhost-only.</p>')
         return
       }

package/lib/updater.js

@@ -0,0 +1,260 @@
+import { spawn } from 'node:child_process'
+import { existsSync, readFileSync } from 'node:fs'
+import { readFile } from 'node:fs/promises'
+import { homedir } from 'node:os'
+import { basename, dirname, isAbsolute, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { writeJson } from './http.js'
+
+const UPDATE_HEADER = 'x-dsh-plugin-update'
+const UPDATE_TIMEOUT_MS = 10 * 60_000
+const VERSION_CACHE_MS = 5 * 60_000
+let latestCache
+
+function header(request, name) {
+  const value = request.headers?.[name]
+  return Array.isArray(value) ? value[0] : value
+}
+
+export function isLoopback(value) {
+  const address = value?.toLowerCase().replace(/^\[|\]$/g, '')
+  return address === 'localhost' || address === 'localhost.' || address === '::1'
+    || address?.startsWith('127.') === true
+    || address?.startsWith('::ffff:127.') === true
+}
+
+export function isTrustedUpdateRequest(request) {
+  const customHeader = header(request, UPDATE_HEADER)
+  if (customHeader !== '1') {
+    // In browser fetch, allow if sec-fetch-site is same-origin or same-site
+    const site = header(request, 'sec-fetch-site')
+    if (site === 'cross-site') return false
+  }
+  const remote = request.socket?.remoteAddress
+  if (remote && !isLoopback(remote)) return false
+  const origin = header(request, 'origin')
+  const host = header(request, 'host')
+  if (origin && host) {
+    try {
+      const url = new URL(origin)
+      if (url.host !== host && !isLoopback(url.hostname)) return false
+    } catch {
+      return false
+    }
+  }
+  return true
+}
+
+function validProfileName(value) {
+  return typeof value === 'string' && value !== '' && value !== '.' && value !== '..'
+    && !value.includes('/') && !value.includes('\\') && !/[\0-\x1f\x7f]/.test(value)
+}
+
+function profileNameFromArgv(argv) {
+  for (let index = 2; index < argv.length; index += 1) {
+    if (argv[index] === '--profile') return argv[index + 1]
+    if (argv[index]?.startsWith('--profile=')) return argv[index].slice('--profile='.length)
+  }
+  return argv[2] === 'web' ? 'web' : undefined
+}
+
+function findDshCliEntry() {
+  const value = process.argv[1]
+  if (value === undefined || value === '') return undefined
+  const entry = value.startsWith('file:') ? fileURLToPath(value) : resolve(process.cwd(), value)
+  if (!existsSync(entry)) return undefined
+  for (let directory = dirname(entry); ; directory = dirname(directory)) {
+    const manifestPath = resolve(directory, 'package.json')
+    if (existsSync(manifestPath)) {
+      try {
+        const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'))
+        const bin = typeof manifest.bin === 'string'
+          ? manifest.bin
+          : typeof manifest.bin === 'object' && manifest.bin !== null
+            ? manifest.bin.dsh
+            : undefined
+        if (manifest.name === '@deepseek-ai/dsh' && typeof bin === 'string'
+          && !isAbsolute(bin) && resolve(directory, bin) === resolve(entry)) return entry
+      } catch {
+        // Continue searching parent package directories.
+      }
+    }
+    const parent = dirname(directory)
+    if (parent === directory) return undefined
+  }
+}
+
+function getRuntime() {
+  const profileDir = resolve(process.env.DSH_PROFILE_DIR
+    ?? resolve(homedir(), '.dsh', 'profiles', 'web'))
+  const selected = profileNameFromArgv(process.argv)
+  const profileName = validProfileName(selected)
+    ? selected
+    : validProfileName(basename(profileDir)) ? basename(profileDir) : 'web'
+  const cliEntry = findDshCliEntry()
+  return cliEntry === undefined ? { profileName, profileDir } : { profileName, profileDir, cliEntry }
+}
+
+export function parseSemver(value) {
+  const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(value)
+  if (match === null) return undefined
+  return {
+    core: [Number(match[1]), Number(match[2]), Number(match[3])],
+    prerelease: match[4]?.split('.') ?? [],
+  }
+}
+
+function comparePrerelease(left, right) {
+  if (left.length === 0 || right.length === 0) return left.length === right.length ? 0 : left.length === 0 ? 1 : -1
+  const length = Math.max(left.length, right.length)
+  for (let index = 0; index < length; index += 1) {
+    const a = left[index]
+    const b = right[index]
+    if (a === undefined || b === undefined) return a === b ? 0 : a === undefined ? -1 : 1
+    if (a === b) continue
+    const aNumeric = /^\d+$/.test(a)
+    const bNumeric = /^\d+$/.test(b)
+    if (aNumeric && bNumeric) {
+      const aNumber = BigInt(a)
+      const bNumber = BigInt(b)
+      if (aNumber !== bNumber) return aNumber > bNumber ? 1 : -1
+      continue
+    }
+    if (aNumeric !== bNumeric) return aNumeric ? -1 : 1
+    return a > b ? 1 : -1
+  }
+  return 0
+}
+
+export function isNewerVersion(currentValue, candidateValue) {
+  const current = parseSemver(currentValue)
+  const candidate = parseSemver(candidateValue)
+  if (current === undefined || candidate === undefined) return false
+  for (let index = 0; index < 3; index += 1) {
+    if (candidate.core[index] !== current.core[index]) return candidate.core[index] > current.core[index]
+  }
+  return comparePrerelease(candidate.prerelease, current.prerelease) > 0
+}
+
+export async function fetchLatestVersion(packageName, registry = 'https://registry.npmjs.org') {
+  if (latestCache?.packageName === packageName && latestCache.registry === registry && Date.now() < latestCache.expiresAt) {
+    return latestCache.version
+  }
+  try {
+    const response = await fetch(`${registry.replace(/\/$/, '')}/${encodeURIComponent(packageName)}/latest`, {
+      signal: AbortSignal.timeout(8_000),
+    })
+    if (!response.ok) return undefined
+    const value = await response.json()
+    if (typeof value?.version !== 'string' || value.version === '') return undefined
+    latestCache = { packageName, registry, version: value.version, expiresAt: Date.now() + VERSION_CACHE_MS }
+    return value.version
+  } catch {
+    return undefined
+  }
+}
+
+export async function readCurrentVersion(manifestUrl) {
+  const value = JSON.parse(await readFile(manifestUrl, 'utf8'))
+  if (typeof value?.version !== 'string' || value.version === '') throw new Error('Cannot read current plugin version.')
+  return value.version
+}
+
+export async function getUpdaterStatus(options, target = getRuntime()) {
+  const current = await readCurrentVersion(options.manifestUrl)
+  const latest = await fetchLatestVersion(options.packageName, options.registry ?? 'https://registry.npmjs.org')
+  return {
+    ok: true,
+    packageName: options.packageName,
+    currentVersion: current,
+    ...(latest === undefined ? {} : { latestVersion: latest }),
+    latestCheckFailed: latest === undefined,
+    updateAvailable: latest !== undefined && isNewerVersion(current, latest),
+    profileName: target.profileName,
+    canAutoUpdate: target.cliEntry !== undefined,
+  }
+}
+
+export async function installExactPackage(target, packageSpec, options) {
+  if (target.cliEntry === undefined) throw new Error('Automatic update is unavailable in this runtime.')
+  await new Promise((resolvePromise, reject) => {
+    const child = spawn(process.execPath, [
+      target.cliEntry, 'plugin', '--profile', target.profileName, 'add',
+      '--config.minimumReleaseAge=0', packageSpec,
+      `--registry=${options.registry ?? 'https://registry.npmjs.org/'}`,
+    ], {
+      cwd: target.profileDir,
+      windowsHide: true,
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env: { ...process.env, NO_COLOR: '1' },
+    })
+    let detail = ''
+    child.stdout?.on('data', chunk => { detail = (detail + String(chunk)).slice(-4_000) })
+    child.stderr?.on('data', chunk => { detail = (detail + String(chunk)).slice(-4_000) })
+    const timer = setTimeout(() => {
+      child.kill()
+      reject(new Error('Update timed out; use the normal DSH update flow.'))
+    }, UPDATE_TIMEOUT_MS)
+    child.once('error', error => { clearTimeout(timer); reject(error) })
+    child.once('exit', code => {
+      clearTimeout(timer)
+      if (code === 0) resolvePromise()
+      else reject(new Error(detail.trim() || `Update exited with code ${String(code)}.`))
+    })
+  })
+}
+
+export function registerPluginUpdater(ctx, options) {
+  let installing = false
+  return ctx.webServer.register({
+    kind: 'exact',
+    path: options.endpoint,
+    handler: async (request, response) => {
+      try {
+        const target = getRuntime()
+        if (request.method === 'GET' || request.method === 'HEAD') {
+          const payload = await getUpdaterStatus(options, target)
+          writeJson(response, 200, payload)
+          return
+        }
+        if (request.method !== 'POST') {
+          response.writeHead(405, { allow: 'GET, HEAD, POST' })
+          response.end()
+          return
+        }
+        if (!isTrustedUpdateRequest(request)) {
+          writeJson(response, 403, { ok: false, error: { code: 'forbidden', message: 'Rejected non-local or cross-origin update request.' } })
+          return
+        }
+        if (installing) {
+          writeJson(response, 409, { ok: false, error: { code: 'busy', message: 'This plugin is already updating.' } })
+          return
+        }
+        installing = true
+        try {
+          const before = await getUpdaterStatus(options, target)
+          if (before.latestVersion === undefined) {
+            writeJson(response, 503, { ok: false, error: { code: 'unavailable', message: 'The latest version is temporarily unavailable.' } })
+            return
+          }
+          if (!before.updateAvailable) {
+            writeJson(response, 200, { ok: true, ...before })
+            return
+          }
+          await installExactPackage(target, `${options.packageName}@${before.latestVersion}`, options)
+          writeJson(response, 200, {
+            ok: true,
+            ...before,
+            updatedVersion: before.latestVersion,
+            restartRequired: true,
+          })
+        } finally {
+          installing = false
+        }
+      } catch (error) {
+        ctx.logger?.warn?.(`plugin updater failed: ${String(error)}`)
+        writeJson(response, 503, { ok: false, error: { code: 'update_failed', message: String(error?.message || error) } })
+      }
+    },
+  })
+}

package/lib/usage.js

@@ -52,22 +52,22 @@ export function asUsageSnapshot(percent) {
 // Named limit windows reported by vendors (five_hour, seven_day, primary...).
 // Label map is a data table: extend it when a vendor adds a window name.
 const WINDOW_LABELS = {
-  five_hour: { ru: "5ч", en: "5h" },
-  seven_day: { ru: "7д", en: "7d" },
-  seven_day_oauth_apps: { ru: "7д прил.", en: "7d apps" },
-  weekly_limit_7_days: { ru: "7д", en: "7d" },
-  primary: { ru: "осн.", en: "primary" },
-  secondary: { ru: "втор.", en: "secondary" },
+  five_hour: { zh: "5小时", ru: "5ч", en: "5h" },
+  seven_day: { zh: "7天", ru: "7д", en: "7d" },
+  seven_day_oauth_apps: { zh: "7天应用", ru: "7д прил.", en: "7d apps" },
+  weekly_limit_7_days: { zh: "7天", ru: "7д", en: "7d" },
+  primary: { zh: "主配额", ru: "осн.", en: "primary" },
+  secondary: { zh: "次配额", ru: "втор.", en: "secondary" },
   // codex: the vendor API returns primary_window/secondary_window - surfaced as 5h/7d in the UI
-  primary_window: { ru: "5ч", en: "5h" },
-  secondary_window: { ru: "7д", en: "7d" },
-  monthly: { ru: "месяц", en: "month" },
-  credits: { ru: "кредиты", en: "credits" },
+  primary_window: { zh: "5小时", ru: "5ч", en: "5h" },
+  secondary_window: { zh: "7天", ru: "7д", en: "7d" },
+  monthly: { zh: "月度", ru: "месяц", en: "month" },
+  credits: { zh: "点数", ru: "кредиты", en: "credits" },
 }
 
 export function windowLabel(id) {
   const known = WINDOW_LABELS[id]
-  return known || { ru: id, en: id }
+  return known || { zh: id, ru: id, en: id }
 }
 
 // Walk vendor usage JSON; every node carrying a utilization-style number

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "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",
@@ -34,6 +34,10 @@
   "bugs": {
     "url": "https://github.com/GooDAnDReaDY/dsh-subscriptions/issues"
   },
+  "scripts": {
+    "test": "eslint lib/ && node --test test/*.test.mjs",
+    "typecheck": "tsc -p tsconfig.checkjs.json"
+  },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -62,9 +66,5 @@
     "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
     "@types/node": "^22.20.2",
     "typescript": "^7.0.2"
-  },
-  "scripts": {
-    "test": "eslint lib/ && node --test test/*.test.mjs",
-    "typecheck": "tsc -p tsconfig.checkjs.json"
   }
-}
+}