feat: mcp server

ComposioHQ · Feb 28, 2025 · 5543edc · 5543edc
1 parent ee70499
commit 5543edc
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 18 deletions.
diff --git a/js/[email protected] b/js/[email protected]
diff --git a/js/jest b/js/jest
diff --git a/js/src/sdk/base.toolset.ts b/js/src/sdk/base.toolset.ts
@@ -278,6 +278,7 @@ export class ComposioToolSet {
       params = await processor({
         params: params,
         actionName: action,
+        client: this.client.backendClient.instance,
       });
     }
 

diff --git a/js/src/sdk/index.spec.ts b/js/src/sdk/index.spec.ts
@@ -73,13 +73,15 @@ describe("Basic SDK spec suite", () => {
       name: "AppNotFoundError",
       message: "Not found",
     };
-    mock.onGet(/.*\/api\/v1\/apps/).reply(404, mockError);
 
     const client = new Composio({
       apiKey: COMPOSIO_API_KEY,
       baseUrl: getTestConfig().BACKEND_HERMES_URL,
     });
+
+    const mock = new AxiosMockAdapter(client.backendClient.getAxiosInstance());
 
+    mock.onGet(/.*\/api\/v1\/apps/).reply(404, mockError);
     let errorWasThrown = false;
     try {
       await client.apps.list();
@@ -98,9 +100,19 @@ describe("Basic SDK spec suite", () => {
       }
     }
     expect(errorWasThrown).toBe(true);
+    mock.reset();
   });
 
   it("should handle 400 error gracefully", async () => {
+
+
+    let errorWasThrown = false;
+    const client = new Composio({
+      apiKey: COMPOSIO_API_KEY,
+      baseUrl: getTestConfig().BACKEND_HERMES_URL,
+    });
+
+    const mock = new AxiosMockAdapter(client.backendClient.getAxiosInstance());
     mock.onGet(/.*\/api\/v1\/apps/).reply(400, {
       type: "BadRequestError",
       name: "InvalidRequestError",
@@ -115,12 +127,6 @@ describe("Basic SDK spec suite", () => {
         },
       ],
     });
-
-    let errorWasThrown = false;
-    const client = new Composio({
-      apiKey: COMPOSIO_API_KEY,
-      baseUrl: getTestConfig().BACKEND_HERMES_URL,
-    });
     try {
       await client.apps.list();
     } catch (e) {
@@ -134,19 +140,21 @@ describe("Basic SDK spec suite", () => {
       );
     }
     expect(errorWasThrown).toBe(true);
+    mock.reset();
   });
 
   it("should handle 500 and 502 error gracefully, and without backend fix", async () => {
-    mock.onGet(/.*\/api\/v1\/apps/).reply(500, {
-      type: "InternalServerError",
-      name: "ServerError",
-      message: "Internal Server Error",
-    });
     let errorWasThrown = false;
     const client = new Composio({
       apiKey: COMPOSIO_API_KEY,
       baseUrl: getTestConfig().BACKEND_HERMES_URL,
     });
+    const mock = new AxiosMockAdapter(client.backendClient.getAxiosInstance());
+    mock.onGet(/.*\/api\/v1\/apps/).reply(500, {
+      type: "InternalServerError",
+      name: "ServerError",
+      message: "Internal Server Error",
+    });
     try {
       await client.apps.list();
     } catch (e) {
@@ -195,13 +203,15 @@ describe("Basic SDK spec suite", () => {
       const error = e as ComposioError;
       expect(error.errCode).toBe(COMPOSIO_SDK_ERROR_CODES.BACKEND.SERVER_ERROR);
     }
+    mock.reset();
   });
 
   it("should give request timeout error", async () => {
     const client = new Composio({
       apiKey: COMPOSIO_API_KEY,
       baseUrl: getTestConfig().BACKEND_HERMES_URL,
     });
+    const mock = new AxiosMockAdapter(client.backendClient.getAxiosInstance());
 
     mock.onGet(/.*\/api\/v1\/apps/).reply(408, {
       error: {
@@ -225,6 +235,7 @@ describe("Basic SDK spec suite", () => {
     }
 
     expect(errorWasThrown).toBe(true);
+    mock.reset()
   });
 
   it("syntax error handling", async () => {

diff --git a/js/src/sdk/utils/processor/file.ts b/js/src/sdk/utils/processor/file.ts
@@ -1,3 +1,4 @@
+import { Client } from "@hey-api/client-axios";
 import {
   TPostProcessor,
   TPreProcessor,
@@ -31,7 +32,8 @@ const convertFileSchemaProperty = (
 
 const processFileUpload = async (
   params: Record<string, unknown>,
-  actionName: string
+  actionName: string,
+  client: Client
 ) => {
   const result = { ...params };
 
@@ -41,7 +43,8 @@ const processFileUpload = async (
     const originalKey = key.replace(FILE_SUFFIX, "");
     const fileData = await getFileDataAfterUploadingToS3(
       value as string,
-      actionName
+      actionName,
+      client
     );
 
     result[originalKey] = fileData;
@@ -54,8 +57,9 @@ const processFileUpload = async (
 export const FILE_INPUT_PROCESSOR: TPreProcessor = async ({
   params,
   actionName,
+  client
 }) => {
-  return processFileUpload(params, actionName);
+  return processFileUpload(params, actionName, client);
 };
 
 export const FILE_DOWNLOADABLE_PROCESSOR: TPostProcessor = async ({

diff --git a/js/src/sdk/utils/processor/fileUtils.ts b/js/src/sdk/utils/processor/fileUtils.ts
@@ -2,6 +2,7 @@ import axios, { AxiosError } from "axios";
 import crypto from "crypto";
 import apiClient from "../../client/client";
 import { saveFile } from "../fileUtils";
+import { Client } from "@hey-api/client-axios";
 
 const readFileContent = async (
   path: string
@@ -36,10 +37,12 @@ const uploadFileToS3 = async (
   content: string,
   actionName: string,
   appName: string,
-  mimeType: string
+  mimeType: string,
+  client: Client
 ): Promise<string> => {
   const extension = mimeType.split("/")[1] || "bin";
   const response = await apiClient.actionsV2.createFileUploadUrl({
+    client: client,
     body: {
       action: actionName,
       app: appName,
@@ -80,7 +83,8 @@ const uploadFileToS3 = async (
 
 export const getFileDataAfterUploadingToS3 = async (
   path: string,
-  actionName: string
+  actionName: string,
+  client: Client
 ): Promise<{
   name: string;
   mimetype: string;
@@ -95,7 +99,8 @@ export const getFileDataAfterUploadingToS3 = async (
     fileData.content,
     actionName,
     actionName,
-    fileData.mimeType
+    fileData.mimeType,
+    client
   );
 
   return {

diff --git a/js/src/types/base_toolset.ts b/js/src/types/base_toolset.ts
@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { ActionExecutionResDto } from "../sdk/client";
+import { Client } from "@hey-api/client-axios";
 
 /*
     This is the schema for the raw action to be stored locally
@@ -52,6 +53,7 @@ export type TPreProcessor = ({
 }: {
   params: Record<string, unknown>;
   actionName: string;
+  client: Client;
 }) => Promise<Record<string, unknown>> | Record<string, unknown>;
 
 export type TPostProcessor = ({