npm - @modeltoolsprotocol/mtpcli - Versions diffs - 1.3.3 → 1.3.4 - Mend

@modeltoolsprotocol/mtpcli 1.3.3 → 1.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/LICENSE CHANGED Viewed

@@ -175,7 +175,7 @@
    END OF TERMS AND CONDITIONS
-   Copyright 2025 Nick
+   Copyright 2026 Nick Rogers
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package/dist/index.js CHANGED Viewed

@@ -7574,47 +7574,62 @@ function generatePkce() {
   const challenge = createHash("sha256").update(verifier).digest("base64url");
   return { verifier, challenge };
 }
-function waitForCallback(port, timeoutSecs) {
+function startCallbackServer() {
   return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      server.close();
-      reject(new Error("OAuth callback timed out"));
-    }, timeoutSecs * 1000);
-    const server = createServer((req, res) => {
-      const url = new URL(req.url ?? "/", `http://127.0.0.1:${port}`);
-      const code = url.searchParams.get("code");
-      const error = url.searchParams.get("error");
-      if (code) {
-        const html = "<html><body><h2>Authentication successful!</h2>" + "<p>You can close this tab and return to your terminal.</p>" + "<script>window.close()</script></body></html>";
-        res.writeHead(200, {
-          "Content-Type": "text/html",
-          "Content-Length": Buffer.byteLength(html).toString()
-        });
-        res.end(html);
-        clearTimeout(timer);
-        server.close();
-        resolve({ code });
-        return;
-      }
-      if (error) {
-        const desc = url.searchParams.get("error_description") ?? "Unknown error";
-        const html = `<html><body><h2>Authentication failed</h2><p>${desc}</p></body></html>`;
-        res.writeHead(400, {
-          "Content-Type": "text/html",
-          "Content-Length": Buffer.byteLength(html).toString()
-        });
-        res.end(html);
-        clearTimeout(timer);
+    const server = createServer(() => {});
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      if (!addr || typeof addr === "string") {
         server.close();
-        resolve({ error });
+        reject(new Error("failed to get callback server address"));
         return;
       }
-      res.writeHead(404);
-      res.end();
+      const port = addr.port;
+      server.removeAllListeners("request");
+      server.on("request", (req, res) => {
+        const url = new URL(req.url ?? "/", `http://127.0.0.1:${port}`);
+        const code = url.searchParams.get("code");
+        const error = url.searchParams.get("error");
+        if (code) {
+          const html = "<html><body><h2>Authentication successful!</h2>" + "<p>You can close this tab and return to your terminal.</p>" + "<script>window.close()</script></body></html>";
+          res.writeHead(200, {
+            "Content-Type": "text/html",
+            "Content-Length": Buffer.byteLength(html).toString()
+          });
+          res.end(html);
+          server.emit("oauth-result", { code });
+          return;
+        }
+        if (error) {
+          const desc = url.searchParams.get("error_description") ?? "Unknown error";
+          const html = `<html><body><h2>Authentication failed</h2><p>${desc}</p></body></html>`;
+          res.writeHead(400, {
+            "Content-Type": "text/html",
+            "Content-Length": Buffer.byteLength(html).toString()
+          });
+          res.end(html);
+          server.emit("oauth-result", { error });
+          return;
+        }
+        res.writeHead(404);
+        res.end();
+      });
+      resolve({
+        port,
+        wait: (timeoutSecs) => new Promise((res, rej) => {
+          const timer = setTimeout(() => {
+            server.close();
+            rej(new Error("OAuth callback timed out"));
+          }, timeoutSecs * 1000);
+          server.on("oauth-result", (result) => {
+            clearTimeout(timer);
+            server.close();
+            res(result);
+          });
+        })
+      });
     });
-    server.listen(port, "127.0.0.1", () => {});
     server.on("error", (e) => {
-      clearTimeout(timer);
       reject(new Error(`failed to bind callback server: ${e.message}`));
     });
   });
@@ -7684,13 +7699,14 @@ function parseTokenResponse(text) {
     created_at: new Date().toISOString()
   };
 }
-async function oauth2Login(toolName, provider, port) {
+async function oauth2Login(toolName, provider) {
   if (!provider.authorizationUrl)
     throw new Error("provider missing authorizationUrl");
   if (!provider.tokenUrl)
     throw new Error("provider missing tokenUrl");
   if (!provider.clientId)
     throw new Error("provider missing clientId");
+  const { port, wait } = await startCallbackServer();
   const redirectUri = `http://127.0.0.1:${port}/callback`;
   const state = randomBytes(32).toString("base64url");
   const params = new URLSearchParams({
@@ -7720,7 +7736,7 @@ ${fullUrl}
   open_default(fullUrl).catch(() => {});
   process.stderr.write(`Waiting for authentication callback on port ${port}...
 `);
-  const result = await waitForCallback(port, 120);
+  const result = await wait(120);
   if (result.error)
     throw new Error(`OAuth error: ${result.error}`);
   if (!result.code)
@@ -7776,13 +7792,13 @@ function apiKeyLogin(toolName, provider, tokenValue) {
     });
   });
 }
