@jeffusion/bungee-core 4.4.2 → 4.5.0

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

@@ -189,12 +189,13 @@
                   "X-Codex-Window-Id",
                   "Thread-Id",
                   "Session-Id",
+                  "X-Codex-Routing-Hint",
                   "X-OpenAI-Internal-Codex-Responses-Lite"
                 ],
                 "set": {
                   "Accept": "text/event-stream",
                   "Content-Type": "application/json",
-                  "User-Agent": "codex-tui/0.153.3 (Mac OS 26.5.1; arm64) iTerm.app/3.6.11 (codex-tui; 0.153.3)",
+                  "User-Agent": "codex-tui/0.154.0 (Mac OS 26.5.2; arm64) iTerm.app/3.6.11 (codex-tui; 0.154.0)",
                   "Originator": "codex-tui"
                 }
               }
@@ -266,6 +267,31 @@
       "ui.accountType": "Account type: {plan}",
       "ui.credentialExpiry": "Credentials expire: {date}",
       "ui.useService": "Use with service",
+      "ui.useRoute": "Use with route",
+      "ui.newRoute": "New route",
+      "ui.chooseRoute": "Choose route",
+      "ui.routesLoading": "Loading routes…",
+      "ui.routesFailed": "Unable to load routes. Try again.",
+      "ui.routeMissing": "The selected route no longer exists. Reload the list.",
+      "ui.routeDescription": "Add “{label}” to a route draft. No configuration is published now.",
+      "ui.routeHelp": "For a new or custom-endpoint route, this account is added to the unsaved target. An existing binding is reused. Review and explicitly save the route to publish.",
+      "ui.routeUsesService": "This route uses service “{name}”. Edit that service to add this account; its target will not be switched silently.",
+      "ui.editReferencedService": "Edit referenced service",
+      "ui.reloadRoutes": "Reload routes",
+      "ui.continueRoute": "Continue to route editor",
+      "ui.routeDraftAdded": "Account added to the unsaved route target. Check it, then explicitly save the route to publish.",
+      "ui.routeDraftExisting": "This account is already used by this route. The existing target is selected; no duplicate was added. Save only if you change the route.",
+      "ui.routeDraftError": "The account could not be added. Your current route draft is unchanged. Return to Accounts and try again.",
+      "ui.routeHandoffInvalid": "The account handoff link is invalid. Return to Accounts and choose the route again.",
+      "ui.routeHandoffChanged": "This route changed while adding the account. Your draft is unchanged; return to Accounts and choose it again.",
+      "ui.routeHandoffUnsupported": "This route cannot accept a custom target. Edit the referenced service or change the route target yourself.",
+      "ui.routeHandoffSourceUnavailable": "The account source is unavailable. Check that its plugin is enabled, then try again.",
+      "ui.routeHandoffAccountUnavailable": "This account is no longer available. Refresh Accounts and choose an available account.",
+      "ui.routeSaveError": "The route could not be saved. Your draft remains here; try again.",
+      "ui.routeStale": "This route changed elsewhere. No changes were published. Your draft remains here; reload the latest route before saving again.",
+      "ui.routeReload": "Reload route",
+      "ui.routeReloadTitle": "Reload latest route?",
+      "ui.routeReloadConfirm": "This will discard your unsaved route draft. Continue?",
       "ui.usageLabel": "Usage",
       "ui.refreshUsage": "Refresh quota usage",
       "ui.resolveReset": "Resolve",
@@ -434,6 +460,31 @@
       "ui.accountType": "账号类型：{plan}",
       "ui.credentialExpiry": "凭据到期：{date}",
       "ui.useService": "用于服务",
+      "ui.useRoute": "用于路由",
+      "ui.newRoute": "新建路由",
+      "ui.chooseRoute": "选择路由",
+      "ui.routesLoading": "正在加载路由…",
+      "ui.routesFailed": "路由加载失败，请重试。",
+      "ui.routeMissing": "所选路由已不存在，请刷新列表。",
+      "ui.routeDescription": "将「{label}」加入路由草稿，当前不会发布配置。",
+      "ui.routeHelp": "新建或自定义端点路由会加入未保存的目标；已绑定同一账号时定位已有端点。检查后需手动保存路由才会发布。",
+      "ui.routeUsesService": "这条路由引用服务「{name}」。请到服务编辑器添加账号，不会静默切换路由目标。",
+      "ui.editReferencedService": "编辑引用的服务",
+      "ui.reloadRoutes": "重新加载路由",
+      "ui.continueRoute": "继续到路由编辑器",
+      "ui.routeDraftAdded": "账号已加入未保存的路由目标。检查后需明确保存路由才会发布。",
+      "ui.routeDraftExisting": "此路由已使用该账号，已定位现有目标，不会重复添加。仅在修改路由后才需保存。",
+      "ui.routeDraftError": "无法加入账号，当前路由草稿未改变。请返回账号页面重试。",
+      "ui.routeHandoffInvalid": "账号交接链接无效，请返回账号页面重新选择路由。",
+      "ui.routeHandoffChanged": "添加账号期间路由已发生变化，草稿未修改；请返回账号页面重新选择。",
+      "ui.routeHandoffUnsupported": "此路由不能添加自定义目标。请编辑其引用的服务，或自行调整路由目标。",
+      "ui.routeHandoffSourceUnavailable": "账号来源不可用，请确认插件已启用后重试。",
+      "ui.routeHandoffAccountUnavailable": "此账号目前不可用，请刷新账号页面后选择可用账号。",
+      "ui.routeSaveError": "路由保存失败，当前草稿仍保留，请重试。",
+      "ui.routeStale": "路由已被其他操作修改，未发布任何更改。当前草稿仍保留；需重新加载最新路由后才能再次保存。",
+      "ui.routeReload": "重新加载路由",
+      "ui.routeReloadTitle": "重新加载最新路由？",
+      "ui.routeReloadConfirm": "这会丢弃当前未保存的路由草稿，是否继续？",
       "ui.usageLabel": "用量",
       "ui.refreshUsage": "刷新额度用量",
       "ui.resolveReset": "确认结果",

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

