@gatling.io/cli 3.13.402 → 3.13.501

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gatling.io/cli",
-  "version": "3.13.402",
+  "version": "3.13.501",
   "license": "Apache-2.0",
   "homepage": "https://gatling.io",
   "repository": "github:gatling/gatling-js",
@@ -27,8 +27,8 @@
     "archiver": "7.0.1",
     "node-stream-zip": "1.15.0",
     "commander": "13.1.0",
-    "esbuild": "0.25.0",
-    "esbuild-plugin-tsc": "0.4.0",
+    "esbuild": "0.25.1",
+    "esbuild-plugin-tsc": "0.5.0",
     "import-meta-resolve": "4.1.0",
     "make-fetch-happen": "14.0.3",
     "readline-sync": "1.4.10"
@@ -36,11 +36,11 @@
   "devDependencies": {
     "@types/archiver": "6.0.3",
     "@types/make-fetch-happen": "10.0.4",
-    "@types/node": "18.19.76",
+    "@types/node": "18.19.80",
     "@types/readline-sync": "1.4.8",
-    "prettier": "3.5.2",
+    "prettier": "3.5.3",
     "rimraf": "6.0.1",
-    "typescript": "5.7.3"
+    "typescript": "5.8.2"
   },
   "scripts": {
     "clean": "rimraf target",

package/target/commands/enterpriseDeploy.js

@@ -22,6 +22,8 @@ exports.default = (program) => {
         .addOption(options_1.apiTokenOption)
         // Plugin configuration
         .addOption(options_1.controlPlaneUrlOption)
+        .addOption(options_1.trustStoreOption)
+        .addOption(options_1.trustStorePasswordOption)
         .addOption(options_1.nonInteractiveOption)
         // Descriptor file
         .addOption(options_1.packageDescriptorFilenameOption)
@@ -40,6 +42,8 @@ exports.default = (program) => {
         const webAppUrl = (0, options_1.webAppUrlOptionValue)(options);
         const apiToken = (0, options_1.apiTokenOptionValue)(options);
         const controlPlaneUrl = (0, options_1.controlPlaneUrlOptionValue)(options);
+        const trustStore = (0, options_1.trustStoreOptionValue)(options);
+        const trustStorePassword = (0, options_1.trustStorePasswordOptionValue)(options);
         const nonInteractive = (0, options_1.nonInteractiveOptionValue)(options);
         const packageDescriptorFilename = (0, options_1.packageDescriptorFilenameOptionValue)(options);
         const packageFile = (0, options_1.packageFileOptionValue)(options);
@@ -56,6 +60,8 @@ exports.default = (program) => {
             webAppUrl,
             apiToken,
             controlPlaneUrl,
+            trustStore,
+            trustStorePassword,
             nonInteractive,
             packageDescriptorFilename,
             packageFile

package/target/commands/enterpriseStart.js

@@ -22,6 +22,8 @@ exports.default = (program) => {
         .addOption(options_1.apiTokenOption)
         // Plugin configuration
         .addOption(options_1.controlPlaneUrlOption)
+        .addOption(options_1.trustStoreOption)
+        .addOption(options_1.trustStorePasswordOption)
         .addOption(options_1.nonInteractiveOption)
         // Descriptor file
         .addOption(options_1.packageDescriptorFilenameOption)
@@ -45,6 +47,8 @@ exports.default = (program) => {
         const webAppUrl = (0, options_1.webAppUrlOptionValue)(options);
         const apiToken = (0, options_1.apiTokenOptionValue)(options);
         const controlPlaneUrl = (0, options_1.controlPlaneUrlOptionValue)(options);
+        const trustStore = (0, options_1.trustStoreOptionValue)(options);
+        const trustStorePassword = (0, options_1.trustStorePasswordOptionValue)(options);
         const nonInteractive = (0, options_1.nonInteractiveOptionValue)(options);
         const packageDescriptorFilename = (0, options_1.packageDescriptorFilenameOptionValue)(options);
         const packageFile = (0, options_1.packageFileOptionValue)(options);
@@ -68,6 +72,8 @@ exports.default = (program) => {
             webAppUrl,
             apiToken,
             controlPlaneUrl,
+            trustStore,
+            trustStorePassword,
             nonInteractive,
             packageDescriptorFilename,
             packageFile,

package/target/commands/options.d.ts

@@ -39,6 +39,10 @@ export declare const apiTokenOption: Option;
 export declare const apiTokenOptionValue: (options: any) => string | undefined;
 export declare const controlPlaneUrlOption: Option;
 export declare const controlPlaneUrlOptionValue: (options: any) => string | undefined;
+export declare const trustStoreOption: Option;
+export declare const trustStoreOptionValue: (options: any) => string | undefined;
+export declare const trustStorePasswordOption: Option;
+export declare const trustStorePasswordOptionValue: (options: any) => string | undefined;
 export declare const packageDescriptorFilenameOption: Option;
 export declare const packageDescriptorFilenameOptionValue: (options: any) => string;
 export declare const enterpriseSimulationOption: Option;

package/target/commands/options.js

@@ -3,7 +3,8 @@ 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.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;
+exports.runDescriptionOption = exports.runTitleOptionValue = exports.runTitleOption = exports.enterpriseSimulationOptionValue = exports.enterpriseSimulationOption = exports.packageDescriptorFilenameOptionValue = exports.packageDescriptorFilenameOption = exports.trustStorePasswordOptionValue = exports.trustStorePasswordOption = exports.trustStoreOptionValue = exports.trustStoreOption = 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;
+exports.waitForRunEndOptionValue = exports.waitForRunEndOption = exports.runDescriptionOptionValue = void 0;
 const commander_1 = require("commander");
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
@@ -201,6 +202,10 @@ exports.apiTokenOptionValue = getStringValueOptional(exports.apiTokenOption);
 // Plugin configuration
 exports.controlPlaneUrlOption = new commander_1.Option("--control-plane-url <value>", "URL of a control plane for Gatling Enterprise providing a private repository. If this parameter is provided, packages will be registered as private packages and uploaded through this private control plane.");
 exports.controlPlaneUrlOptionValue = getStringValueOptional(exports.controlPlaneUrlOption);
+exports.trustStoreOption = new commander_1.Option("--trust-store <value>", `Path to a trust store (in PKCS#12 or JKS format) used when calling remote APIs over HTTPS. Useful with the ${exports.controlPlaneUrlOption.long} option, if your control plane uses a certificate signed by an internal CA.`);
+exports.trustStoreOptionValue = getStringValueOptional(exports.trustStoreOption);
+exports.trustStorePasswordOption = new commander_1.Option("--trust-store-password <value>", `Use with the ${exports.trustStoreOption.long} option, if your trust store is protected by a password.`);
+exports.trustStorePasswordOptionValue = getStringValueOptional(exports.trustStorePasswordOption);
 // Descriptor file
 exports.packageDescriptorFilenameOption = new commander_1.Option("--package-descriptor-filename <value>", "Path to a package descriptor inside the .gatling folder").default("package.conf");
 exports.packageDescriptorFilenameOptionValue = getStringValueMandatory(exports.packageDescriptorFilenameOption);

package/target/dependencies/download.js

@@ -8,18 +8,12 @@ const make_fetch_happen_1 = __importDefault(require("make-fetch-happen"));
 const fs_1 = __importDefault(require("fs"));
 const util_1 = __importDefault(require("util"));
 const stream_1 = __importDefault(require("stream"));
+const proxy_1 = require("../proxy");
 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 fetchOptionsFromNpmConfiguration = () => ({
+    proxy: proxy_1.proxyConfiguration.httpsProxyUrl || proxy_1.proxyConfiguration.proxyUrl,
+    noProxy: proxy_1.proxyConfiguration.noProxyHosts
+});
 const downloadFile = async (url, targetFile) => {
     const options = fetchOptionsFromNpmConfiguration();
     const response = await (0, make_fetch_happen_1.default)(url, options);

package/target/dependencies/versions.js

@@ -4,14 +4,14 @@ exports.versions = void 0;
 exports.versions = {
     graalvm: {
         jdk: "23.0.2",
-        js: "24.1.2"
+        js: "24.2.0"
     },
     java: {
         compilerRelease: "21"
     },
     gatling: {
-        core: "3.13.4",
-        enterprisePluginCommons: "1.15.2",
-        jsAdapter: "3.13.402"
+        core: "3.13.5",
+        enterprisePluginCommons: "1.16.0",
+        jsAdapter: "3.13.501"
     }
 };

package/target/enterprise.d.ts

@@ -16,6 +16,8 @@ export interface EnterprisePluginOptions extends RunJavaProcessOptions {
     webAppUrl: string;
     apiToken?: string;
     controlPlaneUrl?: string;
+    trustStore?: string;
+    trustStorePassword?: string;
     nonInteractive: boolean;
 }
 export interface EnterpriseDeployOptions extends EnterprisePluginOptions {

package/target/enterprise.js

@@ -11,6 +11,7 @@ const zlib_1 = require("zlib");
 const dependencies_1 = require("./dependencies");
 const java_1 = require("./java");
 const log_1 = require("./log");
+const proxy_1 = require("./proxy");
 const enterprisePackage = async (options) => {
     log_1.logger.info(`Packaging a Gatling simulation with options:
  - bundleFile: ${options.bundleFile}
@@ -123,6 +124,12 @@ const javaArgsFromPluginOptions = (options) => {
     if (options.controlPlaneUrl !== undefined) {
         javaArgs.push(`-Dgatling.enterprise.controlPlaneUrl=${options.controlPlaneUrl}`);
     }
+    if (options.trustStore !== undefined) {
+        javaArgs.push(`-Djavax.net.ssl.trustStore=${options.trustStore}`);
+    }
+    if (options.trustStore !== undefined && options.trustStorePassword !== undefined) {
+        javaArgs.push(`-Djavax.net.ssl.trustStorePassword=${options.trustStorePassword}`);
+    }
     javaArgs.push("-Dgatling.enterprise.buildTool=js-cli");
     javaArgs.push(`-Dgatling.enterprise.pluginVersion=${dependencies_1.versions.gatling.jsAdapter}`);
     if (options.nonInteractive) {
@@ -149,7 +156,7 @@ const enterpriseDeploy = async (options) => {
             log_1.logger.debug("  " + javaArgs[i]);
         }
     }
-    return (0, java_1.runJavaProcess)(options, "io.gatling.plugin.cli.EnterpriseDeploy", additionalClasspathElements, javaArgs, []);
+    return (0, java_1.runJavaProcess)(options, "io.gatling.plugin.cli.EnterpriseDeploy", additionalClasspathElements, javaArgs, [], proxy_1.proxyConfiguration);
 };
 exports.enterpriseDeploy = enterpriseDeploy;
 const enterpriseStart = async (options) => {
@@ -174,6 +181,6 @@ const enterpriseStart = async (options) => {
             log_1.logger.debug("  " + javaArgs[i]);
         }
     }
-    return (0, java_1.runJavaProcess)(options, "io.gatling.plugin.cli.EnterpriseStart", additionalClasspathElements, javaArgs, []);
+    return (0, java_1.runJavaProcess)(options, "io.gatling.plugin.cli.EnterpriseStart", additionalClasspathElements, javaArgs, [], proxy_1.proxyConfiguration);
 };
 exports.enterpriseStart = enterpriseStart;

package/target/java.d.ts

@@ -1,5 +1,6 @@
+import { ProxyConfiguration } from "./proxy";
 export interface RunJavaProcessOptions {
     graalvmHome: string;
     jvmClasspath: string;
 }
-export declare const runJavaProcess: (options: RunJavaProcessOptions, mainClass: string, additionalClasspathElements: string[], javaArgs: string[], mainClassArgs: string[]) => Promise<void>;
+export declare const runJavaProcess: (options: RunJavaProcessOptions, mainClass: string, additionalClasspathElements: string[], javaArgs: string[], mainClassArgs: string[], proxyConf?: ProxyConfiguration) => Promise<void>;

package/target/java.js

@@ -4,10 +4,11 @@ exports.runJavaProcess = void 0;
 const child_process_1 = require("child_process");
 const os_1 = require("./dependencies/os");
 const log_1 = require("./log");
-const runJavaProcess = (options, mainClass, additionalClasspathElements, javaArgs, mainClassArgs) => {
+const runJavaProcess = (options, mainClass, additionalClasspathElements, javaArgs, mainClassArgs, proxyConf) => {
     const command = `${options.graalvmHome}/bin/java`;
     const classpathSeparator = os_1.osType === "Windows_NT" ? ";" : ":";
     const classpath = [...additionalClasspathElements, options.jvmClasspath].join(classpathSeparator);
+    const proxyArgs = generateProxyArgs(proxyConf);
     const allArgs = [
         "-server",
         "-XX:+HeapDumpOnOutOfMemoryError",
@@ -16,6 +17,7 @@ const runJavaProcess = (options, mainClass, additionalClasspathElements, javaArg
         "-classpath",
         classpath,
         ...javaArgs,
+        ...proxyArgs,
         mainClass,
         ...mainClassArgs
     ];
@@ -36,3 +38,26 @@ const runJavaProcess = (options, mainClass, additionalClasspathElements, javaArg
     });
 };
 exports.runJavaProcess = runJavaProcess;
+const generateProxyArgs = (proxyConf) => {
+    const proxyProps = (protocol, url) => {
+        const props = [];
+        if (url !== undefined) {
+            props.push(`-D${protocol}.proxyHost=${url.hostname}`);
+            props.push(`-D${protocol}.proxyPort=${url.port || "80"}`);
+            if (url.username) {
+                props.push(`-D${protocol}.proxyUser=${url.username}`);
+            }
+            if (url.password) {
+                props.push(`-D${protocol}.proxyPassword=${url.password}`);
+            }
+        }
+        return props;
+    };
+    const httpProps = proxyProps("http", proxyConf?.proxyUrl);
+    // For HTTPS, fallback on proxyUrl if httpsProxyUrl isn't set, following npm's own behavior
+    const httpsProps = proxyProps("https", proxyConf?.httpsProxyUrl || proxyConf?.proxyUrl);
+    const noProxyProps = proxyConf !== undefined && proxyConf.noProxyHosts.length > 0
+        ? [`-Dhttp.nonProxyHosts=${proxyConf.noProxyHosts.join("|")}`]
+        : [];
+    return [...httpProps, ...httpsProps, ...noProxyProps];
+};

package/target/proxy.d.ts

@@ -0,0 +1,6 @@
+export interface ProxyConfiguration {
+    proxyUrl?: URL;
+    httpsProxyUrl?: URL;
+    noProxyHosts: string[];
+}
+export declare const proxyConfiguration: ProxyConfiguration;

package/target/proxy.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.proxyConfiguration = void 0;
+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 httpProxy = process.env[NPM_CONFIG_PROXY_KEY] || undefined;
+const proxyUrl = httpProxy !== undefined ? new URL(httpProxy) : undefined;
+const httpsProxy = process.env[NPM_CONFIG_HTTPS_PROXY_KEY] || undefined;
+const httpsProxyUrl = httpsProxy !== undefined ? new URL(httpsProxy) : undefined;
+const noProxy = process.env[NPM_CONFIG_NOPROXY_KEY] || undefined;
+const noProxyHosts = noProxy !== undefined ? noProxy.split(",") : [];
+exports.proxyConfiguration = {
+    proxyUrl,
+    httpsProxyUrl,
+    noProxyHosts
+};