@sap_oss/wdio-qmate-service 1.0.0 → 1.0.2

package/lib/scripts/hooks/utils/addLocatorCommands.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 var qmateLocator = require("../../locators/qmateLocator");
@@ -15,177 +6,123 @@ var uiveri5Locator = require("../../locators/uiveri5Locator");
 var lib = require("./lib");
 const locatorCommands_1 = require("./locatorCommands");
 var AddLocatorCommands = function () {
-    this.addControlCommands = function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Add Qmate locator strategy
-            yield browser.addLocatorStrategy("ui5All", qmateLocator.ui5All);
-            yield browser.addLocatorStrategy("ui5Veri5", uiveri5Locator.ui5Veri5);
-            // Register global names
-            //global.uiControl = ui5ControlLocator;
-            //global.uiControls = ui5ControlsLocator;
-            // Add command to trigger coverage collection
-            yield browser.addCommand("collectCoverage", function () {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return true;
-                });
-            });
-            // Add command for control
-            yield browser.addCommand("uiControl", function (ui5Selector, index, timeout, returnAllDomElements = false) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.ui5ControlLocator)(ui5Selector, index, timeout, this, returnAllDomElements);
-                });
-            }, true);
-            yield browser.addCommand("uiControl", function (ui5Selector, index, timeout, returnAllDomElements = false) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.ui5ControlLocator)(ui5Selector, index, timeout, undefined, returnAllDomElements);
-                });
-            });
-            // Add command for controls
-            yield browser.addCommand("uiControls", function (ui5Selector, timeout) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.ui5ControlsLocators)(ui5Selector, timeout, this);
-                });
-            }, true);
-            yield browser.addCommand("uiControls", function (ui5Selector, timeout) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.ui5ControlsLocators)(ui5Selector, timeout);
-                });
-            });
+    this.addControlCommands = async function () {
+        // Add Qmate locator strategy
+        await browser.addLocatorStrategy("ui5All", qmateLocator.ui5All);
+        await browser.addLocatorStrategy("ui5Veri5", uiveri5Locator.ui5Veri5);
+        // Register global names
+        //global.uiControl = ui5ControlLocator;
+        //global.uiControls = ui5ControlsLocator;
+        // Add command to trigger coverage collection
+        await browser.addCommand("collectCoverage", async function () {
+            return true;
+        });
+        // Add command for control
+        await browser.addCommand("uiControl", async function (ui5Selector, index, timeout, returnAllDomElements = false) {
+            return (0, locatorCommands_1.ui5ControlLocator)(ui5Selector, index, timeout, this, returnAllDomElements);
+        }, true);
+        await browser.addCommand("uiControl", async function (ui5Selector, index, timeout, returnAllDomElements = false) {
+            return (0, locatorCommands_1.ui5ControlLocator)(ui5Selector, index, timeout, undefined, returnAllDomElements);
+        });
+        // Add command for controls
+        await browser.addCommand("uiControls", async function (ui5Selector, timeout) {
+            return (0, locatorCommands_1.ui5ControlsLocators)(ui5Selector, timeout, this);
+        }, true);
+        await browser.addCommand("uiControls", async function (ui5Selector, timeout) {
+            return (0, locatorCommands_1.ui5ControlsLocators)(ui5Selector, timeout);
         });
     };
-    this.addGetBindingInfos = function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Add command for element properties
-            yield browser.addCommand("getBindingContextPath", function () {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getBindingContextPath)(this);
-                });
-            }, true);
-            // Add command for browser properties
-            yield browser.addCommand("getBindingContextPath", function (ui5SelectorOrElement) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getBindingContextPath)(ui5SelectorOrElement);
-                });
-            });
-            // Add command for element properties
-            yield browser.addCommand("getBindingProperty", function (propName) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getBindingProperty)(propName, this);
-                });
-            }, true);
-            // Add command for browser properties
-            yield browser.addCommand("getBindingProperty", function (propName, ui5SelectorOrElement) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getBindingProperty)(propName, ui5SelectorOrElement);
-                });
-            });
+    this.addGetBindingInfos = async function () {
+        // Add command for element properties
+        await browser.addCommand("getBindingContextPath", async function () {
+            return (0, locatorCommands_1.getBindingContextPath)(this);
+        }, true);
+        // Add command for browser properties
+        await browser.addCommand("getBindingContextPath", async function (ui5SelectorOrElement) {
+            return (0, locatorCommands_1.getBindingContextPath)(ui5SelectorOrElement);
+        });
+        // Add command for element properties
+        await browser.addCommand("getBindingProperty", async function (propName) {
+            return (0, locatorCommands_1.getBindingProperty)(propName, this);
+        }, true);
+        // Add command for browser properties
+        await browser.addCommand("getBindingProperty", async function (propName, ui5SelectorOrElement) {
+            return (0, locatorCommands_1.getBindingProperty)(propName, ui5SelectorOrElement);
         });
     };