@@ -1,15 +1,17 @@
 <script lang="ts">
-  import { onMount } from 'svelte';
+  import { onMount, tick } from 'svelte';
   import { push } from 'svelte-spa-router';
   import { requestPluginControl } from '$api/client';
   import { getConfigSnapshot } from '$api/config';
   import { ServicesAPI, type Service } from '$api/services';
   import { accountReferences } from '$api/upstream-sources';
-  import { sourceHandoffUrl } from '$api/source-handoff';
+  import { sourceHandoffUrl, routeSourceHandoffUrl } from '$api/source-handoff';
+  import { RoutesAPI, type Route } from '$api/routes';
   import { PanelCard, MetricBar, StatusBadge, LoadingIndicator, IndustrialDialog } from '$components/industrial';
   import RefreshCw from 'lucide-svelte/icons/refresh-cw';
   import Plus from 'lucide-svelte/icons/plus';
   import Server from 'lucide-svelte/icons/server';
+  import RouteIcon from 'lucide-svelte/icons/route';
   import Ellipsis from 'lucide-svelte/icons/ellipsis';
   import Pencil from 'lucide-svelte/icons/pencil';
   import LogIn from 'lucide-svelte/icons/log-in';
@@ -70,6 +72,11 @@
   let useOpen = $state(false), useAccount = $state<Account | null>(null), services = $state<Service[]>([]);
   let serviceChoice = $state('new'), servicesLoading = $state(false), serviceError = $state('');
   let selectedService = $derived($isLoading ? undefined : { value: serviceChoice, label: serviceChoice === 'new' ? t('ui.newService') : services.find(service => service._uid === serviceChoice)?.name ?? serviceChoice });
+  let routeOpen = $state(false), routeAccount = $state<Account | null>(null), routes = $state<Route[]>([]);
+  let routeChoice = $state('new'), routesLoading = $state(false), routeError = $state('');
+  let routeGeneration = 0;
+  let selectedRoute = $derived(routes.find(route => route.path === routeChoice));
+  let routeSelection = $derived($isLoading ? undefined : { value: routeChoice, label: routeChoice === 'new' ? t('ui.newRoute') : selectedRoute?.path ?? routeChoice });
   let resetOpen = $state(false), resetAccount = $state<Account | null>(null), resetCredit = $state<Credit | null>(null);
   let resetRequestId = $state(''), resetBusy = $state(false), resetNotice = $state('');
   let pendingResetByAccount = $state<Record<string, PendingReset>>({});
@@ -362,17 +369,50 @@
   }
   function openUse(account: Account) {
     if (!account.available) return;
+    routeOpen = false;
     useAccount = account; serviceChoice = 'new'; services = []; useOpen = true; void loadServices();
   }
