@mcp-ts/sdk 2.4.4 → 2.4.5

package/dist/server/index.js

@@ -159,13 +159,9 @@ init_cjs_shims();
 // src/shared/utils.ts
 init_cjs_shims();
 var OAUTH_STATE_SEPARATOR = ".";
-var firstChar = nanoid.customAlphabet(
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-  1
-);
-var rest = nanoid.customAlphabet(
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-  11
+var serverIdAlphabet = nanoid.customAlphabet(
+  "abcdefghijklmnopqrstuvwxyz0123456789",
+  12
 );
 function sanitizeServerLabel(name) {
   let sanitized = name.replace(/[^a-zA-Z0-9-_]/g, "_").replace(/_{2,}/g, "_").toLowerCase();
@@ -175,7 +171,10 @@ function sanitizeServerLabel(name) {
   return sanitized;
 }
 function generateSessionId() {
-  return firstChar() + rest();
+  return "sess_" + nanoid.nanoid(21);
+}
+function generateServerId() {
+  return serverIdAlphabet();
 }
 function formatOAuthState(nonce, sessionId) {
   return `${nonce}${OAUTH_STATE_SEPARATOR}${sessionId}`;
@@ -2384,7 +2383,15 @@ var MCPClient = class {
     if (!existingSession && this.serverId && this.serverUrl && this.callbackUrl) {
       this.createdAt = Date.now();
       const updatedAt = this.createdAt;
-      console.log(`[MCPClient] Creating pending session ${this.sessionId} for connection setup`);
+      this._onObservabilityEvent.fire({
+        type: "mcp:client:session_created",
+        level: "info",
+        message: `Creating pending session ${this.sessionId} for connection setup`,
+        sessionId: this.sessionId,
+        serverId: this.serverId,
+        timestamp: Date.now(),
+        id: nanoid.nanoid()
+      });
       await sessions.create({
         sessionId: this.sessionId,
         userId: this.userId,
@@ -2514,7 +2521,15 @@ var MCPClient = class {
       this.transportType = transportType;
       this.emitStateChange("CONNECTED");
       this.emitProgress("Connected successfully");
-      console.log(`[MCPClient] Saving active session ${this.sessionId} (connect success)`);
+      this._onObservabilityEvent.fire({
+        type: "mcp:client:session_saved",
+        level: "info",
+        message: `Saving active session ${this.sessionId} (connect success)`,
+        sessionId: this.sessionId,
+        serverId: this.serverId,
+        timestamp: Date.now(),
+        id: nanoid.nanoid()
+      });
       await this.saveSession("active");
     } catch (error) {
       if (error instanceof auth_js.UnauthorizedError || error instanceof Error && error.message.toLowerCase().includes("unauthorized")) {
@@ -2531,7 +2546,15 @@ var MCPClient = class {
           throw new Error(message);
         }
         this.emitStateChange("AUTHENTICATING");
-        console.log(`[MCPClient] Saving pending OAuth session ${this.sessionId}`);
+        this._onObservabilityEvent.fire({
+          type: "mcp:client:session_saved",
+          level: "info",
+          message: `Saving pending OAuth session ${this.sessionId}`,
+          sessionId: this.sessionId,
+          serverId: this.serverId,
+          timestamp: Date.now(),
+          id: nanoid.nanoid()
+        });
         await this.saveSession("pending");
         if (this.serverId) {
           this._onConnectionEvent.fire({
@@ -2606,27 +2629,25 @@ var MCPClient = class {
           this.emitStateChange("AUTHENTICATED");
           authenticatedStateEmitted = true;
         }
-        this.emitProgress("Creating authenticated client...");
-        this.client = new index_js.Client(
-          {
-            name: MCP_CLIENT_NAME,
-            version: MCP_CLIENT_VERSION
-          },
-          {
-            capabilities: {
-              extensions: {
-                "io.modelcontextprotocol/ui": {
-                  mimeTypes: ["text/html+mcp"]
-                }
-              }
-            }
-          }
-        );
         this.emitStateChange("CONNECTING");
+        if (this.client.transport) {
+          try {
+            await this.client.close();
+          } catch {
+          }
+        }
         await this.client.connect(this.transport);
         this.transportType = currentType;
         this.emitStateChange("CONNECTED");
-        console.log(`[MCPClient] Saving active session ${this.sessionId} (OAuth complete)`);
+        this._onObservabilityEvent.fire({
+          type: "mcp:client:session_saved",
+          level: "info",
+          message: `Saving active session ${this.sessionId} (OAuth complete)`,
+          sessionId: this.sessionId,
+          serverId: this.serverId,
+          timestamp: Date.now(),
+          id: nanoid.nanoid()
+        });
         await this.saveSession("active");
         return;
       } catch (error) {
@@ -2667,9 +2688,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async listTools() {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     this.emitStateChange("DISCOVERING");
     try {
       const request = {
@@ -2707,9 +2725,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async callTool(toolName, toolArgs) {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     const request = {
       method: "tools/call",
       params: {
@@ -2763,9 +2778,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async listPrompts() {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     this.emitStateChange("DISCOVERING");
     try {
       const request = {
@@ -2793,9 +2805,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async getPrompt(name, args) {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     const request = {
       method: "prompts/get",
       params: {
@@ -2813,9 +2822,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async listResources() {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     this.emitStateChange("DISCOVERING");
     try {
       const request = {
@@ -2842,9 +2848,6 @@ var MCPClient = class {
    * @throws {Error} When client is not connected
    */
   async readResource(uri) {
-    if (!this.client) {
-      throw new Error("Not connected to server");
-    }
     const request = {
       method: "resources/read",
       params: {
@@ -2900,7 +2903,16 @@ var MCPClient = class {
     try {
       await this.ensureSession();
     } catch (error) {
-      console.warn("[MCPClient] Initialization failed during clearSession:", error);
+      this._onObservabilityEvent.fire({
+        type: "mcp:client:error",
+        level: "warn",
+        message: "Initialization failed during clearSession",
+        sessionId: this.sessionId,
+        serverId: this.serverId,
+        payload: { error: String(error) },
+        timestamp: Date.now(),
+        id: nanoid.nanoid()
+      });
     }
     if (this.oauthProvider) {
       await this.oauthProvider.invalidateCredentials("all");
@@ -3382,7 +3394,7 @@ var SSEConnectionManager = class {
   async connect(params) {
     const { serverName, serverUrl, callbackUrl, transportType } = params;
     const headers = normalizeHeaders(params.headers);
-    const serverId = params.serverId && params.serverId.length <= 12 ? params.serverId : await sessions.generateSessionId();
+    const serverId = params.serverId && params.serverId.length <= 12 ? params.serverId : generateServerId();
     const existingSessions = await sessions.list(this.userId);
     const duplicate = existingSessions.find(
       (s) => s.serverId === serverId || s.serverUrl === serverUrl