@moguiyu/dsh-tavily 0.1.6 → 0.1.8

package/lib/client.js

@@ -7,9 +7,9 @@ window.__ModuleLoader__.load({
   const inject = ['slots']
 
   const STRATEGIES = [
-    { id: 'rotate', label: 'Rotate each key', hint: 'Keys are tried in turn (round-robin); on 401/429 the next key is used.' },
-    { id: 'low-usage-first', label: 'Lowest usage first', hint: 'On save, keys are re-ordered by current Tavily usage (least used first).' },
-    { id: 'high-usage-first', label: 'Highest usage first', hint: 'On save, keys are re-ordered by current Tavily usage (most used first).' }
+    { id: 'rotate', label: 'Round-robin', hint: 'Use keys in turn; on HTTP 401/429 the next key is tried automatically.' },
+    { id: 'low-usage-first', label: 'Lowest usage first', hint: 'Re-orders keys by current Tavily usage, least-used first. The first key becomes primary.' },
+    { id: 'high-usage-first', label: 'Highest usage first', hint: 'Re-orders keys by current Tavily usage, most-used first. The first key becomes primary.' }
   ]
 
   const ICONS = {
@@ -338,7 +338,9 @@ window.__ModuleLoader__.load({
                     const isRemoved = removing[masked] === true
                     const isReplacing = replacing[masked] === true
                     const isRevealed = typeof revealed[masked] === 'string'
-                    const usageRow = usage !== null && usage.ok === true ? usage.perKey[index] : null
+                    const usageRow = usage !== null && usage.ok === true
+                      ? (usage.perKey.find((row) => row.masked === masked) || usage.perKey[index])
+                      : null
                     const pct = usageRow && usageRow.ok && usageRow.planLimit != null && usageRow.planLimit > 0 && usageRow.planUsage != null
                       ? Math.min(100, Math.round((usageRow.planUsage / usageRow.planLimit) * 100))
                       : null
@@ -422,7 +424,7 @@ window.__ModuleLoader__.load({
                   notice !== null && react.createElement('span', { style: { fontSize: 13, color: notice.ok ? 'var(--dsw-alias-state-success-primary)' : 'var(--dsw-alias-state-error-primary)' } }, notice.ok ? notice.ok : String(notice.error))
                 ),
                 react.createElement('p', { style: { margin: 0, fontSize: 12, color: 'var(--dsw-alias-label-tertiary)' } },
-                  (STRATEGIES.find((option) => option.id === strategy) || STRATEGIES[0]).hint + ' Saved immediately when selected; the first key then becomes primary for web_search.'
+                  (STRATEGIES.find((option) => option.id === strategy) || STRATEGIES[0]).hint + ' Saved immediately when selected.'
                 )
               ),
               usageError !== null && react.createElement('p', { style: { margin: 0, fontSize: 12, color: 'var(--dsw-alias-state-error-primary)' } }, String(usageError)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moguiyu/dsh-tavily",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Tavily Search for DSH: multiple API keys, rotation/failover, usage gauge, settings card, and web_search toggle in one plugin.",
   "type": "module",
   "main": "./src/index.js",

package/src/client.js

@@ -12,9 +12,9 @@ export function factory(require) {
   const inject = ['slots']
 
   const STRATEGIES = [
-    { id: 'rotate', label: 'Rotate each key', hint: 'Keys are tried in turn (round-robin); on 401/429 the next key is used.' },
-    { id: 'low-usage-first', label: 'Lowest usage first', hint: 'On save, keys are re-ordered by current Tavily usage (least used first).' },
-    { id: 'high-usage-first', label: 'Highest usage first', hint: 'On save, keys are re-ordered by current Tavily usage (most used first).' }
+    { id: 'rotate', label: 'Round-robin', hint: 'Use keys in turn; on HTTP 401/429 the next key is tried automatically.' },
+    { id: 'low-usage-first', label: 'Lowest usage first', hint: 'Re-orders keys by current Tavily usage, least-used first. The first key becomes primary.' },
+    { id: 'high-usage-first', label: 'Highest usage first', hint: 'Re-orders keys by current Tavily usage, most-used first. The first key becomes primary.' }
   ]
 
   const ICONS = {
@@ -343,7 +343,9 @@ export function factory(require) {
                     const isRemoved = removing[masked] === true
                     const isReplacing = replacing[masked] === true
                     const isRevealed = typeof revealed[masked] === 'string'
-                    const usageRow = usage !== null && usage.ok === true ? usage.perKey[index] : null
+                    const usageRow = usage !== null && usage.ok === true
+                      ? (usage.perKey.find((row) => row.masked === masked) || usage.perKey[index])
+                      : null
                     const pct = usageRow && usageRow.ok && usageRow.planLimit != null && usageRow.planLimit > 0 && usageRow.planUsage != null
                       ? Math.min(100, Math.round((usageRow.planUsage / usageRow.planLimit) * 100))
                       : null
@@ -427,7 +429,7 @@ export function factory(require) {
                   notice !== null && react.createElement('span', { style: { fontSize: 13, color: notice.ok ? 'var(--dsw-alias-state-success-primary)' : 'var(--dsw-alias-state-error-primary)' } }, notice.ok ? notice.ok : String(notice.error))
                 ),
                 react.createElement('p', { style: { margin: 0, fontSize: 12, color: 'var(--dsw-alias-label-tertiary)' } },
-                  (STRATEGIES.find((option) => option.id === strategy) || STRATEGIES[0]).hint + ' Saved immediately when selected; the first key then becomes primary for web_search.'
+                  (STRATEGIES.find((option) => option.id === strategy) || STRATEGIES[0]).hint + ' Saved immediately when selected.'
                 )
               ),
               usageError !== null && react.createElement('p', { style: { margin: 0, fontSize: 12, color: 'var(--dsw-alias-state-error-primary)' } }, String(usageError)),

package/src/index.js

@@ -306,7 +306,7 @@ function readBody(req) {
   })
 }
 
-async function fetchUsageFor(key) {
+async function fetchUsageDetailsFor(key) {
   try {
     const controller = new AbortController()
     const timer = setTimeout(() => controller.abort(), 15000)
@@ -323,14 +323,32 @@ async function fetchUsageFor(key) {
     const json = await response.json()
     const account = json !== null && typeof json === 'object' ? json.account : undefined
     const keyUsage = json !== null && typeof json === 'object' ? json.key : undefined
-    if (account !== undefined && typeof account.plan_usage === 'number') return account.plan_usage
-    if (keyUsage !== undefined && typeof keyUsage.usage === 'number') return keyUsage.usage
-    return null
+    const usage = keyUsage !== undefined && typeof keyUsage.usage === 'number'
+      ? keyUsage.usage
+      : (account !== undefined && typeof account.plan_usage === 'number' ? account.plan_usage : null)
+    const planUsage = account !== undefined && typeof account.plan_usage === 'number'
+      ? account.plan_usage
+      : (keyUsage !== undefined && typeof keyUsage.usage === 'number' ? keyUsage.usage : null)
+    const planLimit = account !== undefined && typeof account.plan_limit === 'number'
+      ? account.plan_limit
+      : (keyUsage !== undefined && typeof keyUsage.limit === 'number' ? keyUsage.limit
+        : (keyUsage !== undefined && typeof keyUsage.plan_limit === 'number' ? keyUsage.plan_limit : null))
+    const currentPlan = account !== undefined && typeof account.plan === 'string'
+      ? account.plan
+      : (keyUsage !== undefined && typeof keyUsage.plan === 'string' ? keyUsage.plan : null)
+    if (usage === null && planUsage === null) return null
+    return { usage, planUsage, planLimit, currentPlan }
   } catch {
     return null
   }
 }
 
+async function fetchUsageFor(key) {
+  const details = await fetchUsageDetailsFor(key)
+  if (details === null) return null
+  return details.usage !== null ? details.usage : details.planUsage
+}
+
 async function collectStoredKeys(credentials) {
   const out = []
   const seen = new Set()
@@ -382,11 +400,24 @@ function applyBackend(ctx) {
         }
       }
     }
+    const primaryMasked = keys.length > 0 ? maskValue(keys[0]) : null
+    const display = keys.map((value) => {
+      const masked = maskValue(value)
+      return {
+        masked,
+        savedAt: keySavedAt[masked] !== undefined ? keySavedAt[masked] : null,
+      }
+    }).sort((a, b) => {
+      if (a.savedAt === b.savedAt) return 0
+      if (a.savedAt === null) return 1
+      if (b.savedAt === null) return -1
+      return a.savedAt < b.savedAt ? -1 : 1
+    })
     return {
-      keys: keys.map((value, index) => ({
-        masked: maskValue(value),
-        savedAt: keySavedAt[maskValue(value)] !== undefined ? keySavedAt[maskValue(value)] : null,
-        primary: index === 0,
+      keys: display.map((entry) => ({
+        masked: entry.masked,
+        savedAt: entry.savedAt,
+        primary: entry.masked === primaryMasked,
       })),
       strategy: isValidStrategy(state.strategy) ? state.strategy : 'rotate',
     }
@@ -419,15 +450,25 @@ function applyBackend(ctx) {
       try {
         const keys = await collectStoredKeys(credentials)
         if (keys.length === 0) return send(res, 200, { ok: false, error: 'no Tavily API key configured' })
+        const state = readState(MANAGER_STATE)
+        const keySavedAt = state.keySavedAt !== undefined && typeof state.keySavedAt === 'object' ? state.keySavedAt : {}
+        const orderedKeys = keys.slice().sort((a, b) => {
+          const am = keySavedAt[maskValue(a)] !== undefined ? keySavedAt[maskValue(a)] : null
+          const bm = keySavedAt[maskValue(b)] !== undefined ? keySavedAt[maskValue(b)] : null
+          if (am === bm) return 0
+          if (am === null) return 1
+          if (bm === null) return -1
+          return am < bm ? -1 : 1
+        })
         const perKey = []
-        for (const key of keys) {
+        for (const key of orderedKeys) {
           try {
-            const usage = await fetchUsageFor(key)
+            const usage = await fetchUsageDetailsFor(key)
             perKey.push(usage !== null
-              ? { ok: true, usage, planUsage: usage, planLimit: null, currentPlan: null }
-              : { ok: false, error: 'usage unavailable' })
+              ? { ok: true, masked: maskValue(key), ...usage }
+              : { ok: false, masked: maskValue(key), error: 'usage unavailable' })
           } catch (error) {
-            perKey.push({ ok: false, error: String(error && error.message ? error.message : error) })
+            perKey.push({ ok: false, masked: maskValue(key), error: String(error && error.message ? error.message : error) })
           }
         }
         const okRows = perKey.filter((row) => row.ok)
@@ -438,8 +479,8 @@ function applyBackend(ctx) {
             keys: keys.length,
             okKeys: okRows.length,
             usage: okRows.reduce((sum, row) => sum + (row.usage || 0), 0),
-            planUsage: null,
-            planLimit: null,
+            planUsage: okRows.reduce((sum, row) => sum + (row.planUsage || 0), 0),
+            planLimit: okRows.every((row) => row.planLimit !== null) ? okRows.reduce((sum, row) => sum + row.planLimit, 0) : null,
           },
         })
       } catch (error) {