@alilis/k-hat 0.2.3 → 0.2.4

package/dist/admin.js

@@ -3,6 +3,7 @@ import { LogWriter } from './logger.js';
 import { join } from 'node:path';
 import { UiSessions, serveUi } from './web-ui.js';
 import { ACCESS_TOKEN_REF, generateAccessToken } from './vault.js';
+import { providerUrl } from './config.js';
 // Admin API is the daemon's single-writer surface (ADR-0005). It is reachable
 // only from loopback and behind the proxy access token, so a local non-loopback
 // client or a process without the token cannot mutate config/state/vault.
@@ -43,7 +44,7 @@ async function listProviderModels(store, providerId) {
     if (!secret)
         throw new Error('provider key secret is missing');
     const headers = upstreamHeaders(provider.protocol, secret);
-    const response = await fetch(new URL('/v1/models', provider.baseUrl), { headers, signal: AbortSignal.timeout(10_000) });
+    const response = await fetch(providerUrl(provider.baseUrl, '/v1/models'), { headers, signal: AbortSignal.timeout(10_000) });
     if (!response.ok)
         throw new Error(`model query failed with HTTP ${response.status}`);
     const body = await response.json();
@@ -186,7 +187,7 @@ async function route(req, res, store, sessionAuthorized = false) {
             const path = provider.protocol === 'anthropic' ? '/v1/messages' : '/v1/chat/completions';
             const headers = upstreamHeaders(provider.protocol, secret, true);
             const body = provider.protocol === 'anthropic' ? { model, max_tokens: 1, messages: [{ role: 'user', content: 'ping' }] } : { model, max_tokens: 1, messages: [{ role: 'user', content: 'ping' }], stream: false };
-            const response = await fetch(new URL(path, provider.baseUrl), { method: 'POST', headers: headers, body: JSON.stringify(body), signal: AbortSignal.timeout(30_000) });
+            const response = await fetch(providerUrl(provider.baseUrl, path), { method: 'POST', headers: headers, body: JSON.stringify(body), signal: AbortSignal.timeout(30_000) });
             if (response.ok)
                 await store.mutate(() => enableKey(store, provider.id, key.id));
             return json(res, response.ok ? 200 : 502, { ok: response.ok, status: response.status });

package/dist/cli.js

@@ -6,7 +6,7 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createInterface } from 'node:readline/promises';
-import { saveJsonAtomic, defaultConfig } from './config.js';
+import { saveJsonAtomic, providerUrl, defaultConfig } from './config.js';
 import { createKhatServer } from './server.js';
 import { openStore, maskSecret } from './store.js';
 import { Vault, generateAccessToken, ACCESS_TOKEN_REF } from './vault.js';
@@ -547,7 +547,7 @@ try {
                 const protocol = (flagString(flags, 'protocol') ?? 'openai');
                 if (protocol !== 'openai' && protocol !== 'anthropic')
                     throw new Error(`unsupported protocol '${protocol}' (use 'openai' or 'anthropic')`);
-                await adminRequest('/_keys/providers', { method: 'POST', body: JSON.stringify({ id, name: flagString(flags, 'name'), protocol, baseUrl: baseUrl.replace(/\/+$/, '') }) });
+                await adminRequest('/_keys/providers', { method: 'POST', body: JSON.stringify({ id, name: flagString(flags, 'name'), protocol, baseUrl }) });
                 console.log(`added provider ${id} -> ${baseUrl}`);
             }
             else if (action === 'list') {
@@ -665,7 +665,7 @@ try {
                     ? JSON.stringify({ model, max_tokens: 1, messages: [{ role: 'user', content: 'ping' }] })
                     : JSON.stringify({ model, messages: [{ role: 'user', content: 'ping' }], max_tokens: 1, stream: false });
                 console.log(`probing ${provider.baseUrl}${path} with model ${model}…`);
-                const response = await fetch(new URL(path, provider.baseUrl), {
+                const response = await fetch(providerUrl(provider.baseUrl, path), {
                     method: 'POST',
                     headers,
                     body,

package/dist/config.js

@@ -31,6 +31,13 @@ export async function saveJsonAtomic(path, value) {
 function isLoopbackHost(hostname) {
     return hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '::1';
 }
+export function providerUrl(baseUrl, path) {
+    const base = new URL(baseUrl);
+    const prefix = base.pathname.replace(/\/+$/, '');
+    const suffix = path.startsWith('/') ? path : `/${path}`;
+    base.pathname = `${prefix}${suffix}` || '/';
+    return base;
+}
 export function validateConfig(config) {
     if (!config || config.version !== 1 || !Array.isArray(config.providers) || !Array.isArray(config.routes)) {
         throw new Error('Invalid configuration: expected version 1 with providers and routes');
@@ -57,8 +64,8 @@ export function validateConfig(config) {
         }
         if (url.protocol !== 'https:' && !isLoopbackHost(url.hostname))
             throw new Error(`Provider ${provider.id}: baseUrl must use https (plain http is only allowed on loopback hosts)`);
-        if (url.pathname !== '/')
-            throw new Error(`Provider ${provider.id}: baseUrl must not contain a path (strip trailing /v1 etc.)`);
+        if (url.search || url.hash)
+            throw new Error(`Provider ${provider.id}: baseUrl must not contain a query or hash`);
         for (const key of provider.keys) {
             if (!key.id || !Number.isInteger(key.weight) || key.weight < 1)
                 throw new Error(`Invalid key in provider ${provider.id}`);

package/dist/server.js

@@ -1,6 +1,6 @@
 import { createServer } from 'node:http';
 import { watch } from 'node:fs';
-import { readJsonFile, saveJsonAtomic, validateConfig, defaultTimeouts } from './config.js';
+import { readJsonFile, saveJsonAtomic, validateConfig, providerUrl, defaultTimeouts } from './config.js';
 import { LogWriter } from './logger.js';
 import { join, basename } from 'node:path';
 import { resolveProvider, isRouteDisabled } from './router.js';
@@ -124,7 +124,7 @@ export function createKhatServer(options) {
                 const headerTimer = setTimeout(() => upstreamAbort(abort, 'upstream response header timeout'), timeouts().headerMs);
                 let upstream;
                 try {
-                    upstream = await fetch(new URL(req.url, provider.baseUrl), { method: 'POST', headers: upstreamHeaders(protocol, secret, req.headers.accept), body: new Uint8Array(body), signal: abort.signal });
+                    upstream = await fetch(providerUrl(provider.baseUrl, req.url), { method: 'POST', headers: upstreamHeaders(protocol, secret, req.headers.accept), body: new Uint8Array(body), signal: abort.signal });
                 }
                 catch (error) {
                     if (error?.upstreamTimeout)

package/dist/store.js

@@ -12,6 +12,9 @@ function requireValidId(kind, id) {
     if (!ID_PATTERN.test(id))
         throw new Error(`${kind} id '${id}' is invalid: use letters, digits, '-' or '_'`);
 }
+function normalizeBaseUrl(baseUrl) {
+    return baseUrl.replace(/\/+$/, '');
+}
 export async function openStore(dir, protector) {
     await mkdir(dir, { recursive: true, mode: 0o700 });
     const configPath = join(dir, 'config.json');
@@ -100,7 +103,7 @@ export async function addProvider(store, input) {
     requireValidId('provider', input.id);
     if (store.config.providers.some((item) => item.id === input.id))
         throw new Error(`provider already exists: ${input.id}`);
-    store.config.providers.push({ id: input.id, name: input.name?.trim() || input.id, protocol: input.protocol, baseUrl: input.baseUrl, keys: [] });
+    store.config.providers.push({ id: input.id, name: input.name?.trim() || input.id, protocol: input.protocol, baseUrl: normalizeBaseUrl(input.baseUrl), keys: [] });
     try {
         await persistConfig(store);
     }
@@ -117,7 +120,7 @@ export async function updateProvider(store, id, input) {
     if (input.protocol !== undefined)
         provider.protocol = input.protocol;
     if (input.baseUrl !== undefined)
-        provider.baseUrl = input.baseUrl.replace(/\/+$/, '');
+        provider.baseUrl = normalizeBaseUrl(input.baseUrl);
     try {
         await persistConfig(store);
     }
@@ -133,6 +136,7 @@ export async function removeProvider(store, id) {
     for (const key of provider.keys) {
         store.vault.delete(key.vaultRef);
         delete store.states[`${id}/${key.id}`];
+        delete store.counters[`${id}/${key.id}`];
     }
     await persistConfig(store);
     await store.vault.save();

package/dist/tui.js

@@ -180,6 +180,8 @@ export function Tui({ client }) {
             }
             else if (row && input === 'd')
                 setConfirm({ label: `删除 key ${row.providerId}/${row.keyId}`, run: () => client.deleteKey(row.providerId, row.keyId) });
+            else if (row && input === 'D')
+                setConfirm({ label: `删除 Provider ${row.providerId}`, run: () => client.deleteProvider(row.providerId) });
         }
         else if (section === 'routes') {
             const route = routes[routeCursor];
@@ -221,7 +223,7 @@ export function Tui({ client }) {
     else
         body = _jsx(DiagnosticsBody, { snapshot: snapshot });
     const HELP = {
-        overview: 'Tab/1-4 区块 · ↑↓ 选择 · e 启用 · p 探活 · d 删除 · Enter 详情 · r 刷新 · q 退出',
+        overview: 'Tab/1-4 区块 · ↑↓ 选择 · e 启用 · p 探活 · d 删除 key · D 删除 Provider · Enter 详情 · r 刷新 · q 退出',
         routes: 'Tab/1-4 区块 · ↑↓ 选择 · d 删除 · r 刷新 · q 退出',
         logs: 'Tab/1-4 区块 · ↑↓ 选择 · f 过滤 · Enter 详情 · r 刷新 · q 退出',
         diagnostics: 'Tab/1-4 区块 · t 轮换令牌 · r 刷新 · q 退出'

package/dist/web-ui.js

@@ -344,20 +344,27 @@ async function loadModels(){
  }catch(e){error.textContent=e.message;toast(e.message);syncRouteModelHeader()}
 }
 async function load(){
- try{
-  await exchange();
-  const results=await Promise.all([api('/_keys/status'),api('/_keys/logs?tail='+state.logTail)]);
-  state.status=results[0];state.logs=results[1].logs||[];
-  error.textContent='';
+ try{await exchange()}catch(e){error.textContent=e.message;toast(e.message);return}
+ const statusResult=await Promise.allSettled([api('/_keys/status'),api('/_keys/logs?tail='+state.logTail)]);
+ const statusResultValue=statusResult[0];
+ const logsResultValue=statusResult[1];
+ if(statusResultValue.status==='fulfilled'){
+  state.status=statusResultValue.value;
   renderConnection();
-  renderStats();
   syncProviderSelect($('#keyForm [name=provider]'),state.status.providers);
   syncProviderSelect($('#routeForm [name=provider]'),state.status.providers);
   renderProviders();
   renderRoutes();
+ }else{error.textContent=statusResultValue.reason?.message||String(statusResultValue.reason);toast(error.textContent)}
+ if(logsResultValue.status==='fulfilled'){
+  state.logs=logsResultValue.value.logs||[];
   renderLogs();
   drawTraffic();
- }catch(e){error.textContent=e.message;toast(e.message)}
+ }else if(statusResultValue.status==='fulfilled'){
+  error.textContent=logsResultValue.reason?.message||String(logsResultValue.reason);toast(error.textContent,'warn');
+ }
+ if(statusResultValue.status==='fulfilled'&&logsResultValue.status==='fulfilled')error.textContent='';
+ if(statusResultValue.status==='fulfilled')renderStats();
 }
 function applyTheme(theme){document.documentElement.setAttribute('data-theme',theme);try{localStorage.setItem('khatTheme',theme)}catch(e){}const b=$('#themeToggle');b.textContent=theme==='dark'?'☀️':'🌙';b.setAttribute('aria-label',t('toggleTheme'))}
 $('#themeToggle').onclick=()=>applyTheme(document.documentElement.getAttribute('data-theme')==='dark'?'light':'dark');
@@ -381,7 +388,7 @@ $('#logStatus').onchange=e=>{state.logStatus=e.target.value;renderLogs()};
 $('#logTail').onchange=e=>{state.logTail=e.target.value;load()};
 $('#refresh').onclick=()=>load();
 window.addEventListener('resize',drawTraffic);
-load();setInterval(load,30000);
+load();setInterval(load,5000);
 </script></body></html>`;
 export class UiSessions {
     tickets = new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilis/k-hat",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "publishConfig": {
     "access": "public"
   },