@gatling.io/cli 3.11.5 → 3.11.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gatling.io/cli",
-  "version": "3.11.5",
+  "version": "3.11.6",
   "license": "Apache-2.0",
   "bin": {
     "gatling": "target/index.js"
@@ -19,15 +19,16 @@
   "devDependencies": {
     "@types/archiver": "6.0.2",
     "@types/decompress": "4.2.7",
-    "@types/node": "20.14.9",
+    "@types/node": "20.14.12",
     "@types/readline-sync": "1.4.8",
-    "prettier": "3.3.2",
-    "rimraf": "5.0.7",
-    "typescript": "5.4.5"
+    "prettier": "3.3.3",
+    "rimraf": "6.0.1",
+    "typescript": "5.5.3"
   },
   "scripts": {
     "clean": "rimraf target",
     "format": "prettier --write '**/*.ts'",
+    "format-check": "prettier --check '**/*.ts'",
     "build": "tsc -p . && chmod +x ./target/index.js"
   }
 }

package/target/dependencies/versions.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.versions = void 0;
 exports.versions = {
     graalvm: {
-        jdk: "22.0.1",
-        js: "24.0.1"
+        jdk: "22.0.2",
+        js: "24.0.2"
     },
     coursier: "2.1.10",
     gatling: {
         core: "3.11.5",
-        enterprisePluginCommons: "1.9.4",
-        jsAdapter: "3.11.5"
+        enterprisePluginCommons: "1.9.6",
+        jsAdapter: "3.11.6"
     }
 };

package/target/enterprise.js

@@ -39,17 +39,19 @@ const generateManifest = (simulationNames) => {
     const continuation = utf8Encoder.encode("\n ");
     const lines = [
         "Manifest-Version: 1.0",
-        "Implementation-Title: gatling-javascript",
-        `Implementation-Version: ${versions_1.versions.gatling.jsAdapter}`,
-        "Implementation-Vendor: GatlingCorp",
         "Specification-Vendor: GatlingCorp",
         "Gatling-Context: js",
         `Gatling-Version: ${versions_1.versions.gatling.core}`,
-        "Gatling-Packager: javascript",
+        "Gatling-Packager: js-cli",
         `Gatling-Packager-Version: ${versions_1.versions.gatling.jsAdapter}`,
         `Gatling-Simulations: ${simulationNames.join(",")}`,
         `Java-Version: ${versions_1.versions.graalvm.jdk.split(".")[0]}`
     ];
+    const pkg = getPackageNameAndVersion();
+    lines.push(`Implementation-Title: ${pkg.name}`);
+    if (pkg.version !== undefined) {
+        lines.push(`Implementation-Version: ${pkg.version}`);
+    }
     let totalLength = 0;
     const buffer = [];
     for (const line of lines) {
@@ -81,6 +83,30 @@ const generateManifest = (simulationNames) => {
     }
     return manifest;
 };
+const getPackageNameAndVersion = () => {
+    // npm_package_* env vars are available when launching CLI with npx
+    let name = process.env.npm_package_name;
+    let version = process.env.npm_package_version;
+    // otherwise, try to read from package.json file
+    if (name === undefined || version === undefined) {
+        if (!fs_1.default.existsSync("package.json")) {
+            throw Error("package.json not found");
+        }
+        const pkg = JSON.parse(fs_1.default.readFileSync("package.json", "utf-8"));
+        if (name === undefined) {
+            if (typeof pkg.name === "string") {
+                name = pkg.name;
+            }
+            else {
+                throw Error("package.json does not contain a valid package name");
+            }
+        }
+        if (version === undefined && typeof pkg.version === "string") {
+            version = pkg.version;
+        }
+    }
+    return { name: name, version: version };
+};
 const javaArgsFromPluginOptions = (options) => {
     const javaArgs = [];
     // Base
@@ -92,7 +118,7 @@ const javaArgsFromPluginOptions = (options) => {
     if (options.controlPlaneUrl !== undefined) {
         javaArgs.push(`-Dgatling.enterprise.controlPlaneUrl=${options.controlPlaneUrl}`);
     }
-    javaArgs.push("-Dgatling.enterprise.buildTool=JS_CLI");
+    javaArgs.push("-Dgatling.enterprise.buildTool=js-cli");
     javaArgs.push(`-Dgatling.enterprise.pluginVersion=${versions_1.versions.gatling.jsAdapter}`);
     if (options.nonInteractive) {
         javaArgs.push(`-Dgatling.enterprise.batchMode=true`);
@@ -106,9 +132,7 @@ const javaArgsFromDeployOptions = (options) => {
     javaArgs.push(`-Dgatling.enterprise.packageDescriptorFilename=${options.packageDescriptorFilename}`);
     // Deployment info
     javaArgs.push(`-Dgatling.enterprise.packageFile=${options.packageFile}`);
-    if (process.env.npm_package_name !== undefined) {
-        javaArgs.push(`-Dgatling.enterprise.artifactId=${process.env.npm_package_name}`);
-    }
+    javaArgs.push(`-Dgatling.enterprise.artifactId=${getPackageNameAndVersion().name}`);
     return javaArgs;
 };
 const enterpriseDeploy = async (options) => {