@gatling.io/cli 3.11.3-M1 → 3.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gatling.io/cli",
-  "version": "3.11.3-M1",
+  "version": "3.11.3",
   "license": "Apache-2.0",
   "bin": {
     "gatling": "target/index.js"

package/target/dependencies/coursier.d.ts

@@ -1,2 +1,3 @@
 export declare const installCoursier: (gatlingHomeDir: string, downloadDir: string) => Promise<string>;
-export declare const resolveDependencies: (coursierPath: string, javaHome: string) => Promise<string>;
+export declare const resolveGatlingJsDependencies: (coursierPath: string, javaHome: string) => Promise<string>;
+export declare const resolveRecorderDependencies: (coursierPath: string, javaHome: string) => Promise<string>;

package/target/dependencies/coursier.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.resolveDependencies = exports.installCoursier = void 0;
+exports.resolveRecorderDependencies = exports.resolveGatlingJsDependencies = exports.installCoursier = void 0;
 const fs_1 = require("fs");
 const promises_1 = __importDefault(require("fs/promises"));
 const download_1 = require("./download");
@@ -46,15 +46,23 @@ const installCoursier = async (gatlingHomeDir, downloadDir) => {
     return coursierPath;
 };
 exports.installCoursier = installCoursier;
-const resolveDependencies = async (coursierPath, javaHome) => {
+const resolveGatlingJsDependencies = async (coursierPath, javaHome) => {
     const gatlingDep = `"io.gatling.highcharts:gatling-charts-highcharts:${versions_1.versions.gatling.core}"`;
     const gatlingAdapterDep = `"io.gatling:gatling-jvm-to-js-adapter:${versions_1.versions.gatling.jsAdapter}"`;
     const graalvmJsDep = `"org.graalvm.polyglot:js-community:${versions_1.versions.graalvm.js}"`;
-    const command = `"${coursierPath}" fetch --classpath ${gatlingDep} ${gatlingAdapterDep} ${graalvmJsDep}`;
+    return await resolveDependencies(coursierPath, javaHome, gatlingDep, gatlingAdapterDep, graalvmJsDep);
+};
+exports.resolveGatlingJsDependencies = resolveGatlingJsDependencies;
+const resolveRecorderDependencies = async (coursierPath, javaHome) => {
+    const recorderDep = `io.gatling:gatling-recorder:${versions_1.versions.gatling.core}`;
+    return await resolveDependencies(coursierPath, javaHome, recorderDep);
+};
+exports.resolveRecorderDependencies = resolveRecorderDependencies;
+const resolveDependencies = async (coursierPath, javaHome, ...dependencies) => {
+    const command = `"${coursierPath}" fetch --classpath ${dependencies.join(" ")}`;
     // TODO could add a timeout
     log_1.logger.info(`Resolving dependencies with Coursier`);
     const { stdout } = await execAsync(command, { env: { ...process.env, JAVA_HOME: javaHome } });
     return stdout;
 };
-exports.resolveDependencies = resolveDependencies;
 const execAsync = (0, util_1.promisify)(child_process_1.exec);

package/target/dependencies/index.d.ts

@@ -6,4 +6,5 @@ export interface ResolvedDependencies {
     coursierBinary: string;
     jvmClasspath: string;
 }
-export declare const installAll: (options: DependenciesOptions) => Promise<ResolvedDependencies>;
+export declare const installGatlingJs: (options: DependenciesOptions) => Promise<ResolvedDependencies>;
+export declare const installRecorder: (options: DependenciesOptions) => Promise<ResolvedDependencies>;

package/target/dependencies/index.js

@@ -3,20 +3,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installAll = void 0;
+exports.installRecorder = exports.installGatlingJs = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const coursier_1 = require("./coursier");
 const graalVm_1 = require("./graalVm");
-const installAll = async (options) => {
+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.resolveDependencies)(coursierPath, graalvmHomePath);
+    const classpath = await (0, coursier_1.resolveGatlingJsDependencies)(coursierPath, graalvmHomePath);
     return {
         graalvmHome: graalvmHomePath,
         coursierBinary: coursierPath,
         jvmClasspath: classpath.trim()
     };
 };
-exports.installAll = installAll;
+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.installRecorder = installRecorder;

package/target/dependencies/versions.js

@@ -8,7 +8,7 @@ exports.versions = {
     },
     coursier: "2.1.10",
     gatling: {
-        core: "3.11.2",
-        jsAdapter: "3.11.3-M1"
+        core: "3.11.3",
+        jsAdapter: "3.11.3"
     }
 };

package/target/index.js

@@ -30,7 +30,7 @@ program
     .addOption(gatlingHomeOption)
     .action(async (options) => {
     const gatlingHome = gatlingHomeDirWithDefaults(options);
-    const { graalvmHome, coursierBinary, jvmClasspath } = await (0, dependencies_1.installAll)({ gatlingHome });
+    const { graalvmHome, coursierBinary, jvmClasspath } = await (0, dependencies_1.installGatlingJs)({ gatlingHome });
     log_1.logger.info(`graalvmHome=${graalvmHome}`);
     log_1.logger.info(`coursierBinary=${coursierBinary}`);
     log_1.logger.info(`jvmClasspath=${jvmClasspath}`);
@@ -63,7 +63,14 @@ program
     const bundleFile = options.bundleFile;
     const resourcesFolder = options.resourcesFolder;
     const resultsFolder = options.resultsFolder;
-    await (0, run_1.run)({ graalvmHome, jvmClasspath, simulation: simulation, bundleFile, resourcesFolder, resultsFolder });
+    await (0, run_1.runSimulation)({
+        graalvmHome,
+        jvmClasspath,
+        simulation: simulation,
+        bundleFile,
+        resourcesFolder,
+        resultsFolder
+    });
 });
 program
     .command("run")
