@jeffusion/bungee-core 5.5.0 → 5.6.1

package/dist/plugins/chatgpt-oauth/manifest.json

@@ -78,6 +78,15 @@
         "execution": "control",
         "capability": "config.write"
       },
+      {
+        "path": "/accounts/auto-reset",
+        "methods": [
+          "POST"
+        ],
+        "handler": "setAutoResetCredits",
+        "execution": "control",
+        "capability": "config.write"
+      },
       {
         "path": "/accounts/draft",
         "methods": [
@@ -344,6 +353,13 @@
       "ui.credit.redeemed": "Redeemed",
       "ui.credit.unknown": "Unknown",
       "ui.useCredit": "Use",
+      "ui.autoResetEnabled": "Automatic reset enabled (30 minutes before expiry)",
+      "ui.autoResetDisabled": "Automatic reset disabled",
+      "ui.autoResetLabel": "Auto reset",
+      "ui.enableAutoReset": "Enable automatic reset",
+      "ui.disableAutoReset": "Disable automatic reset",
+      "ui.autoResetHelp": "The server refreshes the credit list every 5 minutes and schedules available credits for 30 minutes before expiry. Credits already in their final 30 minutes are processed immediately. Expired credits and credits without an expiry are skipped. Unknown results pause automation and require explicit resolution. Enable for this account?",
+      "ui.disableAutoResetHelp": "Stop scheduling automatic resets for this account. Requests already sent may still finish.",
       "ui.resetConfirmTitle": "Use reset credit",
       "ui.resetRetryTitle": "Retry reset credit",
       "ui.resetConfirmHelp": "This uses one reset credit for the account. Confirm only once.",
@@ -537,6 +553,13 @@
       "ui.credit.redeemed": "已兑换",
       "ui.credit.unknown": "未知",
       "ui.useCredit": "使用",
+      "ui.autoResetEnabled": "自动重置已开启（到期前 30 分钟）",
+      "ui.autoResetDisabled": "自动重置已关闭",
+      "ui.autoResetLabel": "自动重置",
+      "ui.enableAutoReset": "开启自动重置",
+      "ui.disableAutoReset": "关闭自动重置",
+      "ui.autoResetHelp": "服务端每 5 分钟刷新卡列表，并定时在重置卡到期前 30 分钟自动使用；已进入最后 30 分钟的卡立即处理。跳过已过期或到期时间未知的卡；结果未知时暂停自动兑换，需手动处理。是否为此账号开启？",
+      "ui.disableAutoResetHelp": "停止为此账号安排自动重置。已发送的兑换请求仍可能完成。",
       "ui.resetConfirmTitle": "使用重置额度",
       "ui.resetRetryTitle": "重试重置额度",
       "ui.resetConfirmHelp": "这会为该账号使用一份重置额度，请只确认一次。",

package/dist/plugins/chatgpt-oauth/ui/AccountsPage.svelte

@@ -40,7 +40,7 @@
   type AccountUsage = ReturnType<typeof accountUsage>;
   type Credit = NonNullable<AccountUsage['resetCredits']['value']>['credits'][number];
   type UsageSnapshot = AccountUsage | { state: 'loading' | 'unavailable'; error?: boolean };
-  type PendingReset = { credit: Credit; creditId: string; redeemRequestId: string; unknown: true };
+  type PendingReset = { credit: Credit; creditId: string; redeemRequestId: string; unknown: true; automatic?: boolean };
   type Session = { sessionId: string; expiresAt: number; userCode?: string; verificationUri?: string; authorizationUrl?: string };
   const pluginName = 'chatgpt-oauth';
   const id = $props.id();
@@ -220,6 +220,12 @@
       if (!Array.isArray(response.accounts)) throw new Error('invalid_response');
       if (generation !== accountRefreshGeneration) return;
       accounts = response.accounts.map(accountSummary);
+      for (const account of accounts) {
+        const pending = account.pendingAutoReset;
+        if (pending) pendingResetByAccount[account.id] = { ...pending, unknown: true, automatic: true,
+          credit: { creditId: pending.creditId, status: 'unknown', expiresAt: pending.expiresAt } };
+        else if (pendingResetByAccount[account.id]?.automatic) delete pendingResetByAccount[account.id];
+      }
       await refreshUsages(accounts, generation);
     } catch (error) { if (!lifetime.signal.aborted && generation === accountRefreshGeneration) notice = errorText(error); }
     finally { if (generation === accountRefreshGeneration) refreshing = false; }
@@ -303,7 +309,7 @@
     if (actionBusy) return;
     const generation = ++referenceGeneration;
     action = value; actionAccount = account; label = account.label; actionNotice = ''; references = null; referenceNotice = ''; actionOpen = true;
-    if (value === 'rename') return;
+    if (value === 'rename' || value === 'auto-reset') return;
     referenceNotice = 'ui.referencesLoading';
     try {
       const snapshot = await getConfigSnapshot();
@@ -355,7 +361,8 @@
     actionBusy = true;
     const generation = referenceGeneration;
     try {
-      await control('POST', `/accounts/${action}`, { accountRef: actionAccount.id, ...(action === 'rename' ? { label: label.trim() } : {}) });
+      await control('POST', `/accounts/${action}`, { accountRef: actionAccount.id, ...(action === 'rename' ? { label: label.trim() } : {}),
+        ...(action === 'auto-reset' ? { enabled: !actionAccount.autoResetCredits } : {}) });
       if (generation === referenceGeneration) actionOpen = false;
       await refreshAccounts();
     } catch (error) { actionNotice = errorText(error); }
@@ -450,6 +457,7 @@
               {#if !account.email}<p class="text-sm text-zinc-400">{t('ui.noEmail')}</p>{/if}
               {#if account.plan}<p class="text-sm text-zinc-300" data-testid="account-type">{t('ui.accountType', { plan: account.plan })}</p>{/if}
               {#if typeof account.expiresAt === 'number'}<p class="tabular-nums text-xs text-zinc-400">{t('ui.credentialExpiry', { date: dateText(account.expiresAt) })}</p>{/if}
+              <p class="text-xs text-zinc-400" data-testid="auto-reset-status">{t(account.autoResetCredits ? 'ui.autoResetEnabled' : 'ui.autoResetDisabled')}</p>
             </div>
             <div class="flex flex-wrap items-center gap-2"><span class="nx-field-label">{t('ui.usageLabel')}</span><Button variant="ghost" size="sm" class="aspect-square px-0 [&>span]:mr-0" disabled={!eligibleForUsage(account) || usageRefreshing[account.id]} aria-busy={!!usageRefreshing[account.id]} aria-label={t('ui.refreshUsage')} title={t('ui.refreshUsage')} onclick={() => { if (!usageRefreshing[account.id]) void refreshUsage(account); }}>{@render actionIcon(RefreshCw, usageRefreshing[account.id])}</Button>{#if status !== 'fresh'}<span role="status" class={`text-xs ${status === 'stale' || status === 'partial' ? 'text-amber-300' : 'text-zinc-400'}`}>{t(`ui.usage.${status}`)}</span>{/if}</div>
             {#if 'usage' in snapshot}
@@ -457,9 +465,25 @@
               {#if snapshot.usage.value?.primary?.usedPercent !== undefined}<MetricBar label={windowLabel(snapshot.usage.value.primary.windowSeconds)} value={snapshot.usage.value.primary.usedPercent} valueLabel={`${snapshot.usage.value.primary.usedPercent}% ${t('ui.used')}`} /><p class="tabular-nums text-xs text-zinc-400">{#if snapshot.usage.value.primary.windowSeconds !== undefined}{t('ui.window', { duration: formatWindow(snapshot.usage.value.primary.windowSeconds) })}{/if}{#if snapshot.usage.value.primary.resetAt !== undefined} · {t('ui.resetAt', { value: resetTime(snapshot.usage.value.primary.resetAt) })}{/if}</p>{/if}
               {#if snapshot.usage.value?.secondary?.usedPercent !== undefined}<MetricBar label={windowLabel(snapshot.usage.value.secondary.windowSeconds)} value={snapshot.usage.value.secondary.usedPercent} valueLabel={`${snapshot.usage.value.secondary.usedPercent}% ${t('ui.used')}`} /><p class="tabular-nums text-xs text-zinc-400">{#if snapshot.usage.value.secondary.windowSeconds !== undefined}{t('ui.window', { duration: formatWindow(snapshot.usage.value.secondary.windowSeconds) })}{/if}{#if snapshot.usage.value.secondary.resetAt !== undefined} · {t('ui.resetAt', { value: resetTime(snapshot.usage.value.secondary.resetAt) })}{/if}</p>{/if}
               {#if !snapshot.usage.value?.primary && !snapshot.usage.value?.secondary}<p class="text-sm text-zinc-400">{t('ui.noUsageWindows')}</p>{/if}
+            {:else if snapshot.state === 'loading'}<LoadingIndicator label={t('ui.usageLoading')} size="sm" height="none" />
+            {:else}<p class="text-sm text-zinc-400">{t(snapshot.error ? 'ui.usageFailed' : 'ui.usageSkipped')}</p>{/if}
+            <div class="mt-auto border-t border-carbon-600 pt-3 space-y-2">
+              <div class="flex items-center justify-between gap-2" data-testid="reset-heading">
+                <div class="flex min-w-0 flex-wrap items-center gap-2"><span class="nx-field-label">{t('ui.resetCredits')}</span><span aria-hidden="true" class="text-zinc-500">·</span><span class="text-sm text-zinc-400"><span class="nx-display tabular-nums text-zinc-100">{count ?? '—'}</span> {t('ui.creditsAvailable')}</span></div>
+                <button type="button" role="switch" aria-checked={account.autoResetCredits}
+                  aria-label={`${t('ui.autoResetLabel')}: ${account.label}`}
+                  title={t(account.autoResetCredits ? 'ui.autoResetEnabled' : 'ui.autoResetHelp')}
+                  disabled={actionBusy || account.status === 'revoked'} data-testid="auto-reset-toggle"
+                  class="inline-flex h-[24px] shrink-0 items-center gap-1.5 whitespace-nowrap text-xs text-zinc-400 transition-colors hover:text-zinc-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-nexus-500 focus-visible:ring-offset-2 focus-visible:ring-offset-carbon-950 disabled:cursor-not-allowed disabled:opacity-50"
+                  onclick={() => openAction('auto-reset', account)}>
+                  <span>{t('ui.autoResetLabel')}</span>
+                  <span aria-hidden="true" data-testid="auto-reset-track"
+                    class={`inline-flex h-[16px] w-[30px] shrink-0 items-center border bg-carbon-900 transition-colors ${account.autoResetCredits ? 'border-nexus-500' : 'border-carbon-600'}`}>
+                    <span class={`block h-[12px] w-[12px] transition-transform ${account.autoResetCredits ? 'translate-x-[15px] bg-nexus-500' : 'translate-x-px bg-carbon-500'}`}></span>
+                  </span>
+                </button>
+              </div>
               {#if count !== undefined || ('usage' in snapshot && snapshot.resetCredits.state !== 'unavailable') || pending}
-                <div class="mt-auto border-t border-carbon-600 pt-3 space-y-2">
-                  <div class="flex flex-wrap items-center gap-2" data-testid="reset-heading"><span class="nx-field-label">{t('ui.resetCredits')}</span><span aria-hidden="true" class="text-zinc-500">·</span><span class="text-sm text-zinc-400"><span class="nx-display tabular-nums text-zinc-100">{count ?? '—'}</span> {t('ui.creditsAvailable')}</span></div>
                   <!-- Native keyboard scrolling must also work when no credit action is available. -->
                   <!-- svelte-ignore a11y_no_noninteractive_tabindex -->
                   <div class="credit-viewport h-32 overscroll-contain space-y-1 pr-1" data-testid="credit-viewport" role="region" aria-label={t('ui.resetCredits')} tabindex="0">
@@ -474,10 +498,8 @@
                     </div>
                   {/each}
                   </div>
-                </div>
-              {/if}
-            {:else if snapshot.state === 'loading'}<LoadingIndicator label={t('ui.usageLoading')} size="sm" height="none" />
-            {:else}<p class="text-sm text-zinc-400">{t(snapshot.error ? 'ui.usageFailed' : 'ui.usageSkipped')}</p>{/if}
+              {:else}<p class="text-sm text-zinc-400">{t('ui.creditDetailsUnavailable')}</p>{/if}
+            </div>
             <div class="flex flex-wrap items-center justify-end gap-2" data-testid="account-actions">
               <Button variant="secondary" size="sm" disabled={!account.available} onclick={() => openUse(account)}>{@render actionIcon(Server)}{t('ui.useService')}</Button>
               <Button variant="secondary" size="sm" disabled={!account.available} onclick={() => openRoute(account)}>{@render actionIcon(RouteIcon)}{t('ui.useRoute')}</Button>
@@ -588,10 +610,11 @@
 {/snippet}
 
 <IndustrialDialog bind:open={actionOpen} busy={actionBusy} scrollBody closeLabel={t('ui.close')} footer={action === 'references' ? undefined : accountActionFooter}
-  title={t(actionTitles[action] ?? 'ui.more')} description={actionAccount?.label ?? ''}>
+  title={t(action === 'auto-reset' ? (actionAccount?.autoResetCredits ? 'ui.disableAutoReset' : 'ui.enableAutoReset') : actionTitles[action] ?? 'ui.more')} description={actionAccount?.label ?? ''}>
   {#snippet body()}
     <form id={`${id}-account-action`} onsubmit={confirmAction} class="space-y-4">
       {#if action === 'rename'}<label class="block space-y-1.5"><span class="nx-field-label">{t('ui.accountName')}</span><Input bind:value={label} maxlength={128} required /></label>{/if}
+      {#if action === 'auto-reset'}<p class="text-sm text-zinc-300">{t(actionAccount?.autoResetCredits ? 'ui.disableAutoResetHelp' : 'ui.autoResetHelp')}</p>{/if}
       {#if ['delete', 'disable'].includes(action)}<p role="alert" class="text-sm text-amber-300">{t('ui.dangerHelp')}</p>{/if}
       {#if referenceNotice}<p role="status" class="text-sm text-zinc-400">{t(referenceNotice)}</p>{/if}
       {#if references}

package/dist/plugins/chatgpt-oauth/ui/account-model.js

@@ -51,7 +51,19 @@ export function accountSummary(input) {
   if (typeof value.id !== 'string' || typeof value.label !== 'string' || typeof value.status !== 'string' || !Object.hasOwn(accountStates, value.status)
     || typeof value.available !== 'boolean') throw new Error('invalid_response');
   const identity = value.identity === undefined ? {} : record(value.identity);
+  if (value.autoResetCredits !== undefined && typeof value.autoResetCredits !== 'boolean') throw new Error('invalid_response');
+  let pendingAutoReset;
+  if (value.pendingAutoReset !== undefined) {
+    const pending = record(value.pendingAutoReset);
+    const creditId = safeText(pending.creditId);
+    const redeemRequestId = safeText(pending.redeemRequestId, 128);
+    const expiresAt = safeEpoch(pending.expiresAt);
+    if (!creditId || !redeemRequestId || !/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(redeemRequestId)
+      || pending.completed !== false) throw new Error('invalid_response');
+    pendingAutoReset = { creditId, redeemRequestId, expiresAt };
+  }
   return { id: value.id, label: value.label, status: value.status, available: value.available,
+    autoResetCredits: value.autoResetCredits === true, pendingAutoReset,
     expiresAt: Number.isFinite(value.expiresAt) ? value.expiresAt : undefined,
     email: typeof identity.email === 'string' ? identity.email : undefined,
     plan: typeof identity.planType === 'string' ? identity.planType : undefined };

package/dist/plugins/chatgpt-oauth/ui/account-model.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import { test } from 'bun:test';
-import { accountUsage, errorCode, resetOutcome } from './account-model.js';
+import { accountSummary, accountUsage, errorCode, resetOutcome } from './account-model.js';
 
 const usage = { usage: { state: 'fresh', value: { availableCount: 1 } }, resetCredits: { state: 'fresh', value: {
   availableCount: 1,
@@ -8,6 +8,19 @@ const usage = { usage: { state: 'fresh', value: { availableCount: 1 } }, resetCr
     title: 'Daily reset', description: 'A bounded description', expiresAt: 1700003600000 }],
 } } };
 
+test('old accounts default automation off; pending automatic reset is bounded and redacted', () => {
+  const base = { id: 'simulation-account', label: 'Simulation', status: 'active', available: true };
+  assert.equal(accountSummary(base).autoResetCredits, false);
+  const pending = { creditId: 'simulation-credit', redeemRequestId: '123e4567-e89b-42d3-a456-426614174000', expiresAt: 1900000000000, completed: false };
+  const parsed = accountSummary({ ...base, autoResetCredits: true, pendingAutoReset: { ...pending, accessToken: 'never-expose' } });
+  assert.equal(parsed.autoResetCredits, true);
+  assert.deepEqual(parsed.pendingAutoReset, { creditId: pending.creditId, redeemRequestId: pending.redeemRequestId, expiresAt: pending.expiresAt });
+  for (const autoResetCredits of ['true', 1, null]) assert.throws(() => accountSummary({ ...base, autoResetCredits }), /invalid_response/);
+  for (const override of [{ creditId: '' }, { redeemRequestId: 'bad' }, { expiresAt: NaN }, { completed: true }]) {
+    assert.throws(() => accountSummary({ ...base, pendingAutoReset: { ...pending, ...override } }), /invalid_response/);
+  }
+});
+
 test('projects bounded credit metadata without exposing unsafe fields', () => {
   const result = accountUsage(usage);
   assert.deepEqual(result.resetCredits.value?.credits[0], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeffusion/bungee-core",
-  "version": "5.5.0",
+  "version": "5.6.1",
   "description": "Bungee reverse proxy core engine",
   "main": "./dist/main.js",
   "types": "./dist/main.d.ts",
@@ -12,7 +12,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@jeffusion/bungee-types": "^5.5.0",
+    "@jeffusion/bungee-types": "^5.6.1",
     "@types/lodash-es": "^4.17.12",
     "acorn": "^8.15.0",
     "canonicalize": "3.0.0",