-async function login(toolName, provider, token, port = 8914) {
+async function login(toolName, provider, token) {
   switch (provider.type) {
     case "oauth2":
     case "oauth2-pkce":
       if (token)
         return apiKeyLogin(toolName, provider, token);
-      return oauth2Login(toolName, provider, port);
+      return oauth2Login(toolName, provider);
     case "api-key":
     case "bearer":
       return apiKeyLogin(toolName, provider, token);
@@ -7868,7 +7884,7 @@ async function runLogin(toolName, providerId, token) {
   const provider = getProvider(auth, providerId);
   if (!provider)
     throw new Error("no matching auth provider found");
-  await login(toolName, provider, token, 8914);
+  await login(toolName, provider, token);
 }
 async function runLogout(toolName) {
   const auth = await getAuthConfig(toolName);
@@ -8111,7 +8127,7 @@ function storeClientRegistration(origin, client, metadata) {
   store[origin] = { client, metadata };
   saveClientStore(store);
 }
-function startCallbackServer() {
+function startCallbackServer2() {
   return new Promise((resolve, reject) => {
     let codeResolve;
     let codeReject;
@@ -8183,7 +8199,7 @@ async function mcpOAuthFlow(serverUrl, wwwAuth, clientId) {
   if (challengeMethods && !challengeMethods.includes("S256")) {
     throw new Error("authorization server does not support S256 PKCE (required)");
   }
-  const callback = await startCallbackServer();
+  const callback = await startCallbackServer2();
   const redirectUri = `http://127.0.0.1:${callback.port}/callback`;
   let resolvedClientId = clientId;
   let registration;
@@ -8206,7 +8222,7 @@ async function mcpOAuthFlow(serverUrl, wwwAuth, clientId) {
     } else {
       callback.server.close();
       resolvedClientId = await promptForClientId(serverUrl);
-      const newCallback = await startCallbackServer();
+      const newCallback = await startCallbackServer2();
       return doOAuthLogin(metadata, resolvedClientId, `http://127.0.0.1:${newCallback.port}/callback`, newCallback, wwwParsed.scope, storageKey, origin);
     }
   }
@@ -8423,47 +8439,62 @@ function generatePkce2() {
   const challenge = createHash2("sha256").update(verifier).digest("base64url");
   return { verifier, challenge };
 }
-function waitForCallback2(port, timeoutSecs) {
+function startCallbackServer3() {
   return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      server.close();
-      reject(new Error("OAuth callback timed out"));
-    }, timeoutSecs * 1000);
-    const server = createServer3((req, res) => {
-      const url = new URL(req.url ?? "/", `http://127.0.0.1:${port}`);
-      const code = url.searchParams.get("code");
-      const error = url.searchParams.get("error");
-      if (code) {
-        const html = "<html><body><h2>Authentication successful!</h2>" + "<p>You can close this tab and return to your terminal.</p>" + "<script>window.close()</script></body></html>";
-        res.writeHead(200, {
-          "Content-Type": "text/html",
-          "Content-Length": Buffer.byteLength(html).toString()
-        });
-        res.end(html);
-        clearTimeout(timer);
-        server.close();
-        resolve({ code });
-        return;
-      }
-      if (error) {
-        const desc = url.searchParams.get("error_description") ?? "Unknown error";
-        const html = `<html><body><h2>Authentication failed</h2><p>${desc}</p></body></html>`;
-        res.writeHead(400, {
-          "Content-Type": "text/html",
-          "Content-Length": Buffer.byteLength(html).toString()
-        });
-        res.end(html);
-        clearTimeout(timer);
+    const server = createServer3(() => {});
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      if (!addr || typeof addr === "string") {
         server.close();
-        resolve({ error });
+        reject(new Error("failed to get callback server address"));
         return;
       }
-      res.writeHead(404);
-      res.end();
+      const port = addr.port;
+      server.removeAllListeners("request");
+      server.on("request", (req, res) => {
+        const url = new URL(req.url ?? "/", `http://127.0.0.1:${port}`);
+        const code = url.searchParams.get("code");
+        const error = url.searchParams.get("error");
+        if (code) {
+          const html = "<html><body><h2>Authentication successful!</h2>" + "<p>You can close this tab and return to your terminal.</p>" + "<script>window.close()</script></body></html>";
+          res.writeHead(200, {
+            "Content-Type": "text/html",
+            "Content-Length": Buffer.byteLength(html).toString()
+          });
+          res.end(html);
+          server.emit("oauth-result", { code });
+          return;
+        }
+        if (error) {
+          const desc = url.searchParams.get("error_description") ?? "Unknown error";
+          const html = `<html><body><h2>Authentication failed</h2><p>${desc}</p></body></html>`;
+          res.writeHead(400, {
+            "Content-Type": "text/html",
+            "Content-Length": Buffer.byteLength(html).toString()
+          });
+          res.end(html);
+          server.emit("oauth-result", { error });
+          return;
+        }
+        res.writeHead(404);
+        res.end();
+      });
+      resolve({
+        port,
+        wait: (timeoutSecs) => new Promise((res, rej) => {
+          const timer = setTimeout(() => {
+            server.close();
+            rej(new Error("OAuth callback timed out"));
+          }, timeoutSecs * 1000);
+          server.on("oauth-result", (result) => {
+            clearTimeout(timer);
+            server.close();
+            res(result);
+          });
+        })
+      });
     });
-    server.listen(port, "127.0.0.1", () => {});
     server.on("error", (e) => {
-      clearTimeout(timer);
       reject(new Error(`failed to bind callback server: ${e.message}`));
     });
   });
@@ -8533,13 +8564,14 @@ function parseTokenResponse2(text) {
     created_at: new Date().toISOString()
   };
 }
-async function oauth2Login2(toolName, provider, port) {
+async function oauth2Login2(toolName, provider) {
   if (!provider.authorizationUrl)
     throw new Error("provider missing authorizationUrl");
   if (!provider.tokenUrl)
     throw new Error("provider missing tokenUrl");
   if (!provider.clientId)
     throw new Error("provider missing clientId");
+  const { port, wait } = await startCallbackServer3();
   const redirectUri = `http://127.0.0.1:${port}/callback`;
   const state = randomBytes3(32).toString("base64url");
   const params = new URLSearchParams({
@@ -8569,7 +8601,7 @@ ${fullUrl}
   open_default(fullUrl).catch(() => {});
   process.stderr.write(`Waiting for authentication callback on port ${port}...
 `);
-  const result = await waitForCallback2(port, 120);
+  const result = await wait(120);
   if (result.error)
     throw new Error(`OAuth error: ${result.error}`);
   if (!result.code)
@@ -8625,13 +8657,13 @@ function apiKeyLogin2(toolName, provider, tokenValue) {
     });
   });
 }
-async function login2(toolName, provider, token, port = 8914) {
+async function login2(toolName, provider, token) {
   switch (provider.type) {
     case "oauth2":
     case "oauth2-pkce":
       if (token)
         return apiKeyLogin2(toolName, provider, token);
-      return oauth2Login2(toolName, provider, port);
+      return oauth2Login2(toolName, provider);
     case "api-key":
     case "bearer":
       return apiKeyLogin2(toolName, provider, token);
@@ -8717,7 +8749,7 @@ async function runLogin2(toolName, providerId, token) {
   const provider = getProvider2(auth, providerId);
   if (!provider)
     throw new Error("no matching auth provider found");
-  await login2(toolName, provider, token, 8914);
+  await login2(toolName, provider, token);
 }
 async function runLogout2(toolName) {
   const auth = await getAuthConfig2(toolName);
@@ -8843,7 +8875,7 @@ var init_mcp = __esm(() => {
 });
 // src/version.ts
-var VERSION2 = "1.3.3";
+var VERSION2 = "1.3.4";
 // src/serve.ts
 var exports_serve = {};
@@ -9306,7 +9338,7 @@ function storeClientRegistration2(origin, client, metadata) {
   store[origin] = { client, metadata };
   saveClientStore2(store);
 }
-function startCallbackServer2() {
+function startCallbackServer4() {
   return new Promise((resolve, reject) => {
     let codeResolve;
     let codeReject;
@@ -9378,7 +9410,7 @@ async function mcpOAuthFlow2(serverUrl, wwwAuth, clientId) {
   if (challengeMethods && !challengeMethods.includes("S256")) {
     throw new Error("authorization server does not support S256 PKCE (required)");
   }
-  const callback = await startCallbackServer2();
+  const callback = await startCallbackServer4();
   const redirectUri = `http://127.0.0.1:${callback.port}/callback`;
   let resolvedClientId = clientId;
   let registration;
@@ -9401,7 +9433,7 @@ async function mcpOAuthFlow2(serverUrl, wwwAuth, clientId) {
     } else {
       callback.server.close();
       resolvedClientId = await promptForClientId2(serverUrl);
-      const newCallback = await startCallbackServer2();
+      const newCallback = await startCallbackServer4();
       return doOAuthLogin2(metadata, resolvedClientId, `http://127.0.0.1:${newCallback.port}/callback`, newCallback, wwwParsed.scope, storageKey, origin);
     }
   }
@@ -10660,7 +10692,7 @@ function withDescribe(program2, options) {
 }
 // src/version.ts
-var VERSION = "1.3.3";
+var VERSION = "1.3.4";
 // src/index.ts
 var program2 = new Command().name("mtpcli").version(VERSION).description("Unified CLI for discovering, authenticating, and bridging --mtp-describe-compatible tools").addHelpText("after", `

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@modeltoolsprotocol/mtpcli",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "license": "Apache-2.0",
   "type": "module",
   "bin": {