@mediagraph/mcp 1.0.1 → 1.0.3

package/dist/index.js

@@ -10,6 +10,8 @@ import {
   ListToolsRequestSchema,
   ReadResourceRequestSchema
 } from "@modelcontextprotocol/sdk/types.js";
+import { exec } from "child_process";
+import { platform } from "os";
 
 // src/auth/oauth.ts
 import { createHash, randomBytes } from "crypto";
@@ -67,10 +69,11 @@ var OAuthHandler = class {
     });
     return `${this.config.oauthUrl}/oauth/authorize?${params.toString()}`;
   }
+  callbackPromise = null;
   /**
-   * Start a local HTTP server to receive the OAuth callback
+   * Start the callback server and wait for it to be ready
    */
-  async waitForCallback() {
+  async startCallbackServer() {
     return new Promise((resolve, reject) => {
       this.callbackServer = createServer((req, res) => {
         const url = new URL2(req.url || "/", `http://localhost:${this.config.redirectPort}`);
@@ -91,7 +94,8 @@ var OAuthHandler = class {
               </html>
             `);
             this.stopCallbackServer();
-            reject(new Error(errorDescription || error));
+            this.callbackPromise?.reject(new Error(errorDescription || error));
+            this.callbackPromise = null;
             return;
           }
           if (!code || !state) {
@@ -106,7 +110,8 @@ var OAuthHandler = class {
               </html>
             `);
             this.stopCallbackServer();
-            reject(new Error("Missing authorization code or state"));
+            this.callbackPromise?.reject(new Error("Missing authorization code or state"));
+            this.callbackPromise = null;
             return;
           }
           if (state !== this.state) {
@@ -121,7 +126,8 @@ var OAuthHandler = class {
               </html>
             `);
             this.stopCallbackServer();
-            reject(new Error("State parameter mismatch"));
+            this.callbackPromise?.reject(new Error("State parameter mismatch"));
+            this.callbackPromise = null;
             return;
           }
           res.writeHead(200, { "Content-Type": "text/html" });
@@ -135,20 +141,43 @@ var OAuthHandler = class {
             </html>
           `);
           this.stopCallbackServer();
-          resolve({ code, state });
+          this.callbackPromise?.resolve({ code, state });
+          this.callbackPromise = null;
         } else {
           res.writeHead(404);
           res.end("Not found");
         }
       });
+      this.callbackServer.on("error", (err) => {
+        reject(err);
+      });
       this.callbackServer.listen(this.config.redirectPort, () => {
+        resolve();
       });
+    });
+  }
+  /**
+   * Wait for the OAuth callback (server must be started first)
+   */
+  async waitForCallback() {
+    return new Promise((resolve, reject) => {
+      this.callbackPromise = { resolve, reject };
       setTimeout(() => {
-        this.stopCallbackServer();
-        reject(new Error("Authorization timed out"));
+        if (this.callbackPromise) {
+          this.stopCallbackServer();
+          this.callbackPromise.reject(new Error("Authorization timed out"));
+          this.callbackPromise = null;
+        }
       }, 5 * 60 * 1e3);
     });
   }
+  /**
+   * Start server and wait for callback (convenience method for CLI)
+   */
+  async startAndWaitForCallback() {
+    await this.startCallbackServer();
+    return this.waitForCallback();
+  }
   /**
    * Stop the callback server
    */
@@ -2941,6 +2970,48 @@ var oauthHandler = new OAuthHandler({
   redirectPort: config.redirectPort
 });
 var currentTokens = null;
