Refactor tests and improve tool schemas (#15)

* Refactored high level tests to lower level so I can mock dependencies
* Improved tool schemas

Author: SketchingDev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makingchatbots/genesys-cloud-mcp-server",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A MCP server for connecting LLMs to Genesys Cloud's Platform API",
   "exports": "./dist/index.js",
   "type": "module",
@@ -19,8 +19,9 @@
   "scripts": {
     "dev": "tsx watch src/index.ts",
     "start": "tsx src/index.ts",
+    "start:inspector": "npm run build && npx @modelcontextprotocol/inspector node dist/index.js",
     "clean": "rm -rf dist/*",
-    "build:esm": "tsc",
+    "build:esm": "tsc -p tsconfig.build.json",
     "build": "npm run clean && npm run build:esm",
     "lint": "eslint . --ext .ts",
     "format": "prettier --write .",

src/index.ts

@@ -22,84 +22,72 @@ const server: McpServer = new McpServer({
   version: "0.0.1",
 });
 
-const searchQueuesTool = searchQueues({
-  routingApi: new platformClient.RoutingApi(),
-});
+const routingApi = new platformClient.RoutingApi();
+const analyticsApi = new platformClient.AnalyticsApi();
+const speechTextAnalyticsApi = new platformClient.SpeechTextAnalyticsApi();
+
+const searchQueuesTool = searchQueues({ routingApi });
 server.tool(
   searchQueuesTool.schema.name,
   searchQueuesTool.schema.description,
   searchQueuesTool.schema.paramsSchema.shape,
-  config.mockingEnabled
-    ? searchQueuesTool.mockCall
-    : withAuth(
-        searchQueuesTool.call,
-        config.genesysCloud,
-        platformClient.ApiClient.instance,
-      ),
+  withAuth(
+    searchQueuesTool.call,
+    config.genesysCloud,
+    platformClient.ApiClient.instance,
+  ),
 );
 
-const queryConversationsByQueueTool = sampleConversationsByQueue({
-  analyticsApi: new platformClient.AnalyticsApi(),
+const sampleConversationsByQueueTool = sampleConversationsByQueue({
+  analyticsApi,
 });
 server.tool(
-  queryConversationsByQueueTool.schema.name,
-  queryConversationsByQueueTool.schema.description,
-  queryConversationsByQueueTool.schema.paramsSchema.shape,
-  config.mockingEnabled
-    ? queryConversationsByQueueTool.mockCall
-    : withAuth(
-        queryConversationsByQueueTool.call,
-        config.genesysCloud,
-        platformClient.ApiClient.instance,
-      ),
+  sampleConversationsByQueueTool.schema.name,
+  sampleConversationsByQueueTool.schema.description,
+  sampleConversationsByQueueTool.schema.paramsSchema.shape,
+  withAuth(
+    sampleConversationsByQueueTool.call,
+    config.genesysCloud,
+    platformClient.ApiClient.instance,
+  ),
 );
 
-const queryQueueVolumesTool = queryQueueVolumes({
-  analyticsApi: new platformClient.AnalyticsApi(),
-});
+const queryQueueVolumesTool = queryQueueVolumes({ analyticsApi });
 server.tool(
   queryQueueVolumesTool.schema.name,
   queryQueueVolumesTool.schema.description,
   queryQueueVolumesTool.schema.paramsSchema.shape,
-  config.mockingEnabled
-    ? queryQueueVolumesTool.mockCall
-    : withAuth(
-        queryQueueVolumesTool.call,
-        config.genesysCloud,
-        platformClient.ApiClient.instance,
-      ),
+  withAuth(
+    queryQueueVolumesTool.call,
+    config.genesysCloud,
+    platformClient.ApiClient.instance,
+  ),
 );
 
-const voiceCallQualityTool = voiceCallQuality({
-  analyticsApi: new platformClient.AnalyticsApi(),
-});
+const voiceCallQualityTool = voiceCallQuality({ analyticsApi });
 server.tool(
   voiceCallQualityTool.schema.name,
   voiceCallQualityTool.schema.description,
   voiceCallQualityTool.schema.paramsSchema.shape,
-  config.mockingEnabled
-    ? voiceCallQualityTool.mockCall
-    : withAuth(
-        voiceCallQualityTool.call,
-        config.genesysCloud,
-        platformClient.ApiClient.instance,
-      ),
+  withAuth(
+    voiceCallQualityTool.call,
+    config.genesysCloud,
+    platformClient.ApiClient.instance,
+  ),
 );
 
 const conversationSentimentTool = conversationSentiment({
-  speechTextAnalyticsApi: new platformClient.SpeechTextAnalyticsApi(),
+  speechTextAnalyticsApi,
 });
 server.tool(
   conversationSentimentTool.schema.name,
   conversationSentimentTool.schema.description,
   conversationSentimentTool.schema.paramsSchema.shape,
-  config.mockingEnabled
-    ? conversationSentimentTool.mockCall
-    : withAuth(
-        conversationSentimentTool.call,
-        config.genesysCloud,
-        platformClient.ApiClient.instance,
-      ),
+  withAuth(
+    conversationSentimentTool.call,
+    config.genesysCloud,
+    platformClient.ApiClient.instance,
+  ),
 );
 
 const transport = new StdioServerTransport();

src/loadConfig.ts

@@ -1,11 +1,6 @@
 import { z } from "zod";
 
-export interface MockingConfig {
-  readonly mockingEnabled: true;
-}
-
-export interface RealConfig {
-  readonly mockingEnabled: false;
+export interface Config {
   readonly genesysCloud: {
     readonly region: string;
     readonly oAuthClientId: string;
@@ -15,7 +10,7 @@ export interface RealConfig {
 
 export interface SuccessResult {
   success: true;
-  config: MockingConfig | RealConfig;
+  config: Config;
 }
 
 export interface ErrorResult {
@@ -25,13 +20,6 @@ export interface ErrorResult {
 
 export type Result = SuccessResult | ErrorResult;
 
-const mockingConfigSchema = z.object({
-  MOCKING_ENABLED: z
-    .string()
-    .transform((val) => val.toLowerCase() === "true")
-    .default("false"),
-});
-
 const genesysAuthConfigSchema = z.object({
   GENESYSCLOUD_REGION: z.string({
     required_error: "Missing environment variable: GENESYSCLOUD_REGION",
@@ -46,18 +34,6 @@ const genesysAuthConfigSchema = z.object({
 });
 
 export function loadConfig(env: NodeJS.ProcessEnv): Result {
-  const mockingConfig = mockingConfigSchema.safeParse(env);
-  const mockingEnabled = Boolean(mockingConfig.data?.MOCKING_ENABLED);
-
-  if (mockingEnabled) {
-    return {
-      success: true,
-      config: {
-        mockingEnabled,
-      },
-    };
-  }
-
   const genesysAuthConfig = genesysAuthConfigSchema.safeParse(env);
   if (!genesysAuthConfig.success) {
     const failureReason = [
@@ -74,7 +50,6 @@ export function loadConfig(env: NodeJS.ProcessEnv): Result {
   return {
     success: true,
     config: {
-      mockingEnabled,
       genesysCloud: {
         region: genesysAuthConfig.data.GENESYSCLOUD_REGION,
         oAuthClientId: genesysAuthConfig.data.GENESYSCLOUD_OAUTHCLIENT_ID,