integrate-sdk 0.6.9 → 0.7.1

package/dist/index.js

@@ -244,6 +244,176 @@ function base64UrlDecode(str) {
   }
 }
 
+// src/adapters/base-handler.ts
+var exports_base_handler = {};
+__export(exports_base_handler, {
+  OAuthHandler: () => OAuthHandler
+});
+
+class OAuthHandler {
+  config;
+  serverUrl;
+  apiKey;
+  constructor(config) {
+    this.config = config;
+    if (!config || !config.providers) {
+      throw new Error("OAuthHandler requires a valid config with providers");
+    }
+    this.serverUrl = config.serverUrl || MCP_SERVER_URL2;
+    this.apiKey = config.apiKey;
+  }
+  getHeaders(additionalHeaders) {
+    const headers = {
+      ...additionalHeaders
+    };
+    if (this.apiKey) {
+      headers["X-API-KEY"] = this.apiKey;
+    }
+    return headers;
+  }
+  async handleAuthorize(request) {
+    const providerConfig = this.config.providers[request.provider];
+    if (!providerConfig) {
+      throw new Error(`Provider ${request.provider} not configured. Add OAuth credentials to your API route configuration.`);
+    }
+    if (!providerConfig.clientId || !providerConfig.clientSecret) {
+      throw new Error(`Missing OAuth credentials for ${request.provider}. Check your environment variables.`);
+    }
+    const url = new URL("/oauth/authorize", this.serverUrl);
+    url.searchParams.set("provider", request.provider);
+    url.searchParams.set("client_id", providerConfig.clientId);
+    url.searchParams.set("client_secret", providerConfig.clientSecret);
+    url.searchParams.set("scope", request.scopes.join(","));
+    url.searchParams.set("state", request.state);
+    url.searchParams.set("code_challenge", request.codeChallenge);
+    url.searchParams.set("code_challenge_method", request.codeChallengeMethod);
+    const redirectUri = request.redirectUri || providerConfig.redirectUri;
+    if (redirectUri) {
+      url.searchParams.set("redirect_uri", redirectUri);
+    }
+    const response = await fetch(url.toString(), {
+      method: "GET",
+      headers: this.getHeaders()
+    });
+    if (!response.ok) {
+      const error = await response.text();
+      throw new Error(`MCP server failed to generate authorization URL: ${error}`);
+    }
+    const data = await response.json();
+    return data;
+  }
+  async handleCallback(request) {
+    const providerConfig = this.config.providers[request.provider];
+    if (!providerConfig) {
+      throw new Error(`Provider ${request.provider} not configured. Add OAuth credentials to your API route configuration.`);
+    }
+    if (!providerConfig.clientId || !providerConfig.clientSecret) {
+      throw new Error(`Missing OAuth credentials for ${request.provider}. Check your environment variables.`);
+    }
+    const url = new URL("/oauth/callback", this.serverUrl);
+    const response = await fetch(url.toString(), {
+      method: "POST",
+      headers: this.getHeaders({
+        "Content-Type": "application/json"
+      }),
+      body: JSON.stringify({
+        provider: request.provider,
+        code: request.code,
+        code_verifier: request.codeVerifier,
+        state: request.state,
+        client_id: providerConfig.clientId,
+        client_secret: providerConfig.clientSecret,
+        redirect_uri: providerConfig.redirectUri
+      })
+    });
+    if (!response.ok) {
+      const error = await response.text();
+      throw new Error(`MCP server failed to exchange authorization code: ${error}`);
+    }
+    const data = await response.json();
+    return data;
+  }
+  async handleStatus(provider, accessToken) {
+    const url = new URL("/oauth/status", this.serverUrl);
+    url.searchParams.set("provider", provider);
+    const response = await fetch(url.toString(), {
+      method: "GET",
+      headers: this.getHeaders({
+        Authorization: `Bearer ${accessToken}`
+      })
+    });
+    if (!response.ok) {
+      if (response.status === 401) {
+        return {
+          authorized: false
+        };
+      }
+      const error = await response.text();
+      throw new Error(`MCP server failed to check authorization status: ${error}`);
+    }
+    const data = await response.json();
+    return data;
+  }
+  async handleDisconnect(request, accessToken) {
+    if (!accessToken) {
+      throw new Error("No access token provided. Cannot disconnect provider.");
+    }
+    const url = new URL("/oauth/disconnect", this.serverUrl);
+    const response = await fetch(url.toString(), {
+      method: "POST",
+      headers: this.getHeaders({
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`
+      }),
+      body: JSON.stringify({
+        provider: request.provider
+      })
+    });
+    if (!response.ok) {
+      const error = await response.text();
+      throw new Error(`MCP server failed to disconnect provider: ${error}`);
+    }
+    const data = await response.json();
+    return data;
+  }
+  async handleToolCall(request, authHeader) {
+    const url = new URL("/tools/call", this.serverUrl);
+    const headers = this.getHeaders({
+      "Content-Type": "application/json"
+    });
+    if (authHeader && authHeader.startsWith("Bearer ")) {
+      headers["Authorization"] = authHeader;
+    }
+    const jsonRpcRequest = {
+      jsonrpc: "2.0",
+      id: Date.now() + Math.random(),
+      method: "tools/call",
+      params: {
+        name: request.name,
+        arguments: request.arguments || {}
+      }
+    };
+    const response = await fetch(url.toString(), {
+      method: "POST",
+      headers,
+      body: JSON.stringify(jsonRpcRequest)
+    });
+    if (!response.ok) {
+      const error = await response.text();
+      throw new Error(`MCP server failed to execute tool call: ${error}`);
+    }
+    const jsonRpcResponse = await response.json();
+    if (jsonRpcResponse.error) {
+      const error = new Error(jsonRpcResponse.error.message || "Tool call failed");
+      error.code = jsonRpcResponse.error.code;
+      error.data = jsonRpcResponse.error.data;
+      throw error;
+    }
+    return jsonRpcResponse.result;
+  }
+}
+var MCP_SERVER_URL2 = "https://mcp.integrate.dev/api/v1/mcp";
+
 // src/protocol/jsonrpc.ts
 function parseMessage(message) {
   try {
@@ -1014,6 +1184,7 @@ class MCPClient {
   connecting = null;
   oauthManager;
   eventEmitter = new SimpleEventEmitter;
+  apiRouteBase;
   github;
   gmail;
   server;
@@ -1025,6 +1196,7 @@ class MCPClient {
     });
     const oauthApiBase = config.oauthApiBase || "/api/integrate/oauth";
     const defaultRedirectUri = this.getDefaultRedirectUri(oauthApiBase);
+    this.apiRouteBase = config.apiRouteBase || "/api/integrate";
     this.plugins = config.plugins.map((plugin) => {
       if (plugin.oauth && !plugin.oauth.redirectUri) {
         return {
@@ -1116,12 +1288,8 @@ class MCPClient {
     if (!this.availableTools.has(name)) {
       throw new Error(`Tool "${name}" is not available on the server. Available tools: ${Array.from(this.availableTools.keys()).join(", ")}`);
     }
-    const params = {
-      name,
-      arguments: args
-    };
     try {
-      const response = await this.transport.sendRequest("tools/call" /* TOOLS_CALL */, params);
+      const response = await this.callToolThroughHandler(name, args);
       return response;
     } catch (error) {
       const parsedError = parseServerError(error, { toolName: name });
@@ -1180,18 +1348,58 @@ class MCPClient {
     if (!this.availableTools.has(name)) {
       throw new Error(`Tool "${name}" is not available on the server. Available tools: ${Array.from(this.availableTools.keys()).join(", ")}`);
     }
-    const params = {
-      name,
-      arguments: args
-    };
     try {
-      const response = await this.transport.sendRequest("tools/call" /* TOOLS_CALL */, params);
+      const response = await this.callToolThroughHandler(name, args);
       return response;
     } catch (error) {
       const parsedError = parseServerError(error, { toolName: name });
       throw parsedError;
     }
   }
+  async callToolThroughHandler(name, args, provider) {
+    const url = `${this.apiRouteBase}/mcp`;
+    const headers = {
+      "Content-Type": "application/json"
+    };
+    if (provider) {
+      const tokenData = this.oauthManager.getProviderToken(provider);
+      if (tokenData) {
+        headers["Authorization"] = `Bearer ${tokenData.accessToken}`;
+      }
+    }
+    const response = await fetch(url, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        name,
+        arguments: args
+      })
+    });
+    if (!response.ok) {
+      let errorMessage = `Request failed: ${response.statusText}`;
+      const error = new Error(errorMessage);
+      error.statusCode = response.status;
+      try {
+        const errorData = await response.json();
+        if (errorData.error) {
+          errorMessage = typeof errorData.error === "string" ? errorData.error : errorData.error.message || errorMessage;
+          error.message = errorMessage;
+        }
+        if (errorData.code) {
+          error.code = errorData.code;
+        }
+        if (errorData.data) {
+          error.data = errorData.data;
+        }
+        if (errorData.error && typeof errorData.error === "object") {
+          error.jsonrpcError = errorData.error;
+        }
+      } catch {}
+      throw error;
+    }
+    const result = await response.json();
+    return result;
+  }
   async callToolWithRetry(name, args, retryCount = 0) {
     if (!this.initialized) {
       throw new Error("Client not initialized. Call connect() first.");
@@ -1203,35 +1411,24 @@ class MCPClient {
       throw new Error(`Tool "${name}" is not available on the server. Available tools: ${Array.from(this.availableTools.keys()).join(", ")}`);
     }
     const provider = this.getProviderForTool(name);
-    if (provider) {
-      const tokenData = this.oauthManager.getProviderToken(provider);
-      if (tokenData) {
-        this.transport.setHeader("Authorization", `Bearer ${tokenData.accessToken}`);
-      }
-    }
-    const params = {
-      name,
-      arguments: args
-    };
     try {
-      const response = await this.transport.sendRequest("tools/call" /* TOOLS_CALL */, params);
+      const response = await this.callToolThroughHandler(name, args, provider);
       if (provider) {
         this.authState.set(provider, { authenticated: true });
       }
       return response;
     } catch (error) {
-      const provider2 = this.getProviderForTool(name);
-      const parsedError = parseServerError(error, { toolName: name, provider: provider2 });
+      const parsedError = parseServerError(error, { toolName: name, provider });
       if (isAuthError(parsedError) && retryCount < this.maxReauthRetries) {
-        if (provider2) {
-          this.authState.set(provider2, {
+        if (provider) {
+          this.authState.set(provider, {
             authenticated: false,
             lastError: parsedError
           });
         }
-        if (this.onReauthRequired && provider2) {
+        if (this.onReauthRequired && provider) {
           const reauthSuccess = await this.onReauthRequired({
-            provider: provider2,
+            provider,
             error: parsedError,
             toolName: name
           });
@@ -1555,136 +1752,6 @@ async function clearClientCache() {
     }
   }));
 }
-// src/adapters/base-handler.ts
-var MCP_SERVER_URL2 = "https://mcp.integrate.dev/api/v1/mcp";
-
-class OAuthHandler {
-  config;
-  serverUrl;
-  apiKey;
-  constructor(config) {
-    this.config = config;
-    if (!config || !config.providers) {
-      throw new Error("OAuthHandler requires a valid config with providers");
-    }
-    this.serverUrl = config.serverUrl || MCP_SERVER_URL2;
-    this.apiKey = config.apiKey;
-  }
-  getHeaders(additionalHeaders) {
-    const headers = {
-      ...additionalHeaders
-    };
-    if (this.apiKey) {
-      headers["X-API-KEY"] = this.apiKey;
-    }
-    return headers;
-  }
-  async handleAuthorize(request) {
-    const providerConfig = this.config.providers[request.provider];
-    if (!providerConfig) {
-      throw new Error(`Provider ${request.provider} not configured. Add OAuth credentials to your API route configuration.`);
-    }
-    if (!providerConfig.clientId || !providerConfig.clientSecret) {
-      throw new Error(`Missing OAuth credentials for ${request.provider}. Check your environment variables.`);
-    }
-    const url = new URL("/oauth/authorize", this.serverUrl);
-    url.searchParams.set("provider", request.provider);
-    url.searchParams.set("client_id", providerConfig.clientId);
-    url.searchParams.set("client_secret", providerConfig.clientSecret);
-    url.searchParams.set("scope", request.scopes.join(","));
-    url.searchParams.set("state", request.state);
-    url.searchParams.set("code_challenge", request.codeChallenge);
-    url.searchParams.set("code_challenge_method", request.codeChallengeMethod);
-    const redirectUri = request.redirectUri || providerConfig.redirectUri;
-    if (redirectUri) {
-      url.searchParams.set("redirect_uri", redirectUri);
-    }
-    const response = await fetch(url.toString(), {
-      method: "GET",
-      headers: this.getHeaders()
-    });
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(`MCP server failed to generate authorization URL: ${error}`);
-    }
-    const data = await response.json();
-    return data;
-  }
-  async handleCallback(request) {
-    const providerConfig = this.config.providers[request.provider];
-    if (!providerConfig) {
-      throw new Error(`Provider ${request.provider} not configured. Add OAuth credentials to your API route configuration.`);
-    }
-    if (!providerConfig.clientId || !providerConfig.clientSecret) {
-      throw new Error(`Missing OAuth credentials for ${request.provider}. Check your environment variables.`);
-    }
-    const url = new URL("/oauth/callback", this.serverUrl);
-    const response = await fetch(url.toString(), {
-      method: "POST",
-      headers: this.getHeaders({
-        "Content-Type": "application/json"
-      }),
-      body: JSON.stringify({
-        provider: request.provider,
-        code: request.code,
-        code_verifier: request.codeVerifier,
-        state: request.state,
-        client_id: providerConfig.clientId,
-        client_secret: providerConfig.clientSecret,
-        redirect_uri: providerConfig.redirectUri
-      })
-    });
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(`MCP server failed to exchange authorization code: ${error}`);
-    }
-    const data = await response.json();
-    return data;
-  }
-  async handleStatus(provider, accessToken) {
-    const url = new URL("/oauth/status", this.serverUrl);
-    url.searchParams.set("provider", provider);
-    const response = await fetch(url.toString(), {
-      method: "GET",
-      headers: this.getHeaders({
-        Authorization: `Bearer ${accessToken}`
-      })
-    });
-    if (!response.ok) {
-      if (response.status === 401) {
-        return {
-          authorized: false
-        };
-      }
-      const error = await response.text();
-      throw new Error(`MCP server failed to check authorization status: ${error}`);
-    }
-    const data = await response.json();
-    return data;
-  }
-  async handleDisconnect(request, accessToken) {
-    if (!accessToken) {
-      throw new Error("No access token provided. Cannot disconnect provider.");
-    }
-    const url = new URL("/oauth/disconnect", this.serverUrl);
-    const response = await fetch(url.toString(), {
-      method: "POST",
-      headers: this.getHeaders({
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${accessToken}`
-      }),
-      body: JSON.stringify({
-        provider: request.provider
-      })
-    });
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(`MCP server failed to disconnect provider: ${error}`);
-    }
-    const data = await response.json();
-    return data;
-  }
-}
 // src/adapters/nextjs.ts
 function createNextOAuthHandler(config) {
   const handler = new OAuthHandler(config);
@@ -1760,6 +1827,9 @@ function createNextOAuthHandler(config) {
           if (action === "disconnect") {
             return handlers.disconnect(req);
           }
+          if (action === "mcp") {
+            return handlers.mcp(req);
+          }
           return Response.json({ error: `Unknown action: ${action}` }, { status: 404 });
         },
         async GET(req, context) {
@@ -1772,6 +1842,17 @@ function createNextOAuthHandler(config) {
         }
       };
     },