+var isAuthInProgress = false;
+function openBrowser(url) {
+  const command = platform() === "darwin" ? `open "${url}"` : platform() === "win32" ? `start "" "${url}"` : `xdg-open "${url}"`;
+  exec(command, (error) => {
+    if (error) {
+      console.error("Failed to open browser:", error);
+    }
+  });
+}
+async function runAutoAuth() {
+  if (isAuthInProgress) {
+    while (isAuthInProgress) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    return currentTokens !== null;
+  }
+  isAuthInProgress = true;
+  try {
+    const authUrl = oauthHandler.getAuthorizationUrl();
+    await oauthHandler.startCallbackServer();
+    openBrowser(authUrl);
+    const { code } = await oauthHandler.waitForCallback();
+    const tokens = await oauthHandler.exchangeCode(code);
+    currentTokens = tokens;
+    const whoami = await client.whoami();
+    const storedData = {
+      tokens,
+      organizationId: whoami.organization.id,
+      organizationName: whoami.organization.name,
+      userId: whoami.user.id,
+      userEmail: whoami.user.email
+    };
+    tokenStore.save(storedData);
+    return true;
+  } catch (error) {
+    console.error("Auto-auth failed:", error);
+    oauthHandler.stopCallbackServer();
+    return false;
+  } finally {
+    isAuthInProgress = false;
+  }
+}
 async function getAccessToken() {
   if (currentTokens && Date.now() < currentTokens.expires_at - 3e5) {
     return currentTokens.access_token;
@@ -2992,27 +3063,32 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
 });
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
   const { name, arguments: args } = request.params;
-  const token = await getAccessToken();
+  let token = await getAccessToken();
   if (!token) {
-    return {
-      content: [
-        {
-          type: "text",
-          text: `Not authenticated with Mediagraph. Please run the authorization flow first.
-
-To authorize:
-1. Run: npx @mediagraph/mcp authorize
-2. Complete the OAuth flow in your browser
-3. Return here and try again
-
-Or set your credentials via environment variables:
-- MEDIAGRAPH_CLIENT_ID (required)
-- MEDIAGRAPH_CLIENT_SECRET (optional, for confidential clients)
-`
-        }
-      ],
-      isError: true
-    };
+    const authSuccess = await runAutoAuth();
+    if (!authSuccess) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: "Failed to authenticate with Mediagraph. Please try again or check your browser for the authorization window."
+          }
+        ],
+        isError: true
+      };
+    }
+    token = await getAccessToken();
+    if (!token) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: "Authentication completed but failed to retrieve access token. Please try again."
+          }
+        ],
+        isError: true
+      };
+    }
   }
   const result = await handleTool(name, args || {}, toolContext);
   return {
@@ -3026,7 +3102,14 @@ server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => {
   };
 });
 server.setRequestHandler(ListResourcesRequestSchema, async () => {
-  const token = await getAccessToken();
+  let token = await getAccessToken();
+  if (!token) {
+    const authSuccess = await runAutoAuth();
+    if (!authSuccess) {
+      return { resources: [] };
+    }
+    token = await getAccessToken();
+  }
   if (!token) {
     return { resources: [] };
   }
@@ -3035,14 +3118,29 @@ server.setRequestHandler(ListResourcesRequestSchema, async () => {
 });
 server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
   const { uri } = request.params;
-  const token = await getAccessToken();
+  let token = await getAccessToken();
+  if (!token) {
+    const authSuccess = await runAutoAuth();
+    if (!authSuccess) {
+      return {
+        contents: [
+          {
+            uri,
+            mimeType: "text/plain",
+            text: "Failed to authenticate with Mediagraph. Please try again."
+          }
+        ]
+      };
+    }
+    token = await getAccessToken();
+  }
   if (!token) {
     return {
       contents: [
         {
           uri,
           mimeType: "text/plain",
-          text: "Not authenticated with Mediagraph. Please authorize first."
+          text: "Authentication completed but failed to retrieve access token."
         }
       ]
     };
@@ -3062,7 +3160,10 @@ async function runAuthorize() {
   console.log("Starting Mediagraph OAuth authorization...");
   console.log("");
   const authUrl = oauthHandler.getAuthorizationUrl();
-  console.log("Please open this URL in your browser:");
+  await oauthHandler.startCallbackServer();
+  openBrowser(authUrl);
+  console.log("Opening browser for authorization...");
+  console.log("If the browser does not open, please visit:");
   console.log("");
   console.log(authUrl);
   console.log("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediagraph/mcp",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "MCP server for Mediagraph - Media Asset Management Platform",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",