-  function continueToService() {
+  async function continueToService() {
     if (!useAccount?.available || servicesLoading || serviceError) return;
     const existing = services.find(service => service._uid === serviceChoice);
     if (serviceChoice !== 'new' && !existing) { serviceError = 'ui.serviceMissing'; return; }
     const handoff = { sourcePlugin: pluginName, sourceId: 'chatgpt', accountRef: useAccount.id,
       mode: existing ? 'existing' as const : 'new' as const, ...(existing ? { serviceId: existing._uid } : {}) };
     useOpen = false; loginOpen = false; clearSecrets();
+    await tick(); // Flush the dialog close before navigation unmounts the account page.
+    if (lifetime.signal.aborted) return;
     void push(sourceHandoffUrl(handoff, existing?.name));
   }
+  async function loadRoutes() {
+    const generation = ++routeGeneration;
+    routesLoading = true; routeError = '';
+    try { const loaded = await RoutesAPI.list(); if (generation === routeGeneration) routes = loaded; }
+    catch { if (generation === routeGeneration) routeError = 'ui.routesFailed'; }
+    finally { if (generation === routeGeneration) routesLoading = false; }
+  }
+  function openRoute(account: Account) {
+    if (!account.available) return;
+    useOpen = false;
+    routeAccount = account; routeChoice = 'new'; routes = []; routeOpen = true; void loadRoutes();
+  }
+  async function continueToRoute() {
+    if (!routeAccount?.available || routesLoading || routeError || selectedRoute?.service) return;
+    if (routeChoice !== 'new' && !selectedRoute?._uid) { routeError = 'ui.routeMissing'; return; }
+    const handoff = { sourcePlugin: pluginName, sourceId: 'chatgpt', accountRef: routeAccount.id,
+      mode: selectedRoute ? 'existing' as const : 'new' as const,
+      ...(selectedRoute ? { routeId: selectedRoute._uid } : {}) };
+    routeOpen = false; loginOpen = false; clearSecrets();
+    await tick();
+    if (lifetime.signal.aborted) return;
+    void push(routeSourceHandoffUrl(handoff, selectedRoute?.path));
+  }
+  async function editReferencedService() {
+    const service = selectedRoute?.service;
+    if (!service) return;
+    routeOpen = false;
+    await tick();
+    if (!lifetime.signal.aborted) void push(`/services/edit/${encodeURIComponent(service)}`);
+  }
   function invalidatePolling() { pollGeneration += 1; clearTimeout(timer); timer = undefined; }
   function clearSession() { invalidatePolling(); clearSecrets(); session = null; status = ''; }
   onMount(() => { usageTimer = setInterval(() => { clock = Date.now(); }, 30000); void refreshAccounts(); return () => { lifetime.abort(); clearSession(); if (usageTimer) clearInterval(usageTimer); }; });
@@ -440,6 +480,7 @@
             {:else}<p class="text-sm text-zinc-400">{t(snapshot.error ? 'ui.usageFailed' : 'ui.usageSkipped')}</p>{/if}
             <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>
               <DropdownMenu.Root>
                 <DropdownMenu.Trigger asChild let:builder><Button variant="ghost" size="sm" class="aspect-square px-0 [&>span]:mr-0" builders={[builder]} disabled={actionBusy} aria-label={`${t('ui.more')}: ${account.label}`} title={t('ui.more')}>{@render actionIcon(Ellipsis)}</Button></DropdownMenu.Trigger>
                 <DropdownMenu.Content class="z-[200]" align="end">
@@ -520,6 +561,28 @@
   {/snippet}
 </IndustrialDialog>
 
+<IndustrialDialog bind:open={routeOpen} closeLabel={t('ui.close')} title={t('ui.useRoute')} description={t('ui.routeDescription', { label: routeAccount?.label ?? '' })}>
+  {#snippet body()}
+    <div class="space-y-1.5"><span class="nx-field-label">{t('ui.chooseRoute')}</span>
+      <Select.Root selected={routeSelection} onSelectedChange={(next) => routeChoice = next?.value ?? 'new'}>
+        <Select.Trigger class="w-full" aria-label={t('ui.chooseRoute')} disabled={routesLoading}><Select.Value placeholder={t('ui.chooseRoute')} /></Select.Trigger>
+        <Select.Content><Select.Item value="new" label={t('ui.newRoute')}>{t('ui.newRoute')}</Select.Item>{#each routes.filter(route => route._uid) as route (route._uid)}<Select.Item value={route.path} label={route.path}>{route.path}</Select.Item>{/each}</Select.Content>
+      </Select.Root>
+    </div>
+    {#if routesLoading}<p role="status" class="text-sm text-zinc-400">{t('ui.routesLoading')}</p>{/if}
+    {#if selectedRoute?.service}
+      <div role="alert" class="border-l-2 border-amber-500 bg-amber-500/5 px-3 py-2 text-sm text-amber-300 space-y-2">
+        <p>{t('ui.routeUsesService', { name: selectedRoute.service })}</p>
+        <Button variant="outline" size="sm" onclick={editReferencedService}>{@render actionIcon(Server)}{t('ui.editReferencedService')}</Button>
+      </div>
+    {:else}<p class="text-sm text-zinc-400">{t('ui.routeHelp')}</p>{/if}
+    {#if routeError}<p role="alert" class="text-sm text-red-300">{t(routeError)}</p><Button variant="outline" disabled={routesLoading} aria-busy={routesLoading} onclick={loadRoutes}>{@render actionIcon(RefreshCw, routesLoading)}{t('ui.reloadRoutes')}</Button>{/if}
+  {/snippet}
+  {#snippet footer()}
+    <Button disabled={routesLoading || !!routeError || !!selectedRoute?.service} aria-busy={routesLoading} onclick={continueToRoute}>{@render actionIcon(ArrowRight, routesLoading)}{t('ui.continueRoute')}</Button>
+  {/snippet}
+</IndustrialDialog>
+
 {#snippet accountActionFooter()}
   <Button form={`${id}-account-action`} type="submit" variant={action === 'delete' ? 'destructive' : 'default'} disabled={actionBusy} aria-busy={actionBusy}>{@render actionIcon(actionIcons[action] ?? Check, actionBusy)}{t(action === 'delete' ? 'ui.confirmDelete' : 'ui.confirm')}</Button>
 {/snippet}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeffusion/bungee-core",
-  "version": "4.4.2",
+  "version": "4.5.0",
   "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": "^4.4.2",
+    "@jeffusion/bungee-types": "^4.5.0",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
     "lodash-es": "^4.17.21",