dsh-plugin-weapp-gateway 0.8.23 → 0.8.34

package/lib/vendor/cost-meter/workbuddy-accounts.mjs

@@ -1,44 +1,44 @@
-import { fetchWorkBuddyLocal, workBuddyOrigin } from './workbuddy-transport.mjs'
-import { fetchWithRetry, readJsonBounded } from './net.mjs'
-
-export const validWorkBuddyAccountId = id => typeof id === 'string' && /^(cn|global):[^\s\u0000-\u001f\u007f]{1,256}$/.test(id)
-const amount = value => typeof value === 'number' && Number.isFinite(value) && value >= 0
-
-/** Read the connector's published per-account endpoint; never switch its active account. */
-export async function fetchWorkBuddyAccounts(hostOrigin, config = {}, { signal, fetchImpl = fetchWorkBuddyLocal } = {}) {
-  if (!hostOrigin) return null
-  const origin = workBuddyOrigin(hostOrigin)
-  const results = await Promise.all(['cn', 'global'].map(async region => {
-    try {
-      const response = await fetchWithRetry(new URL('/plugins/dsh-connect-workbuddy/account-credits?region=' + region, origin),
-        { method: 'GET', redirect: 'error', signal }, { attempts: 1, timeoutMs: 35000, fetchImpl })
-      if (response.status === 404 || response.headers.get('content-type')?.includes('text/html')) { await response.body?.cancel?.(); return { missing: true } }
-      if (!response.ok) { await response.body?.cancel?.(); return { failed: true } }
-      const body = await readJsonBounded(response)
-      if (!Array.isArray(body?.accounts) || body.accounts.length > 200) return { failed: true }
-      const seen = new Set(), accounts = []
-      for (const row of body.accounts) {
-        const id = region + ':' + row?.id
-        if (!validWorkBuddyAccountId(id) || typeof row?.id !== 'string' || seen.has(id)) return { failed: true }
-        seen.add(id)
-        accounts.push({ id, region, name: typeof row.accountName === 'string' ? row.accountName.slice(0, 160) : '',
-          current: row.selected === true, remaining: amount(row.credits) ? row.credits : null })
-      }
-      return { accounts }
-    } catch { signal?.throwIfAborted(); return { failed: true } }
-  }))
-  // An older connector has no account list; its selected-account route remains usable.
-  if (!results.some(result => result.accounts)) return null
-  const accounts = results.flatMap(result => result.accounts ?? [])
-  const scope = ['all', 'selected'].includes(config.accountScope) ? config.accountScope : 'current'
-  const ids = new Set(Array.isArray(config.accountIds) ? config.accountIds : [])
-  if (scope === 'selected') for (const id of ids) if (validWorkBuddyAccountId(id) && !accounts.some(row => row.id === id)) {
-    accounts.push({ id, region: id.split(':')[0], name: '', current: false, remaining: null })
-  }
-  const selected = accounts.filter(row => scope === 'all' || (scope === 'current' ? row.current : ids.has(row.id)))
-  const known = selected.filter(row => row.remaining !== null)
-  return { scope, accounts, selectedIds: selected.map(row => row.id),
-    knownRemaining: known.reduce((sum, row) => sum + row.remaining, 0),
-    unknownCount: selected.length - known.length,
-    incomplete: results.some(result => result.failed), fetchedAt: Date.now() }
-}
+import { fetchWorkBuddyLocal, workBuddyOrigin } from './workbuddy-transport.mjs'
+import { fetchWithRetry, readJsonBounded } from './net.mjs'
+
+export const validWorkBuddyAccountId = id => typeof id === 'string' && /^(cn|global):[^\s\u0000-\u001f\u007f]{1,256}$/.test(id)
+const amount = value => typeof value === 'number' && Number.isFinite(value) && value >= 0
+
+/** Read the connector's published per-account endpoint; never switch its active account. */
+export async function fetchWorkBuddyAccounts(hostOrigin, config = {}, { signal, fetchImpl = fetchWorkBuddyLocal } = {}) {
+  if (!hostOrigin) return null
+  const origin = workBuddyOrigin(hostOrigin)
+  const results = await Promise.all(['cn', 'global'].map(async region => {
+    try {
+      const response = await fetchWithRetry(new URL('/plugins/dsh-connect-workbuddy/account-credits?region=' + region, origin),
+        { method: 'GET', redirect: 'error', signal }, { attempts: 1, timeoutMs: 35000, fetchImpl })
+      if (response.status === 404 || response.headers.get('content-type')?.includes('text/html')) { await response.body?.cancel?.(); return { missing: true } }
+      if (!response.ok) { await response.body?.cancel?.(); return { failed: true } }
+      const body = await readJsonBounded(response)
+      if (!Array.isArray(body?.accounts) || body.accounts.length > 200) return { failed: true }
+      const seen = new Set(), accounts = []
+      for (const row of body.accounts) {
+        const id = region + ':' + row?.id
+        if (!validWorkBuddyAccountId(id) || typeof row?.id !== 'string' || seen.has(id)) return { failed: true }
+        seen.add(id)
+        accounts.push({ id, region, name: typeof row.accountName === 'string' ? row.accountName.slice(0, 160) : '',
+          current: row.selected === true, remaining: amount(row.credits) ? row.credits : null })
+      }
+      return { accounts }
+    } catch { signal?.throwIfAborted(); return { failed: true } }
+  }))
+  // An older connector has no account list; its selected-account route remains usable.
+  if (!results.some(result => result.accounts)) return null
+  const accounts = results.flatMap(result => result.accounts ?? [])
+  const scope = ['all', 'selected'].includes(config.accountScope) ? config.accountScope : 'current'
+  const ids = new Set(Array.isArray(config.accountIds) ? config.accountIds : [])
+  if (scope === 'selected') for (const id of ids) if (validWorkBuddyAccountId(id) && !accounts.some(row => row.id === id)) {
+    accounts.push({ id, region: id.split(':')[0], name: '', current: false, remaining: null })
+  }
+  const selected = accounts.filter(row => scope === 'all' || (scope === 'current' ? row.current : ids.has(row.id)))
+  const known = selected.filter(row => row.remaining !== null)
+  return { scope, accounts, selectedIds: selected.map(row => row.id),
+    knownRemaining: known.reduce((sum, row) => sum + row.remaining, 0),
+    unknownCount: selected.length - known.length,
+    incomplete: results.some(result => result.failed), fetchedAt: Date.now() }
+}