-    this.addGetControlProperties = function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Add command for element properties
-            yield browser.addCommand("getUI5Property", function (propertyName) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getUI5Property)(propertyName, this);
-                });
-            }, true);
-            // Add command for browser properties
-            yield browser.addCommand("getUI5Property", function (propertyName, ui5SelectorOrElement) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getUI5Property)(propertyName, ui5SelectorOrElement);
-                });
-            });
-            // Add command for element properties
-            yield browser.addCommand("getUI5Aggregation", function (propertyName) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getUI5Aggregation)(propertyName, this);
-                });
-            }, true);
-            // Add command for browser properties
-            yield browser.addCommand("getUI5Aggregation", function (propertyName, ui5SelectorOrElement) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getUI5Aggregation)(propertyName, ui5SelectorOrElement);
-                });
-            });
-            // Add command for element properties
-            yield browser.addCommand("getUI5Association", function (propertyName) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getUI5Association)(propertyName, this);
-                });
-            }, true);
-            // Add command for browser properties
-            yield browser.addCommand("getUI5Association", function (propertyName, ui5SelectorOrElement) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getUI5Association)(propertyName, ui5SelectorOrElement);
-                });
-            });
-            yield browser.addCommand("getAllUI5Properties", function () {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getAllUI5Properties)(this);
-                });
-            }, true);
-            yield browser.addCommand("getAllUI5Properties", function (ui5SelectorOrElement) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getAllUI5Properties)(ui5SelectorOrElement);
-                });
-            });
-            yield browser.addCommand("getAllUI5Aggregations", function () {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getAllUI5Aggregations)(this);
-                });
-            }, true);
-            yield browser.addCommand("getAllUI5Aggregations", function (ui5SelectorOrElement) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getAllUI5Aggregations)(ui5SelectorOrElement);
-                });
-            });
-            yield browser.addCommand("getAllUI5Associations", function () {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getAllUI5Associations)(this);
-                });
-            }, true);
-            yield browser.addCommand("getAllUI5Associations", function (ui5SelectorOrElement) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return (0, locatorCommands_1.getAllUI5Associations)(ui5SelectorOrElement);
-                });
-            });
+    this.addGetControlProperties = async function () {
+        // Add command for element properties
+        await browser.addCommand("getUI5Property", async function (propertyName) {
+            return (0, locatorCommands_1.getUI5Property)(propertyName, this);
+        }, true);
+        // Add command for browser properties
+        await browser.addCommand("getUI5Property", async function (propertyName, ui5SelectorOrElement) {
+            return (0, locatorCommands_1.getUI5Property)(propertyName, ui5SelectorOrElement);
+        });
+        // Add command for element properties
+        await browser.addCommand("getUI5Aggregation", async function (propertyName) {
+            return (0, locatorCommands_1.getUI5Aggregation)(propertyName, this);
+        }, true);
+        // Add command for browser properties
+        await browser.addCommand("getUI5Aggregation", async function (propertyName, ui5SelectorOrElement) {
+            return (0, locatorCommands_1.getUI5Aggregation)(propertyName, ui5SelectorOrElement);
+        });
+        // Add command for element properties
+        await browser.addCommand("getUI5Association", async function (propertyName) {
+            return (0, locatorCommands_1.getUI5Association)(propertyName, this);
+        }, true);
+        // Add command for browser properties
+        await browser.addCommand("getUI5Association", async function (propertyName, ui5SelectorOrElement) {
+            return (0, locatorCommands_1.getUI5Association)(propertyName, ui5SelectorOrElement);
+        });
+        await browser.addCommand("getAllUI5Properties", async function () {
+            return (0, locatorCommands_1.getAllUI5Properties)(this);
+        }, true);
+        await browser.addCommand("getAllUI5Properties", async function (ui5SelectorOrElement) {
+            return (0, locatorCommands_1.getAllUI5Properties)(ui5SelectorOrElement);
+        });
+        await browser.addCommand("getAllUI5Aggregations", async function () {
+            return (0, locatorCommands_1.getAllUI5Aggregations)(this);
+        }, true);
+        await browser.addCommand("getAllUI5Aggregations", async function (ui5SelectorOrElement) {
+            return (0, locatorCommands_1.getAllUI5Aggregations)(ui5SelectorOrElement);
+        });
+        await browser.addCommand("getAllUI5Associations", async function () {
+            return (0, locatorCommands_1.getAllUI5Associations)(this);
+        }, true);
+        await browser.addCommand("getAllUI5Associations", async function (ui5SelectorOrElement) {
+            return (0, locatorCommands_1.getAllUI5Associations)(ui5SelectorOrElement);
         });
     };
