@loadmill/executer 0.1.71 → 0.1.73

package/dist/cookies.d.ts

@@ -1,4 +1,4 @@
 import { ResolvedRequest } from './request-sequence-result';
 import { CookiesDetails } from '@loadmill/core/dist/conf/types';
-export declare const setCookies: (httpAgent: any, cookies?: CookiesDetails | undefined) => void;
+export declare const setCookies: (httpAgent: any, cookiesList?: CookiesDetails | undefined) => void;
 export declare const getCookies: (httpAgent: any, requests: ResolvedRequest[]) => CookiesDetails;

package/dist/cookies.js

@@ -5,15 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCookies = exports.setCookies = void 0;
 var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
-var setCookies = function (httpAgent, cookies) {
-    if (cookies) {
-        for (var _i = 0, _a = Object.values(cookies); _i < _a.length; _i++) {
-            var _b = _a[_i], cookie = _b.cookie, domain = _b.domain, path = _b.path;
-            try {
-                httpAgent.jar.setCookies(cookie, domain, path);
-            }
-            catch (error) {
-                log_1.default.error('Failed to set cookies: ', { cookie: cookie, domain: domain, path: path, error: error });
+var lodash_1 = require("lodash");
+var setCookies = function (httpAgent, cookiesList) {
+    if (cookiesList) {
+        for (var _i = 0, _a = Object.values(cookiesList); _i < _a.length; _i++) {
+            var cookies = _a[_i];
+            if (lodash_1.isArray(cookies)) {
+                for (var _b = 0, cookies_1 = cookies; _b < cookies_1.length; _b++) {
+                    var cookieDetails = cookies_1[_b];
+                    var _c = cookieDetails || {}, cookie = _c.cookie, domain = _c.domain, path = _c.path;
+                    try {
+                        httpAgent.jar.setCookies(cookie, domain, path);
+                    }
+                    catch (error) {
+                        log_1.default.error('Failed to set cookies: ', { cookie: cookie, domain: domain, path: path, error: error });
+                    }
+                }
             }
         }
     }
@@ -21,37 +28,52 @@ var setCookies = function (httpAgent, cookies) {
 exports.setCookies = setCookies;
 var getCookies = function (httpAgent, requests) {
     var cookiesToSend = {};
-    for (var _i = 0, requests_1 = requests; _i < requests_1.length; _i++) {
-        var request = requests_1[_i];
+    var _loop_1 = function (request) {
         if (request && request.response && request.url) {
             try {
-                var url = new URL(request.url);
-                var cookie = httpAgent.jar.getCookies({
-                    domain: url.host,
-                    path: url.pathname,
-                    secure: url.protocol.endsWith('s:'),
-                    script: false,
+                var url_1 = new URL(request.url);
+                var cookies = httpAgent.jar.getCookies({
+                    domain: url_1.hostname,
+                    path: url_1.pathname,
+                    secure: url_1.protocol.endsWith('s:')
                 });
-                if (cookie.toString()) {
-                    var path = getPathFromCookie(cookie.toString());
-                    cookiesToSend[url.host + path] = {
-                        cookie: cookie.toValueString(),
-                        domain: url.host,
-                        path: path
-                    };
+                if (Array.isArray(cookies)) {
+                    cookies.forEach(function (cookie) {
+                        var domain = cookie.domain || url_1.hostname;
+                        var path = cookie.path || '/';
+                        var cookieDetails = {
+                            cookie: cookie.name + "=" + cookie.value,
+                            domain: domain,
+                            path: path
+                        };
+                        if (!lodash_1.isEmpty(cookiesToSend[domain + path])) {
+                            if (cookieDoesNotExist(cookiesToSend[domain + path], cookieDetails)) {
+                                cookiesToSend[domain + path].push(cookieDetails);
+                            }
+                        }
+                        else {
+                            cookiesToSend[domain + path] = [cookieDetails];
+                        }
+                    });
                 }
             }
             catch (e) {
                 log_1.default.error('Failed to get a cookie from request with URL: ' + request.url, e);
             }
         }
+    };
+    for (var _i = 0, requests_1 = requests; _i < requests_1.length; _i++) {
+        var request = requests_1[_i];
+        _loop_1(request);
     }
     return cookiesToSend;
 };
 exports.getCookies = getCookies;
-// For example: '_ga=GA1.1.7360; expires=Thu, 11 Aug 2022 11:41:30 GMT; path=/home; secure' --> '/home'
-var getPathFromCookie = function (cookie) {
-    var path = /path=(.[^;]*);/gmi.exec(cookie);
-    return path ? path[1] : '/';
+var cookieDoesNotExist = function (cookieList, cookieDetails) {
+    return cookieList.every(function (cookie) {
+        return cookie.cookie !== cookieDetails.cookie ||
+            cookie.path !== cookieDetails.path ||
+            cookie.domain !== cookieDetails.domain;
+    });
 };
 //# sourceMappingURL=cookies.js.map

package/dist/cookies.js.map

@@ -1 +1 @@
-{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../src/cookies.ts"],"names":[],"mappings":";;;;;;AAEA,qEAA+C;AAExC,IAAM,UAAU,GAAG,UAAC,SAAS,EAAE,OAAwB;IAC5D,IAAI,OAAO,EAAE;QACX,KAAuC,UAAsB,EAAtB,KAAA,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAtB,cAAsB,EAAtB,IAAsB,EAAE;YAApD,IAAA,WAAwB,EAAtB,MAAM,YAAA,EAAE,MAAM,YAAA,EAAE,IAAI,UAAA;YAC/B,IAAI;gBACF,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;aAChD;YAAC,OAAO,KAAK,EAAE;gBACd,aAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAC,CAAC;aACvE;SACF;KACF;AACH,CAAC,CAAC;AAVW,QAAA,UAAU,cAUrB;AAEK,IAAM,UAAU,GAAG,UAAC,SAAS,EAAE,QAA2B;IAC/D,IAAM,aAAa,GAAG,EAAE,CAAC;IACzB,KAAsB,UAAQ,EAAR,qBAAQ,EAAR,sBAAQ,EAAR,IAAQ,EAAE;QAA3B,IAAM,OAAO,iBAAA;QAChB,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE;YAC9C,IAAI;gBACF,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACjC,IAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC;oBACtC,MAAM,EAAE,GAAG,CAAC,IAAI;oBAChB,IAAI,EAAE,GAAG,CAAC,QAAQ;oBAClB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACnC,MAAM,EAAE,KAAK;iBACd,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE;oBACrB,IAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAClD,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG;wBAC/B,MAAM,EAAE,MAAM,CAAC,aAAa,EAAE;wBAC9B,MAAM,EAAE,GAAG,CAAC,IAAI;wBAChB,IAAI,MAAA;qBACL,CAAC;iBACH;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,gDAAgD,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;aAC9E;SACF;KACF;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AA1BW,QAAA,UAAU,cA0BrB;AAEF,uGAAuG;AACvG,IAAM,iBAAiB,GAAG,UAAC,MAAc;IACvC,IAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAA,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAC7B,CAAC,CAAC"}
+{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../src/cookies.ts"],"names":[],"mappings":"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"}

package/dist/mill-version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.millVersionString = exports.millVersion = void 0;
 exports.millVersion = {
     major: 9,
-    minor: 70,
+    minor: 71,
     patch: 0,
 };
 exports.millVersionString = exports.millVersion.major + "." + exports.millVersion.minor + "." + exports.millVersion.patch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loadmill/executer",
-  "version": "0.1.71",
+  "version": "0.1.73",
   "description": "Loadmill executer library",
   "scripts": {
     "ts-watch": "rimraf dist && tsc -w -p tsconfig.json",
@@ -14,8 +14,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@loadmill/core": "0.3.70",
-    "@loadmill/universal": "0.3.65",
+    "@loadmill/core": "0.3.72",
+    "@loadmill/universal": "0.3.67",
     "@types/estree": "^0.0.50",
     "acorn": "^8.4.1",
     "agentkeepalive": "^4.1.3",