oauth-callback 1.2.4 → 1.2.5

package/dist/index.js

@@ -718,6 +718,7 @@ class BaseCallbackServer {
   successHtml;
   errorHtml;
   onRequest;
+  callbackReceived = false;
   abortHandler;
   signal;
   setup(options) {
@@ -743,6 +744,7 @@ class BaseCallbackServer {
     for (const [key, value] of url.searchParams)
       params[key] = value;
     listener.resolve(params);
+    this.callbackReceived = true;
     return new Response(generateCallbackHTML(params, this.successHtml, this.errorHtml), {
       status: 200,
       headers: { "Content-Type": "text/html" }
@@ -751,18 +753,21 @@ class BaseCallbackServer {
   async waitForCallback(path2, timeout) {
     if (this.callbackListeners.has(path2))
       return Promise.reject(new Error(`A listener for the path "${path2}" is already active.`));
+    let timeoutId;
     try {
       return await Promise.race([
         new Promise((resolve, reject) => {
           this.callbackListeners.set(path2, { resolve, reject });
         }),
         new Promise((_, reject) => {
-          setTimeout(() => {
+          timeoutId = setTimeout(() => {
             reject(new Error(`OAuth callback timeout after ${timeout}ms waiting for ${path2}`));
           }, timeout);
         })
       ]);
     } finally {
+      if (timeoutId)
+        clearTimeout(timeoutId);
       this.callbackListeners.delete(path2);
     }
   }
@@ -792,13 +797,10 @@ class BunCallbackServer extends BaseCallbackServer {
   async stopServer() {
     if (!this.server)
       return;
-    if (this.server.pendingRequests > 0) {
-      while (this.server.pendingRequests > 0) {
-        await new Promise((resolve) => setTimeout(resolve, 10));
-      }
-      await new Promise((resolve) => setTimeout(resolve, 100));
+    if (this.callbackReceived) {
+      await new Promise((resolve) => setTimeout(resolve, 50));
     }
-    this.server.stop();
+    this.server.stop(true);
     this.server = undefined;
   }
 }

package/dist/mcp.js

@@ -738,6 +738,7 @@ class BaseCallbackServer {
   successHtml;
   errorHtml;
   onRequest;
+  callbackReceived = false;
   abortHandler;
   signal;
   setup(options) {
@@ -763,6 +764,7 @@ class BaseCallbackServer {
     for (const [key, value] of url.searchParams)
       params[key] = value;
     listener.resolve(params);
+    this.callbackReceived = true;
     return new Response(generateCallbackHTML(params, this.successHtml, this.errorHtml), {
       status: 200,
       headers: { "Content-Type": "text/html" }
@@ -771,18 +773,21 @@ class BaseCallbackServer {
   async waitForCallback(path2, timeout) {
     if (this.callbackListeners.has(path2))
       return Promise.reject(new Error(`A listener for the path "${path2}" is already active.`));
+    let timeoutId;
     try {
       return await Promise.race([
         new Promise((resolve, reject) => {
           this.callbackListeners.set(path2, { resolve, reject });
         }),
         new Promise((_, reject) => {
-          setTimeout(() => {
+          timeoutId = setTimeout(() => {
             reject(new Error(`OAuth callback timeout after ${timeout}ms waiting for ${path2}`));
           }, timeout);
         })
       ]);
     } finally {
+      if (timeoutId)
+        clearTimeout(timeoutId);
       this.callbackListeners.delete(path2);
     }
   }
@@ -812,13 +817,10 @@ class BunCallbackServer extends BaseCallbackServer {
   async stopServer() {
     if (!this.server)
       return;
-    if (this.server.pendingRequests > 0) {
-      while (this.server.pendingRequests > 0) {
-        await new Promise((resolve) => setTimeout(resolve, 10));
-      }
-      await new Promise((resolve) => setTimeout(resolve, 100));
+    if (this.callbackReceived) {
+      await new Promise((resolve) => setTimeout(resolve, 50));
     }
-    this.server.stop();
+    this.server.stop(true);
     this.server = undefined;
   }
 }

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oDAAoD;IACpD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sDAAsD;IACtD,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mHAAmH;IACnH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sDAAsD;IACtD,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,oFAAoF;IACpF,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,iEAAiE;IACjE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACxE,4CAA4C;IAC5C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AA6RD;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,cAAc,CAKrD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oDAAoD;IACpD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sDAAsD;IACtD,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mHAAmH;IACnH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sDAAsD;IACtD,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,oFAAoF;IACpF,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,iEAAiE;IACjE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACxE,4CAA4C;IAC5C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AA8RD;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,cAAc,CAKrD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth-callback",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Lightweight OAuth 2.0 callback handler for Node.js, Deno, and Bun with built-in browser flow and MCP SDK integration",
   "keywords": [
     "oauth",

package/src/server.ts

@@ -100,6 +100,7 @@ abstract class BaseCallbackServer implements CallbackServer {
   protected successHtml?: string;
   protected errorHtml?: string;
   protected onRequest?: (req: Request) => void;
+  protected callbackReceived = false;
   private abortHandler?: () => void;
   private signal?: AbortSignal;
 
@@ -142,6 +143,7 @@ abstract class BaseCallbackServer implements CallbackServer {
 
     // Resolve the promise for the waiting listener.
     listener.resolve(params);
+    this.callbackReceived = true;
 
     return new Response(
       generateCallbackHTML(params, this.successHtml, this.errorHtml),
@@ -164,6 +166,8 @@ abstract class BaseCallbackServer implements CallbackServer {
         new Error(`A listener for the path "${path}" is already active.`),
       );
 
+    let timeoutId: ReturnType<typeof setTimeout> | undefined;
+
     try {
       // Race a promise that waits for the callback against a promise that rejects on timeout.
       return await Promise.race([
@@ -173,7 +177,7 @@ abstract class BaseCallbackServer implements CallbackServer {
         }),
         // This promise rejects after the specified timeout.
         new Promise<CallbackResult>((_, reject) => {
-          setTimeout(() => {
+          timeoutId = setTimeout(() => {
             reject(
               new Error(
                 `OAuth callback timeout after ${timeout}ms waiting for ${path}`,
@@ -183,8 +187,9 @@ abstract class BaseCallbackServer implements CallbackServer {
         }),
       ]);
     } finally {
-      // CRITICAL: Always clean up the listener to prevent memory leaks,
-      // regardless of whether the promise resolved or rejected.
+      // CRITICAL: Always clean up the listener and timeout to prevent memory leaks
+      // and allow the process to exit cleanly.
+      if (timeoutId) clearTimeout(timeoutId);
       this.callbackListeners.delete(path);
     }
   }
@@ -225,15 +230,11 @@ class BunCallbackServer extends BaseCallbackServer {
 
   protected async stopServer(): Promise<void> {
     if (!this.server) return;
-    // Wait for pending requests to complete and flush response bytes
-    if (this.server.pendingRequests > 0) {
-      while (this.server.pendingRequests > 0) {
-        await new Promise((resolve) => setTimeout(resolve, 10));
-      }
-      // Allow response bytes to flush to the client before shutdown
-      await new Promise((resolve) => setTimeout(resolve, 100));
+    // Brief delay to allow response bytes to flush to the client
+    if (this.callbackReceived) {
+      await new Promise((resolve) => setTimeout(resolve, 50));
     }
-    this.server.stop();
+    this.server.stop(true); // Force close connections
     this.server = undefined;
   }
 }