-    this.addInBrowserHandling = function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield browser.addCommand("controlActionInBrowser", function (fnBrowser) {
-                return __awaiter(this, arguments, void 0, function* () {
-                    if (arguments.length > 1) {
-                        // Inject web element in index 1
-                        const aCustomParams = [];
-                        for (var i = 1; i < arguments.length; i++) {
-                            if (arguments[i]) {
-                                aCustomParams.push(arguments[i]);
-                            }
-                        }
-                        return lib.controlActionInBrowser(fnBrowser, this, aCustomParams.toString());
-                    }
-                    else {
-                        return lib.controlActionInBrowser(fnBrowser, this);
-                    }
-                });
-            }, true);
-            yield browser.addCommand("controlActionInBrowser", function (fnBrowser, selectorOrElement) {
-                return __awaiter(this, arguments, void 0, function* () {
-                    if (arguments.length > 2) {
-                        const aCustomParams = [];
-                        for (var i = 2; i < arguments.length; i++) {
-                            if (arguments[i]) {
-                                aCustomParams.push(arguments[i]);
-                            }
-                        }
-                        return lib.controlActionInBrowser(fnBrowser, selectorOrElement, aCustomParams.join(","));
+    this.addInBrowserHandling = async function () {
+        await browser.addCommand("controlActionInBrowser", async function (fnBrowser) {
+            if (arguments.length > 1) {
+                // Inject web element in index 1
+                const aCustomParams = [];
+                for (var i = 1; i < arguments.length; i++) {
+                    if (arguments[i]) {
+                        aCustomParams.push(arguments[i]);
                     }
-                    else {
-                        return lib.controlActionInBrowser(fnBrowser, selectorOrElement);
+                }
+                return lib.controlActionInBrowser(fnBrowser, this, aCustomParams.toString());
+            }
+            else {
+                return lib.controlActionInBrowser(fnBrowser, this);
+            }
+        }, true);
+        await browser.addCommand("controlActionInBrowser", async function (fnBrowser, selectorOrElement) {
+            if (arguments.length > 2) {
+                const aCustomParams = [];
+                for (var i = 2; i < arguments.length; i++) {
+                    if (arguments[i]) {
+                        aCustomParams.push(arguments[i]);
                     }
-                });
-            });
+                }
+                return lib.controlActionInBrowser(fnBrowser, selectorOrElement, aCustomParams.join(","));
+            }
+            else {
+                return lib.controlActionInBrowser(fnBrowser, selectorOrElement);
+            }
         });
     };
 };

package/lib/scripts/hooks/utils/addLocatorCommands.js.map

@@ -1 +1 @@
-{"version":3,"file":"addLocatorCommands.js","sourceRoot":"","sources":["../../../../src/scripts/hooks/utils/addLocatorCommands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addLocatorCommands.js","sourceRoot":"","sources":["../../../../src/scripts/hooks/utils/addLocatorCommands.ts"],"names":[],"mappings":"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"}

package/lib/scripts/hooks/utils/browserLog.js

@@ -1,39 +1,26 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 module.exports = {
-    showBrowserLogs: function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const logList = yield browser.getLogs("browser");
-            if (logList) {
-                logList.forEach(function (log) {
-                    if (log.level === "SEVERE") {
-                        // eslint-disable-next-line no-console
-                        console.log(log.message);
-                    }
-                });
-            }
-        });
+    showBrowserLogs: async function () {
+        const logList = await browser.getLogs("browser");
+        if (logList) {
+            logList.forEach(function (log) {
+                if (log.level === "SEVERE") {
+                    // eslint-disable-next-line no-console
+                    console.log(log.message);
+                }
+            });
+        }
     },
-    addBrowserLogs: function (allure) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const logList = yield browser.getLogs("browser");
-            if (logList && logList.length > 0) {
-                for (let index = 0; index < logList.length; index++) {
-                    const log = logList[index];
-                    if (log.level === "SEVERE") {
-                        yield allure.addAttachment("Browser logs", log.message);
-                    }
+    addBrowserLogs: async function (allure) {
+        const logList = await browser.getLogs("browser");
+        if (logList && logList.length > 0) {
+            for (let index = 0; index < logList.length; index++) {
+                const log = logList[index];
+                if (log.level === "SEVERE") {
+                    await allure.addAttachment("Browser logs", log.message);
                 }
             }
-        });
+        }
     }
 };
 //# sourceMappingURL=browserLog.js.map

