@jeffusion/bungee-core 5.24.0 → 5.24.1

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

@@ -326,7 +326,9 @@
                 "GET"
               ],
               "outboundHeaders": {
-                "passthrough": [],
+                "passthrough": [
+                  "If-None-Match"
+                ],
                 "set": {
                   "Accept": "application/json",
                   "User-Agent": "codex_cli_rs/0.153.3 (Mac OS 26.3.1; arm64) iTerm.app/3.6.9",
@@ -388,7 +390,9 @@
                 "GET"
               ],
               "outboundHeaders": {
-                "passthrough": [],
+                "passthrough": [
+                  "If-None-Match"
+                ],
                 "set": {
                   "Accept": "application/json",
                   "User-Agent": "Bungee/5.11.0",

package/dist/plugins/codex-router/index.js

@@ -3427,6 +3427,38 @@ var model_template_0_160_1_default = {
 };
 
 // plugins/codex-router/server/catalog.ts
+class CatalogSnapshots {
+  now;
+  entries = new Map;
+  constructor(now = Date.now) {
+    this.now = now;
+  }
+  get(key) {
+    const entry = this.entries.get(key);
+    if (entry) {
+      this.entries.delete(key);
+      this.entries.set(key, entry);
+    }
+    return entry;
+  }
+  fresh(snapshot) {
+    return snapshot.expiresAt > this.now();
+  }
+  put(key, native, upstreamEtag) {
+    this.entries.delete(key);
+    if (Buffer.byteLength(JSON.stringify(native), "utf8") > 256 * 1024)
+      return;
+    if (this.entries.size >= 32)
+      this.entries.delete(this.entries.keys().next().value);
+    this.entries.set(key, { native: structuredClone(native), upstreamEtag, expiresAt: this.now() + 600000 });
+  }
+  invalidate(key) {
+    this.entries.delete(key);
+  }
+  clear() {
+    this.entries.clear();
+  }
+}
 function mergeCatalog(native, bindings, catalog) {
   if (!native || typeof native !== "object" || Array.isArray(native))
     throw new Error("codex_router_invalid_catalog");
@@ -3552,6 +3584,7 @@ var CodexRouterPlugin = definePlugin(class {
   history;
   validators;
   catalogRequests = new Map;
+  snapshots = new CatalogSnapshots;
   conversion;
   constructor(options) {
     this.bindings = parseBindings(options?.models);
@@ -3565,7 +3598,10 @@ var CodexRouterPlugin = definePlugin(class {
     try {
       this.validators = catalogValidatorsClient(context.services);
     } catch {}
-    context.services.onDispose?.(() => this.catalogRequests.clear());
+    context.services.onDispose?.(() => {
+      this.catalogRequests.clear();
+      this.snapshots.clear();
+    });
   }
   bodyRequirements(context) {
     return { request: context.method === "POST" && /\/responses$/.test(context.url.pathname) ? "json-write" : "none", response: context.method === "GET" && /\/models$/.test(context.url.pathname) ? ["json"] : [] };
@@ -3702,10 +3738,41 @@ var CodexRouterPlugin = definePlugin(class {
         for (const key of Object.keys(context.headers))
           if (["if-none-match", "if-modified-since"].includes(key.toLowerCase()))
             delete context.headers[key];
+        const record = this.catalogRequests.get(context.requestId);
+        if (record) {
+          record.snapshot = this.snapshots.get(record.key);
+          if (record.snapshot?.upstreamEtag)
+            context.headers["if-none-match"] = record.snapshot.upstreamEtag;
+        }
       }
       return context;
     });
+    hooks.onInterceptRequest.tapPromise("codex-router.catalog-cache", async (context) => {
+      if (context.method !== "GET" || !/\/models$/.test(context.originalUrl.pathname))
+        return;
+      const record = this.catalogRequests.get(context.requestId);
+      const revalidate = Object.entries(context.headers).some(([key, value]) => key.toLowerCase() === "cache-control" && /(?:^|,)\s*(?:no-cache|max-age=0)\s*(?:,|$)/i.test(value));
+      if (!record?.snapshot || !this.snapshots.fresh(record.snapshot) || revalidate)
+        return;
+      const response = await this.catalogResponse(record.snapshot.native, new Headers, record);
+      return { action: "respond", response };
+    });
     hooks.onRawResponse.tapPromise("codex-router.catalog-notification", async (result, context) => {
+      if (context.method === "GET" && /\/models$/.test(context.originalUrl.pathname)) {
+        const record = this.catalogRequests.get(context.requestId);
+        if (record && [401, 403].includes(result.response.status))
+          this.snapshots.invalidate(record.key);
+        if (result.response.status === 304) {
+          if (!record?.snapshot?.upstreamEtag)
+            throw new DataAdmissionError(502, "codex_router_catalog_without_snapshot");
+          const headers = new Headers(result.response.headers);
+          for (const key of ["content-length", "content-encoding", "transfer-encoding"])
+            headers.delete(key);
+          headers.set("content-type", "application/json");
+          headers.set("etag", headers.get("etag") ?? record.snapshot.upstreamEtag);
+          return { ...result, response: new Response(JSON.stringify(record.snapshot.native), { headers }) };
+        }
+      }
       if (context.method === "POST" && /\/responses$/.test(context.originalUrl.pathname)) {
         await this.rewriteCatalogNotification(result.response, this.catalogRequests.get(context.requestId));
       }
@@ -3716,25 +3783,31 @@ var CodexRouterPlugin = definePlugin(class {
       if (context.method !== "GET" || !/\/models$/.test(context.originalUrl.pathname) || !response.ok)
         return response;
       const native = await context.bodyHandle.json({ id: "codex-router.catalog", mandatory: true });
-      const body = JSON.stringify(mergeCatalog(native, this.bindings, this.conversion));
-      const etag = catalogEtag(body);
-      const headers = new Headers(response.headers);
-      for (const key of ["content-length", "content-encoding", "etag", "last-modified"])
-        headers.delete(key);
-      headers.set("content-type", "application/json");
-      headers.set("cache-control", "private, no-store");
-      headers.set("etag", etag);
-      if (record && this.validators) {
-        try {
-          await this.validators.put({ key: record.key, etag }, { signal: record.signal, timeoutMs: 1000, operationId: crypto.randomUUID() });
-        } catch {}
-      }
-      return new Response(body, { status: response.status, headers });
+      const merged = await this.catalogResponse(native, response.headers, record, response.status);
+      if (record && !record.signal.aborted)
+        this.snapshots.put(record.key, native, response.headers.get("etag"));
+      return merged;
     });
     hooks.onFinally.tap("codex-router.catalog-cleanup", (context) => {
       this.catalogRequests.delete(context.requestId);
     });
   }
+  async catalogResponse(native, sourceHeaders, record, status = 200) {
+    const body = JSON.stringify(mergeCatalog(native, this.bindings, this.conversion));
+    const etag = catalogEtag(body);
+    const headers = new Headers(sourceHeaders);
+    for (const key of ["content-length", "content-encoding", "etag", "last-modified"])
+      headers.delete(key);
+    headers.set("content-type", "application/json");
+    headers.set("cache-control", "private, no-store");
+    headers.set("etag", etag);
+    if (record && this.validators) {
+      try {
+        await this.validators.put({ key: record.key, etag }, { signal: record.signal, timeoutMs: 1000, operationId: crypto.randomUUID() });
+      } catch {}
+    }
+    return new Response(body, { status, headers });
+  }
   async rewriteCatalogNotification(response, record) {
     response.headers.delete("x-models-etag");
     if (record && this.validators) {
@@ -3747,6 +3820,7 @@ var CodexRouterPlugin = definePlugin(class {
   }
   reset() {
     this.catalogRequests.clear();
+    this.snapshots.clear();
   }
 });
 var server_default = CodexRouterPlugin;
@@ -3755,4 +3829,4 @@ export {
   server_default as default
 };
 
-//# debugId=68FE5D69208B581A64756E2164756E21
+//# debugId=F4766DDE3923022964756E2164756E21