fix

Author: omermorad

package.json

@@ -52,6 +52,7 @@
   "devDependencies": {
     "@types/jest": "^29.5.5",
     "@types/node": "^20.10.0",
+    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "eslint": "^8.56.0",
@@ -63,6 +64,7 @@
     "rimraf": "^5.0.5",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "uuid": "^11.1.0"
   }
 }

pnpm-lock.yaml

@@ -27,7 +27,6 @@ interface CustomApiFetcherArgs {
 export function createApiClient(apiKey: string, options: ClientOptions) {
   const { baseUrl, version, timeout = 30000, logger } = options;
 
-  // Create axios instance with defaults
   const axiosInstance = axios.create({
     baseURL: baseUrl,
     timeout,
@@ -49,7 +48,7 @@ export function createApiClient(apiKey: string, options: ClientOptions) {
         // Format error for cleaner logs
         const errorInfo = {
           message: error.message,
-          code: error.code
+          code: error.code,
         };
         logger.error('Request error', errorInfo);
         return Promise.reject(error);
@@ -63,27 +62,26 @@ export function createApiClient(apiKey: string, options: ClientOptions) {
       },
       error => {
         // Format error for cleaner logs
-        let errorInfo: Record<string, any> = {
+        const errorInfo: Record<string, any> = {
           message: error.message,
-          code: error.code
+          code: error.code,
         };
-        
+
         if (error.response) {
           errorInfo.status = error.response.status;
-          
+
           // Extract specific error details
           if (error.response.data && error.response.data.error) {
             errorInfo.errorCode = error.response.data.error.code;
             errorInfo.errorMessage = error.response.data.error.message;
-            
+
             // Include first validation error if present
-            if (error.response.data.error.errors && 
-                error.response.data.error.errors.length > 0) {
+            if (error.response.data.error.errors && error.response.data.error.errors.length > 0) {
               errorInfo.validation = error.response.data.error.errors[0];
             }
           }
         }
-        
+
         logger.error('Response error', errorInfo);
         return Promise.reject(error);
       }
@@ -147,14 +145,21 @@ export function createApiClient(apiKey: string, options: ClientOptions) {
           }
 
           const { status, data } = axiosError.response;
-          const errorMessage =
-            typeof data === 'object' && data !== null ? (data as any).message : undefined;
+
+          // Extract error details from the standardized response envelope
+          // The server returns: { ok: false, status: number, error: { code, message, errors?, details? } }
+          const errorResponse = data as any;
+          const errorDetails = errorResponse?.error || {};
+
+          const errorMessage = errorDetails.message || `API error: ${status}`;
 
           if (status === 401 || status === 403) {
             throw new AuthError(errorMessage || 'Authentication failed', axiosError);
           }
 
-          throw new ApiError(errorMessage || `API error: ${status}`, status, data, axiosError);
+          // For all other errors, throw ApiError with the full response
+          // Higher-level SDK code can inspect this and throw more specific errors
+          throw new ApiError(errorMessage, status, errorResponse, axiosError);
         }
       } catch (error) {
         // Re-throw domain errors

src/contract/client.ts

@@ -67,7 +67,10 @@ export class TadataNodeSDK {
   constructor(options: TadataOptions) {
     const logger = options.logger || createDefaultLogger();
     const isDev = options.dev || false;
-    const baseUrl = isDev ? 'https://api.stage.tadata.com' : 'https://api.tadata.com';
+
+    // Always use http://localhost:3000 as the baseUrl
+    // This is a requirement for the current implementation
+    const baseUrl = 'http://localhost:3000';
 
     const client = createApiClient(options.apiKey, {
       baseUrl,

src/core/sdk.ts

@@ -1,5 +1,5 @@
 import { initContract } from '@ts-rest/core';
-import { HttpStatusCode } from 'axios';
+import { StatusCodes } from 'http-status-codes';
 import { z } from 'zod';
 import {
   createApiResponseSchema,
@@ -9,23 +9,22 @@ import {
 
 const contract = initContract();
 
-const ErrorResponseBadRequest = createApiResponseSchema(z.null());
+const ErrorResponse400 = createApiResponseSchema(z.null());
+const ErrorResponseNotFound = createApiResponseSchema(z.null());
+const ErrorResponse500 = createApiResponseSchema(z.null());
 const ErrorResponseUnauthorized = createApiResponseSchema(z.null());
-const ErrorResponseForbidden = createApiResponseSchema(z.null());
-const ErrorResponseInternalServerError = createApiResponseSchema(z.null());
 
 export const deploymentsContract = contract.router({
   upsertFromOpenApi: {
     method: 'POST',
     path: '/api/deployments/from-openapi',
     body: UpsertDeploymentBodySchema,
     responses: {
-      [HttpStatusCode.Ok]: UpsertDeploymentResponseSchema, // Success with response envelope
-      [HttpStatusCode.Created]: UpsertDeploymentResponseSchema, // Created with response envelope
-      [HttpStatusCode.BadRequest]: ErrorResponseBadRequest, // Validation error
-      [HttpStatusCode.Unauthorized]: ErrorResponseUnauthorized, // Auth error
-      [HttpStatusCode.Forbidden]: ErrorResponseForbidden, // Permission error
-      [HttpStatusCode.InternalServerError]: ErrorResponseInternalServerError, // Internal server error
+      [StatusCodes.CREATED]: UpsertDeploymentResponseSchema, // Created with response envelope
+      [StatusCodes.BAD_REQUEST]: ErrorResponse400, // Validation error
+      [StatusCodes.NOT_FOUND]: ErrorResponseNotFound, // Not found error
+      [StatusCodes.INTERNAL_SERVER_ERROR]: ErrorResponse500, // Internal server error
+      [StatusCodes.UNAUTHORIZED]: ErrorResponseUnauthorized, // Auth error handled by middleware
     },
     summary: 'Upsert a deployment from an OpenAPI specification',
   },

src/http/contracts/deployments.contract.ts

@@ -3,10 +3,16 @@ import { createApiResponseSchema } from './response.schema';
 
 export const DeploymentResponseMinSchema = z.object({
   id: z.string(),
-  name: z.string(),
-  url: z.string(), // Added from existing McpDeploymentSchema
-  // specVersion: z.string(), // Consider if this is needed for 'Min' schema
-  // createdAt: z.date(), // Consider if this is needed for 'Min' schema
+  createdAt: z
+    .union([z.string(), z.date()])
+    .transform(val => (val instanceof Date ? val.toISOString() : val))
+    .optional(),
+  createdBy: z.string(),
+  updatedBy: z.string(),
+  mcpServerId: z.string(),
+  openAPISpecHash: z.string(),
+  mcpSpecHash: z.string(),
+  status: z.string(),
 });
 
 // Define a Zod schema for OpenAPI 3.0 with basic validation
@@ -23,16 +29,10 @@ export const OpenApi3Schema = z
   })
   .passthrough();
 
-// Assuming UpsertMCPServerFromOpenAPISchema is defined elsewhere
-// For now, let's define a placeholder based on the description
 export const UpsertDeploymentBodySchema = z.object({
-  // Updated to use the OpenApi3Schema
-  openapiSpec: OpenApi3Schema,
-  serviceName: z.string().optional(), // Corresponds to 'name' in mcpDeploy body
-  // 'version' from the plan doesn't directly map to mcpDeploy, adding as optional
-  version: z.string().optional(),
-  // 'baseUrl' from mcpDeploy body doesn't seem to be in the plan's subset, omitting for now
-  // 'dev' from mcpDeploy body doesn't seem to be in the plan's subset, omitting for now
+  openApiSpec: OpenApi3Schema,
+  name: z.string().optional(),
+  baseUrl: z.string().optional(),
 });
 
 // Original unwrapped response schema

src/http/schemas/deployments.schema.ts

@@ -1,5 +1,5 @@
-import fs from 'fs/promises';
-import path from 'path';
+import * as fs from 'fs/promises';
+import * as path from 'path';
 import type { OpenAPI3 } from 'openapi-typescript';
 import { SpecInvalidError } from '../errors';
 

src/openapi/openapi-source.ts

@@ -1,18 +1,23 @@
 import { ClientArgs, InitClientReturn } from '@ts-rest/core';
 import { StatusCodes } from 'http-status-codes';
+import { z } from 'zod';
 import { Logger } from '../../core/logger';
-import { ApiError, SpecInvalidError, AuthError } from '../../errors';
+import { ApiError, SpecInvalidError } from '../../errors';
 import { deploymentsContract } from '../../http/contracts';
 import { OpenApi3Schema } from '../../http/schemas';
-import { z } from 'zod';
 import { McpDeployInput, McpDeploymentResult } from './types';
 
 interface DeploymentSuccessResponse {
   ok: true;
   data: {
+    updated: boolean;
     deployment: {
       id: string;
-      url: string;
+      name: string;
+      url?: string; // URL is optional in the server response
+      specVersion?: string; // specVersion is optional in the server response
+      createdAt?: string;
+      updatedAt?: string;
     };
   };
 }
@@ -60,21 +65,22 @@ export class McpResource {
       // No need to pass apiKey as it's automatically added by the client
       const response = await this.client.upsertFromOpenApi({
         body: {
-          openapiSpec,
-          serviceName: input.name,
-          version: '1.0.0', // Add proper versioning parameter
+          openApiSpec: openapiSpec,
+          name: input.name,
+          baseUrl: input.specBaseUrl,
         },
       });
 
-      // For successful response, transform to expected McpDeploymentResult format
       if (isDeploymentResponse(response.body) && response.body.ok) {
         const deploymentData = response.body.data.deployment;
 
         return {
           id: deploymentData.id,
-          url: deploymentData.url,
-          specVersion: '1.0.0', // Use appropriate version from response when available
-          createdAt: new Date(), // Use appropriate timestamp from response when available
+          // Provide a default value for specVersion if undefined
+          specVersion: deploymentData.specVersion || '1.0.0',
+          // Provide a default URL value (required by type) if not returned from server
+          url: deploymentData.url || `http://localhost:3000/mcp/${deploymentData.id}`,
+          createdAt: deploymentData.createdAt ? new Date(deploymentData.createdAt) : new Date(),
         };
       }
 
@@ -116,47 +122,47 @@ export class McpResource {
  */
 function formatErrorForLogging(error: unknown): Record<string, any> {
   if (!error) return { type: 'unknown' };
-  
+
   // Handle ApiError
   if (error instanceof ApiError) {
     const result: Record<string, any> = {
       type: 'ApiError',
       message: error.message,
       code: error.code,
-      statusCode: error.statusCode
+      statusCode: error.statusCode,
     };
-    
+
     // Extract response body if available
     if (error.body) {
-      if (typeof error.body === 'object' && error.body !== null) {
+      if (typeof error.body === 'object') {
         const body = error.body as any;
         if (body.error) {
           result.errorCode = body.error.code;
           result.errorMessage = body.error.message;
-          
+
           // Include first validation error if present
           if (body.error.errors && body.error.errors.length > 0) {
             result.validation = body.error.errors[0];
           }
         }
       }
     }
-    
+
     return result;
   }
-  
+
   // Handle AuthError
   if (error instanceof Error) {
     return {
       type: error.constructor.name,
       message: error.message,
-      code: (error as any).code
+      code: (error as any).code,
     };
   }
-  
+
   // Unknown error type
-  return { 
+  return {
     type: 'unknown',
-    error: String(error)
+    error: String(error),
   };
 }

src/resources/mcp/mcp-resource.ts

@@ -5,7 +5,7 @@ import { OpenApiSource } from '../../openapi';
  */
 export interface McpDeployInput {
   spec: OpenApiSource;
-  specBaseUrl: string;
+  specBaseUrl?: string;
   name?: string;
 }
 

src/resources/mcp/types.ts

@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Deployments Integration Test (Nock) when deploying an OpenAPI spec should throw ApiError for not found errors (404) 1`] = `"Deployment not found"`;
+
+exports[`Deployments Integration Test (Nock) when deploying an OpenAPI spec should throw ApiError for server errors (e.g., 500) 1`] = `"Internal mock server error occurred"`;
+
+exports[`Deployments Integration Test (Nock) when deploying an OpenAPI spec should throw AuthError when using invalid API key 1`] = `"Invalid API key from mock"`;
+
+exports[`Deployments Integration Test (Nock) when deploying an OpenAPI spec should throw SpecInvalidError for backend validation failures 1`] = `"Invalid OpenAPI specification from backend"`;
+
+exports[`Deployments Integration Test (Nock) when deploying an OpenAPI spec should throw SpecInvalidError for malformed request body 1`] = `"Validation error"`;