@swydo/byol 2.0.11 → 2.0.14

package/CHANGELOG.md

@@ -3,12 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 2.0.11 (2021-10-13)
+## 2.0.14 (2022-04-04)
 
 
 ### Bug Fixes
 
-* **byol-cli:** fix invoke command when passing template or env path ([#291](https://github.com/Swydo/byol/issues/291)) ([29f97e3](https://github.com/Swydo/byol/commit/29f97e329c633273004c264399266d607a25f5c2))
+* **byol:** add timeout delay to print all the logs ([#356](https://github.com/Swydo/byol/issues/356)) ([937393b](https://github.com/Swydo/byol/commit/937393bed0bd8c88e4776619d27f954e7077cc71))
+
+
+
+
+
+## 2.0.13 (2021-10-25)
+
+**Note:** Version bump only for package @swydo/byol
+
+
+
+
+
+## 2.0.12 (2021-10-13)
+
+**Note:** Version bump only for package @swydo/byol
+
+
+
+
+
+## 2.0.11 (2021-10-13)
+
+**Note:** Version bump only for package @swydo/byol
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@swydo/byol",
-	"version": "2.0.11",
+	"version": "2.0.14",
 	"description": "Bring Your Own Lambda",
 	"license": "MIT",
 	"engines": {
@@ -27,5 +27,5 @@
 	"peerDependencies": {
 		"aws-xray-sdk-core": "^3.0.0"
 	},
-	"gitHead": "29f97e329c633273004c264399266d607a25f5c2"
+	"gitHead": "937393bed0bd8c88e4776619d27f954e7077cc71"
 }

package/src/assets/callHandlerProcess.js

@@ -17,7 +17,7 @@ function hasXRay() {
 }
 
 async function execute(handler, event, awsContext) {
-    return new Promise(((resolve, reject) => {
+    const handlerResult = await new Promise(((resolve, reject) => {
         const maybePromise = handler(event, awsContext, (err, res) => {
             if (err) {
                 reject(err);
@@ -36,6 +36,12 @@ async function execute(handler, event, awsContext) {
                 .catch((err) => reject(err));
         }
     }));
+
+    // Timeout delay is required in order to print console logs
+    // that are omitted otherwise
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    return handlerResult;
 }
 
 async function executeWithXRay(segmentName, handler, event, awsContext) {

package/src/invokeFunction.js

@@ -45,6 +45,7 @@ async function invokeFunction(functionName, event, {
     requestId,
     keepAlive = false,
     profile = 'default',
+    invocationType = 'RequestResponse',
 } = {}) {
     const resource = getFunctionResource(templatePath, functionName);
     const environment = {
@@ -55,7 +56,6 @@ async function invokeFunction(functionName, event, {
         Properties: {
             Handler: handler,
             CodeUri: codeUri = '.',
-            EventInvokeConfig: eventInvokeConfig,
         },
     } = resource;
 
@@ -74,17 +74,13 @@ async function invokeFunction(functionName, event, {
     };
 
     let result;
-    let invocationType;
-
-    if (eventInvokeConfig) {
+    if (invocationType === 'Event') {
         invokeHandler(options);
-        invocationType = 'Event';
     } else {
         result = await invokeHandler(options);
-        invocationType = 'RequestResponse';
     }
 
-    return { result, invocationType };
+    return { result };
 }
 
 module.exports = {

package/src/invokeFunction.spec.js

@@ -28,7 +28,7 @@ describe('invokeFunction', function () {
             foo: 'foo',
         };
 
-        const { result, invocationType } = await invokeFunction(
+        const { result } = await invokeFunction(
             'GoodFunction',
             event,
             { templatePath },
@@ -37,7 +37,6 @@ describe('invokeFunction', function () {
         expect(result).to.be.an('object');
         expect(result).to.have.property('env');
         expect(result).to.have.property('args');
-        expect(invocationType).to.equal('RequestResponse');
     });
 
     it('invokes the non-async function\'s handler', async function () {
@@ -46,7 +45,7 @@ describe('invokeFunction', function () {
             foo: 'foo',
         };
 
-        const { result, invocationType } = await invokeFunction(
+        const { result } = await invokeFunction(
             'GoodCallbackFunction',
             event,
             { templatePath },
@@ -55,7 +54,6 @@ describe('invokeFunction', function () {
         expect(result).to.be.an('object');
         expect(result).to.have.property('env');
         expect(result).to.have.property('args');
-        expect(invocationType).to.equal('RequestResponse');
     });
 
     it('invokes the function\'s handler with the given event', async function () {
@@ -64,7 +62,7 @@ describe('invokeFunction', function () {
             foo: 'foo',
         };
 
-        const { result, invocationType } = await invokeFunction(
+        const { result } = await invokeFunction(
             'GoodFunction',
             event,
             { templatePath },
@@ -73,7 +71,6 @@ describe('invokeFunction', function () {
         expect(result).to.be.an('object');
         expect(result).to.have.property('env');
         expect(result).to.have.property('args');
-        expect(invocationType).to.equal('RequestResponse');
 
         const { args } = result;
         expect(args).to.be.an('array').with.length(2);
@@ -86,7 +83,7 @@ describe('invokeFunction', function () {
             foo: 'foo',
         };
 
-        const { result, invocationType } = await invokeFunction(
+        const { result } = await invokeFunction(
             'GoodFunction',
             event,
             { templatePath },
@@ -95,7 +92,6 @@ describe('invokeFunction', function () {
         expect(result).to.be.an('object');
         expect(result).to.have.property('env');
         expect(result).to.have.property('args');
-        expect(invocationType).to.equal('RequestResponse');
 
         const { args } = result;
         expect(args).to.be.an('array').with.length(2);
@@ -107,7 +103,7 @@ describe('invokeFunction', function () {
         const envPath = path.resolve(__dirname, '../tests/assets/goodEnv.json');
         const event = {};
 
-        const { result, invocationType } = await invokeFunction(
+        const { result } = await invokeFunction(
             'GoodFunction',
             event,
             { templatePath, envPath },
@@ -116,7 +112,6 @@ describe('invokeFunction', function () {
         expect(result).to.be.an('object');
         expect(result).to.have.property('env');
         expect(result).to.have.property('args');
-        expect(invocationType).to.equal('RequestResponse');
 
         const { env } = result;
         expect(env).to.have.property('FOO', 'FOO');
@@ -161,13 +156,13 @@ describe('invokeFunction', function () {
             foo: 'foo',
         };
 
-        const { invocationType } = await invokeFunction(
+        const { result } = await invokeFunction(
             'GoodAcyncFunction',
             event,
-            { templatePath },
+            { templatePath, invocationType: 'Event' },
         );
 
-        expect(invocationType).to.equal('Event');
+        expect(result).to.be.equal(undefined);
     });
 
     it('rejects when an error is thrown by the handler', async function () {