package/lib/scripts/hooks/utils/browserLog.js.map

@@ -1 +1 @@
-{"version":3,"file":"browserLog.js","sourceRoot":"","sources":["../../../../src/scripts/hooks/utils/browserLog.js"],"names":[],"mappings":";;;;;;;;;;AAAA,MAAM,CAAC,OAAO,GAAG;IACf,eAAe,EAAE;;YACf,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,OAAO,CAAC,UAAU,GAAG;oBAC3B,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE;wBAC1B,sCAAsC;wBACtC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;qBAC1B;gBACH,CAAC,CAAC,CAAC;aACJ;QACH,CAAC;KAAA;IAED,cAAc,EAAE,UAAgB,MAAM;;YACpC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;oBACnD,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;oBAC3B,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE;wBAC1B,MAAM,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;qBACzD;iBACF;aACF;QACH,CAAC;KAAA;CAEF,CAAC"}
+{"version":3,"file":"browserLog.js","sourceRoot":"","sources":["../../../../src/scripts/hooks/utils/browserLog.js"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,GAAG;IACf,eAAe,EAAE,KAAK;QACpB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,OAAO,CAAC,UAAU,GAAG;gBAC3B,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE;oBAC1B,sCAAsC;oBACtC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBAC1B;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,cAAc,EAAE,KAAK,WAAW,MAAM;QACpC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBACnD,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC3B,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE;oBAC1B,MAAM,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;iBACzD;aACF;SACF;IACH,CAAC;CAEF,CAAC"}

package/lib/scripts/hooks/utils/dataExchangeCommands.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,21 +8,19 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const dataExchange = require("../../dataExchange/dataExchange");
-function createTmpDataFolder() {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            // create tmp folder name to store export data 
-            const randomStr = "vyp-exp-" + Math.random().toString(16).substring(2, 10);
-            const tmpDir = path_1.default.join(os_1.default.tmpdir(), randomStr);
-            process.env.TMP_EXPORT_PATH = tmpDir;
-            yield fs_extra_1.default.ensureDir(process.env.TMP_EXPORT_PATH);
-        }
-        catch (error) {
-            // log and continue
-            console.warn(`Failed to create tmp data folder`);
-            console.warn(error);
-        }
-    });
+async function createTmpDataFolder() {
+    try {
+        // create tmp folder name to store export data 
+        const randomStr = "vyp-exp-" + Math.random().toString(16).substring(2, 10);
+        const tmpDir = path_1.default.join(os_1.default.tmpdir(), randomStr);
+        process.env.TMP_EXPORT_PATH = tmpDir;
+        await fs_extra_1.default.ensureDir(process.env.TMP_EXPORT_PATH);
+    }
+    catch (error) {
+        // log and continue
+        console.warn(`Failed to create tmp data folder`);
+        console.warn(error);
+    }
 }
 class DataFolderCommands {
     constructor() {

package/lib/scripts/hooks/utils/dataExchangeCommands.js.map

@@ -1 +1 @@
-{"version":3,"file":"dataExchangeCommands.js","sourceRoot":"","sources":["../../../../src/scripts/hooks/utils/dataExchangeCommands.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,wDAAyB;AACzB,gDAAuB;AACvB,4CAAmB;AACnB,MAAM,YAAY,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAEhE,SAAe,mBAAmB;;QAChC,IAAI;YACF,+CAA+C;YAC/C,MAAM,SAAS,GAAG,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3E,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,CAAC;YACjD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;YACrC,MAAM,kBAAE,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;SACjD;QAAC,OAAO,KAAK,EAAE;YACd,mBAAmB;YACnB,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;YACjD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACrB;IACH,CAAC;CAAA;AAED,MAAM,kBAAkB;IAAxB;QACE,wBAAmB,GAAG,mBAAmB,CAAC;QAC1C,eAAU,GAAG,YAAY,CAAC,UAAU,CAAC;QACrC,6BAAwB,GAAG,YAAY,CAAC,wBAAwB,CAAC;QACjE,oBAAe,GAAG,YAAY,CAAC,eAAe,CAAC;IACjD,CAAC;CAAA;AAAA,CAAC;AAEF,kBAAe,IAAI,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"dataExchangeCommands.js","sourceRoot":"","sources":["../../../../src/scripts/hooks/utils/dataExchangeCommands.ts"],"names":[],"mappings":";;;;;AAAA,+BAA+B;AAC/B,wDAAyB;AACzB,gDAAuB;AACvB,4CAAmB;AACnB,MAAM,YAAY,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAEhE,KAAK,UAAU,mBAAmB;IAChC,IAAI;QACF,+CAA+C;QAC/C,MAAM,SAAS,GAAG,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;QACrC,MAAM,kBAAE,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;KACjD;IAAC,OAAO,KAAK,EAAE;QACd,mBAAmB;QACnB,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACrB;AACH,CAAC;AAED,MAAM,kBAAkB;IAAxB;QACE,wBAAmB,GAAG,mBAAmB,CAAC;QAC1C,eAAU,GAAG,YAAY,CAAC,UAAU,CAAC;QACrC,6BAAwB,GAAG,YAAY,CAAC,wBAAwB,CAAC;QACjE,oBAAe,GAAG,YAAY,CAAC,eAAe,CAAC;IACjD,CAAC;CAAA;AAAA,CAAC;AAEF,kBAAe,IAAI,kBAAkB,EAAE,CAAC"}

package/lib/scripts/hooks/utils/decryption.d.ts

@@ -5,7 +5,7 @@ declare class Decryption {
     private childProcess;
     initDecryptFunction(): void;
     retrievePrivateKey(dirname: string): any;
-    decryptSecureData(privateKey: string, input: string): any;
+    decryptSecureData(privateKey: string, input: string | Array<string>): any;
     decryptSauceConfig(config: Record<string, any>): void;
     private _decryptDataWithRepoName;
 }

package/lib/scripts/hooks/utils/decryption.js

@@ -9,7 +9,7 @@ class Decryption {
     }
     initDecryptFunction() {
         try {
-            const privateKey = this.retrievePrivateKey(this.path.resolve(__dirname, "../../.."));
+            const privateKey = this.retrievePrivateKey(this.path.resolve(__dirname, "../../../.."));
             global.util.data.privateKeyFound = true;
             global.util.data.decrypt = (input) => {
                 return this.decryptSecureData(privateKey, input);
@@ -25,15 +25,22 @@ class Decryption {
         let privateKey;
         try {
             privateKey = this.fs.readFileSync(this.path.resolve(process.cwd(), "private.key"), "utf8");
+            console.log("\n[private key is used from current working directory]\n");
         }
         catch (error) {
-            privateKey = process.env.QMATE_PRIVATE_KEY;
-            if (!privateKey) {
+            if (process.env.QMATE_PRIVATE_KEY) {
+                privateKey = process.env.QMATE_PRIVATE_KEY;
+                privateKey = privateKey.replace(/\\n/gm, "\n");
+                privateKey = privateKey.replace(/\\s/gm, " ");
+                console.log("\n[private key is used from env var]\n");
+            }
+            else {
                 try {
                     privateKey = this.fs.readFileSync(this.path.resolve(dirname, "private.key"), "utf8");
+                    console.log("\n[default private key is used]\n");
                 }
                 catch (error) {
-                    throw new Error(`Decryption failed: ${error}`);
+                    throw new Error(`No private key found: ${error}`);
                 }
             }
         }
@@ -41,17 +48,30 @@ class Decryption {
         return privateKey;
     }
     decryptSecureData(privateKey, input) {
-        try {
-            const decryptedDataByRepoName = Buffer.from(this._decryptDataWithRepoName(Buffer.from(input, "hex")), "base64");
-            const decryptedDataByKey = this.crypto.privateDecrypt({
-                key: privateKey,
-                padding: this.crypto.constants.RSA_PKCS1_OAEP_PADDING,
-                oaepHash: "sha256",
-            }, decryptedDataByRepoName);
+        // input data can either be as single value or array of values for different keys
+        if (typeof input === "string") {
+            input = [input];
+        }
+        let decryptedDataByKey;
+        let decryptError;
+        for (const data of input) {
+            try {
+                const decryptedDataByRepoName = Buffer.from(this._decryptDataWithRepoName(Buffer.from(data, "hex")), "base64");
+                decryptedDataByKey = this.crypto.privateDecrypt({
+                    key: privateKey,
+                    padding: this.crypto.constants.RSA_PKCS1_OAEP_PADDING,
+                    oaepHash: "sha256"
+                }, decryptedDataByRepoName);
+            }
+            catch (error) {
+                decryptError = error;
+            }
+        }
+        if (decryptedDataByKey) {
             return decryptedDataByKey.toString();
         }
-        catch (error) {
-            throw new Error(`Function 'decrypt' failed: ${error}`);
+        else {
+            throw new Error(`Function 'decrypt' failed: ${decryptError}`);
         }
     }
     decryptSauceConfig(config) {
@@ -68,7 +88,6 @@ class Decryption {
             // do nothing, key was not encrypted
         }
     }
-    ;
     _decryptDataWithRepoName(data) {
         let repoUrl;
         try {

package/lib/scripts/hooks/utils/decryption.js.map

@@ -1 +1 @@
-{"version":3,"file":"decryption.js","sourceRoot":"","sources":["../../../../src/scripts/hooks/utils/decryption.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decryption.js","sourceRoot":"","sources":["../../../../src/scripts/hooks/utils/decryption.ts"],"names":[],"mappings":";;AAAA,MAAM,UAAU;IAAhB;QACU,SAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QACvB,OAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACnB,WAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3B,iBAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IA4GlD,CAAC;IA1GC,mBAAmB;QACjB,IAAI;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;YACxF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;gBACnC,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YACnD,CAAC,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG;gBACzB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,CAAC,CAAC;SACH;IACH,CAAC;IAED,kBAAkB,CAAC,OAAe;QAChC,IAAI,UAAU,CAAC;QAEf,IAAI;YACF,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CAAC;YAC3F,OAAO,CAAC,GAAG,CAAC,0DAA0D,CAAC,CAAC;SACzE;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;gBACjC,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;gBAC3C,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC/C,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC9C,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;aACvD;iBAAM;gBACL,IAAI;oBACF,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CAAC;oBACrF,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;iBAClD;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;iBACnD;aACF;SACF;QAED,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAEnC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,iBAAiB,CAAC,UAAkB,EAAE,KAA6B;QACjE,iFAAiF;QACjF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;SACjB;QAED,IAAI,kBAAuB,CAAC;QAC5B,IAAI,YAAiB,CAAC;QAEtB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI;gBACF,MAAM,uBAAuB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;gBAE/G,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAC7C;oBACE,GAAG,EAAE,UAAU;oBACf,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,sBAAsB;oBACrD,QAAQ,EAAE,QAAQ;iBACnB,EACD,uBAAuB,CACxB,CAAC;aACH;YAAC,OAAO,KAAK,EAAE;gBACd,YAAY,GAAG,KAAK,CAAC;aACtB;SACF;QAED,IAAI,kBAAkB,EAAE;YACtB,OAAO,kBAAkB,CAAC,QAAQ,EAAE,CAAC;SACtC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,8BAA8B,YAAY,EAAE,CAAC,CAAC;SAC/D;IACH,CAAC;IAED,kBAAkB,CAAC,MAA2B;QAC5C,IAAI;YACF,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC9C;QAAC,OAAO,KAAK,EAAE;YACd,qCAAqC;SACtC;QACD,IAAI;YACF,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC5C;QAAC,OAAO,KAAK,EAAE;YACd,oCAAoC;SACrC;IACH,CAAC;IAEO,wBAAwB,CAAC,IAAY;QAC3C,IAAI,OAAO,CAAC;QACZ,IAAI;YACF,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,oCAAoC,CAAC,CAAC,QAAQ,EAAE,CAAC;SACvF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;QAED,MAAM,IAAI,GAAG,kBAAkB,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;QAE9E,MAAM,EAAE,GAAG,kBAAkB,CAAC;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,aAAa,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QAE5E,IAAI,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC1D,aAAa,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAExC,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AACD,kBAAe,IAAI,UAAU,EAAE,CAAC"}