@trayio/cdk-runtime 1.16.0 → 2.0.0

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

@@ -3,9 +3,22 @@ import { HttpOperationHandler } from '@trayio/cdk-dsl/connector/operation/HttpOp
 import { HttpClient } from '@trayio/commons/http/HttpClient';
 import { OperationExecution } from './OperationExecution';
 export declare class HttpOperationExecution<AUTH extends OperationHandlerAuth<unknown, unknown>, IN, OUT> implements OperationExecution<AUTH, IN, OUT> {
+    private jsonSerialization;
     private httpClient;
     private handler;
     constructor(httpClient: HttpClient, handler: HttpOperationHandler<AUTH, IN, OUT>);
     execute(ctx: OperationHandlerContext<AUTH>, input: IN): Promise<OperationHandlerResult<OUT>>;
+    private operationRequestToHttpRequest;
+    private serializeAsJson;
+    private serializeAsText;
+    private serializeAsMultipart;
+    private serializeAsFile;
+    private serializeEmptyBody;
+    private defaultErrorHandling;
+    private parseResponse;
+    private parseBodyAsJson;
+    private parseEmptyBody;
+    private parseBodyAsFile;
+    private parseeBodyAsText;
 }
 //# sourceMappingURL=HttpOperationExecution.d.ts.map

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":"AAAA,OAAO,EACN,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EAEtB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EACN,oBAAoB,EAEpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,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,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAsC;gBAGpD,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC;IAMvC,OAAO,CACZ,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,EAClC,KAAK,EAAE,EAAE,GACP,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;CA+BvC"}
+{"version":3,"file":"HttpOperationExecution.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/HttpOperationExecution.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EAEtB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAEN,oBAAoB,EAKpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAQ7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,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;gBAGpD,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC;IAOvC,OAAO,CACZ,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,EAClC,KAAK,EAAE,EAAE,GACP,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAyCvC,OAAO,CAAC,6BAA6B;IA4BrC,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,aAAa;IAiCrB,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,gBAAgB;CAQxB"}

package/dist/connector/operation/HttpOperationExecution.js

@@ -35,25 +35,105 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpOperationExecution = void 0;
 const OperationHandler_1 = require("@trayio/cdk-dsl/connector/operation/OperationHandler");
 const HttpOperationHandler_1 = require("@trayio/cdk-dsl/connector/operation/HttpOperationHandler");
-const E = __importStar(require("fp-ts/Either"));
+const Http_1 = require("@trayio/commons/http/Http");
+const JsonSerialization_1 = require("@trayio/commons/serialization/JsonSerialization");
+const TE = __importStar(require("fp-ts/TaskEither"));
+const O = __importStar(require("fp-ts/Option"));
+const function_1 = require("fp-ts/function");
+const BufferExtensions_1 = require("@trayio/commons/buffer/BufferExtensions");
 class HttpOperationExecution {
     constructor(httpClient, handler) {
+        this.jsonSerialization = new JsonSerialization_1.JsonSerialization();
         this.httpClient = httpClient;
         this.handler = handler;
     }
     execute(ctx, input) {
         return __awaiter(this, void 0, void 0, function* () {
-            const finalRequest = this.handler.requestHandler(ctx, input, this.handler.request);
-            const resultE = yield this.httpClient.execute(finalRequest.method, finalRequest.path, finalRequest.request)();
-            const result = E.match((error) => OperationHandler_1.OperationHandlerResult.failure(OperationHandler_1.OperationHandlerError.connectorError(error.message)), (value) => OperationHandler_1.OperationHandlerResult.success(value))(resultE);
-            switch (result.isFailure) {
-                case true:
-                    return result;
-                case false:
-                    const response = new HttpOperationHandler_1.HttpOperationResponse(result.value);
-                    return this.handler.responseHandler(response);
-            }
+            const operationRequest = this.handler.requestHandler(ctx, input, this.handler.request);
+            const httpRequest = this.operationRequestToHttpRequest(operationRequest);
+            const resultTE = this.httpClient.execute(operationRequest.method, operationRequest.path, httpRequest);
+            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)))), 
+            // 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
+            TE.mapLeft((error) => OperationHandler_1.OperationHandlerResult.failure(OperationHandler_1.OperationHandlerError.connectorError(error.message))));
+            return TE.toUnion(operationResponseTE)();
         });
     }