@@ -83,11 +90,29 @@ program
     const resourcesFolder = options.resourcesFolder;
     const resultsFolder = options.resultsFolder;
     const typescript = options.typescript;
-    const { graalvmHome, coursierBinary, jvmClasspath } = await (0, dependencies_1.installAll)({ gatlingHome });
+    const { graalvmHome, coursierBinary, jvmClasspath } = await (0, dependencies_1.installGatlingJs)({ 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, typescript });
-    await (0, run_1.run)({ graalvmHome, jvmClasspath, simulation, bundleFile, resourcesFolder, resultsFolder });
+    await (0, run_1.runSimulation)({ graalvmHome, jvmClasspath, simulation, bundleFile, resourcesFolder, resultsFolder });
+});
+program
+    .command("recorder")
+    .description("Run the Gatling recorder")
+    .addOption(gatlingHomeOption)
+    .addOption(sourcesFolderOption)
+    .addOption(typescriptOption)
+    .addOption(resourcesFolderOption)
+    .action(async (options) => {
+    const gatlingHome = gatlingHomeDirWithDefaults(options);
+    const sourcesFolder = options.sourcesFolder;
+    const resourcesFolder = options.resourcesFolder;
+    const typescript = options.typescript;
+    const { graalvmHome, coursierBinary, jvmClasspath } = await (0, dependencies_1.installRecorder)({ 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 });
 });
 program.parse(process.argv);

package/target/run.d.ts

@@ -1,9 +1,17 @@
 export interface RunOptions {
     graalvmHome: string;
     jvmClasspath: string;
+}
+export interface RunSimulationOptions extends RunOptions {
     simulation: string;
     bundleFile: string;
     resourcesFolder: string;
     resultsFolder: string;
 }
-export declare const run: (options: RunOptions) => Promise<void>;
+export interface RunRecorderOptions extends RunOptions {
+    sourcesFolder: string;
+    typescript: boolean;
+    resourcesFolder: string;
+}
+export declare const runSimulation: (options: RunSimulationOptions) => Promise<void>;
+export declare const runRecorder: (options: RunRecorderOptions) => Promise<void>;

package/target/run.js

@@ -1,27 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = void 0;
+exports.runRecorder = exports.runSimulation = void 0;
 const child_process_1 = require("child_process");
 const log_1 = require("./log");
 const versions_1 = require("./dependencies/versions");
 const os_1 = require("./dependencies/os");
-const run = async (options) => {
+const runSimulation = async (options) => {
     log_1.logger.info(`Running a Gatling simulation with options:
  - simulation: ${options.simulation}
  - bundleFile: ${options.bundleFile}`);
-    const command = `${options.graalvmHome}/bin/java`;
-    const classpathSeparator = os_1.osType === "Windows_NT" ? ";" : ":";
-    const args = [
-        "-server",
-        "-XX:+HeapDumpOnOutOfMemoryError",
-        "-XX:MaxInlineLevel=20",
-        "-XX:MaxTrivialSize=12",
-        "-Xmx1G",
-        "-classpath",
-        `${options.resourcesFolder}${classpathSeparator}${options.jvmClasspath}`,
+    const additionalClasspathElements = [options.resourcesFolder];
+    const javaArgs = [
         `-Dgatling.js.bundle.filePath=${options.bundleFile}`,
-        `-Dgatling.js.simulation=${options.simulation}`,
-        "io.gatling.app.Gatling",
+        `-Dgatling.js.simulation=${options.simulation}`
+    ];
+    const simulationArgs = [
         "--results-folder",
         options.resultsFolder,
         "--simulation",
@@ -31,7 +24,39 @@ const run = async (options) => {
         "--build-tool-version",
         versions_1.versions.gatling.jsAdapter
     ];
-    const process = (0, child_process_1.spawn)(command, args);
+    return run(options, "io.gatling.app.Gatling", additionalClasspathElements, javaArgs, simulationArgs);
+};
+exports.runSimulation = runSimulation;
+const runRecorder = async (options) => {
+    log_1.logger.info("Running the Gatling Recorder");
+    const recorderArgs = [
+        "--simulations-folder",
+        options.sourcesFolder,
+        "--resources-folder",
+        options.resourcesFolder,
+        "--format",
+        options.typescript ? "typescript" : "javascript"
+    ];
+    return run(options, "io.gatling.recorder.GatlingRecorder", [], [], recorderArgs);
+};
+exports.runRecorder = runRecorder;
+const run = (options, mainClass, additionalClasspathElements, javaArgs, mainClassArgs) => {
+    const command = `${options.graalvmHome}/bin/java`;
+    const classpathSeparator = os_1.osType === "Windows_NT" ? ";" : ":";
+    const classpath = [...additionalClasspathElements, options.jvmClasspath].join(classpathSeparator);
+    const allArgs = [
+        "-server",
+        "-XX:+HeapDumpOnOutOfMemoryError",
+        "-XX:MaxInlineLevel=20",
+        "-XX:MaxTrivialSize=12",
+        "-Xmx1G",
+        "-classpath",
+        classpath,
+        ...javaArgs,
+        mainClass,
+        ...mainClassArgs
+    ];
+    const process = (0, child_process_1.spawn)(command, allArgs);
     return new Promise((resolve, reject) => {
         process.stdout.on("data", (data) => log_1.logger.info(data.toString()));
         process.stderr.on("data", (data) => log_1.logger.error(data.toString()));
@@ -46,4 +71,3 @@ const run = async (options) => {
         });
     });
 };
-exports.run = run;