Release 17/1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "katalon-agent",
-  "version": "v2.0.0",
+  "version": "v2.0.1",
   "description": "",
   "main": "cli.js",
   "scripts": {

src/config/transports.js

@@ -1,11 +1,16 @@
 const _ = require('lodash');
+const path = require('path');
+const moment = require('moment');
 const TransportStream = require('winston-transport');
 
+const { generateUuid } = require('../helper/agent');
 const api = require('../core/api');
 
 class S3FileTransport extends TransportStream {
   constructor(options = {}, afterLog) {
     super(options);
+    this.jobInfo = options.jobInfo;
+    this.apiKey = options.apiKey;
     this.filePath = options.filePath;
     this.signedUrl = options.signedUrl;
     this.parentLogger = options.logger;
@@ -17,7 +22,36 @@ class S3FileTransport extends TransportStream {
     this.uploadToS3Throttled = _.throttle(this.uploadToS3, this.wait, { trailing: false });
   }
 
-  uploadToS3() {
+  async uploadToS3() {
+    const parsedUrl = new URL(this.signedUrl);
+    const params = new URLSearchParams(parsedUrl.search);
+
+    const amzDate = params.get('X-Amz-Date');
+    const amzExpires = params.get('X-Amz-Expires');
+
+    const dateFormart = 'YYYYMMDDTHHmmss[Z]';
+    const dateExpires = moment.utc(amzDate, dateFormart).toDate();
+    dateExpires.setSeconds(dateExpires.getSeconds(), amzExpires * 1000);
+    //  Minus more 2 minutes to ensure regenerate presigned url
+    dateExpires.setSeconds(dateExpires.getSeconds(), -(2 * 60 * 1000));
+
+    const now = new Date();
+    if (dateExpires < now) {
+      const requestGetUploadInfo = async () => {
+        const response = await api.getUploadInfo(this.jobInfo.projectId, this.apiKey);
+        if (!response || !response.body) {
+          return null;
+        }
+        const { body } = response;
+        const { uploadUrl } = body;
+        this.signedUrl = uploadUrl;
+        const batch = generateUuid();
+        const fileName = path.basename(this.filePath);
+        return api.saveJobLog(this.jobInfo, batch, fileName, this.apiKey);
+      };
+      await requestGetUploadInfo();
+    }
+
     return api
       .uploadFile(this.signedUrl, this.filePath)
       .then(() => this.afterLog && this.afterLog())

src/core/utils.js

@@ -41,6 +41,24 @@ module.exports = {
     }, command);
   },
 
+  overrideCommand(command, ...options) {
+    return options.reduce((cmd, option) => {
+      const { flag, value } = option;
+      if (value) {
+        if (cmd.includes(flag)) {
+          const arStr = cmd.split(' ');
+          const index = arStr.findIndex((t) => t.startsWith(flag));
+          if (index >= 0) {
+            arStr[index] = arStr[index].replace(/=.*/, `="${value}"`);
+            return arStr.join(' ');
+          }
+        }
+        return `${cmd} ${flag}="${value}"`;
+      }
+      return cmd;
+    }, command);
+  },
+
   getVersion() {
     return packageJson.version;
   },

src/service/agent.js

@@ -47,11 +47,11 @@
   const uploadPath = body.path;
 
   if (jobInfo.uploadPath) {
     jobInfo.oldUploadPath = jobInfo.uploadPath;
   }
 
   jobInfo.uploadUrl = uploadUrl;
   jobInfo.uploadPath = uploadPath;
 
   await api.uploadFile(uploadUrl, filePath);
 
@@ -156,6 +156,8 @@
     jLogger.add(
       new S3FileTransport(
         {
+          jobInfo,
+          apiKey,
           filePath: logFilePath,
           signedUrl: jobInfo.uploadUrl,
           logger,
@@ -301,12 +303,12 @@
 
         let ksArgs;
         if (config.isOnPremise) {
-          ksArgs = utils.updateCommand(parameter.command, {
+          ksArgs = utils.overrideCommand(parameter.command, {
             flag: '-apiKeyOnPremise',
             value: apiKey,
           });
         } else {
-          ksArgs = utils.updateCommand(
+          ksArgs = utils.overrideCommand(
             parameter.command,
             { flag: '-apiKey', value: apiKey },
           );
@@ -394,12 +396,12 @@
 
       let ksArgs;
       if (config.isOnPremise) {
-        ksArgs = utils.updateCommand(parameter.command, {
+        ksArgs = utils.overrideCommand(parameter.command, {
           flag: '-apiKeyOnPremise',
           value: apiKey,
         });
       } else {
-        ksArgs = utils.updateCommand(
+        ksArgs = utils.overrideCommand(
           parameter.command,
           { flag: '-apiKey', value: apiKey },
         );