integrate-sdk 0.7.43 → 0.7.45

package/dist/adapters/index.js

@@ -1117,7 +1117,9 @@ class OAuthManager {
   flowConfig;
   oauthApiBase;
   apiBaseUrl;
-  constructor(oauthApiBase, flowConfig, apiBaseUrl) {
+  getTokenCallback;
+  setTokenCallback;
+  constructor(oauthApiBase, flowConfig, apiBaseUrl, tokenCallbacks) {
     this.oauthApiBase = oauthApiBase;
     this.apiBaseUrl = apiBaseUrl;
     this.windowManager = new OAuthWindowManager;
@@ -1126,6 +1128,8 @@ class OAuthManager {
       popupOptions: flowConfig?.popupOptions,
       onAuthCallback: flowConfig?.onAuthCallback
     };
+    this.getTokenCallback = tokenCallbacks?.getProviderToken;
+    this.setTokenCallback = tokenCallbacks?.setProviderToken;
     this.cleanupExpiredPendingAuths();
   }
   async initiateFlow(provider, config, returnUrl) {
@@ -1189,7 +1193,7 @@ class OAuthManager {
         scopes: response.scopes
       };
       this.providerTokens.set(pendingAuth.provider, tokenData);
-      this.saveProviderToken(pendingAuth.provider, tokenData);
+      await this.saveProviderToken(pendingAuth.provider, tokenData);
       this.pendingAuths.delete(state);
       this.removePendingAuthFromStorage(state);
       return { ...tokenData, provider: pendingAuth.provider };
@@ -1200,7 +1204,7 @@ class OAuthManager {
     }
   }
   async checkAuthStatus(provider) {
-    const tokenData = this.providerTokens.get(provider);
+    const tokenData = await this.getProviderToken(provider);
     if (!tokenData) {
       return {
         authorized: false,
@@ -1215,26 +1219,38 @@ class OAuthManager {
     };
   }
   async disconnectProvider(provider) {
-    const tokenData = this.providerTokens.get(provider);
+    const tokenData = await this.getProviderToken(provider);
     if (!tokenData) {
       throw new Error(`No access token available for provider "${provider}". Cannot disconnect provider.`);
     }
     this.providerTokens.delete(provider);
     this.clearProviderToken(provider);
   }
-  getProviderToken(provider) {
+  async getProviderToken(provider, context) {
+    if (this.getTokenCallback) {
+      try {
+        const tokenData = await this.getTokenCallback(provider, context);
+        if (tokenData) {
+          this.providerTokens.set(provider, tokenData);
+        }
+        return tokenData;
+      } catch (error) {
+        console.error(`Failed to get token for ${provider} via callback:`, error);
+        return;
+      }
+    }
     return this.providerTokens.get(provider);
   }
   getAllProviderTokens() {
     return new Map(this.providerTokens);
   }
-  setProviderToken(provider, tokenData) {
+  async setProviderToken(provider, tokenData, context) {
     this.providerTokens.set(provider, tokenData);
-    this.saveProviderToken(provider, tokenData);
+    await this.saveProviderToken(provider, tokenData, context);
   }
   clearProviderToken(provider) {
     this.providerTokens.delete(provider);
-    if (typeof window !== "undefined" && window.localStorage) {
+    if (!this.getTokenCallback && typeof window !== "undefined" && window.localStorage) {
       try {
         window.localStorage.removeItem(`integrate_token_${provider}`);
       } catch (error) {
@@ -1245,7 +1261,7 @@ class OAuthManager {
   clearAllProviderTokens() {
     const providers = Array.from(this.providerTokens.keys());
     this.providerTokens.clear();
-    if (typeof window !== "undefined" && window.localStorage) {
+    if (!this.getTokenCallback && typeof window !== "undefined" && window.localStorage) {
       for (const provider of providers) {
         try {
           window.localStorage.removeItem(`integrate_token_${provider}`);
@@ -1273,7 +1289,16 @@ class OAuthManager {
       }
     }
   }
-  saveProviderToken(provider, tokenData) {
+  async saveProviderToken(provider, tokenData, context) {
+    if (this.setTokenCallback) {
+      try {
+        await this.setTokenCallback(provider, tokenData, context);
+      } catch (error) {
+        console.error(`Failed to save token for ${provider} via callback:`, error);
+        throw error;
+      }
+      return;
+    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_token_${provider}`;
@@ -1283,7 +1308,15 @@ class OAuthManager {
       }
     }
   }
-  loadProviderToken(provider) {
+  async loadProviderToken(provider) {
+    if (this.getTokenCallback) {
+      try {
+        return await this.getTokenCallback(provider);
+      } catch (error) {
+        console.error(`Failed to load token for ${provider} via callback:`, error);
+        return;
+      }
+    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_token_${provider}`;
@@ -1297,9 +1330,9 @@ class OAuthManager {
     }
     return;
   }
-  loadAllProviderTokens(providers) {
+  async loadAllProviderTokens(providers) {
     for (const provider of providers) {
-      const tokenData = this.loadProviderToken(provider);
+      const tokenData = await this.loadProviderToken(provider);
       if (tokenData) {
         this.providerTokens.set(provider, tokenData);
       }
@@ -1497,16 +1530,28 @@ class MCPClientBase {
     };
     this.onReauthRequired = config.onReauthRequired;
     this.maxReauthRetries = config.maxReauthRetries ?? 1;
-    this.oauthManager = new OAuthManager(oauthApiBase, config.oauthFlow, this.apiBaseUrl);
+    this.oauthManager = new OAuthManager(oauthApiBase, config.oauthFlow, this.apiBaseUrl, {
+      getProviderToken: config.getProviderToken,
+      setProviderToken: config.setProviderToken
+    });
     const providers = this.integrations.filter((p) => p.oauth).map((p) => p.oauth.provider);
-    this.oauthManager.loadAllProviderTokens(providers);
+    this.oauthManager.loadAllProviderTokens(providers).catch((error) => {
+      console.error("Failed to load provider tokens:", error);
+    });
     for (const integration of this.integrations) {
       for (const toolName of integration.tools) {
         this.enabledToolNames.add(toolName);
       }
       if (integration.oauth) {
-        const hasToken = this.oauthManager.getProviderToken(integration.oauth.provider) !== undefined;
-        this.authState.set(integration.oauth.provider, { authenticated: hasToken });
+        const provider = integration.oauth.provider;
+        this.authState.set(provider, { authenticated: false });
+        this.oauthManager.getProviderToken(provider).then((tokenData) => {
+          if (tokenData) {
+            this.authState.set(provider, { authenticated: true });
+          }
+        }).catch((error) => {
+          console.error(`Failed to check token for ${provider}:`, error);
+        });
       }
     }
     const integrationIds = this.integrations.map((i) => i.id);
@@ -1534,9 +1579,9 @@ class MCPClientBase {
     }
     return new Proxy({}, {
       get: (_target, methodName) => {
-        return async (args) => {
+        return async (args, options) => {
           const toolName = methodToToolName(methodName, integrationId);
-          return await this.callToolWithRetry(toolName, args, 0);
+          return await this.callToolWithRetry(toolName, args, 0, options);
         };
       }
     });
@@ -1544,17 +1589,17 @@ class MCPClientBase {
   createServerProxy() {
     return new Proxy({}, {
       get: (_target, methodName) => {
-        return async (args) => {
+        return async (args, options) => {
           const toolName = methodToToolName(methodName, "");
           const finalToolName = toolName.startsWith("_") ? toolName.substring(1) : toolName;
-          return await this.callServerToolInternal(finalToolName, args);
+          return await this.callServerToolInternal(finalToolName, args, options);
         };
       }
     });
   }
-  async callServerToolInternal(name, args) {
+  async callServerToolInternal(name, args, options) {
     try {
-      const response = await this.callToolThroughHandler(name, args);
+      const response = await this.callToolThroughHandler(name, args, undefined, options);
       return response;
     } catch (error) {
       const parsedError = parseServerError(error, { toolName: name });
@@ -1603,8 +1648,8 @@ class MCPClientBase {
     const enabledTools = response.tools.filter((tool) => this.enabledToolNames.has(tool.name));
     console.log(`Discovered ${response.tools.length} tools, ${enabledTools.length} enabled by integrations`);
   }
-  async _callToolByName(name, args) {
-    return await this.callToolWithRetry(name, args, 0);
+  async _callToolByName(name, args, options) {
+    return await this.callToolWithRetry(name, args, 0, options);
   }
   async callServerTool(name, args) {
     try {
@@ -1615,12 +1660,12 @@ class MCPClientBase {
       throw parsedError;
     }
   }
-  async callToolThroughHandler(name, args, provider) {
+  async callToolThroughHandler(name, args, provider, options) {
     const transportHeaders = this.transport.headers || {};
     const hasApiKey = !!transportHeaders["X-API-KEY"];
     if (hasApiKey) {
       if (provider) {
-        const tokenData = this.oauthManager.getProviderToken(provider);
+        const tokenData = await this.oauthManager.getProviderToken(provider, options?.context);
         if (tokenData && this.transport.setHeader) {
           const previousAuthHeader = transportHeaders["Authorization"];
           try {
@@ -1650,7 +1695,7 @@ class MCPClientBase {
       "Content-Type": "application/json"
     };
     if (provider) {
-      const tokenData = this.oauthManager.getProviderToken(provider);
+      const tokenData = await this.oauthManager.getProviderToken(provider, options?.context);
       if (tokenData) {
         headers["Authorization"] = `Bearer ${tokenData.accessToken}`;
       }
@@ -1688,13 +1733,13 @@ class MCPClientBase {
     const result = await response.json();
     return result;
   }
-  async callToolWithRetry(name, args, retryCount = 0) {
+  async callToolWithRetry(name, args, retryCount = 0, options) {
     if (!this.enabledToolNames.has(name)) {
       throw new Error(`Tool "${name}" is not enabled. Enable it by adding the appropriate integration.`);
     }
     const provider = this.getProviderForTool(name);
     try {
-      const response = await this.callToolThroughHandler(name, args, provider);
+      const response = await this.callToolThroughHandler(name, args, provider, options);
       if (provider) {
         this.authState.set(provider, { authenticated: true });
       }
@@ -1845,7 +1890,7 @@ class MCPClientBase {
     this.eventEmitter.emit("auth:started", { provider });
     try {
       await this.oauthManager.initiateFlow(provider, integration.oauth, options?.returnUrl);
-      const tokenData = this.oauthManager.getProviderToken(provider);
+      const tokenData = await this.oauthManager.getProviderToken(provider);
       if (tokenData) {
         this.eventEmitter.emit("auth:complete", {
           provider,
@@ -1876,11 +1921,11 @@ class MCPClientBase {
       throw error;
     }
   }
-  getProviderToken(provider) {
-    return this.oauthManager.getProviderToken(provider);
+  async getProviderToken(provider, context) {
+    return await this.oauthManager.getProviderToken(provider, context);
   }
-  setProviderToken(provider, tokenData) {
-    this.oauthManager.setProviderToken(provider, tokenData);
+  async setProviderToken(provider, tokenData, context) {
+    await this.oauthManager.setProviderToken(provider, tokenData, context);
     this.authState.set(provider, { authenticated: true });
   }
   getAllProviderTokens() {

package/dist/adapters/solid-start.js

@@ -982,7 +982,9 @@ class OAuthManager {
   flowConfig;
   oauthApiBase;
   apiBaseUrl;
-  constructor(oauthApiBase, flowConfig, apiBaseUrl) {
+  getTokenCallback;
+  setTokenCallback;
+  constructor(oauthApiBase, flowConfig, apiBaseUrl, tokenCallbacks) {
     this.oauthApiBase = oauthApiBase;
     this.apiBaseUrl = apiBaseUrl;
     this.windowManager = new OAuthWindowManager;
@@ -991,6 +993,8 @@ class OAuthManager {
       popupOptions: flowConfig?.popupOptions,
       onAuthCallback: flowConfig?.onAuthCallback
     };
+    this.getTokenCallback = tokenCallbacks?.getProviderToken;
+    this.setTokenCallback = tokenCallbacks?.setProviderToken;
     this.cleanupExpiredPendingAuths();
   }
   async initiateFlow(provider, config, returnUrl) {
@@ -1054,7 +1058,7 @@ class OAuthManager {
         scopes: response.scopes
       };
       this.providerTokens.set(pendingAuth.provider, tokenData);
-      this.saveProviderToken(pendingAuth.provider, tokenData);
+      await this.saveProviderToken(pendingAuth.provider, tokenData);
       this.pendingAuths.delete(state);
       this.removePendingAuthFromStorage(state);
       return { ...tokenData, provider: pendingAuth.provider };
@@ -1065,7 +1069,7 @@ class OAuthManager {
     }
   }
   async checkAuthStatus(provider) {
-    const tokenData = this.providerTokens.get(provider);
+    const tokenData = await this.getProviderToken(provider);
     if (!tokenData) {
       return {
         authorized: false,
@@ -1080,26 +1084,38 @@ class OAuthManager {
     };
   }
   async disconnectProvider(provider) {
-    const tokenData = this.providerTokens.get(provider);
+    const tokenData = await this.getProviderToken(provider);
     if (!tokenData) {
       throw new Error(`No access token available for provider "${provider}". Cannot disconnect provider.`);
     }
     this.providerTokens.delete(provider);
     this.clearProviderToken(provider);
   }
-  getProviderToken(provider) {
+  async getProviderToken(provider, context) {
+    if (this.getTokenCallback) {
+      try {
+        const tokenData = await this.getTokenCallback(provider, context);
+        if (tokenData) {
+          this.providerTokens.set(provider, tokenData);
+        }
+        return tokenData;
+      } catch (error) {
+        console.error(`Failed to get token for ${provider} via callback:`, error);
+        return;
+      }
+    }
     return this.providerTokens.get(provider);
   }
   getAllProviderTokens() {
     return new Map(this.providerTokens);
   }
-  setProviderToken(provider, tokenData) {
+  async setProviderToken(provider, tokenData, context) {
     this.providerTokens.set(provider, tokenData);
-    this.saveProviderToken(provider, tokenData);
+    await this.saveProviderToken(provider, tokenData, context);
   }
   clearProviderToken(provider) {
     this.providerTokens.delete(provider);
-    if (typeof window !== "undefined" && window.localStorage) {
+    if (!this.getTokenCallback && typeof window !== "undefined" && window.localStorage) {
       try {
         window.localStorage.removeItem(`integrate_token_${provider}`);
       } catch (error) {
@@ -1110,7 +1126,7 @@ class OAuthManager {
   clearAllProviderTokens() {
     const providers = Array.from(this.providerTokens.keys());
     this.providerTokens.clear();
-    if (typeof window !== "undefined" && window.localStorage) {
+    if (!this.getTokenCallback && typeof window !== "undefined" && window.localStorage) {
       for (const provider of providers) {
         try {
           window.localStorage.removeItem(`integrate_token_${provider}`);
@@ -1138,7 +1154,16 @@ class OAuthManager {
       }
     }
   }
-  saveProviderToken(provider, tokenData) {
+  async saveProviderToken(provider, tokenData, context) {
+    if (this.setTokenCallback) {
+      try {
+        await this.setTokenCallback(provider, tokenData, context);
+      } catch (error) {
+        console.error(`Failed to save token for ${provider} via callback:`, error);
+        throw error;
+      }
+      return;
+    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_token_${provider}`;
@@ -1148,7 +1173,15 @@ class OAuthManager {
       }
     }
   }
-  loadProviderToken(provider) {
+  async loadProviderToken(provider) {
+    if (this.getTokenCallback) {
+      try {
+        return await this.getTokenCallback(provider);
+      } catch (error) {
+        console.error(`Failed to load token for ${provider} via callback:`, error);
+        return;
+      }
+    }
     if (typeof window !== "undefined" && window.localStorage) {
       try {
         const key = `integrate_token_${provider}`;
@@ -1162,9 +1195,9 @@ class OAuthManager {
     }
     return;
   }
-  loadAllProviderTokens(providers) {
+  async loadAllProviderTokens(providers) {
     for (const provider of providers) {
-      const tokenData = this.loadProviderToken(provider);
+      const tokenData = await this.loadProviderToken(provider);
       if (tokenData) {
         this.providerTokens.set(provider, tokenData);
       }
@@ -1362,16 +1395,28 @@ class MCPClientBase {
     };
     this.onReauthRequired = config.onReauthRequired;
     this.maxReauthRetries = config.maxReauthRetries ?? 1;
-    this.oauthManager = new OAuthManager(oauthApiBase, config.oauthFlow, this.apiBaseUrl);
+    this.oauthManager = new OAuthManager(oauthApiBase, config.oauthFlow, this.apiBaseUrl, {
+      getProviderToken: config.getProviderToken,
+      setProviderToken: config.setProviderToken
+    });
     const providers = this.integrations.filter((p) => p.oauth).map((p) => p.oauth.provider);
-    this.oauthManager.loadAllProviderTokens(providers);
+    this.oauthManager.loadAllProviderTokens(providers).catch((error) => {
+      console.error("Failed to load provider tokens:", error);
+    });
     for (const integration of this.integrations) {
       for (const toolName of integration.tools) {
         this.enabledToolNames.add(toolName);
       }
       if (integration.oauth) {
-        const hasToken = this.oauthManager.getProviderToken(integration.oauth.provider) !== undefined;
-        this.authState.set(integration.oauth.provider, { authenticated: hasToken });
+        const provider = integration.oauth.provider;
+        this.authState.set(provider, { authenticated: false });
+        this.oauthManager.getProviderToken(provider).then((tokenData) => {
+          if (tokenData) {
+            this.authState.set(provider, { authenticated: true });
+          }
+        }).catch((error) => {
+          console.error(`Failed to check token for ${provider}:`, error);
+        });
       }
     }
     const integrationIds = this.integrations.map((i) => i.id);
@@ -1399,9 +1444,9 @@ class MCPClientBase {
     }
     return new Proxy({}, {
       get: (_target, methodName) => {
-        return async (args) => {
+        return async (args, options) => {
           const toolName = methodToToolName(methodName, integrationId);
-          return await this.callToolWithRetry(toolName, args, 0);
+          return await this.callToolWithRetry(toolName, args, 0, options);
         };
       }
     });
@@ -1409,17 +1454,17 @@ class MCPClientBase {
   createServerProxy() {
     return new Proxy({}, {
       get: (_target, methodName) => {
-        return async (args) => {
+        return async (args, options) => {
           const toolName = methodToToolName(methodName, "");
           const finalToolName = toolName.startsWith("_") ? toolName.substring(1) : toolName;
-          return await this.callServerToolInternal(finalToolName, args);
+          return await this.callServerToolInternal(finalToolName, args, options);
         };
       }
     });
   }
-  async callServerToolInternal(name, args) {
+  async callServerToolInternal(name, args, options) {
     try {
-      const response = await this.callToolThroughHandler(name, args);
+      const response = await this.callToolThroughHandler(name, args, undefined, options);
       return response;
     } catch (error) {
       const parsedError = parseServerError(error, { toolName: name });
@@ -1468,8 +1513,8 @@ class MCPClientBase {
     const enabledTools = response.tools.filter((tool) => this.enabledToolNames.has(tool.name));
     console.log(`Discovered ${response.tools.length} tools, ${enabledTools.length} enabled by integrations`);
   }
-  async _callToolByName(name, args) {
-    return await this.callToolWithRetry(name, args, 0);
+  async _callToolByName(name, args, options) {
+    return await this.callToolWithRetry(name, args, 0, options);
   }
   async callServerTool(name, args) {
     try {
@@ -1480,12 +1525,12 @@ class MCPClientBase {
       throw parsedError;
     }
   }
-  async callToolThroughHandler(name, args, provider) {
+  async callToolThroughHandler(name, args, provider, options) {
     const transportHeaders = this.transport.headers || {};
     const hasApiKey = !!transportHeaders["X-API-KEY"];
     if (hasApiKey) {
       if (provider) {
-        const tokenData = this.oauthManager.getProviderToken(provider);
+        const tokenData = await this.oauthManager.getProviderToken(provider, options?.context);
         if (tokenData && this.transport.setHeader) {
           const previousAuthHeader = transportHeaders["Authorization"];
           try {
@@ -1515,7 +1560,7 @@ class MCPClientBase {
       "Content-Type": "application/json"
     };
     if (provider) {
-      const tokenData = this.oauthManager.getProviderToken(provider);
+      const tokenData = await this.oauthManager.getProviderToken(provider, options?.context);
       if (tokenData) {
         headers["Authorization"] = `Bearer ${tokenData.accessToken}`;
       }
@@ -1553,13 +1598,13 @@ class MCPClientBase {
     const result = await response.json();
     return result;
   }
-  async callToolWithRetry(name, args, retryCount = 0) {
+  async callToolWithRetry(name, args, retryCount = 0, options) {
     if (!this.enabledToolNames.has(name)) {
       throw new Error(`Tool "${name}" is not enabled. Enable it by adding the appropriate integration.`);
     }
     const provider = this.getProviderForTool(name);
     try {
-      const response = await this.callToolThroughHandler(name, args, provider);
+      const response = await this.callToolThroughHandler(name, args, provider, options);
       if (provider) {
         this.authState.set(provider, { authenticated: true });
       }
@@ -1710,7 +1755,7 @@ class MCPClientBase {
     this.eventEmitter.emit("auth:started", { provider });
     try {
       await this.oauthManager.initiateFlow(provider, integration.oauth, options?.returnUrl);
-      const tokenData = this.oauthManager.getProviderToken(provider);
+      const tokenData = await this.oauthManager.getProviderToken(provider);
       if (tokenData) {
         this.eventEmitter.emit("auth:complete", {
           provider,
@@ -1741,11 +1786,11 @@ class MCPClientBase {
       throw error;
     }
   }
-  getProviderToken(provider) {
-    return this.oauthManager.getProviderToken(provider);
+  async getProviderToken(provider, context) {
+    return await this.oauthManager.getProviderToken(provider, context);
   }
-  setProviderToken(provider, tokenData) {
-    this.oauthManager.setProviderToken(provider, tokenData);
+  async setProviderToken(provider, tokenData, context) {
+    await this.oauthManager.setProviderToken(provider, tokenData, context);
     this.authState.set(provider, { authenticated: true });
   }
   getAllProviderTokens() {