+    // TODO: Add file support, the output may need to be changed to TastEither<Error, HttpRequest>
+    operationRequestToHttpRequest(operationRequest) {
+        const serializedBody = (0, function_1.pipe)(operationRequest.contentType, O.map((contentType) => {
+            switch (contentType) {
+                case Http_1.HttpContentType.Json:
+                    return this.serializeAsJson(operationRequest.body);
+                case Http_1.HttpContentType.OctetStream:
+                    return this.serializeAsFile(operationRequest.body);
+                case Http_1.HttpContentType.MultipartRequestBody:
+                    return this.serializeAsMultipart(operationRequest.body);
+                case Http_1.HttpContentType.Text:
+                    return this.serializeAsText(operationRequest.body);
+                default:
+                    return this.serializeAsJson(operationRequest.body);
+            }
+        }), O.getOrElse(() => this.serializeEmptyBody()));
+        return Object.assign(Object.assign({}, operationRequest.request), { body: serializedBody });
+    }
+    serializeAsJson(body) {
+        const serializedBody = this.jsonSerialization.serialize(body);
+        return BufferExtensions_1.BufferExtensions.arrayBufferToReadable(serializedBody);
+    }
+    serializeAsText(body) {
+        const serializedBody = new TextEncoder().encode(body);
+        return BufferExtensions_1.BufferExtensions.arrayBufferToReadable(serializedBody);
+    }
+    serializeAsMultipart(body) {
+        throw new Error('unimplemented');
+    }
+    serializeAsFile(body) {
+        throw new Error('unimplemented');
+    }
+    serializeEmptyBody() {
+        return BufferExtensions_1.BufferExtensions.arrayBufferToReadable(new ArrayBuffer(0));
+    }
+    defaultErrorHandling(statusCode) {
+        return () => OperationHandler_1.OperationHandlerResult.failure(OperationHandler_1.OperationHandlerError.apiError(`API returned a status code of ${statusCode}`, {
+            statusCode,
+        }));
+    }
+    parseResponse(operationResponse) {
+        if (operationResponse.response.statusCode >= 300) {
+            return TE.right(operationResponse.errorHandling());
+        }
+        return (0, function_1.pipe)(operationResponse.contentType, O.map((contentType) => {
+            switch (contentType) {
+                case Http_1.HttpContentType.Json:
+                    return this.parseBodyAsJson(operationResponse);
+                case Http_1.HttpContentType.OctetStream:
+                    return this.parseBodyAsFile(operationResponse);
+                case Http_1.HttpContentType.MultipartRequestBody:
+                    return TE.right(OperationHandler_1.OperationHandlerResult.failure(OperationHandler_1.OperationHandlerError.connectorError(`Invalid Response Type ${contentType}`)));
+                case Http_1.HttpContentType.Text:
+                    return this.parseeBodyAsText(operationResponse);
+                default:
+                    return this.parseBodyAsJson(operationResponse);
+            }
+        }), O.getOrElse(() => this.parseEmptyBody(operationResponse)));
+    }
+    parseBodyAsJson(operationResponse) {
+        const deserializedBodyE = this.jsonSerialization.deserialize(operationResponse.response.body);
+        return (0, function_1.pipe)(TE.fromEither(deserializedBodyE), TE.map((deserializedBody) => operationResponse.responseParser(deserializedBody)));
+    }
+    parseEmptyBody(operationResponse) {
+        return TE.right(operationResponse.responseParser(undefined));
+    }
+    parseBodyAsFile(operationResponse) {
+        return TE.right(OperationHandler_1.OperationHandlerResult.failure(OperationHandler_1.OperationHandlerError.connectorError('not implemented')));
+    }
+    parseeBodyAsText(operationResponse) {
+        const deserializeBody = new TextDecoder().decode(operationResponse.response.body);
+        return TE.right(operationResponse.responseParser(deserializeBody));
+    }
 }
 exports.HttpOperationExecution = HttpOperationExecution;

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

@@ -9,9 +9,9 @@ const getProductOperation = OperationHandlerSetup_1.OperationHandlerSetup.config
     .condition((ctx, input) => input.id > 0)
     .errorMessage(() => 'id must be bigger than zero'))
     .usingHttp((http) => http
-    .get('https://fakestoreapi.com/products/:id')
-    .handleRequest((ctx, input, request) => request.addPathParameter('id', input.id.toString()))
-    .handleResponse((response) => response.parseWithBodyAsJson())));
+    .get('https://jsonplaceholder.typicode.com/posts/:id')
+    .handleRequest((ctx, input, request) => request.addPathParameter('id', input.id.toString()).withoutBody())
+    .handleResponse((ctx, input, response) => response.parseWithBodyAsJson())));
 OperationHandlerTest_1.OperationHandlerTestSetup.configureHandlerTest(getProductOperation, (handlerTest) => handlerTest
     .usingHandlerContext('test')
     .nothingBeforeAll()
@@ -37,9 +37,9 @@ const getProductOperationAsText = OperationHandlerSetup_1.OperationHandlerSetup.
     .condition((ctx, input) => input.id > 0)
     .errorMessage(() => 'id must be bigger than zero'))
     .usingHttp((http) => http
-    .get('https://fakestoreapi.com/products/:id')
-    .handleRequest((ctx, input, request) => request.addPathParameter('id', input.id.toString()))
-    .handleResponse((response) => response.parseWithBodyAsText())));
+    .get('https://jsonplaceholder.typicode.com/posts/:id')
+    .handleRequest((ctx, input, request) => request.addPathParameter('id', input.id.toString()).withoutBody())
+    .handleResponse((ctx, input, response) => response.parseWithBodyAsText((text) => OperationHandler_1.OperationHandlerResult.success({ textField: text })))));
 OperationHandlerTest_1.OperationHandlerTestSetup.configureHandlerTest(getProductOperationAsText, (handlerTest) => handlerTest
     .usingHandlerContext('test')
     .nothingBeforeAll()
@@ -49,7 +49,7 @@ OperationHandlerTest_1.OperationHandlerTestSetup.configureHandlerTest(getProduct
     .when(() => ({ id: 2 }))
     .then(({ output }) => {
     const outputValue = OperationHandler_1.OperationHandlerResult.getSuccessfulValueOrFail(output);
-    expect(outputValue).toContain(`"id":2`);
+    expect(outputValue.textField).toContain(`"id": 2`);
 })
     .finallyDoNothing())
     .testCase('should validate id', (testCase) => testCase

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/cdk-runtime",
-  "version": "1.16.0",
+  "version": "2.0.0",
   "description": "A Runtime that executes connector operations defined using the CDK DSL",
   "exports": {
     "./*": "./dist/*.js"
@@ -14,9 +14,9 @@
     "node": ">=18.x"
   },
   "dependencies": {
-    "@trayio/axios": "1.16.0",
-    "@trayio/cdk-dsl": "1.16.0",
-    "@trayio/winston": "1.16.0"
+    "@trayio/axios": "2.0.0",
+    "@trayio/cdk-dsl": "2.0.0",
+    "@trayio/winston": "2.0.0"
   },
   "typesVersions": {
     "*": {