@trayio/cdk-runtime 3.15.0 → 3.17.0

package/dist/connector/operation/HttpOperationExecution.d.ts

@@ -23,6 +23,7 @@ export declare class HttpOperationExecution<AUTH extends OperationHandlerAuth<un
     private serializeAsFile;
     private serializeEmptyBody;
     private defaultErrorHandling;
+    private parseErrorResponse;
     private parseResponse;
     private parseBodyAsJson;
     private parseEmptyBody;

package/dist/connector/operation/HttpOperationExecution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpOperationExecution.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/HttpOperationExecution.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAKlC,OAAO,EACN,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EAGtB,oBAAoB,EACpB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAGN,oBAAoB,EAMpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAW7D,OAAO,EAAQ,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AACtG,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAO1D,qBAAa,sBAAsB,CAClC,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EACnD,EAAE,EACF,GAAG,CACF,YAAW,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC;IAE7C,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAsC;IACrD,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,mBAAmB,CAA4C;IACvE,WAAW,EAAE,oBAAoB,CAAC;gBAGjC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,EAC5C,mBAAmB,EAAE,CAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,EAC9D,WAAW,EAAE,oBAAoB;IAU5B,OAAO,CACZ,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,EAClC,KAAK,EAAE,EAAE,GACP,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAsDvC,OAAO,CAAC,eAAe;IAkCvB,OAAO,CAAC,6BAA6B;IAiCrC,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,oBAAoB;IAuD5B,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,aAAa;IAiCrB,OAAO,CAAC,eAAe;IAmBvB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,eAAe;IA2CvB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,qBAAqB;CAwC7B"}
+{"version":3,"file":"HttpOperationExecution.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/HttpOperationExecution.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAKlC,OAAO,EACN,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EAGtB,oBAAoB,EACpB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAGN,oBAAoB,EAMpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAW7D,OAAO,EAAQ,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AACtG,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAO1D,qBAAa,sBAAsB,CAClC,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EACnD,EAAE,EACF,GAAG,CACF,YAAW,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC;IAE7C,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAsC;IACrD,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,mBAAmB,CAA4C;IACvE,WAAW,EAAE,oBAAoB,CAAC;gBAGjC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,EAC5C,mBAAmB,EAAE,CAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,EAC9D,WAAW,EAAE,oBAAoB;IAU5B,OAAO,CACZ,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,EAClC,KAAK,EAAE,EAAE,GACP,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAuDvC,OAAO,CAAC,eAAe;IAkCvB,OAAO,CAAC,6BAA6B;IAiCrC,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,oBAAoB;IAuD5B,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,kBAAkB;IA8B1B,OAAO,CAAC,aAAa;IAoCrB,OAAO,CAAC,eAAe;IAmBvB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,eAAe;IA2CvB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,qBAAqB;CAwC7B"}

package/dist/connector/operation/HttpOperationExecution.js

@@ -63,7 +63,7 @@ class HttpOperationExecution {
         const resultTE = this.httpClient.execute(operationRequest.method, operationRequest.path, httpRequestE.right);
         const operationResponseTE = (0, function_1.pipe)(resultTE, 
         // get the dsl http response object
-        TE.map((response) => this.handler.responseHandler(ctx, input, new HttpOperationHandler_1.HttpOperationResponseBuilder(response, this.defaultErrorHandling(response.statusCode)))), 
+        TE.map((response) => this.handler.responseHandler(ctx, input, new HttpOperationHandler_1.HttpOperationResponseBuilder(response, this.defaultErrorHandling(response.statusCode), O.none))), 
         // interpret the dsl response object by mapping the low level http response to a connector response
         TE.chain((operationResponse) => this.parseResponse(operationResponse)), 
         // handle errors during the execution of the http request or parsing or the http response
@@ -170,9 +170,23 @@ class HttpOperationExecution {
             statusCode,
         }));
     }
