@toolplex/client 0.1.10 → 0.1.12

package/dist/mcp-server/toolHandlers/callToolHandler.js

@@ -1,6 +1,7 @@
 import { findServerManagerClient } from "./serverManagerUtils.js";
 import { CallToolResultSchema } from "../../shared/serverManagerTypes.js";
 import { FileLogger } from "../../shared/fileLogger.js";
+import { sanitizeServerIdForLogging, validateServerIdOrThrow, } from "../utils/serverIdValidator.js";
 import Registry from "../registry.js";
 const logger = FileLogger;
 function safeLength(obj) {
@@ -22,6 +23,8 @@ export async function handleCallTool(params) {
     const policyEnforcer = Registry.getPolicyEnforcer();
     const callToolObserver = policyEnforcer.getCallToolObserver();
     try {
+        // Validate server ID format
+        validateServerIdOrThrow(params.server_id);
         // Enforce call tool policy
         policyEnforcer.enforceCallToolPolicy(params.server_id);
         const client = await findServerManagerClient(params.server_id, serverManagerClients);
@@ -48,7 +51,7 @@ export async function handleCallTool(params) {
         await telemetryLogger.log("client_call_tool", {
             success: true,
             log_context: {
-                server_id: params.server_id,
+                server_id: sanitizeServerIdForLogging(params.server_id),
                 tool_name: params.tool_name,
                 input_length: safeLength(params),
                 response_length: safeLength(content),
@@ -67,7 +70,7 @@ export async function handleCallTool(params) {
         await telemetryLogger.log("client_call_tool", {
             success: false,
             log_context: {
-                server_id: params.server_id,
+                server_id: sanitizeServerIdForLogging(params.server_id),
                 tool_name: params.tool_name,
             },
             pii_sanitized_error_message: errorMessage,

package/dist/mcp-server/toolHandlers/getServerConfigHandler.js

@@ -1,5 +1,6 @@
 import { FileLogger } from "../../shared/fileLogger.js";
 import { findServerManagerClient } from "./serverManagerUtils.js";
+import { sanitizeServerIdForLogging, validateServerIdOrThrow, } from "../utils/serverIdValidator.js";
 import Registry from "../registry.js";
 const logger = FileLogger;
 export async function handleGetServerConfig(params) {
@@ -13,6 +14,8 @@ export async function handleGetServerConfig(params) {
         if (!server_id) {
             throw new Error("Missing server_id");
         }
+        // Validate server ID format
+        validateServerIdOrThrow(server_id);
         // Check if server is blocked using policy enforcer
         policyEnforcer.enforceUseServerPolicy(server_id);
         await logger.debug(`Getting config for server: ${server_id}`);
@@ -29,7 +32,7 @@ export async function handleGetServerConfig(params) {
         await telemetryLogger.log("client_get_server_config", {
             success: true,
             log_context: {
-                server_id,
+                server_id: sanitizeServerIdForLogging(server_id),
             },
             latency_ms: Date.now() - startTime,
         });
@@ -54,7 +57,7 @@ export async function handleGetServerConfig(params) {
         await telemetryLogger.log("client_get_server_config", {
             success: false,
             log_context: {
-                server_id: params.server_id,
+                server_id: sanitizeServerIdForLogging(params.server_id || ""),
             },
             pii_sanitized_error_message: errorMessage,
             latency_ms: Date.now() - startTime,

package/dist/mcp-server/toolHandlers/installServerHandler.js

@@ -2,6 +2,7 @@ import { FileLogger } from "../../shared/fileLogger.js";
 import { ServerInstallResultSchema, ListToolsResultSchema, } from "../../shared/serverManagerTypes.js";
 import Registry from "../registry.js";
 import { RuntimeCheck } from "../utils/runtimeCheck.js";
+import { sanitizeServerIdForLogging, validateServerIdOrThrow, } from "../utils/serverIdValidator.js";
 import { isAbsolute, parse } from "path";
 const logger = FileLogger;
 /**
@@ -114,6 +115,8 @@ export async function handleInstallServer(params) {
         if (!config || !server_id || !server_name) {
             throw new Error("Missing required install parameters");
         }
+        // Validate server ID format
+        validateServerIdOrThrow(server_id);
         // Validate command is installed before proceeding
         if (config.command) {
             await RuntimeCheck.validateCommandOrThrow(config.command);
@@ -154,7 +157,7 @@ export async function handleInstallServer(params) {
         await telemetryLogger.log("client_install", {
             success: true,
             log_context: {
-                server_id: installResult.server_id,
+                server_id: sanitizeServerIdForLogging(installResult.server_id),
                 sanitized_config: sanitizeServerConfig(config),
             },
             latency_ms: Date.now() - startTime,
@@ -188,7 +191,7 @@ export async function handleInstallServer(params) {
         await telemetryLogger.log("client_install", {
             success: false,
             log_context: {
-                server_id: params.server_id,
+                server_id: sanitizeServerIdForLogging(params.server_id),
             },
             pii_sanitized_error_message: errorMessage,
             latency_ms: Date.now() - startTime,

package/dist/mcp-server/toolHandlers/listToolsHandler.js

@@ -1,6 +1,7 @@
 import { FileLogger } from "../../shared/fileLogger.js";
 import { findServerManagerClient } from "./serverManagerUtils.js";
 import { ListToolsResultSchema, ListAllToolsResultSchema, } from "../../shared/serverManagerTypes.js";
+import { sanitizeServerIdForLogging, validateServerIdOrThrow, } from "../utils/serverIdValidator.js";
 import Registry from "../registry.js";
 const logger = FileLogger;
 export async function handleListTools(params) {
@@ -13,6 +14,8 @@ export async function handleListTools(params) {
         const server_id = params.server_id;
         const content = [];
         if (server_id) {
+            // Validate server ID format
+            validateServerIdOrThrow(server_id);
             // Check if server is blocked using policy enforcer
             policyEnforcer.enforceUseServerPolicy(server_id);
             await logger.debug(`Listing tools for specific server: ${server_id}`);
@@ -105,7 +108,7 @@ export async function handleListTools(params) {
         await telemetryLogger.log("client_list_tools", {
             success: true,
             log_context: {
-                server_id: params.server_id,
+                server_id: sanitizeServerIdForLogging(params.server_id || ""),
             },
             latency_ms: Date.now() - startTime,
         });
@@ -121,7 +124,7 @@ export async function handleListTools(params) {
         await telemetryLogger.log("client_list_tools", {
             success: false,
             log_context: {
-                server_id: params.server_id,
+                server_id: sanitizeServerIdForLogging(params.server_id || ""),
             },
             pii_sanitized_error_message: errorMessage,
             latency_ms: Date.now() - startTime,

package/dist/mcp-server/toolHandlers/uninstallServerHandler.js

@@ -1,6 +1,7 @@
 import { findServerManagerClient } from "./serverManagerUtils.js";
 import { ServerUninstallResultSchema } from "../../shared/serverManagerTypes.js";
 import { FileLogger } from "../../shared/fileLogger.js";
+import { sanitizeServerIdForLogging, validateServerIdOrThrow, } from "../utils/serverIdValidator.js";
 import Registry from "../registry.js";
 const logger = FileLogger;
 export async function handleUninstallServer(params) {
@@ -19,6 +20,8 @@ export async function handleUninstallServer(params) {
             throw new Error("Uninstall functionality is disabled in restricted mode.");
         }
         const server_id = params.server_id;
+        // Validate server ID format
+        validateServerIdOrThrow(server_id);
         await logger.info(`Handling uninstall request for server ${server_id}`);
         const client = await findServerManagerClient(server_id, serverManagerClients);
         const response = await client.sendRequest("uninstall", { server_id });
@@ -36,7 +39,7 @@ export async function handleUninstallServer(params) {
         await telemetryLogger.log("client_uninstall", {
             success: true,
             log_context: {
-                server_id: parsed.data.server_id,
+                server_id: sanitizeServerIdForLogging(parsed.data.server_id),
             },
             latency_ms: Date.now() - startTime,
         });
@@ -62,6 +65,9 @@ export async function handleUninstallServer(params) {
         await logger.error(`Failed to uninstall server: ${errorMessage}`);
         await telemetryLogger.log("client_uninstall", {
             success: false,
+            log_context: {
+                server_id: sanitizeServerIdForLogging(params.server_id),
+            },
             pii_sanitized_error_message: errorMessage,
             latency_ms: Date.now() - startTime,
         });

package/dist/mcp-server/utils/serverIdValidator.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Server ID validation utilities
+ */
+/**
+ * Validates if a server ID matches the expected format
+ */
+export declare function isValidServerId(serverId: string): boolean;
+/**
+ * Validates a server ID and throws an error if invalid
+ */
+export declare function validateServerIdOrThrow(serverId: string): void;
+/**
+ * Sanitizes a server ID for logging - returns the ID if valid, otherwise returns "invalid_format"
+ */
+export declare function sanitizeServerIdForLogging(serverId: string): string;

package/dist/mcp-server/utils/serverIdValidator.js

@@ -0,0 +1,25 @@
+/**
+ * Server ID validation utilities
+ */
+// Server ID format: sv_[12 hex chars]
+const SERVER_ID_REGEX = /^sv_[a-f0-9]{12}$/;
+/**
+ * Validates if a server ID matches the expected format
+ */
+export function isValidServerId(serverId) {
+    return SERVER_ID_REGEX.test(serverId);
+}
+/**
+ * Validates a server ID and throws an error if invalid
+ */
+export function validateServerIdOrThrow(serverId) {
+    if (!isValidServerId(serverId)) {
+        throw new Error(`Invalid server ID format: ${serverId}. Expected format: sv_[12 hex chars]`);
+    }
+}
+/**
+ * Sanitizes a server ID for logging - returns the ID if valid, otherwise returns "invalid_format"
+ */
+export function sanitizeServerIdForLogging(serverId) {
+    return isValidServerId(serverId) ? serverId : "invalid_format";
+}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.1.10";
+export declare const version = "0.1.11";

package/dist/version.js

@@ -1 +1 @@
-export const version = '0.1.10';
+export const version = '0.1.11';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolplex/client",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "author": "ToolPlex LLC",
   "license": "SEE LICENSE IN LICENSE",
   "description": "The official ToolPlex client for AI agent tool discovery and execution",