@trayio/cdk-runtime 3.0.0 → 3.1.1-unstable

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

@@ -1,14 +1,17 @@
+import * as O from 'fp-ts/Option';
 import { OperationHandlerAuth, OperationHandlerContext, OperationHandlerResult } from '@trayio/cdk-dsl/connector/operation/OperationHandler';
 import { HttpOperationHandler } from '@trayio/cdk-dsl/connector/operation/HttpOperationHandler';
 import { HttpClient } from '@trayio/commons/http/HttpClient';
 import { FileStorage } from '@trayio/commons/file/File';
+import { HttpGlobalHandler } from '@trayio/cdk-dsl/connector/operation/GlobalHandler';
 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;
+    private globalHandler;
     private fileStorage;
-    constructor(httpClient: HttpClient, fileStorage: FileStorage, handler: HttpOperationHandler<AUTH, IN, OUT>);
+    constructor(httpClient: HttpClient, fileStorage: FileStorage, handler: HttpOperationHandler<AUTH, IN, OUT>, globalHandler: O.Option<HttpGlobalHandler<AUTH>>);
     execute(ctx: OperationHandlerContext<AUTH>, input: IN): Promise<OperationHandlerResult<OUT>>;
     private operationRequestToHttpRequest;
     private serializeAsJson;

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":"AASA,OAAO,EACN,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EAGtB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAGN,oBAAoB,EAKpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAW7D,OAAO,EAAQ,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE9D,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;gBAGhC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC;IAQvC,OAAO,CACZ,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,EAClC,KAAK,EAAE,EAAE,GACP,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAiDvC,OAAO,CAAC,6BAA6B;IAiCrC,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,oBAAoB;IAyD5B,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,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAGN,oBAAoB,EAKpB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAW7D,OAAO,EAAQ,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AACtF,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,aAAa,CAAoC;IACzD,OAAO,CAAC,WAAW,CAAc;gBAGhC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,EAC5C,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAS3C,OAAO,CACZ,GAAG,EAAE,uBAAuB,CAAC,IAAI,CAAC,EAClC,KAAK,EAAE,EAAE,GACP,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAiEvC,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"}

package/dist/connector/operation/HttpOperationExecution.js

