@jeffusion/bungee-core 6.8.2 → 6.10.0

package/dist/observability-worker.js

@@ -15214,6 +15214,7 @@ class LogQueryService {
       transformer,
       success,
       transportOutcome,
+      transportType,
       searchTerm,
       requestType,
       sortBy = "timestamp",
@@ -15229,6 +15230,12 @@ class LogQueryService {
       whereClauses.push("timestamp < ?");
       whereParams.push(endTime);
     }
+    if (transportType !== undefined) {
+      if (transportType !== "http" && transportType !== "websocket")
+        throw new Error("Invalid transport type");
+      whereClauses.push("transport_type = ?");
+      whereParams.push(transportType);
+    }
     if (method) {
       whereClauses.push("method = ?");
       whereParams.push(method);
@@ -15330,6 +15337,7 @@ class LogQueryService {
       transformer,
       success,
       transportOutcome,
+      transportType,
       searchTerm,
       requestType,
       sortBy = "timestamp",
@@ -15342,6 +15350,12 @@ class LogQueryService {
     } = params;
     const rowWhereClauses = [];
     const rowWhereParams = [];
+    if (transportType !== undefined) {
+      if (transportType !== "http" && transportType !== "websocket")
+        throw new Error("Invalid transport type");
+      rowWhereClauses.push("transport_type = ?");
+      rowWhereParams.push(transportType);
+    }
     if (method) {
       rowWhereClauses.push("method = ?");
       rowWhereParams.push(method);
@@ -15673,6 +15687,7 @@ class LogQueryService {
     const headers = [
       "requestId",
       "timestamp",
+      "transportType",
       "method",
       "path",
       "query",
@@ -15699,6 +15714,7 @@ class LogQueryService {
         return [
           entry.requestId,
           new Date(entry.timestamp).toISOString(),
+          entry.transportType ?? "",
           entry.method,
           `"${entry.path}"`,
           entry.query ? `"${entry.query}"` : "",
@@ -15946,6 +15962,7 @@ class LogQueryService {
       requestId: row.request_id,
       timestamp: row.timestamp,
       method: row.method,
+      transportType: row.transport_type,
       path: row.path,
       query: row.query || undefined,
       status: row.status,
@@ -15992,10 +16009,14 @@ function getSingleParam(url, name) {
   const values = url.searchParams.getAll(name);
   return values.length === 0 ? undefined : values.length === 1 && values[0] !== "" ? values[0] : null;
 }
-function getOutcomeFilters(url) {
+function getLogFilters(url) {
   const values = url.searchParams.getAll("status");
   const statuses = values.map((value) => /^\d{3}$/.test(value) ? Number(value) : NaN);
   const transport = getSingleParam(url, "transportOutcome");
+  const transportType = getSingleParam(url, "transportType");
+  if (transportType !== undefined && transportType !== "http" && transportType !== "websocket") {
+    return Response.json({ error: "transportType must be http or websocket" }, { status: 400 });
+  }
   if (statuses.some((value) => !Number.isInteger(value) || value < 100 || value > 599)) {
     return Response.json({ error: "status must contain HTTP status codes between 100 and 599" }, { status: 400 });
   }
@@ -16004,6 +16025,7 @@ function getOutcomeFilters(url) {
   }
   return {
     status: statuses.length === 0 ? undefined : statuses.length === 1 ? statuses[0] : [...new Set(statuses)],
+    transportType,
     transportOutcome: transport
   };
 }
@@ -16039,7 +16061,7 @@ class LogsHandler {
     try {
       const url = new URL(req.url);
       const groupBy = url.searchParams.get("groupBy");
-      const outcomeFilters = getOutcomeFilters(url);
+      const outcomeFilters = getLogFilters(url);
       if (outcomeFilters instanceof Response)
         return outcomeFilters;
       const params = {
@@ -16277,7 +16299,7 @@ class LogsHandler {
       const format = url.searchParams.get("format") || "json";
       if (format !== "json" && format !== "csv")
         return Response.json({ error: "format must be json or csv" }, { status: 400 });
-      const outcomeFilters = getOutcomeFilters(url);
+      const outcomeFilters = getLogFilters(url);
       if (outcomeFilters instanceof Response)
         return outcomeFilters;
       const params = {
@@ -17604,6 +17626,16 @@ var ACCESS_BASELINE = {
   }
 };
 
+// src/migrations/access-log-transport-type.ts
+var ACCESS_LOG_TRANSPORT_TYPE = {
+  version: "005",
+  name: "access_log_transport_type",
+  up(db) {
+    db.run(`ALTER TABLE access_logs ADD COLUMN transport_type TEXT
+      CHECK (transport_type IS NULL OR transport_type IN ('http', 'websocket'))`);
+  }
+};
+
 // src/migrations/migration-manager.ts
 import { Database as Database4 } from "bun:sqlite";
 import { mkdirSync as mkdirSync2, existsSync } from "fs";
@@ -18074,7 +18106,7 @@ class MigrationManager {
 }
 
 // src/migrations/index.ts
-var migrations = [ACCESS_BASELINE, LLM_TPS_SAMPLES, LLM_TPS_MODEL, LLM_TPS_UPSTREAM_HOST];
+var migrations = [ACCESS_BASELINE, LLM_TPS_SAMPLES, LLM_TPS_MODEL, LLM_TPS_UPSTREAM_HOST, ACCESS_LOG_TRANSPORT_TYPE];
 
 // src/master-runtime/observability-worker.ts
 function headerEntries(headers) {

package/dist/plugins/chatgpt-oauth/control.js

@@ -1281,7 +1281,7 @@ function validStoredAccount(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value))
     return false;
   const account = value;
-  return typeof account.id === "string" && account.id.length > 0 && account.id.length <= 128 && typeof account.label === "string" && account.label.length > 0 && account.label.length <= MAX_TEXT && ["active", "disabled", "reauth_required", "revoked"].includes(account.status) && Number.isSafeInteger(account.generation) && account.generation > 0 && (account.loginFence === undefined || Number.isSafeInteger(account.loginFence) && account.loginFence > 0) && (account.credentialValid === undefined || typeof account.credentialValid === "boolean") && (account.autoResetCredits === undefined || typeof account.autoResetCredits === "boolean") && (account.siwc === undefined || validSiwcMetadata(account.siwc)) && validAutoResetAttempts(account.autoResetAttempts) && Number.isFinite(account.createdAt) && Number.isFinite(account.updatedAt);
+  return typeof account.id === "string" && account.id.length > 0 && account.id.length <= 128 && typeof account.label === "string" && account.label.length > 0 && account.label.length <= MAX_TEXT && ["active", "disabled", "reauth_required", "revoked"].includes(account.status) && Number.isSafeInteger(account.generation) && account.generation > 0 && (account.loginFence === undefined || Number.isSafeInteger(account.loginFence) && account.loginFence > 0) && (account.credentialValid === undefined || typeof account.credentialValid === "boolean") && (account.autoResetCredits === undefined || typeof account.autoResetCredits === "boolean") && (account.autoResetLeadMinutes === undefined || Number.isInteger(account.autoResetLeadMinutes) && account.autoResetLeadMinutes >= 1 && account.autoResetLeadMinutes <= 10080) && (account.autoResetOnLowBalance === undefined || typeof account.autoResetOnLowBalance === "boolean") && (account.autoResetRemainingPercent === undefined || Number.isInteger(account.autoResetRemainingPercent) && account.autoResetRemainingPercent >= 0 && account.autoResetRemainingPercent <= 100) && (account.siwc === undefined || validSiwcMetadata(account.siwc)) && validAutoResetAttempts(account.autoResetAttempts) && Number.isFinite(account.createdAt) && Number.isFinite(account.updatedAt);
 }
 function decode(value) {
   if (value === undefined)
@@ -1326,6 +1326,9 @@ function accountListItem(account) {
     expiresAt: account.expiresAt,
     identity: copyIdentity(account.identity),
     autoResetCredits: !account.siwc && account.autoResetCredits === true,
+    autoResetLeadMinutes: account.autoResetLeadMinutes ?? 30,
+    autoResetOnLowBalance: !account.siwc && account.autoResetOnLowBalance === true,
+    autoResetRemainingPercent: account.autoResetRemainingPercent ?? 10,
     pendingAutoReset: !account.siwc && pending ? { ...pending } : undefined
   };
 }
@@ -1539,8 +1542,8 @@ class AccountStore {
       return copyAccount(account);
     });
   }
-  async setAutoResetCredits(id, enabled) {
-    if (typeof enabled !== "boolean")
+  async setAutoResetCredits(id, enabled, options = {}) {
+    if (enabled !== undefined && typeof enabled !== "boolean" || options.lowBalanceEnabled !== undefined && typeof options.lowBalanceEnabled !== "boolean" || options.leadMinutes !== undefined && (!Number.isInteger(options.leadMinutes) || options.leadMinutes < 1 || options.leadMinutes > 10080) || options.remainingPercent !== undefined && (!Number.isInteger(options.remainingPercent) || options.remainingPercent < 0 || options.remainingPercent > 100))
       throw new AccountControlError("invalid_input");
     return this.mutate((aggregate) => {
       const account = aggregate.accounts.find((item) => item.id === id);
@@ -1550,7 +1553,10 @@ class AccountStore {
         throw new AccountControlError("revoked");
       if (account.siwc)
         throw new AccountControlError("unsupported_operation");
-      account.autoResetCredits = enabled;
+      account.autoResetCredits = enabled ?? account.autoResetCredits ?? false;
+      account.autoResetLeadMinutes = options.leadMinutes ?? account.autoResetLeadMinutes ?? 30;
+      account.autoResetOnLowBalance = options.lowBalanceEnabled ?? account.autoResetOnLowBalance ?? false;
+      account.autoResetRemainingPercent = options.remainingPercent ?? account.autoResetRemainingPercent ?? 10;
       account.updatedAt = Date.now();
       return copyAccount(account);
     });
@@ -1558,7 +1564,7 @@ class AccountStore {
   async claimAutoReset(id, credit, now) {
     return this.mutate((aggregate) => {
       const account = aggregate.accounts.find((item) => item.id === id);
-      if (!account || account.siwc || !accountListItem(account).available || account.autoResetCredits !== true)
+      if (!account || account.siwc || !accountListItem(account).available || !(account.autoResetCredits || account.autoResetOnLowBalance))
         return;
       const attempts = account.autoResetAttempts ?? [];
       if (attempts.some((item) => !item.completed || item.creditId === credit.id))
@@ -2554,8 +2560,17 @@ var defaultTimer = {
   },
   cancel: (handle) => clearTimeout(handle)
 };
-function isAutoResetDue(credit, now) {
-  return credit.status === "available" && typeof credit.expiresAt === "number" && Number.isFinite(credit.expiresAt) && credit.expiresAt > now && credit.expiresAt - now <= AUTO_RESET_LEAD_MS;
+function isAutoResetDue(credit, now, leadMinutes = 30) {
+  return credit.status === "available" && typeof credit.expiresAt === "number" && Number.isFinite(credit.expiresAt) && credit.expiresAt > now && credit.expiresAt - now <= leadMinutes * 60000;
+}
+function isLowBalance(usage, remainingPercent, now) {
+  if (usage.state !== "fresh" || usage.error)
+    return false;
+  const windows = [usage.primary, usage.secondary].filter((window) => window !== undefined && Number.isFinite(window.windowSeconds) && window.windowSeconds > 18000);
+  const longest = Math.max(...windows.map((window) => window.windowSeconds));
+  const candidates = windows.filter((window) => window.windowSeconds === longest);
+  const window = candidates[0];
+  return candidates.length === 1 && window !== undefined && Number.isFinite(window.usedPercent) && window.usedPercent >= 0 && window.usedPercent <= 100 && window.resetAt > now && window.resetAt - now <= window.windowSeconds * 1000 && 100 - window.usedPercent <= remainingPercent;
 }
 
 class AutoResetScheduler {
@@ -2605,7 +2620,7 @@ class AutoResetScheduler {
   }
   async scan() {
     const accounts = await this.accounts.list();
-    const eligible = new Set(accounts.filter((account) => account.available && account.autoResetCredits && (!account.pendingAutoReset || this.accountRuns.has(account.id))).map((account) => account.id));
+    const eligible = new Set(accounts.filter((account) => account.available && (account.autoResetCredits || account.autoResetOnLowBalance) && (!account.pendingAutoReset || this.accountRuns.has(account.id))).map((account) => account.id));
     for (const id of this.plans.keys())
       if (!eligible.has(id))
         this.cancelPlan(id);
@@ -2626,7 +2641,12 @@ class AutoResetScheduler {
         if ((snapshot.resetCredits.availableCount ?? 0) <= 0)
           continue;
         const credits = [...snapshot.resetCredits.credits ?? []].filter((credit) => credit.status === "available" && typeof credit.expiresAt === "number" && Number.isFinite(credit.expiresAt) && credit.expiresAt > this.now()).sort((a, b) => a.expiresAt - b.expiresAt);
-        const plan = { credits };
+        const plan = {
+          credits,
+          leadMinutes: account.autoResetLeadMinutes,
+          expiryEnabled: account.autoResetCredits,
+          lowBalance: account.autoResetOnLowBalance && isLowBalance(snapshot.usage, account.autoResetRemainingPercent, this.now())
+        };
         this.plans.set(account.id, plan);
         await this.executePlan(account.id, plan);
       } catch {}
@@ -2647,7 +2667,11 @@ class AutoResetScheduler {
       this.cancelPlan(accountRef);
       return;
     }
-    const dueAt = plan.credits[0].expiresAt - AUTO_RESET_LEAD_MS;
+    if (!plan.expiryEnabled) {
+      this.cancelPlan(accountRef);
+      return;
+    }
+    const dueAt = plan.credits[0].expiresAt - plan.leadMinutes * 60000;
     plan.handle = this.timer.schedule(() => this.executePlan(accountRef, plan), Math.min(MAX_TIMER_DELAY_MS, Math.max(0, dueAt - this.now())));
   }
   executePlan(accountRef, plan) {
@@ -2659,32 +2683,51 @@ class AutoResetScheduler {
         return;
       try {
         const account = accountListItem(await this.accounts.get(accountRef));
-        if (!account.available || !account.autoResetCredits || account.pendingAutoReset) {
+        if (!account.available || !(account.autoResetCredits || account.autoResetOnLowBalance) || account.pendingAutoReset) {
           this.cancelPlan(accountRef, plan);
           return;
         }
+        plan.leadMinutes = account.autoResetLeadMinutes;
+        plan.expiryEnabled = account.autoResetCredits;
         while (this.plans.get(accountRef) === plan && plan.credits.length > 0) {
           if (this.disposed || this.signal.aborted)
             return;
           const credit = plan.credits[0];
-          if (credit.expiresAt - AUTO_RESET_LEAD_MS > this.now())
+          const latestConfig = accountListItem(await this.accounts.get(accountRef));
+          plan.leadMinutes = latestConfig.autoResetLeadMinutes;
+          plan.expiryEnabled = latestConfig.autoResetCredits;
+          const balanceAttempt = plan.lowBalance && latestConfig.autoResetOnLowBalance;
+          if (!balanceAttempt && (!plan.expiryEnabled || credit.expiresAt - plan.leadMinutes * 60000 > this.now()))
             break;
           plan.credits.shift();
-          if (!isAutoResetDue(credit, this.now()))
+          if (balanceAttempt)
+            plan.lowBalance = false;
+          if (!balanceAttempt && !isAutoResetDue(credit, this.now(), plan.leadMinutes))
             continue;
           const attempt = await this.accounts.claimAutoReset(accountRef, credit, this.now());
-          if (!attempt)
+          if (!attempt) {
             continue;
+          }
           let deferred;
           try {
             const result = await this.usage.consume(accountRef, attempt.redeemRequestId, credit.id, this.signal, {
               canConsume: async (selected) => {
-                const latest = await this.accounts.get(accountRef);
-                if (this.disposed || this.signal.aborted || latest.autoResetCredits !== true || latest.status !== "active")
+                const fresh = balanceAttempt ? await this.usage.get(accountRef, this.signal, { forceFresh: true }).catch(() => {
+                  return;
+                }) : undefined;
+                const latest = accountListItem(await this.accounts.get(accountRef));
+                if (this.disposed || this.signal.aborted || !latest.available)
+                  return false;
+                if (balanceAttempt) {
+                  const first = fresh?.resetCredits.state === "fresh" && (fresh.resetCredits.availableCount ?? 0) > 0 ? [...fresh.resetCredits.credits ?? []].filter((item) => item.status === "available" && Number.isFinite(item.expiresAt) && item.expiresAt > this.now()).sort((a, b) => a.expiresAt - b.expiresAt)[0] : undefined;
+                  if (latest.autoResetOnLowBalance && fresh !== undefined && first?.id === selected.id && isLowBalance(fresh.usage, latest.autoResetRemainingPercent, this.now()))
+                    return true;
+                }
+                if (!latest.autoResetCredits)
                   return false;
-                if (selected.status === "available" && typeof selected.expiresAt === "number" && Number.isFinite(selected.expiresAt) && selected.expiresAt - AUTO_RESET_LEAD_MS > this.now())
+                if (selected.status === "available" && typeof selected.expiresAt === "number" && Number.isFinite(selected.expiresAt) && selected.expiresAt - latest.autoResetLeadMinutes * 60000 > this.now())
                   deferred = selected;
-                return isAutoResetDue(selected, this.now());
+                return isAutoResetDue(selected, this.now(), latest.autoResetLeadMinutes);
               }
             });
             if (result.outcome === "reset_outcome_unknown") {
@@ -3202,10 +3245,14 @@ class ChatgptControl {
       }) },
       { path: "/accounts/auto-reset", methods: ["POST"], handler: "setAutoResetCredits", invoke: invoke(async (context) => {
         const body = await this.readJson(context);
-        exactKeys(body, ["accountRef", "enabled"]);
-        if (typeof body.enabled !== "boolean")
+        exactKeys(body, ["accountRef", "enabled", "leadMinutes", "lowBalanceEnabled", "remainingPercent"]);
+        if ("enabled" in body && typeof body.enabled !== "boolean" || "lowBalanceEnabled" in body && typeof body.lowBalanceEnabled !== "boolean" || "leadMinutes" in body && (typeof body.leadMinutes !== "number" || !Number.isInteger(body.leadMinutes) || body.leadMinutes < 1 || body.leadMinutes > 10080) || "remainingPercent" in body && (typeof body.remainingPercent !== "number" || !Number.isInteger(body.remainingPercent) || body.remainingPercent < 0 || body.remainingPercent > 100))
           throw new ControlError("invalid_input");
-        return jsonResponse({ account: accountListItem(await this.accounts.setAutoResetCredits(requiredText(body.accountRef, 128), body.enabled)) });
+        return jsonResponse({ account: accountListItem(await this.accounts.setAutoResetCredits(requiredText(body.accountRef, 128), body.enabled, {
+          leadMinutes: body.leadMinutes,
+          lowBalanceEnabled: body.lowBalanceEnabled,
+          remainingPercent: body.remainingPercent
+        })) });
       }) },
       { path: "/accounts/draft", methods: ["POST"], handler: "createDraft", invoke: invoke((context) => this.draft(context, "codex")) },
       { path: "/accounts/siwc/draft", methods: ["POST"], handler: "createSiwcDraft", invoke: invoke((context) => this.draft(context, "siwc")) },
@@ -3381,4 +3428,4 @@ export {
   rpc
 };
 
-//# debugId=ADBAC825AA911C0864756E2164756E21
+//# debugId=88F390C0C885560A64756E2164756E21