+    async mcp(req) {
+      try {
+        const body = await req.json();
+        const authHeader = req.headers.get("authorization");
+        const result = await handler.handleToolCall(body, authHeader);
+        return Response.json(result);
+      } catch (error) {
+        console.error("[MCP Tool Call] Error:", error);
+        return Response.json({ error: error.message || "Failed to execute tool call" }, { status: error.statusCode || 500 });
+      }
+    },
     toNextJsHandler(redirectConfig) {
       const defaultRedirectUrl = redirectConfig?.redirectUrl || "/";
       const errorRedirectUrl = redirectConfig?.errorRedirectUrl || "/auth-error";
@@ -1792,6 +1873,9 @@ function createNextOAuthHandler(config) {
             }
             return Response.json({ error: `Unknown action: ${action}` }, { status: 404 });
           }
+          if (segments.length === 1 && segments[0] === "mcp") {
+            return handlers.mcp(req);
+          }
           return Response.json({ error: `Invalid route: /${segments.join("/")}` }, { status: 404 });
         },
         async GET(req, context) {
@@ -2259,6 +2343,23 @@ function createMCPServer(config) {
       if (segments.length === 2 && segments[0] !== "oauth") {
         return Response.json({ error: `Invalid route: /${segments.join("/")}` }, { status: 404 });
       }
+      if (segments.length === 1 && segments[0] === "mcp" && method === "POST") {
+        try {
+          const body = await request.json();
+          const authHeader = request.headers.get("authorization");
+          const { OAuthHandler: OAuthHandler2 } = await Promise.resolve().then(() => exports_base_handler);
+          const oauthHandler = new OAuthHandler2({
+            providers,
+            serverUrl: config.serverUrl,
+            apiKey: config.apiKey
+          });
+          const result = await oauthHandler.handleToolCall(body, authHeader);
+          return Response.json(result);
+        } catch (error) {
+          console.error("[MCP Tool Call] Error:", error);
+          return Response.json({ error: error.message || "Failed to execute tool call" }, { status: error.statusCode || 500 });
+        }
+      }
     }
     if (method === "GET" && action === "callback") {
       const url = new URL(request.url);

package/dist/oauth.js

@@ -11,7 +11,10 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
 // src/adapters/base-handler.ts
-var MCP_SERVER_URL = "https://mcp.integrate.dev/api/v1/mcp";
+var exports_base_handler = {};
+__export(exports_base_handler, {
+  OAuthHandler: () => OAuthHandler
+});
 
 class OAuthHandler {
   config;
@@ -139,7 +142,43 @@ class OAuthHandler {
     const data = await response.json();
     return data;
   }
+  async handleToolCall(request, authHeader) {
+    const url = new URL("/tools/call", this.serverUrl);
+    const headers = this.getHeaders({
+      "Content-Type": "application/json"
+    });
+    if (authHeader && authHeader.startsWith("Bearer ")) {
+      headers["Authorization"] = authHeader;
+    }
+    const jsonRpcRequest = {
+      jsonrpc: "2.0",
+      id: Date.now() + Math.random(),
+      method: "tools/call",
+      params: {
+        name: request.name,
+        arguments: request.arguments || {}
+      }
+    };
+    const response = await fetch(url.toString(), {
+      method: "POST",
+      headers,
+      body: JSON.stringify(jsonRpcRequest)
+    });
+    if (!response.ok) {
+      const error = await response.text();
+      throw new Error(`MCP server failed to execute tool call: ${error}`);
+    }
+    const jsonRpcResponse = await response.json();
+    if (jsonRpcResponse.error) {
+      const error = new Error(jsonRpcResponse.error.message || "Tool call failed");
+      error.code = jsonRpcResponse.error.code;
+      error.data = jsonRpcResponse.error.data;
+      throw error;
+    }
+    return jsonRpcResponse.result;
+  }
 }
+var MCP_SERVER_URL = "https://mcp.integrate.dev/api/v1/mcp";
 
 // src/adapters/auto-routes.ts
 var globalOAuthConfig = null;