@@ -48,15 +48,16 @@ const BufferExtensions_1 = require("@trayio/commons/buffer/BufferExtensions");
 const mime = require('mime');
 const { AWS_LAMBDA_FUNCTION_MEMORY_SIZE, CONNECTOR_MAX_ALLOCATED_RAM_MB } = process.env;
 class HttpOperationExecution {
-    constructor(httpClient, fileStorage, handler) {
+    constructor(httpClient, fileStorage, handler, globalHandler) {
         this.jsonSerialization = new JsonSerialization_1.JsonSerialization();
         this.httpClient = httpClient;
         this.fileStorage = fileStorage;
         this.handler = handler;
+        this.globalHandler = globalHandler;
     }
     execute(ctx, input) {
         return __awaiter(this, void 0, void 0, function* () {
-            const operationRequest = this.handler.requestHandler(ctx, input, this.handler.request);
+            const operationRequest = (0, function_1.pipe)(this.globalHandler, O.match(() => this.handler.requestHandler(ctx, input, this.handler.request), (globalHandler) => (0, function_1.pipe)(globalHandler.beforeRequest, O.match(() => this.handler.requestHandler(ctx, input, this.handler.request), (beforeRequest) => beforeRequest(this.handler.requestHandler, ctx, input, this.handler.request)))));
             const httpRequestE = yield this.operationRequestToHttpRequest(operationRequest)();
             if (E.isLeft(httpRequestE)) {
                 return OperationHandler_1.OperationHandlerResult.failure(OperationHandler_1.OperationHandlerError.connectorError(httpRequestE.left.message));
@@ -106,9 +107,7 @@ class HttpOperationExecution {
         const fileStreamsFromReferencesTasks = Object.keys(body.files).map((fileKey) => {
             const fileRef = body.files[fileKey];
             return (0, function_1.pipe)(this.httpClient.execute(Http_1.HttpMethod.Get, fileRef.url, {
-                headers: {
-                    [Http_1.HttpHeader.ContentType]: Http_1.HttpContentType.OctetStream,
-                },
+                headers: {},
                 pathParams: {},
                 queryString: {},
                 body: BufferExtensions_1.BufferExtensions.arrayBufferToReadable(new ArrayBuffer(0)),
@@ -140,7 +139,7 @@ class HttpOperationExecution {
     }
     serializeAsFile(operationRequest) {
         const downloadFilefromReference = this.httpClient.execute(Http_1.HttpMethod.Get, operationRequest.body.url, {
-            headers: { [Http_1.HttpHeader.ContentType]: Http_1.HttpContentType.OctetStream },
+            headers: {},
             pathParams: {},
             queryString: {},
             body: BufferExtensions_1.BufferExtensions.arrayBufferToReadable(new ArrayBuffer(0)),

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

@@ -1,12 +1,14 @@
 import { OperationHandlerAuth } from '@trayio/cdk-dsl/connector/operation/OperationHandler';
 import { HttpOperationHandler } from '@trayio/cdk-dsl/connector/operation/HttpOperationHandler';
 import { HttpClient } from '@trayio/commons/http/HttpClient';
-import { FileStorage } from '@trayio/commons/dist/file/File';
+import { FileStorage } from '@trayio/commons/file/File';
+import { HttpGlobalHandler } from '@trayio/cdk-dsl/connector/operation/GlobalHandler';
+import * as O from 'fp-ts/Option';
 import { OperationExecution } from './OperationExecution';
 export declare class HttpOperationExecutionFactory {
     private httpClient;
     private fileStorage;
     constructor(httpClient: HttpClient, fileStorage: FileStorage);
-    executionFrom<AUTH extends OperationHandlerAuth<unknown, unknown>, IN, OUT>(handler: HttpOperationHandler<AUTH, IN, OUT>): OperationExecution<AUTH, IN, OUT>;
+    executionFrom<AUTH extends OperationHandlerAuth<unknown, unknown>, IN, OUT>(handler: HttpOperationHandler<AUTH, IN, OUT>, globalHandler: O.Option<HttpGlobalHandler<AUTH>>): OperationExecution<AUTH, IN, OUT>;
 }
 //# sourceMappingURL=HttpOperationExecutionFactory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"HttpOperationExecutionFactory.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/HttpOperationExecutionFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,0DAA0D,CAAC;AAChG,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,qBAAa,6BAA6B;IAExC,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,WAAW;gBADX,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW;IAGjC,aAAa,CAAC,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,EACzE,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,GAC1C,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC;CAOpC"}
+{"version":3,"file":"HttpOperationExecutionFactory.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/HttpOperationExecutionFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,0DAA0D,CAAC;AAChG,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AACtF,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,qBAAa,6BAA6B;IAExC,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,WAAW;gBADX,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW;IAGjC,aAAa,CAAC,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,EACzE,OAAO,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,EAC5C,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAC9C,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC;CAQpC"}

package/dist/connector/operation/HttpOperationExecutionFactory.js

@@ -7,8 +7,8 @@ class HttpOperationExecutionFactory {
         this.httpClient = httpClient;
         this.fileStorage = fileStorage;
     }
-    executionFrom(handler) {
-        return new HttpOperationExecution_1.HttpOperationExecution(this.httpClient, this.fileStorage, handler);
+    executionFrom(handler, globalHandler) {
+        return new HttpOperationExecution_1.HttpOperationExecution(this.httpClient, this.fileStorage, handler, globalHandler);
     }
 }
 exports.HttpOperationExecutionFactory = HttpOperationExecutionFactory;

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

@@ -1 +1 @@
-{"version":3,"file":"OperationExecutionFactory.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/OperationExecutionFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,gBAAgB,EAEhB,MAAM,2DAA2D,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAGxF,qBAAa,yBAAyB;IACrC,OAAO,CAAC,mCAAmC,CAAsC;IACjF,OAAO,CAAC,6BAA6B,CAAgC;IACrE,OAAO,CAAC,kCAAkC,CAAqC;gBAG9E,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,iCAAiC,EAAE,iCAAiC;IAYrE,aAAa,CAAC,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,EACzE,OAAO,EAAE,gBAAgB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,GACtC,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC;IAYpC,OAAO,CAAC,2BAA2B;CAoBnC"}
+{"version":3,"file":"OperationExecutionFactory.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/OperationExecutionFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAGxF,qBAAa,yBAAyB;IACrC,OAAO,CAAC,mCAAmC,CAAsC;IACjF,OAAO,CAAC,6BAA6B,CAAgC;IACrE,OAAO,CAAC,kCAAkC,CAAqC;gBAG9E,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,iCAAiC,EAAE,iCAAiC;IAYrE,aAAa,CAAC,IAAI,SAAS,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,EACzE,OAAO,EAAE,gBAAgB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,GACtC,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC;IAYpC,OAAO,CAAC,2BAA2B;CAqBnC"}

package/dist/connector/operation/OperationExecutionFactory.js

@@ -13,16 +13,16 @@ class OperationExecutionFactory {
             new CompositeOperationExecutionFactory_1.CompositeOperationExecutionFactory(operationHandlerInvocationFactory);
     }
     executionFrom(handler) {
-        const executionFromImplementation = this.executionFromImplementation(handler.implementation);
+        const executionFromImplementation = this.executionFromImplementation(handler);
         const execution = this.operationExecutionValidationFactory.decorateExecution(executionFromImplementation, handler.validation);
         return execution;
     }
-    executionFromImplementation(implementation) {
-        switch (implementation._tag) {
+    executionFromImplementation(handler) {
+        switch (handler.implementation._tag) {
             case 'HttpOperationHandler':
-                return this.httpOperationExecutionFactory.executionFrom(implementation);
+                return this.httpOperationExecutionFactory.executionFrom(handler.implementation, handler.globalHandler);
             case 'CompositeOperationHandler':
-                return this.compositeOperationExecutionFactory.executionFrom(implementation);
+                return this.compositeOperationExecutionFactory.executionFrom(handler.implementation);
         }
     }
 }

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

@@ -36,6 +36,7 @@ const ExpressHttpServer_1 = require("@trayio/express/http/ExpressHttpServer");
 const ExpressHttpController_1 = require("@trayio/express/http/ExpressHttpController");
 const NodeFsFileStorage_1 = require("@trayio/commons/file/NodeFsFileStorage");
 require("./OperationHandlerTestRunner");
+const GlobalHandler_1 = require("@trayio/cdk-dsl/connector/operation/GlobalHandler");
 const fileStorage = new NodeFsFileStorage_1.NodeFsFileStorage('/tmp');
 class TestControllerHttp {
     constructor() {
@@ -185,6 +186,41 @@ describe('OperationExecutionGateway', () => {
             .finallyDoNothing())
             .nothingAfterAll());
     });
+    describe('add path parameter using global handler', () => {
+        const globalHandler = GlobalHandler_1.HttpGlobalHandler.create().withBeforeRequest((handler, ctx, input, request) => {
+            const newRequest = request.addPathParameter('id', input.id.toString());
+            return handler(ctx, input, newRequest);
+        });
+        const getProductOperationAsText = OperationHandlerSetup_1.OperationHandlerSetup.configureHandler((handler) => handler
+            .addInputValidation((inputValidation) => inputValidation
+            .condition((ctx, input) => input.id > 0)
+            .errorMessage(() => 'id must be bigger than zero'))
+            .withGlobalHandler(globalHandler)
+            .usingHttp((http) => http
+            .get('http://localhost:3000/posts/:id')
+            .handleRequest((ctx, input, request) => request.withoutBody())
+            .handleResponse((ctx, input, response) => response.parseWithBodyAsText((text) => OperationHandler_1.OperationHandlerResult.success({ textField: text })))));
+        OperationHandlerTest_1.OperationHandlerTestSetup.configureHandlerTest(getProductOperationAsText, (handlerTest) => handlerTest
+            .usingHandlerContext('test')
+            .nothingBeforeAll()
+            .testCase('should get a product as text', (testCase) => testCase
+            .usingHandlerContext('test')
+            .givenNothing()
+            .when(() => ({ id: 2 }))
+            .then(({ output }) => {
+            const outputValue = OperationHandler_1.OperationHandlerResult.getSuccessfulValueOrFail(output);
+            expect(outputValue.textField).toContain(`"id":2`);
+        })
+            .finallyDoNothing())
+            .testCase('should validate id', (testCase) => testCase
+            .givenNothing()
+            .when(() => ({ id: -1 }))
+            .then(({ output }) => {
+            expect(output.isFailure).toBe(true);
+        })
+            .finallyDoNothing())
+            .nothingAfterAll());
+    });
     describe('post a product as form url encoded', () => {
         const postProductOperation = OperationHandlerSetup_1.OperationHandlerSetup.configureHandler((handler) => handler.usingHttp((http) => http
             .post('http://localhost:3000/posts/create')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/cdk-runtime",
-  "version": "3.0.0",
+  "version": "3.1.1-unstable",
   "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.0.0",
-    "@trayio/cdk-dsl": "3.0.0",
-    "@trayio/express": "3.0.0",
-    "@trayio/winston": "3.0.0",
+    "@trayio/axios": "3.1.1-unstable",
+    "@trayio/cdk-dsl": "3.1.1-unstable",
+    "@trayio/express": "3.1.1-unstable",
+    "@trayio/winston": "3.1.1-unstable",
     "mime": "3.0.0",
     "uuid": "9.0.0"
   },