@serenity-js/serenity-bdd 3.10.4 → 3.11.1

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.11.1](https://github.com/serenity-js/serenity-js/compare/v3.11.0...v3.11.1) (2023-10-04)
+
+**Note:** Version bump only for package @serenity-js/serenity-bdd
+
+
+
+
+
+# [3.11.0](https://github.com/serenity-js/serenity-js/compare/v3.10.4...v3.11.0) (2023-10-03)
+
+
+### Features
+
+* **serenity-bdd:** serenity-bdd downloader will now automatically detect proxy server configuration ([c221210](https://github.com/serenity-js/serenity-js/commit/c221210c95753a518621b5e97f6e037fa9383be1)), closes [#1949](https://github.com/serenity-js/serenity-js/issues/1949)
+
+
+
+
+
 ## [3.10.4](https://github.com/serenity-js/serenity-js/compare/v3.10.3...v3.10.4) (2023-09-22)
 
 **Note:** Version bump only for package @serenity-js/serenity-bdd

package/lib/cli/commands/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;oBAmCV,IAAI,KAAG,QAAQ,IAAI,CAAC;;AAzB9C,kBAkEE"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;oBAmCV,IAAI,KAAG,QAAQ,IAAI,CAAC;;AAzB9C,kBAyEE"}

package/lib/cli/commands/update.js

@@ -1,7 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 const assertions_1 = require("@serenity-js/assertions");
 const core_1 = require("@serenity-js/core");
 const io_1 = require("@serenity-js/core/lib/io");
+const https = __importStar(require("https"));
 const url_1 = require("url");
 const defaults_1 = require("../defaults");
 const io_2 = require("../io");
@@ -36,9 +60,15 @@ module.exports = {
         },
     },
     handler: async (argv) => {
-        const printer = new Printer_1.Printer(process.stdout, process.stderr), artifactGAV = model_1.GAV.fromString(argv.artifact), pathToArtifact = new io_1.Path(argv.cacheDir).join(artifactGAV.toPath()), repository = new url_1.URL(argv.repository);
+        const printer = new Printer_1.Printer(process.stdout, process.stderr), artifactGAV = model_1.GAV.fromString(argv.artifact), pathToArtifact = new io_1.Path(argv.cacheDir).join(artifactGAV.toPath()), repository = new url_1.URL(argv.repository), ignoreSSL = Boolean(argv.ignoreSSL);
         (0, core_1.configure)({
-            actors: new stage_1.UpdateCommandActors(new io_1.Path(process.cwd()), () => (0, io_2.axiosClient)(repository, Boolean(argv.ignoreSSL), process.env, model_1.Credentials.fromString(argv.auth))),
+            actors: new stage_1.UpdateCommandActors(new io_1.Path(process.cwd()), {
+                baseURL: repository.toString(),
+                auth: model_1.Credentials.fromString(argv.auth).toJSON(),
+                httpsAgent: ignoreSSL
+                    ? new https.Agent({ rejectUnauthorized: !ignoreSSL })
+                    : undefined,
+            }),
             crew: [
                 new stage_1.NotificationReporter(printer),
                 new stage_1.ProgressReporter(printer),

package/lib/cli/commands/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":";AAAA,wDAAiD;AACjD,4CAAkE;AAClE,iDAAgD;AAChD,6BAA0B;AAG1B,0CAAuC;AACvC,8BAAiD;AACjD,oCAA4C;AAC5C,wCAAqC;AACrC,8CAAqE;AACrE,oCAAuF;AAEvF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,yDAAyD;AAEzF,iBAAS;IACL,OAAO,EAAE,QAAQ;IACjB,IAAI,EAAE,sEAAsE;IAC5E,OAAO,EAAE;QACL,QAAQ,EAAE;YACN,OAAO,EAAI,mBAAQ,CAAC,QAAQ;YAC5B,QAAQ,EAAE,yEAAyE;SACtF;QACD,SAAS,EAAE;YACP,OAAO,EAAI,KAAK;YAChB,IAAI,EAAM,SAAS;YACnB,QAAQ,EAAE,yBAAyB;SACtC;QACD,UAAU,EAAE;YACR,OAAO,EAAI,mBAAQ,CAAC,UAAU;YAC9B,QAAQ,EAAE,6EAA6E;SAC1F;QACD,IAAI,EAAE;YACF,QAAQ,EAAE,4EAA4E;SACzF;QACD,QAAQ,EAAE;YACN,OAAO,EAAI,mBAAQ,CAAC,QAAQ;YAC5B,QAAQ,EAAE,oIAAoI;SACjJ;KACJ;IACD,OAAO,EAAE,KAAK,EAAE,IAAU,EAAiB,EAAE;QAEzC,MACI,OAAO,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EACrD,WAAW,GAAG,WAAG,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC3C,cAAc,GAAG,IAAI,SAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EACnE,UAAU,GAAG,IAAI,SAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE1C,IAAA,gBAAS,EAAC;YACN,MAAM,EAAE,IAAI,2BAAmB,CAC3B,IAAI,SAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EACvB,GAAG,EAAE,CAAC,IAAA,gBAAW,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,mBAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACzG;YACD,IAAI,EAAE;gBACF,IAAI,4BAAoB,CAAC,OAAO,CAAC;gBACjC,IAAI,wBAAgB,CAAC,OAAO,CAAC;aAChC;SACJ,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,IAAA,kBAAW,EAAC,qBAAqB,CAAC,CAAC;QAEjD,IAAI;YACA,MAAM,IAAA,kBAAW,EAAC,qBAAqB,CAAC,CAAC,UAAU,CAC/C,YAAK,CAAC,OAAO,CAAC,uBAAU,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,IAAA,mBAAM,GAAE,CAAC;iBACjD,OAAO,CACJ,mBAAM,CAAC,IAAI,CAAC,gEAAiE,cAAc,CAAC,KAAM,EAAE,CAAC,CACxG;iBACA,SAAS,CACN,6BAAgB;iBACX,YAAY,CAAC,WAAW,CAAC;iBACzB,aAAa,CAAC,UAAU,CAAC;iBACzB,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,CACtC,CACR,CAAC;YACF,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;SACzB;QACD,OAAO,KAAK,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,IAAA,gBAAW,EAAC,KAAK,CAAC,CAAC,CAAC;YAClC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SAChC;IACL,CAAC;CACJ,CAAC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"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"}

package/lib/cli/io/index.d.ts

@@ -1,3 +1,2 @@
-export * from './axiosClient';
 export * from './formatError';
 //# sourceMappingURL=index.d.ts.map

package/lib/cli/io/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/io/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/io/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC"}

package/lib/cli/io/index.js

@@ -14,6 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./axiosClient"), exports);
 __exportStar(require("./formatError"), exports);
 //# sourceMappingURL=index.js.map

package/lib/cli/io/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/io/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/io/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B"}

package/lib/cli/stage/UpdateCommandActors.d.ts

@@ -1,13 +1,13 @@
 import type { Actor, Cast } from '@serenity-js/core';
 import type { Path } from '@serenity-js/core/lib/io';
-import type { AxiosInstance } from 'axios';
+import type { AxiosRequestConfigDefaults } from '@serenity-js/rest';
 /**
  * @package
  */
 export declare class UpdateCommandActors implements Cast {
     private readonly cwd;
-    private readonly createAxios;
-    constructor(cwd: Path, createAxios: () => AxiosInstance);
+    private readonly axiosConfigDefaults;
+    constructor(cwd: Path, axiosConfigDefaults: AxiosRequestConfigDefaults);
     prepare(actor: Actor): Actor;
 }
 //# sourceMappingURL=UpdateCommandActors.d.ts.map

package/lib/cli/stage/UpdateCommandActors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateCommandActors.d.ts","sourceRoot":"","sources":["../../../src/cli/stage/UpdateCommandActors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAI3C;;GAEG;AACH,qBAAa,mBAAoB,YAAW,IAAI;IAExC,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,GAAG,EAAE,IAAI,EACT,WAAW,EAAE,MAAM,aAAa;IAIrD,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAO/B"}
+{"version":3,"file":"UpdateCommandActors.d.ts","sourceRoot":"","sources":["../../../src/cli/stage/UpdateCommandActors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAE,0BAA0B,EAAC,MAAM,mBAAmB,CAAC;AAKnE;;GAEG;AACH,qBAAa,mBAAoB,YAAW,IAAI;IAExC,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBADnB,GAAG,EAAE,IAAI,EACT,mBAAmB,EAAE,0BAA0B;IAIpE,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAO/B"}

package/lib/cli/stage/UpdateCommandActors.js

@@ -8,12 +8,12 @@ const screenplay_1 = require("../screenplay");
  * @package
  */
 class UpdateCommandActors {
-    constructor(cwd, createAxios) {
+    constructor(cwd, axiosConfigDefaults) {
         this.cwd = cwd;
-        this.createAxios = createAxios;
+        this.axiosConfigDefaults = axiosConfigDefaults;
     }
     prepare(actor) {
-        return actor.whoCan(rest_1.CallAnApi.using(this.createAxios()), screenplay_1.UseFileSystem.at(this.cwd), core_1.TakeNotes.usingAnEmptyNotepad());
+        return actor.whoCan(rest_1.CallAnApi.using(this.axiosConfigDefaults), screenplay_1.UseFileSystem.at(this.cwd), core_1.TakeNotes.usingAnEmptyNotepad());
     }
 }
 exports.UpdateCommandActors = UpdateCommandActors;

package/lib/cli/stage/UpdateCommandActors.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateCommandActors.js","sourceRoot":"","sources":["../../../src/cli/stage/UpdateCommandActors.ts"],"names":[],"mappings":";;;AACA,4CAA8C;AAE9C,4CAA8C;AAG9C,8CAA8C;AAE9C;;GAEG;AACH,MAAa,mBAAmB;IAC5B,YACqB,GAAS,EACT,WAAgC;QADhC,QAAG,GAAH,GAAG,CAAM;QACT,gBAAW,GAAX,WAAW,CAAqB;IAErD,CAAC;IAED,OAAO,CAAC,KAAY;QAChB,OAAO,KAAK,CAAC,MAAM,CACf,gBAAS,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EACnC,0BAAa,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAC1B,gBAAS,CAAC,mBAAmB,EAAE,CAClC,CAAC;IACN,CAAC;CACJ;AAdD,kDAcC"}
+{"version":3,"file":"UpdateCommandActors.js","sourceRoot":"","sources":["../../../src/cli/stage/UpdateCommandActors.ts"],"names":[],"mappings":";;;AACA,4CAA8C;AAG9C,4CAA8C;AAE9C,8CAA8C;AAE9C;;GAEG;AACH,MAAa,mBAAmB;IAC5B,YACqB,GAAS,EACT,mBAA+C;QAD/C,QAAG,GAAH,GAAG,CAAM;QACT,wBAAmB,GAAnB,mBAAmB,CAA4B;IAEpE,CAAC;IAED,OAAO,CAAC,KAAY;QAChB,OAAO,KAAK,CAAC,MAAM,CACf,gBAAS,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,EACzC,0BAAa,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAC1B,gBAAS,CAAC,mBAAmB,EAAE,CAClC,CAAC;IACN,CAAC;CACJ;AAdD,kDAcC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/serenity-bdd",
-  "version": "3.10.4",
+  "version": "3.11.1",
   "description": "Serenity BDD reporter for Serenity/JS",
   "author": {
     "name": "Jan Molak",
@@ -45,11 +45,11 @@
     "node": "^16.13 || ^18.12 || ^20"
   },
   "dependencies": {
-    "@serenity-js/assertions": "3.10.4",
-    "@serenity-js/core": "3.10.4",
-    "@serenity-js/rest": "3.10.4",
+    "@serenity-js/assertions": "3.11.1",
+    "@serenity-js/core": "3.11.1",
+    "@serenity-js/rest": "3.11.1",
     "ansi-regex": "^5.0.1",
-    "axios": "^1.5.0",
+    "axios": "^1.5.1",
     "chalk": "^4.1.2",
     "find-java-home": "^2.0.0",
     "https-proxy-agent": "^7.0.2",
@@ -61,15 +61,15 @@
   "devDependencies": {
     "@integration/testing-tools": "3.0.0",
     "@types/chai": "^4.3.6",
-    "@types/mocha": "^10.0.1",
+    "@types/mocha": "^10.0.2",
     "@types/progress": "^2.0.5",
     "c8": "8.0.1",
     "if-env": "^1.0.4",
-    "memfs": "^4.4.0",
+    "memfs": "^4.5.0",
     "mocha": "^10.2.0",
     "mocha-multi": "^1.1.7",
     "ts-node": "^10.9.1",
     "typescript": "5.1.6"
   },
-  "gitHead": "28f12bd6029a9a6c1d8e492486138bf0c83916cd"
+  "gitHead": "b3e36f6e42eb2c545afa961946469fb6dd93f4df"
 }

package/src/cli/commands/update.ts

@@ -1,11 +1,12 @@
 import { isTrue } from '@serenity-js/assertions';
 import { actorCalled, Check, configure } from '@serenity-js/core';
 import { Path } from '@serenity-js/core/lib/io';
+import * as https from 'https';
 import { URL } from 'url';
 
 import type { Argv } from '../Argv';
 import { defaults } from '../defaults';
-import { axiosClient, formatError } from '../io';
+import { formatError } from '../io';
 import { Credentials, GAV } from '../model';
 import { Printer } from '../Printer';
 import { DownloadArtifact, FileExists, Notify } from '../screenplay';
@@ -44,12 +45,19 @@ export = {
             printer = new Printer(process.stdout, process.stderr),
             artifactGAV = GAV.fromString(argv.artifact),
             pathToArtifact = new Path(argv.cacheDir).join(artifactGAV.toPath()),
-            repository = new URL(argv.repository);
+            repository = new URL(argv.repository),
+            ignoreSSL = Boolean(argv.ignoreSSL);
 
         configure({
             actors: new UpdateCommandActors(
                 new Path(process.cwd()),
-                () => axiosClient(repository, Boolean(argv.ignoreSSL), process.env, Credentials.fromString(argv.auth)),
+                {
+                    baseURL: repository.toString(),
+                    auth: Credentials.fromString(argv.auth).toJSON() as { username: string, password: string } | undefined,
+                    httpsAgent: ignoreSSL
+                        ? new https.Agent({ rejectUnauthorized: ! ignoreSSL })
+                        : undefined,
+                }
             ),
             crew: [
                 new NotificationReporter(printer),

package/src/cli/io/index.ts

@@ -1,2 +1 @@
-export * from './axiosClient';
 export * from './formatError';

package/src/cli/stage/UpdateCommandActors.ts

@@ -1,8 +1,8 @@
-import type { Actor, Cast} from '@serenity-js/core';
+import type { Actor, Cast } from '@serenity-js/core';
 import { TakeNotes } from '@serenity-js/core';
 import type { Path } from '@serenity-js/core/lib/io';
+import type { AxiosRequestConfigDefaults} from '@serenity-js/rest';
 import { CallAnApi } from '@serenity-js/rest';
-import type { AxiosInstance } from 'axios';
 
 import { UseFileSystem } from '../screenplay';
 
@@ -12,13 +12,13 @@ import { UseFileSystem } from '../screenplay';
 export class UpdateCommandActors implements Cast {
     constructor(
         private readonly cwd: Path,
-        private readonly createAxios: () => AxiosInstance,
+        private readonly axiosConfigDefaults: AxiosRequestConfigDefaults,
     ){
     }
 
     prepare(actor: Actor): Actor {
         return actor.whoCan(
-            CallAnApi.using(this.createAxios()),
+            CallAnApi.using(this.axiosConfigDefaults),
             UseFileSystem.at(this.cwd),
             TakeNotes.usingAnEmptyNotepad(),
         );

package/lib/cli/io/axiosClient.d.ts

@@ -1,20 +0,0 @@
-/// <reference types="node" />
-import type { AxiosInstance } from 'axios';
-import { URL } from 'url';
-import type { Credentials } from '../model';
-/**
- * @package
- */
-export declare function axiosClient(repository: URL, ignoreSsl: boolean, env: {
-    [key: string]: string;
-}, repositoryAuth?: Credentials): AxiosInstance;
-/**
- * @package
- */
-export declare function shouldProxy(url: URL, configuredProxy: EnvVar, configuredNoProxy: EnvVar): boolean;
-type EnvVar = {
-    name?: string;
-    value?: string;
-};
-export {};
-//# sourceMappingURL=axiosClient.d.ts.map

package/lib/cli/io/axiosClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"axiosClient.d.ts","sourceRoot":"","sources":["../../../src/cli/io/axiosClient.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,aAAa,EAAwC,MAAM,OAAO,CAAC;AAKjF,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C;;GAEG;AACH,wBAAgB,WAAW,CACvB,UAAU,EAAE,GAAG,EACf,SAAS,EAAE,OAAO,EAClB,GAAG,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC9B,cAAc,CAAC,EAAE,WAAW,GAC7B,aAAa,CAmCf;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAuBjG;AA8DD,KAAK,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/lib/cli/io/axiosClient.js

@@ -1,153 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldProxy = exports.axiosClient = void 0;
-const core_1 = require("@serenity-js/core");
-const axios_1 = __importDefault(require("axios"));
-const fs = __importStar(require("fs"));
-const https = __importStar(require("https"));
-const https_proxy_agent_1 = require("https-proxy-agent");
-const url_1 = require("url");
-/**
- * @package
- */
-function axiosClient(repository, ignoreSsl, env, repositoryAuth) {
-    const configuredProxy = isHttps(repository.protocol)
-        ? firstNonEmpty(env, 'npm_config_https_proxy', 'https_proxy', 'HTTPS_PROXY')
-        : firstNonEmpty(env, 'npm_config_proxy', 'npm_config_http_proxy', 'http_proxy', 'HTTP_PROXY');
-    const configuredNoProxy = firstNonEmpty(env, 'npm_config_noproxy', 'no_proxy', 'NO_PROXY');
-    const configuredCa = certificationAuthority(env);
-    const rejectUnauthorized = shouldRejectUnauthorizedCertificates(env, ignoreSsl);
-    const options = {
-        baseURL: repository.toString(),
-        adapter: ['http'],
-        auth: repositoryAuth.toJSON(),
-    };
-    if (isHttps(repository.protocol)) {
-        options.proxy = false;
-        options.httpsAgent = shouldProxy(repository, configuredProxy, configuredNoProxy)
-            ? proxiedHttpsAgent(configuredProxy.value, configuredCa, rejectUnauthorized)
-            : httpsAgent(configuredCa, rejectUnauthorized);
-    }
-    else {
-        options.proxy = shouldProxy(repository, configuredProxy, configuredNoProxy)
-            ? proxyConfigFrom(configuredProxy)
-            : undefined;
-    }
-    if (env.npm_config_user_agent) {
-        options.headers = { 'User-Agent': env.npm_config_user_agent };
-    }
-    return axios_1.default.create(options);
-}
-exports.axiosClient = axiosClient;
-/**
- * @package
- */
-function shouldProxy(url, configuredProxy, configuredNoProxy) {
-    // there's no proxy configured so don't proxy...
-    if (!configuredProxy.value) {
-        return false;
-    }
-    const noProxyDomains = (configuredNoProxy.value || '').split(',').map(_ => _.trim());
-    return !noProxyDomains.some(noProxyDomain => {
-        if (!noProxyDomain) {
-            return false;
-        }
-        if (noProxyDomain === '*') {
-            return true;
-        }
-        if (noProxyDomain[0] === '.' && url.hostname.slice(url.hostname.length - noProxyDomain.length) === noProxyDomain) {
-            return true;
-        }
-        return url.hostname === noProxyDomain;
-    });
-}
-exports.shouldProxy = shouldProxy;
-function proxyConfigFrom(proxyUrl) {
-    let parsed;
-    try {
-        parsed = new url_1.URL(proxyUrl.value);
-    }
-    catch (error) {
-        throw new core_1.ConfigurationError(`Env variable ${proxyUrl.name}=${proxyUrl.value} should specify a valid URL`, error);
-    }
-    if (!isSupportedProtocol(parsed.protocol)) {
-        throw new core_1.ConfigurationError(`Env variable ${proxyUrl.name}=${proxyUrl.value} should specify protocol to be used, i.e. http:// or https://`);
-    }
-    return {
-        protocol: parsed.protocol,
-        host: parsed.hostname,
-        port: parsed.port
-            ? Number.parseInt(parsed.port, 10)
-            : (isHttps(parsed.protocol) ? 443 : 80),
-        auth: (parsed.password || parsed.username) ? {
-            password: parsed.password,
-            username: parsed.username,
-        } : undefined,
-    };
-}
-function shouldRejectUnauthorizedCertificates(env, ignoreSsl) {
-    return !ignoreSsl
-        || env.npm_config_strict_ssl === 'true';
-}
-function proxiedHttpsAgent(configuredProxy, ca, rejectUnauthorized) {
-    return new https_proxy_agent_1.HttpsProxyAgent(configuredProxy, { ca, rejectUnauthorized });
-}
-function httpsAgent(ca, rejectUnauthorized) {
-    return new https.Agent({ ca, rejectUnauthorized, });
-}
-function certificationAuthority(env) {
-    // old school, the value is specified in the env var itself
-    if (env.npm_config_ca) {
-        return env.npm_config_ca;
-    }
-    if (env.npm_config_cafile) {
-        try {
-            return fs.readFileSync(env.npm_config_cafile, { encoding: 'utf8' });
-        }
-        catch (error) {
-            throw new core_1.ConfigurationError(`Could not read npm_config_cafile at ${env.npm_config_cafile}`, error);
-        }
-    }
-    return undefined;
-}
-function firstNonEmpty(env, ...candidateVariables) {
-    const found = candidateVariables.find(value => !!env[value]);
-    return found
-        ? { name: found, value: env[found] }
-        : {};
-}
-function isSupportedProtocol(protocol) {
-    return ['http:', 'https:', 'socks4:', 'socks5:']
-        .find(supported => supported === protocol);
-}
-function isHttps(urlOrProtocol) {
-    return urlOrProtocol
-        && urlOrProtocol.startsWith('https:');
-}
-//# sourceMappingURL=axiosClient.js.map

package/lib/cli/io/axiosClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"axiosClient.js","sourceRoot":"","sources":["../../../src/cli/io/axiosClient.ts"],"names":[],"mappings":"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"}

package/src/cli/io/axiosClient.ts

@@ -1,162 +0,0 @@
-import { ConfigurationError } from '@serenity-js/core';
-import type { AxiosInstance, AxiosProxyConfig, AxiosRequestConfig } from 'axios';
-import axios from 'axios';
-import * as fs from 'fs';
-import * as https from 'https';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-import { URL } from 'url';
-
-import type { Credentials } from '../model';
-
-/**
- * @package
- */
-export function axiosClient(
-    repository: URL,
-    ignoreSsl: boolean,
-    env: { [key: string]: string },
-    repositoryAuth?: Credentials
-): AxiosInstance {
-
-    const configuredProxy = isHttps(repository.protocol)
-        ? firstNonEmpty(env, 'npm_config_https_proxy', 'https_proxy', 'HTTPS_PROXY')
-        : firstNonEmpty(env, 'npm_config_proxy', 'npm_config_http_proxy', 'http_proxy', 'HTTP_PROXY');
-
-    const configuredNoProxy = firstNonEmpty(env, 'npm_config_noproxy', 'no_proxy', 'NO_PROXY');
-
-    const configuredCa = certificationAuthority(env);
-
-    const rejectUnauthorized = shouldRejectUnauthorizedCertificates(env, ignoreSsl);
-
-    const options: AxiosRequestConfig = {
-        baseURL:    repository.toString(),
-        adapter:    [ 'http' ],
-        auth:       repositoryAuth.toJSON() as { username: string, password: string },
-    };
-
-    if (isHttps(repository.protocol)) {
-        options.proxy = false;
-        options.httpsAgent = shouldProxy(repository, configuredProxy, configuredNoProxy)
-            ? proxiedHttpsAgent(configuredProxy.value, configuredCa, rejectUnauthorized)
-            : httpsAgent(configuredCa, rejectUnauthorized);
-    }
-    else {
-        options.proxy = shouldProxy(repository, configuredProxy, configuredNoProxy)
-            ? proxyConfigFrom(configuredProxy)
-            : undefined;
-    }
-
-    if (env.npm_config_user_agent) {
-        options.headers = { 'User-Agent': env.npm_config_user_agent };
-    }
-
-    return axios.create(options);
-}
-
-/**
- * @package
- */
-export function shouldProxy(url: URL, configuredProxy: EnvVar, configuredNoProxy: EnvVar): boolean {
-    // there's no proxy configured so don't proxy...
-    if (! configuredProxy.value) {
-        return false;
-    }
-
-    const noProxyDomains = (configuredNoProxy.value || '').split(',').map(_ => _.trim());
-
-    return ! noProxyDomains.some(noProxyDomain => {
-        if (! noProxyDomain) {
-            return false;
-        }
-
-        if (noProxyDomain === '*') {
-            return true;
-        }
-
-        if (noProxyDomain[0] === '.' && url.hostname.slice(url.hostname.length - noProxyDomain.length) === noProxyDomain) {
-            return true;
-        }
-
-        return url.hostname === noProxyDomain;
-    });
-}
-
-function proxyConfigFrom(proxyUrl: EnvVar): AxiosProxyConfig | undefined {
-
-    let parsed: URL;
-
-    try {
-        parsed = new URL(proxyUrl.value);
-    } catch (error) {
-        throw new ConfigurationError(`Env variable ${ proxyUrl.name }=${ proxyUrl.value } should specify a valid URL`, error);
-    }
-
-    if (! isSupportedProtocol(parsed.protocol)) {
-        throw new ConfigurationError(`Env variable ${ proxyUrl.name }=${ proxyUrl.value } should specify protocol to be used, i.e. http:// or https://`);
-    }
-
-    return {
-        protocol: parsed.protocol,
-        host: parsed.hostname,
-
-        port: parsed.port
-            ? Number.parseInt(parsed.port, 10)
-            : (isHttps(parsed.protocol) ? 443 : 80),
-
-        auth: (parsed.password || parsed.username) ? {
-            password: parsed.password,
-            username: parsed.username,
-        } : undefined,
-    };
-}
-
-function shouldRejectUnauthorizedCertificates(env: { [key: string]: string }, ignoreSsl: boolean): boolean {
-    return ! ignoreSsl
-        || env.npm_config_strict_ssl === 'true'
-}
-
-function proxiedHttpsAgent(configuredProxy: string, ca: string, rejectUnauthorized: boolean) {
-    return new HttpsProxyAgent(configuredProxy, { ca, rejectUnauthorized });
-}
-
-function httpsAgent(ca: string, rejectUnauthorized: boolean): https.Agent {
-    return new https.Agent({ ca, rejectUnauthorized, });
-}
-
-function certificationAuthority(env: { [key: string]: string }): string | undefined {
-
-    // old school, the value is specified in the env var itself
-    if (env.npm_config_ca) {
-        return env.npm_config_ca;
-    }
-
-    if (env.npm_config_cafile) {
-        try {
-            return fs.readFileSync(env.npm_config_cafile, { encoding: 'utf8' });
-        } catch (error) {
-            throw new ConfigurationError(`Could not read npm_config_cafile at ${ env.npm_config_cafile }`, error);
-        }
-    }
-
-    return undefined;
-}
-
-type EnvVar = { name?: string, value?: string };    // eslint-disable-line unicorn/prevent-abbreviations
-
-function firstNonEmpty(env: { [key: string]: string }, ...candidateVariables: string[]): EnvVar {
-    const found = candidateVariables.find(value => !! env[value]);
-
-    return found
-        ? { name: found, value: env[found] }
-        : {};
-}
-
-function isSupportedProtocol(protocol: string) {
-    return [ 'http:', 'https:', 'socks4:', 'socks5:' ]
-        .find(supported => supported === protocol);
-}
-
-function isHttps(urlOrProtocol: string) {
-    return urlOrProtocol
-        && urlOrProtocol.startsWith('https:');
-}