@jeffusion/bungee-core 6.4.1 → 6.5.0

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

@@ -1858,6 +1858,9 @@ class ChatgptOauthAdapter {
   requests = new Map;
   nativeResponses = new WeakSet;
   constructor() {}
+  endRequest(requestId) {
+    this.requests.delete(requestId);
+  }
   beforeRequest(context) {
     assertResponsesEntryPath(context.url.pathname);
     const target = context.url.pathname === MODELS_PATH || context.originalUrl.searchParams.has("client_version") && context.url.pathname === "/models" ? "models" : context.url.pathname === CHAT_COMPLETIONS_PATH ? "chat" : isResponsesRequest(context.url) ? "responses" : undefined;
@@ -1956,15 +1959,8 @@ class ChatgptOauthAdapter {
     return context;
   }
   async rawResponse(result, context) {
-    if (convertedCompletions.has(result.completion)) {
-      const pending = this.requests.get(context.requestId);
-      const cleanup = () => {
-        if (this.requests.get(context.requestId) === pending)
-          this.requests.delete(context.requestId);
-      };
-      result.completion.then(cleanup, cleanup);
+    if (convertedCompletions.has(result.completion))
       return result;
-    }
     if (this.nativeResponses.has(result.response))
       return result;
     const upstreamUrl = context.upstreamUrl ? new URL(context.upstreamUrl) : undefined;
@@ -1981,17 +1977,10 @@ class ChatgptOauthAdapter {
     current.adaptedResponses.add(result.response);
     if (current.native)
       this.nativeResponses.add(result.response);
-    const state = current.attemptId === undefined ? Object.freeze({ ...current, attemptId: context.attemptId }) : current;
-    if (state !== current && this.requests.get(context.requestId) === current)
-      this.requests.set(context.requestId, state);
-    const cleanup = () => {
-      if (this.requests.get(context.requestId) === state)
-        this.requests.delete(context.requestId);
-    };
+    const state = current;
     const trackCompletion = (completion) => {
       if (!state.native)
         convertedCompletions.add(completion);
-      completion.then(cleanup, cleanup);
     };
     const mark = (response) => {
       current.adaptedResponses.add(response);
@@ -2009,7 +1998,6 @@ class ChatgptOauthAdapter {
       return { response, completion };
     };
     if (state.native && !result.response.ok) {
-      result.completion.then(cleanup, cleanup);
       return result;
     }
     if (state.target === "models" && result.response.status === 304) {
@@ -2123,6 +2111,7 @@ var ChatgptOauthPlugin = definePlugin(class {
     return context.method.toUpperCase() === "POST" && (isResponsesRequest(context.url) || ["/v1/chat/completions", "/backend-api/codex/responses"].includes(path)) ? { request: "json-write", response: ["json", "sse-json"] } : { request: "none" };
   }
   register(hooks) {
+    hooks.onFinally.tap("chatgpt-oauth.request-cleanup", (context) => this.adapter.endRequest(context.requestId));
     hooks.onWebSocketHandshake.tap("chatgpt-oauth", (context) => {
       assertResponsesEntryPath(context.url.pathname);
       if (context.url.origin === "https://chatgpt.com" && isResponsesRequest(context.url))
@@ -2142,4 +2131,4 @@ export {
   server_default as default
 };
 
-//# debugId=6AB7BD049B59B52A64756E2164756E21
+//# debugId=7D45F987B1FCBF9164756E2164756E21