@gatling.io/cli 3.13.103 → 3.13.104-M11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gatling.io/cli",
-  "version": "3.13.103",
+  "version": "3.13.104-M11",
   "license": "Apache-2.0",
   "homepage": "https://gatling.io",
   "repository": "github:gatling/gatling-js",
@@ -25,22 +25,22 @@
   "dependencies": {
     "@jspm/core": "2.1.0",
     "archiver": "7.0.1",
-    "axios": "1.7.7",
+    "node-stream-zip": "1.15.0",
     "commander": "12.1.0",
-    "decompress": "4.2.1",
     "esbuild": "0.24.0",
     "esbuild-plugin-tsc": "0.4.0",
     "import-meta-resolve": "4.1.0",
+    "make-fetch-happen": "14.0.3",
     "readline-sync": "1.4.10"
   },
   "devDependencies": {
     "@types/archiver": "6.0.3",
-    "@types/decompress": "4.2.7",
-    "@types/node": "18.19.64",
+    "@types/make-fetch-happen": "10.0.4",
+    "@types/node": "18.19.67",
     "@types/readline-sync": "1.4.8",
-    "prettier": "3.3.3",
+    "prettier": "3.4.1",
     "rimraf": "6.0.1",
-    "typescript": "5.6.3"
+    "typescript": "5.7.2"
   },
   "scripts": {
     "clean": "rimraf target",

package/target/bundle/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/target/commands/enterpriseDeploy.js

@@ -43,7 +43,7 @@ exports.default = (program) => {
         const nonInteractive = (0, options_1.nonInteractiveOptionValue)(options);
         const packageDescriptorFilename = (0, options_1.packageDescriptorFilenameOptionValue)(options);
         const packageFile = (0, options_1.packageFileOptionValue)(options);
-        const { graalvmHome, jvmClasspath } = await (0, dependencies_1.installGatlingJs)({ gatlingHome });
+        const { graalvmHome, jvmClasspath } = await (0, dependencies_1.resolveBundle)({ gatlingHome });
         await (0, bundle_1.bundle)({ sourcesFolder, bundleFile, postman, typescript, simulations });
         await (0, enterprise_1.enterprisePackage)({ bundleFile, resourcesFolder, packageFile, simulations });
         await (0, enterprise_1.enterpriseDeploy)({

package/target/commands/enterpriseStart.js

@@ -55,7 +55,7 @@ exports.default = (program) => {
         if ((0, options_1.nonInteractiveOptionValue)(options) && enterpriseSimulation === undefined) {
             throw new Error(`No simulation specified when using non-interactive mode`);
         }
-        const { graalvmHome, jvmClasspath } = await (0, dependencies_1.installGatlingJs)({ gatlingHome });
+        const { graalvmHome, jvmClasspath } = await (0, dependencies_1.resolveBundle)({ gatlingHome });
         await (0, bundle_1.bundle)({ sourcesFolder, bundleFile, postman, typescript, simulations });
         await (0, enterprise_1.enterprisePackage)({ bundleFile, resourcesFolder, packageFile, simulations });
         await (0, enterprise_1.enterpriseStart)({

package/target/commands/install.js

@@ -8,11 +8,13 @@ exports.default = (program) => {
         .command("install")
         .description("Install all required components and dependencies for Gatling")
         .addOption(options_1.gatlingHomeOption)
-        .action(async (options) => {
+        .addArgument(options_1.bundleFileArgument)
+        .action(async (bundleFilePath, options) => {
         const gatlingHome = (0, options_1.gatlingHomeOptionValueWithDefaults)(options);
-        const { graalvmHome, coursierBinary, jvmClasspath } = await (0, dependencies_1.installGatlingJs)({ gatlingHome });
+        const { graalvmHome, jvmClasspath } = bundleFilePath !== undefined
+            ? await (0, dependencies_1.installBundleFile)({ gatlingHome, bundleFilePath })
+            : await (0, dependencies_1.resolveBundle)({ gatlingHome });
         log_1.logger.info(`graalvmHome=${graalvmHome}`);
-        log_1.logger.info(`coursierBinary=${coursierBinary}`);
         log_1.logger.info(`jvmClasspath=${jvmClasspath}`);
     });
 };

package/target/commands/options.d.ts

@@ -30,6 +30,7 @@ export declare const postmanOption: Option;
 export declare const postmanOptionValueWithDefaults: (options: any) => string | undefined;
 export declare const runParametersArgument: Argument;
 export declare const parseRunParametersArgument: (args: string[]) => Record<string, string>;
+export declare const bundleFileArgument: Argument;
 export declare const apiUrlOption: Option;
 export declare const apiUrlOptionValue: (options: any) => string;
 export declare const webAppUrlOption: Option;

package/target/commands/options.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForRunEndOptionValue = exports.waitForRunEndOption = exports.runDescriptionOptionValue = exports.runDescriptionOption = exports.runTitleOptionValue = exports.runTitleOption = exports.enterpriseSimulationOptionValue = exports.enterpriseSimulationOption = exports.packageDescriptorFilenameOptionValue = exports.packageDescriptorFilenameOption = exports.controlPlaneUrlOptionValue = exports.controlPlaneUrlOption = exports.apiTokenOptionValue = exports.apiTokenOption = exports.webAppUrlOptionValue = exports.webAppUrlOption = exports.apiUrlOptionValue = exports.apiUrlOption = exports.parseRunParametersArgument = exports.runParametersArgument = exports.postmanOptionValueWithDefaults = exports.postmanOption = exports.nonInteractiveOptionValue = exports.nonInteractiveOption = exports.memoryOptionValue = exports.memoryOption = exports.jvmClasspathMandatoryOptionValue = exports.jvmClasspathMandatoryOption = exports.graalvmHomeMandatoryOptionValue = exports.graalvmHomeMandatoryOption = exports.typescriptOptionValueWithDefaults = exports.typescriptOption = exports.resultsFolderOptionValue = exports.resultsFolderOption = exports.resourcesFolderOptionValue = exports.resourcesFolderOption = exports.packageFileOptionValue = exports.packageFileOption = exports.bundleFileOptionValue = exports.bundleFileOption = exports.simulationMandatoryOptionValue = exports.simulationMandatoryOption = exports.simulationOptionValueWithDefaults = exports.simulationOption = exports.sourcesFolderOptionValue = exports.sourcesFolderOption = exports.gatlingHomeOptionValueWithDefaults = exports.gatlingHomeOption = void 0;
+exports.waitForRunEndOptionValue = exports.waitForRunEndOption = exports.runDescriptionOptionValue = exports.runDescriptionOption = exports.runTitleOptionValue = exports.runTitleOption = exports.enterpriseSimulationOptionValue = exports.enterpriseSimulationOption = exports.packageDescriptorFilenameOptionValue = exports.packageDescriptorFilenameOption = exports.controlPlaneUrlOptionValue = exports.controlPlaneUrlOption = exports.apiTokenOptionValue = exports.apiTokenOption = exports.webAppUrlOptionValue = exports.webAppUrlOption = exports.apiUrlOptionValue = exports.apiUrlOption = exports.bundleFileArgument = exports.parseRunParametersArgument = exports.runParametersArgument = exports.postmanOptionValueWithDefaults = exports.postmanOption = exports.nonInteractiveOptionValue = exports.nonInteractiveOption = exports.memoryOptionValue = exports.memoryOption = exports.jvmClasspathMandatoryOptionValue = exports.jvmClasspathMandatoryOption = exports.graalvmHomeMandatoryOptionValue = exports.graalvmHomeMandatoryOption = exports.typescriptOptionValueWithDefaults = exports.typescriptOption = exports.resultsFolderOptionValue = exports.resultsFolderOption = exports.resourcesFolderOptionValue = exports.resourcesFolderOption = exports.packageFileOptionValue = exports.packageFileOption = exports.bundleFileOptionValue = exports.bundleFileOption = exports.simulationMandatoryOptionValue = exports.simulationMandatoryOption = exports.simulationOptionValueWithDefaults = exports.simulationOption = exports.sourcesFolderOptionValue = exports.sourcesFolderOption = exports.gatlingHomeOptionValueWithDefaults = exports.gatlingHomeOption = void 0;
 const commander_1 = require("commander");
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
@@ -55,7 +55,7 @@ const getNumberValueOptional = (option) => (options) => {
         throw Error(`Expected type number|undefined for attribute ${option.attributeName()}, got ${typeof value} - please report this as a bug.`);
     }
 };
-exports.gatlingHomeOption = new commander_1.Option("--gatling-home <value>", 'The folder used to download and install Gatling components (default: "~/.gatling")');
+exports.gatlingHomeOption = new commander_1.Option("--gatling-home <value>", 'The folder used to download and install Gatling components (default: "<user home>/.gatling")');
 const gatlingHomeOptionValueWithDefaults = (options) => getStringValueOptional(exports.gatlingHomeOption)(options) || `${os_1.default.homedir()}/.gatling`;
 exports.gatlingHomeOptionValueWithDefaults = gatlingHomeOptionValueWithDefaults;
 exports.sourcesFolderOption = new commander_1.Option("--sources-folder <value>", "The sources folder path").default("src");
@@ -187,6 +187,7 @@ const parseRunParametersArgument = (args) => {
     return parsedParameters;
 };
 exports.parseRunParametersArgument = parseRunParametersArgument;
+exports.bundleFileArgument = new commander_1.Argument("[bundleFile]", "Specify the path to a Gatling JS bundle file to install; if not specified, bundle will be downloaded automatically");
 exports.apiUrlOption = new commander_1.Option("--apiUrl <value>", "URL of the Gatling Enterprise API")
     .default("https://api.gatling.io")
     .hideHelp();

package/target/commands/recorder.js

@@ -19,9 +19,8 @@ exports.default = (program) => {
         const resourcesFolder = (0, options_1.resourcesFolderOptionValue)(options);
         const simulations = await (0, simulations_1.findSimulations)(sourcesFolder);
         const typescript = (0, options_1.typescriptOptionValueWithDefaults)(options, simulations);
-        const { graalvmHome, coursierBinary, jvmClasspath } = await (0, dependencies_1.installRecorder)({ gatlingHome });
+        const { graalvmHome, jvmClasspath } = await (0, dependencies_1.resolveBundle)({ gatlingHome });
         log_1.logger.debug(`graalvmHome=${graalvmHome}`);
-        log_1.logger.debug(`coursierBinary=${coursierBinary}`);
         log_1.logger.debug(`jvmClasspath=${jvmClasspath}`);
         await (0, run_1.runRecorder)({ graalvmHome, jvmClasspath, sourcesFolder, typescript, resourcesFolder });
     });

package/target/commands/run.js

@@ -34,9 +34,8 @@ exports.default = (program) => {
         const simulations = await (0, simulations_1.findSimulations)(sourcesFolder);
         const typescript = (0, options_1.typescriptOptionValueWithDefaults)(options, simulations);
         const simulation = (0, options_1.simulationOptionValueWithDefaults)(options, simulations, !nonInteractive);
-        const { graalvmHome, coursierBinary, jvmClasspath } = await (0, dependencies_1.installGatlingJs)({ gatlingHome, postman });
+        const { graalvmHome, jvmClasspath } = await (0, dependencies_1.resolveBundle)({ gatlingHome });
         log_1.logger.debug(`graalvmHome=${graalvmHome}`);
-        log_1.logger.debug(`coursierBinary=${coursierBinary}`);
         log_1.logger.debug(`jvmClasspath=${jvmClasspath}`);
         await (0, bundle_1.bundle)({ sourcesFolder, bundleFile, postman, typescript, simulations });
         await (0, run_1.runSimulation)({

package/target/dependencies/download.js

@@ -4,13 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadFile = void 0;
-const axios_1 = __importDefault(require("axios"));
+const make_fetch_happen_1 = __importDefault(require("make-fetch-happen"));
 const fs_1 = __importDefault(require("fs"));
-const stream_1 = __importDefault(require("stream"));
 const util_1 = __importDefault(require("util"));
+const stream_1 = __importDefault(require("stream"));
 const pipeline = util_1.default.promisify(stream_1.default.pipeline);
+const NPM_CONFIG_PROXY_KEY = "npm_config_proxy";
+const NPM_CONFIG_HTTPS_PROXY_KEY = "npm_config_https_proxy";
+const NPM_CONFIG_NOPROXY_KEY = "npm_config_noproxy";
+const fetchOptionsFromNpmConfiguration = () => {
+    const proxy = process.env[NPM_CONFIG_HTTPS_PROXY_KEY] || process.env[NPM_CONFIG_PROXY_KEY] || undefined;
+    const noProxy = process.env[NPM_CONFIG_NOPROXY_KEY] || undefined;
+    return {
+        proxy,
+        noProxy
+    };
+};
 const downloadFile = async (url, targetFile) => {
-    const request = await axios_1.default.get(url, { responseType: "stream" });
-    await pipeline(request.data, fs_1.default.createWriteStream(targetFile));
+    const options = fetchOptionsFromNpmConfiguration();
+    const response = await (0, make_fetch_happen_1.default)(url, options);
+    if (!response.ok) {
+        throw new Error(`Failed to fetch: ${response.status} ${response.statusText}`);
+    }
+    await pipeline(response.body, fs_1.default.createWriteStream(targetFile));
 };
 exports.downloadFile = downloadFile;

package/target/dependencies/index.d.ts

@@ -1,12 +1,13 @@
 export { versions } from "./versions";
-export interface DependenciesOptions {
+export interface BundleOptions {
     gatlingHome: string;
-    postman?: string;
 }
-export interface ResolvedDependencies {
+export interface BundleInstallOptions extends BundleOptions {
+    bundleFilePath: string;
+}
+export interface ResolvedBundle {
     graalvmHome: string;
-    coursierBinary: string;
     jvmClasspath: string;
 }
-export declare const installGatlingJs: (options: DependenciesOptions) => Promise<ResolvedDependencies>;
-export declare const installRecorder: (options: DependenciesOptions) => Promise<ResolvedDependencies>;
+export declare const installBundleFile: (options: BundleInstallOptions) => Promise<ResolvedBundle>;
+export declare const resolveBundle: (options: BundleOptions) => Promise<ResolvedBundle>;

package/target/dependencies/index.js

@@ -1,37 +1,145 @@
 "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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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.installRecorder = exports.installGatlingJs = exports.versions = void 0;
-const promises_1 = __importDefault(require("fs/promises"));
-const coursier_1 = require("./coursier");
-const graalVm_1 = require("./graalVm");
-var versions_1 = require("./versions");
-Object.defineProperty(exports, "versions", { enumerable: true, get: function () { return versions_1.versions; } });
-const installGatlingJs = async (options) => {
-    const downloadDir = `${options.gatlingHome}/tmp/download`;
-    await promises_1.default.mkdir(downloadDir, { recursive: true });
-    const graalvmHomePath = await (0, graalVm_1.installGraalVm)(options.gatlingHome, downloadDir);
-    const coursierPath = await (0, coursier_1.installCoursier)(options.gatlingHome, downloadDir);
-    const classpath = await (0, coursier_1.resolveGatlingJsDependencies)(coursierPath, graalvmHomePath, options.postman);
-    return {
-        graalvmHome: graalvmHomePath,
-        coursierBinary: coursierPath,
-        jvmClasspath: classpath.trim()
-    };
+exports.resolveBundle = exports.installBundleFile = exports.versions = void 0;
+const fsSync = __importStar(require("node:fs"));
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_stream_zip_1 = __importDefault(require("node-stream-zip"));
+const download_1 = require("./download");
+const log_1 = require("../log");
+const os_1 = require("./os");
+const versions_1 = require("./versions");
+var versions_2 = require("./versions");
+Object.defineProperty(exports, "versions", { enumerable: true, get: function () { return versions_2.versions; } });
+const installBundleFile = async (options) => {
+    log_1.logger.info(`bundleFilePath: ${options.bundleFilePath}`);
+    const zip = new node_stream_zip_1.default.async({ file: options.bundleFilePath });
+    const metadata = await zip.entryData(metadataFileName);
+    const { version } = JSON.parse(metadata.toString("utf-8"));
+    if (version === versions_1.versions.gatling.jsAdapter) {
+        log_1.logger.info(`Installing dependencies bundle for Gatling JS ${version}, which is the current version`);
+    }
+    else {
+        log_1.logger.info(`Installing dependencies bundle for Gatling JS ${version}, which is not the current version (${versions_1.versions.gatling.jsAdapter})`);
+    }
+    const bundlePath = getBundlePath(options, version);
+    if (await canReadPath(bundlePath)) {
+        throw Error(`Directory ${bundlePath} already exists`);
+    }
+    await promises_1.default.mkdir(bundlePath, { recursive: true });
+    await zip.extract(null, bundlePath);
+    if (os_1.osType !== "Windows_NT") {
+        const graalVmBinDir = node_path_1.default.join(bundlePath, "graalvm", "bin");
+        const binFiles = await promises_1.default.readdir(graalVmBinDir);
+        for (const binFile of binFiles) {
+            await promises_1.default.chmod(node_path_1.default.join(graalVmBinDir, binFile), 0o744); // chmod +x
+        }
+    }
+    log_1.logger.info(`Gatling JS dependencies bundle installed in ${bundlePath}`);
+    return getResolvedBundle(bundlePath);
 };
-exports.installGatlingJs = installGatlingJs;
-const installRecorder = async (options) => {
-    const downloadDir = `${options.gatlingHome}/tmp/download`;
-    await promises_1.default.mkdir(downloadDir, { recursive: true });
-    const graalvmHomePath = await (0, graalVm_1.installGraalVm)(options.gatlingHome, downloadDir);
-    const coursierPath = await (0, coursier_1.installCoursier)(options.gatlingHome, downloadDir);
-    const classpath = await (0, coursier_1.resolveRecorderDependencies)(coursierPath, graalvmHomePath);
-    return {
-        graalvmHome: graalvmHomePath,
-        coursierBinary: coursierPath,
-        jvmClasspath: classpath.trim()
-    };
+exports.installBundleFile = installBundleFile;
+const resolveBundle = async (options) => {
+    const bundlePath = getBundlePath(options, versions_1.versions.gatling.jsAdapter);
+    if (await canReadPath(bundlePath)) {
+        // Basic check of the installed bundle we found
+        const bundleMetadataPath = node_path_1.default.join(bundlePath, metadataFileName);
+        let version = "";
+        try {
+            const f = await promises_1.default.readFile(bundleMetadataPath, { encoding: "utf-8" });
+            const metadata = JSON.parse(f);
+            version = metadata.version;
+        }
+        catch { }
+        if (version !== versions_1.versions.gatling.jsAdapter) {
+            throw Error(`Inconsistent bundle content found at ${bundlePath}`);
+        }
+        return getResolvedBundle(bundlePath);
+    }
+    else {
+        return await downloadAndInstallBundle(options);
+    }
+};
+exports.resolveBundle = resolveBundle;
+const getBundlePath = (options, version) => node_path_1.default.join(options.gatlingHome, "gatling-js-bundle", version);
+const metadataFileName = "gatling-bundle.json";
+const canReadPath = async (path) => {
+    try {
+        await promises_1.default.access(path, promises_1.default.constants.R_OK);
+        return true;
+    }
+    catch (e) {
+        if (e.code === "ENOENT") {
+            return false;
+        }
+        else {
+            throw e;
+        }
+    }
+};
+const getResolvedBundle = (bundlePath) => ({
+    graalvmHome: node_path_1.default.join(bundlePath, "graalvm"),
+    jvmClasspath: node_path_1.default.join(bundlePath, "lib", "java", "*")
+});
+const downloadAndInstallBundle = async (options) => {
+    const tmpFolder = node_path_1.default.join(options.gatlingHome, "tmp");
+    if (!fsSync.existsSync(tmpFolder)) {
+        await promises_1.default.mkdir(tmpFolder);
+    }
+    const tmpFile = node_path_1.default.join(tmpFolder, "bundle-download.zip");
+    if (fsSync.existsSync(tmpFile)) {
+        await promises_1.default.rm(tmpFile);
+    }
+    const version = versions_1.versions.gatling.jsAdapter;
+    const url = `https://github.com/gatling/gatling-js/releases/download/v${version}/gatling-js-bundle-${version}-${os_1.osType}-${os_1.osArch}.zip`;
+    try {
+        log_1.logger.info(`Downloading bundle file from ${url} to temporary file ${tmpFile}`);
+        await (0, download_1.downloadFile)(url, tmpFile);
+        const resolvedBundle = await (0, exports.installBundleFile)({ ...options, bundleFilePath: tmpFile });
+        log_1.logger.info(`Deleting temporary file ${tmpFile}`);
+        await promises_1.default.rm(tmpFile);
+        return resolvedBundle;
+    }
+    catch (e) {
+        log_1.logger.error(`Failed to automatically download and install the Gatling dependency bundle. You can try to:
+1. Make sure you have access to https://github.com/gatling/gatling-js/releases/; and if you connect to the Internet through a proxy, make sure it is configured in your NPM configuration file (.npmrc).
+2. Alternatively, you can try manually downloading the file from ${url}, and install it with the command 'npx gatling install <path-to-downloaded-file.zip>'.`);
+        throw e;
+    }
 };
-exports.installRecorder = installRecorder;

package/target/dependencies/versions.d.ts

@@ -6,7 +6,6 @@ export declare const versions: {
     java: {
         compilerRelease: string;
     };
-    coursier: string;
     gatling: {
         core: string;
         enterprisePluginCommons: string;

package/target/dependencies/versions.js

@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.versions = void 0;
 exports.versions = {
     graalvm: {
-        jdk: "23.0.0",
+        jdk: "23.0.1",
         js: "24.1.1"
     },
     java: {
         compilerRelease: "21"
     },
-    coursier: "2.1.12",
     gatling: {
         core: "3.13.1",
-        enterprisePluginCommons: "1.9.8",
-        jsAdapter: "3.13.103"
+        enterprisePluginCommons: "1.11.0",
+        jsAdapter: "3.13.104-M11"
     }
 };

package/src/bundle/index.ts

@@ -1,43 +0,0 @@
-import * as esbuild from "esbuild";
-import esbuildPluginTsc from "esbuild-plugin-tsc";
-
-import { polyfill } from "./polyfill";
-import { SimulationFile } from "../simulations";
-import { logger } from "../log";
-
-export interface BundleOptions {
-  sourcesFolder: string;
-  bundleFile: string;
-  postman?: string;
-  typescript: boolean;
-  simulations: SimulationFile[];
-}
-
-export const bundle = async (options: BundleOptions): Promise<void> => {
-  logger.info(`Bundling a Gatling simulation with options:
- - sourcesFolder: ${options.sourcesFolder}
- - bundleFile: ${options.bundleFile}
- - typescript: ${options.typescript}`);
-
-  const contents = options.simulations.map((s) => `export { default as "${s.name}" } from "./${s.path}";`).join("\n");
-
-  const plugins = options.typescript ? [esbuildPluginTsc({ force: true })] : [];
-  if (options.postman !== undefined) {
-    plugins.push(polyfill());
-  }
-  await esbuild.build({
-    stdin: {
-      contents,
-      resolveDir: options.sourcesFolder
-    },
-    outfile: options.bundleFile,
-    platform: "neutral",
-    mainFields: ["main", "module"],
-    bundle: true,
-    minify: false,
-    sourcemap: true,
-    format: "iife",
-    globalName: "gatling",
-    plugins
-  });
-};

package/src/bundle/polyfill.ts

@@ -1,91 +0,0 @@
-import type { Plugin } from "esbuild";
-import { fileURLToPath, pathToFileURL } from "url";
-import { resolve, dirname } from "path";
-
-// This is largely inspired by https://github.com/cyco130/esbuild-plugin-polyfill-node
-
-export const polyfill = (): Plugin => ({
-  name: "gatling-js-polyfill",
-  setup: async (build) => {
-    // modules
-    const jspmResolved = await resolveImport(`@jspm/core/nodelibs/fs`);
-    build.onResolve({ filter: polyfillsFilter }, async ({ path }) => {
-      const [, , moduleName] = path.match(polyfillsFilter)!;
-      const resolved = customPolyfills.find((name) => name === moduleName)
-        ? resolve(dirname(__filename), `../../polyfills/${moduleName}.js`)
-        : resolve(jspmResolved, `../../browser/${moduleName}.js`);
-      return { path: resolved };
-    });
-
-    // Globals
-    build.initialOptions.inject = build.initialOptions.inject || [];
-    const injectGlobal = (name: string) =>
-      (build.initialOptions.inject as string[]).push(resolve(dirname(__filename), `../../polyfills/${name}.js`));
-    injectGlobal("global");
-  }
-});
-
-const customPolyfills = ["crypto"];
-
-const jspmPolyfills = ["buffer", "path", "string_decoder"];
-
-// Other available jspm-core modules:
-// "_stream_duplex"
-// "_stream_passthrough"
-// "_stream_readable"
-// "_stream_transform"
-// "_stream_writable"
-// "assert"
-// "assert/strict"
-// "async_hooks"
-// "child_process"
-// "cluster"
-// "console"
-// "constants"
-// "crypto"
-// "dgram"
-// "diagnostics_channel"
-// "dns"
-// "domain"
-// "events"
-// "fs"
-// "fs/promises"
-// "http"
-// "http2"
-// "https"
-// "module"
-// "net"
-// "os"
-// "perf_hooks"
-// "process"
-// "punycode"
-// "querystring"
-// "readline"
-// "repl"
-// "stream"
-// "sys"
-// "timers"
-// "timers/promises"
-// "tls"
-// "tty"
-// "url"
-// "util"
-// "v8"
-// "vm"
-// "wasi"
-// "worker_threads"
-// "zlib"
-
-const polyfillsFilter = new RegExp(`^(node:)?(${jspmPolyfills.concat(customPolyfills).join("|")})$`);
-
-let importMetaResolve: (specifier: string, parent: string) => string;
-
-const importMetaUrl = pathToFileURL(__filename).href;
-
-const resolveImport = async (specifier: string) => {
-  if (!importMetaResolve) {
-    importMetaResolve = (await import("import-meta-resolve")).resolve;
-  }
-  const resolved = importMetaResolve(specifier, importMetaUrl);
-  return fileURLToPath(resolved);
-};

package/src/commands/build.ts

@@ -1,34 +0,0 @@
-import { Command } from "commander";
-
-import {
-  bundleFileOption,
-  bundleFileOptionValue,
-  postmanOption,
-  postmanOptionValueWithDefaults,
-  sourcesFolderOption,
-  sourcesFolderOptionValue,
-  typescriptOption,
-  typescriptOptionValueWithDefaults
-} from "./options";
-import { findSimulations } from "../simulations";
-import { bundle } from "../bundle";
-
-export default (program: Command): void => {
-  program
-    .command("build")
-    .description("Build Gatling simulations")
-    .addOption(sourcesFolderOption)
-    .addOption(bundleFileOption)
-    .addOption(postmanOption)
-    .addOption(typescriptOption)
-    .action(async (options) => {
-      const sourcesFolder: string = sourcesFolderOptionValue(options);
-      const bundleFile = bundleFileOptionValue(options);
-
-      const simulations = await findSimulations(sourcesFolder);
-      const postman = postmanOptionValueWithDefaults(options);
-      const typescript = typescriptOptionValueWithDefaults(options, simulations);
-
-      await bundle({ sourcesFolder, bundleFile, postman, typescript, simulations });
-    });
-};