+    parseErrorResponse(operationResponse) {
+        return (0, function_1.pipe)(operationResponse.contentType, O.fold(() => this.parseEmptyBody(operationResponse), (contentType) => {
+            switch (contentType) {
+                case Http_1.HttpContentType.Json:
+                    const bufferTE = BufferExtensions_1.BufferExtensions.readableToArrayBuffer(operationResponse.response.body);
+                    return (0, function_1.pipe)(bufferTE, TE.chain((buffer) => {
+                        const deserializedBodyE = this.jsonSerialization.deserialize(buffer);
+                        return TE.fromEither(deserializedBodyE);
+                    }));
+                default:
+                    return TE.right(undefined);
+            }
+        }));
+    }
     parseResponse(operationResponse) {
         if (operationResponse.response.statusCode >= 300) {
-            return TE.right(operationResponse.errorHandling());
+            return (0, function_1.pipe)(this.parseErrorResponse(operationResponse), TE.chain((result) => TE.right(operationResponse.errorHandling(result))));
         }
         return (0, function_1.pipe)(operationResponse.contentType, O.map((contentType) => {
             switch (contentType) {

package/dist/connector/operation/OperationExecutionGateway.unit.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OperationExecutionGateway.unit.test.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/OperationExecutionGateway.unit.test.ts"],"names":[],"mappings":"AAyBA,OAAO,8BAA8B,CAAC"}
+{"version":3,"file":"OperationExecutionGateway.unit.test.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/OperationExecutionGateway.unit.test.ts"],"names":[],"mappings":"AA0BA,OAAO,8BAA8B,CAAC"}

package/dist/connector/operation/OperationExecutionGateway.unit.test.js

@@ -56,6 +56,17 @@ class TestControllerHttp {
                 });
             },
         },
+        {
+            path: `/error`,
+            method: Http_1.HttpMethod.Get,
+            execute: () => (_request) => T.of({
+                body: stream_1.Readable.from(JSON.stringify({
+                    message: 'Error message',
+                })),
+                headers: {},
+                statusCode: 500,
+            }),
+        },
         {
             path: `/tokens`,
             method: Http_1.HttpMethod.Get,
@@ -384,4 +395,30 @@ describe('OperationExecutionGateway', () => {
             .finallyDoNothing())
             .nothingAfterAll());
     });
+    describe('it should an error using the body as the message', () => {
+        const getProductOperation = OperationHandlerSetup_1.OperationHandlerSetup.configureHandler((handler) => handler.usingHttp((http) => http
+            .get('http://localhost:3000/error')
+            .handleRequest((ctx, input, request) => request.addPathParameter('id', input.id.toString()).withoutBody())
+            .handleResponse((ctx, input, response) => response
+            .withJsonErrorHandling((errorResponse) => OperationHandler_1.OperationHandlerResult.failure(OperationHandler_1.OperationHandlerError.apiError(errorResponse.message)))
+            .parseWithBodyAsJson())));
+        OperationHandlerTest_1.OperationHandlerTestSetup.configureHandlerTest(getProductOperation, (handlerTest) => handlerTest
+            .usingHandlerContext('test')
+            .nothingBeforeAll()
+            .testCase('should get a error message from the body', (testCase) => testCase
+            .usingHandlerContext('test')
+            .givenNothing()
+            .when(() => ({ id: 2 }))
+            .then(({ output }) => {
+            const outputValue = OperationHandler_1.OperationHandlerResult.failure(output);
+            if (outputValue.isFailure && outputValue.error.isFailure) {
+                expect(outputValue.error.error.message).toEqual('Error message');
+            }
+            else {
+                fail('Expected output to be a failure');
+            }
+        })
+            .finallyDoNothing())
+            .nothingAfterAll());
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/cdk-runtime",
-  "version": "3.15.0",
+  "version": "3.17.0",
   "description": "A Runtime that executes connector operations defined using the CDK DSL",
   "exports": {
     "./*": "./dist/*.js"
@@ -14,10 +14,10 @@
     "node": ">=18.x"
   },
   "dependencies": {
-    "@trayio/axios": "3.15.0",
-    "@trayio/cdk-dsl": "3.15.0",
-    "@trayio/express": "3.15.0",
-    "@trayio/winston": "3.15.0",
+    "@trayio/axios": "3.17.0",
+    "@trayio/cdk-dsl": "3.17.0",
+    "@trayio/express": "3.17.0",
+    "@trayio/winston": "3.17.0",
     "mime": "3.0.0",
     "uuid": "9.0.0"
   },