package/lib/vendor/cost-meter/workbuddy-transport.mjs

@@ -1,38 +1,38 @@
-import { request } from 'node:http'
-
-export function workBuddyOrigin(value) {
-  let url
-  try { url = new URL(value) } catch {}
-  if (!url || url.protocol !== 'http:' || !['127.0.0.1', '[::1]', 'localhost'].includes(url.hostname)
-    || url.username || url.password || url.pathname !== '/' || url.search || url.hash) {
-    throw Object.assign(new Error('workbuddyConnectUnavailable'), { code: 'workbuddyConnectUnavailable' })
-  }
-  return url
-}
-
-// Host-local reads must not use DSH's global fetch proxy/dispatcher. No credentials,
-// redirects, or configurable remote paths; the byte limit includes the whole body.
-export function fetchWorkBuddyLocal(url, { signal } = {}) {
-  workBuddyOrigin(new URL(url).origin)
-  return new Promise((resolve, reject) => {
-    const req = request(url, { method: 'GET', agent: false, signal, headers: { accept: 'application/json', 'accept-encoding': 'identity' } }, res => {
-      const chunks = []; let bytes = 0
-      res.on('error', reject)
-      res.on('data', chunk => {
-        bytes += chunk.length
-        if (bytes > 1024 * 1024) { res.destroy(new Error('WorkBuddy response too large')); return }
-        chunks.push(chunk)
-      })
-      res.on('end', () => {
-        const status = res.statusCode ?? 502
-        if (status >= 300 && status < 400) { reject(new TypeError('fetch failed: redirect refused')); return }
-        resolve(new Response([204, 205, 304].includes(status) ? null : Buffer.concat(chunks), {
-          status, headers: { 'content-type': res.headers['content-type'] ?? '' },
-        }))
-      })
-    })
-    req.on('error', reject)
-    req.setTimeout(35000, () => req.destroy(new Error('WorkBuddy query timed out')))
-    req.end()
-  })
-}
+import { request } from 'node:http'
+
+export function workBuddyOrigin(value) {
+  let url
+  try { url = new URL(value) } catch {}
+  if (!url || url.protocol !== 'http:' || !['127.0.0.1', '[::1]', 'localhost'].includes(url.hostname)
+    || url.username || url.password || url.pathname !== '/' || url.search || url.hash) {
+    throw Object.assign(new Error('workbuddyConnectUnavailable'), { code: 'workbuddyConnectUnavailable' })
+  }
+  return url
+}
+
+// Host-local reads must not use DSH's global fetch proxy/dispatcher. No credentials,
+// redirects, or configurable remote paths; the byte limit includes the whole body.
+export function fetchWorkBuddyLocal(url, { signal } = {}) {
+  workBuddyOrigin(new URL(url).origin)
+  return new Promise((resolve, reject) => {
+    const req = request(url, { method: 'GET', agent: false, signal, headers: { accept: 'application/json', 'accept-encoding': 'identity' } }, res => {
+      const chunks = []; let bytes = 0
+      res.on('error', reject)
+      res.on('data', chunk => {
+        bytes += chunk.length
+        if (bytes > 1024 * 1024) { res.destroy(new Error('WorkBuddy response too large')); return }
+        chunks.push(chunk)
+      })
+      res.on('end', () => {
+        const status = res.statusCode ?? 502
+        if (status >= 300 && status < 400) { reject(new TypeError('fetch failed: redirect refused')); return }
+        resolve(new Response([204, 205, 304].includes(status) ? null : Buffer.concat(chunks), {
+          status, headers: { 'content-type': res.headers['content-type'] ?? '' },
+        }))
+      })
+    })
+    req.on('error', reject)
+    req.setTimeout(35000, () => req.destroy(new Error('WorkBuddy query timed out')))
+    req.end()
+  })
+}