fix: env setting

Signed-off-by: sunrabbit123 <[email protected]>

Author: sunrabbit123

src/cli.ts

@@ -1,32 +1,44 @@
-import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { program } from "commander";
 
 import { createServer } from "./server";
 import { startSSEServer } from "./sse";
+import { connectMcp, McpConnection } from ".";
 
-export function buildCli(props: { version: string; name: string; adapter: Client }) {
+export function buildCli<T extends string>(props: { version: string; name: string; mcpServers: Record<T, McpConnection>; env: Record<string, T> }) {
   return program
     .version(props.version)
     .name(props.name)
     .option("--port <port>", "Port to listen on for SSE transport.")
     .action(async (options: unknown) => {
+      const adapter = new Client({
+        name: props.name,
+        version: props.version,
+      });
+      await connectMcp({
+        adapter,
+        mcpServers: props.mcpServers,
+        env: props.env,
+        envMapper: process.env as Record<string, string>,
+      });
+
       if (typeof options === "object" && options !== null && "port" in options && (typeof options.port === "string" || typeof options.port === "number")) {
         console.log(`This server is running on SSE (http://localhost:${options.port}/sse?sessionId=<sessionId>)`);
         await startSSEServer({
           port: +options.port,
           name: props.name,
           version: props.version,
-          adapter: props.adapter,
+          adapter,
         });
       }
       else {
         console.log("This server is running on stdio");
         const server = createServer({
           name: props.name,
           version: props.version,
-          adapter: props.adapter,
+          adapter,
         });
         const transport = new StdioServerTransport();
         await server.connect(transport);

src/index.ts

@@ -25,31 +25,35 @@ interface Props<T extends string> {
 
 export async function bundler<T extends string>(props: Props<T>): Promise<{
   run: () => void;
-  server: Server;
+  createServer: (envList: Record<string, string>) => Promise<Server>;
 }> {
-  const adapter = new Client({
-    name: props.name,
-    version: props.version,
-  });
-  await connectMcp({
-    adapter,
-    mcpServers: props.mcpServers,
-  });
-
-  const server = createServer({
-    name: props.name,
-    version: props.version,
-    adapter,
-  });
   return {
     run: () => {
       buildCli({
         name: props.name,
         version: props.version,
-        adapter,
+        mcpServers: props.mcpServers,
+        env: props.env,
       }).parse(process.argv);
     },
-    server,
+    createServer: async (envList: Record<string, string>) => {
+      const adapter = new Client({
+        name: props.name,
+        version: props.version,
+      });
+      await connectMcp({
+        adapter,
+        mcpServers: props.mcpServers,
+        envMapper: props.env,
+        env: envList,
+      });
+
+      return createServer({
+        name: props.name,
+        version: props.version,
+        adapter,
+      });
+    },
   };
 }
 
@@ -61,10 +65,14 @@ export async function bundler<T extends string>(props: Props<T>): Promise<{
 export async function connectMcp(props: {
   adapter: Client;
   mcpServers: Record<string, McpConnection>;
+  envMapper: Record<string, string>;
+  env: Record<string, string>;
 }) {
   const transports = await Promise.all(Object.entries(props.mcpServers).map(async ([name, setting]) => {
     // InMemory
     if (setting instanceof Server) {
+      const env = extractEnvFromName(name, props.env, props.envMapper);
+      Object.assign(process.env, env);
       const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
       await setting.connect(serverTransport);
       return clientTransport;
@@ -77,7 +85,10 @@ export async function connectMcp(props: {
 
     // Stdio
     if ("command" in setting) {
-      return new StdioClientTransport(setting);
+      return new StdioClientTransport({
+        ...setting,
+        env: extractEnvFromName(name, props.env, props.envMapper),
+      });
     }
 
     setting satisfies never;
@@ -88,3 +99,17 @@ export async function connectMcp(props: {
     await props.adapter.connect(transport);
   }
 }
+
+/**
+ * Extracts the environment variables from the name.
+ *
+ * @param name - The name of the MCP server.
+ * @param env - The environment variables. { ENV_KEY: "ENV_TARGET" }
+ * ENV_TARGET is the target environment variable name, so example: "slack", "notion", "github", etc.
+ * @param envMapper - The environment variable mapper. { ENV_KEY: "ENV_VALUE" }
+ * ENV_VALUE is the value of the environment variable, so example: "gh_12309wqje123", "nt_12309wqje123", etc.
+ * @returns The environment variables.
+ */
+const extractEnvFromName = (name: string, env: Record<string, string>, envMapper: Record<string, string>) => {
+  return Object.fromEntries(Object.entries(env).filter(([, value]) => value === name).map(([key]) => [key, envMapper[key]]));
+}