@gatling.io/cli 3.13.104-M5 → 3.13.104-M7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gatling.io/cli",
-  "version": "3.13.104-M5",
+  "version": "3.13.104-M7",
   "license": "Apache-2.0",
   "homepage": "https://gatling.io",
   "repository": "github:gatling/gatling-js",

package/target/dependencies/versions.js

@@ -12,6 +12,6 @@ exports.versions = {
     gatling: {
         core: "3.13.1",
         enterprisePluginCommons: "1.11.0",
-        jsAdapter: "3.13.104-M5"
+        jsAdapter: "3.13.104-M7"
     }
 };

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 });
-    });
-};

package/src/commands/enterpriseDeploy.ts

@@ -1,97 +0,0 @@
-import { Command } from "commander";
-
-import {
-  apiTokenOption,
-  apiTokenOptionValue,
-  bundleFileOption,
-  bundleFileOptionValue,
-  controlPlaneUrlOption,
-  controlPlaneUrlOptionValue,
-  gatlingHomeOption,
-  gatlingHomeOptionValueWithDefaults,
-  nonInteractiveOption,
-  nonInteractiveOptionValue,
-  packageDescriptorFilenameOption,
-  packageDescriptorFilenameOptionValue,
-  packageFileOption,
-  packageFileOptionValue,
-  postmanOption,
-  postmanOptionValueWithDefaults,
-  resourcesFolderOption,
-  resourcesFolderOptionValue,
-  resultsFolderOption,
-  resultsFolderOptionValue,
-  sourcesFolderOption,
-  sourcesFolderOptionValue,
-  typescriptOption,
-  typescriptOptionValueWithDefaults,
-  apiUrlOption,
-  apiUrlOptionValue,
-  webAppUrlOption,
-  webAppUrlOptionValue
-} from "./options";
-import { findSimulations } from "../simulations";
-import { resolveBundle } from "../dependencies";
-import { bundle } from "../bundle";
-import { enterpriseDeploy, enterprisePackage } from "../enterprise";
-
-export default (program: Command): void => {
-  program
-    .command("enterprise-deploy")
-    .description("Deploy a package and configured simulations")
-    .addOption(sourcesFolderOption)
-    .addOption(resourcesFolderOption)
-    .addOption(bundleFileOption)
-    .addOption(resultsFolderOption)
-    .addOption(postmanOption)
-    .addOption(typescriptOption)
-    .addOption(gatlingHomeOption)
-    // Base
-    .addOption(apiUrlOption)
-    .addOption(webAppUrlOption)
-    .addOption(apiTokenOption)
-    // Plugin configuration
-    .addOption(controlPlaneUrlOption)
-    .addOption(nonInteractiveOption)
-    // Descriptor file
-    .addOption(packageDescriptorFilenameOption)
-    // Deployment info
-    .addOption(packageFileOption)
-    .action(async (options) => {
-      const sourcesFolder: string = sourcesFolderOptionValue(options);
-
-      const simulations = await findSimulations(sourcesFolder);
-      const postman = postmanOptionValueWithDefaults(options);
-      const typescript = typescriptOptionValueWithDefaults(options, simulations);
-
-      const resourcesFolder: string = resourcesFolderOptionValue(options);
-      const bundleFile = bundleFileOptionValue(options);
-      const resultsFolder: string = resultsFolderOptionValue(options);
-      const gatlingHome = gatlingHomeOptionValueWithDefaults(options);
-      const apiUrl = apiUrlOptionValue(options);
-      const webAppUrl = webAppUrlOptionValue(options);
-      const apiToken = apiTokenOptionValue(options);
-      const controlPlaneUrl = controlPlaneUrlOptionValue(options);
-      const nonInteractive = nonInteractiveOptionValue(options);
-      const packageDescriptorFilename = packageDescriptorFilenameOptionValue(options);
-      const packageFile = packageFileOptionValue(options);
-
-      const { graalvmHome, jvmClasspath } = await resolveBundle({ gatlingHome });
-      await bundle({ sourcesFolder, bundleFile, postman, typescript, simulations });
-      await enterprisePackage({ bundleFile, resourcesFolder, packageFile, simulations });
-      await enterpriseDeploy({
-        graalvmHome,
-        jvmClasspath,
-        bundleFile,
-        resourcesFolder,
-        resultsFolder,
-        apiUrl,
-        webAppUrl,
-        apiToken,
-        controlPlaneUrl,
-        nonInteractive,
-        packageDescriptorFilename,
-        packageFile
-      });
-    });
-};

package/src/commands/enterprisePackage.ts

@@ -1,45 +0,0 @@
-import { Command } from "commander";
-
-import {
-  bundleFileOption,
-  bundleFileOptionValue,
-  packageFileOption,
-  packageFileOptionValue,
-  postmanOption,
-  postmanOptionValueWithDefaults,
-  resourcesFolderOption,
-  resourcesFolderOptionValue,
-  sourcesFolderOption,
-  sourcesFolderOptionValue,
-  typescriptOption,
-  typescriptOptionValueWithDefaults
-} from "./options";
-import { findSimulations } from "../simulations";
-import { bundle } from "../bundle";
-import { enterprisePackage } from "../enterprise";
-
-export default (program: Command): void => {
-  program
-    .command("enterprise-package")
-    .description("Build Gatling simulations and package them for Gatling Enterprise")
-    .addOption(sourcesFolderOption)
-    .addOption(resourcesFolderOption)
-    .addOption(bundleFileOption)
-    .addOption(packageFileOption)
-    .addOption(postmanOption)
-    .addOption(typescriptOption)
-    .action(async (options) => {
-      const sourcesFolder: string = sourcesFolderOptionValue(options);
-      const resourcesFolder: string = resourcesFolderOptionValue(options);
-      const bundleFile = bundleFileOptionValue(options);
-      const packageFile = packageFileOptionValue(options);
-
-      const simulations = await findSimulations(sourcesFolder);
-      const postman = postmanOptionValueWithDefaults(options);
-      const typescript = typescriptOptionValueWithDefaults(options, simulations);
-
-      await bundle({ sourcesFolder, bundleFile, postman, typescript, simulations });
-
-      await enterprisePackage({ bundleFile, resourcesFolder, packageFile, simulations });
-    });
-};

package/src/commands/enterpriseStart.ts

@@ -1,122 +0,0 @@
-import { Command } from "commander";
-
-import {
-  apiTokenOption,
-  apiTokenOptionValue,
-  bundleFileOption,
-  bundleFileOptionValue,
-  controlPlaneUrlOption,
-  controlPlaneUrlOptionValue,
-  enterpriseSimulationOption,
-  enterpriseSimulationOptionValue,
-  gatlingHomeOption,
-  gatlingHomeOptionValueWithDefaults,
-  nonInteractiveOption,
-  nonInteractiveOptionValue,
-  packageDescriptorFilenameOption,
-  packageDescriptorFilenameOptionValue,
-  packageFileOption,
-  packageFileOptionValue,
-  postmanOption,
-  postmanOptionValueWithDefaults,
-  resourcesFolderOption,
-  resourcesFolderOptionValue,
-  resultsFolderOption,
-  resultsFolderOptionValue,
-  runDescriptionOption,
-  runDescriptionOptionValue,
-  runTitleOption,
-  runTitleOptionValue,
-  sourcesFolderOption,
-  sourcesFolderOptionValue,
-  typescriptOption,
-  typescriptOptionValueWithDefaults,
-  apiUrlOption,
-  apiUrlOptionValue,
-  webAppUrlOption,
-  webAppUrlOptionValue,
-  waitForRunEndOption,
-  waitForRunEndOptionValue
-} from "./options";
-import { findSimulations } from "../simulations";
-import { resolveBundle } from "../dependencies";
-import { bundle } from "../bundle";
-import { enterprisePackage, enterpriseStart } from "../enterprise";
-
-export default (program: Command): void => {
-  program
-    .command("enterprise-start")
-    .description("Start a simulation deployed with `enterprise-deploy`")
-    .addOption(sourcesFolderOption)
-    .addOption(resourcesFolderOption)
-    .addOption(bundleFileOption)
-    .addOption(resultsFolderOption)
-    .addOption(postmanOption)
-    .addOption(typescriptOption)
-    .addOption(gatlingHomeOption)
-    // Base
-    .addOption(apiUrlOption)
-    .addOption(webAppUrlOption)
-    .addOption(apiTokenOption)
-    // Plugin configuration
-    .addOption(controlPlaneUrlOption)
-    .addOption(nonInteractiveOption)
-    // Descriptor file
-    .addOption(packageDescriptorFilenameOption)
-    // Deployment info
-    .addOption(packageFileOption)
-    // Start
-    .addOption(enterpriseSimulationOption)
-    .addOption(runTitleOption)
-    .addOption(runDescriptionOption)
-    .addOption(waitForRunEndOption)
-    .action(async (options) => {
-      const sourcesFolder: string = sourcesFolderOptionValue(options);
-
-      const simulations = await findSimulations(sourcesFolder);
-      const postman = postmanOptionValueWithDefaults(options);
-      const typescript = typescriptOptionValueWithDefaults(options, simulations);
-
-      const resourcesFolder: string = resourcesFolderOptionValue(options);
-      const bundleFile = bundleFileOptionValue(options);
-      const resultsFolder: string = resultsFolderOptionValue(options);
-      const gatlingHome = gatlingHomeOptionValueWithDefaults(options);
-      const apiUrl = apiUrlOptionValue(options);
-      const webAppUrl = webAppUrlOptionValue(options);
-      const apiToken = apiTokenOptionValue(options);
-      const controlPlaneUrl = controlPlaneUrlOptionValue(options);
-      const nonInteractive = nonInteractiveOptionValue(options);
-      const packageDescriptorFilename = packageDescriptorFilenameOptionValue(options);
-      const packageFile = packageFileOptionValue(options);
-      const enterpriseSimulation = enterpriseSimulationOptionValue(options);
-      const runTitle = runTitleOptionValue(options);
-      const runDescription = runDescriptionOptionValue(options);
-      const waitForRunEnd = waitForRunEndOptionValue(options);
-
-      if (nonInteractiveOptionValue(options) && enterpriseSimulation === undefined) {
-        throw new Error(`No simulation specified when using non-interactive mode`);
-      }
-
-      const { graalvmHome, jvmClasspath } = await resolveBundle({ gatlingHome });
-      await bundle({ sourcesFolder, bundleFile, postman, typescript, simulations });
-      await enterprisePackage({ bundleFile, resourcesFolder, packageFile, simulations });
-      await enterpriseStart({
-        graalvmHome,
-        jvmClasspath,
-        bundleFile,
-        resourcesFolder,
-        resultsFolder,
-        apiUrl,
-        webAppUrl,
-        apiToken,
-        controlPlaneUrl,
-        nonInteractive,
-        packageDescriptorFilename,
-        packageFile,
-        enterpriseSimulation,
-        runTitle,
-        runDescription,
-        waitForRunEnd
-      });
-    });
-};

package/src/commands/index.ts

@@ -1,25 +0,0 @@
-import { Command } from "commander";
-
-import registerInstallCommand from "./install";
-import registerBuildCommand from "./build";
-import registerRunOnlyCommand from "./runOnly";
-import registerRunCommand from "./run";
-import registerRecorderCommand from "./recorder";
-import registerEnterprisePackageCommand from "./enterprisePackage";
-import registerEnterpriseDeployCommand from "./enterpriseDeploy";
-import registerEnterpriseStartCommand from "./enterpriseStart";
-import { versions } from "../dependencies";
-
-export const program: Command = new Command()
-  .name("gatling-js-cli")
-  .version(versions.gatling.jsAdapter)
-  .description("The Gatling Javascript run & packaging tool");
-
-registerInstallCommand(program);
-registerBuildCommand(program);
-registerRunOnlyCommand(program);
-registerRunCommand(program);
-registerRecorderCommand(program);
-registerEnterprisePackageCommand(program);
-registerEnterpriseDeployCommand(program);
-registerEnterpriseStartCommand(program);

package/src/commands/install.ts

@@ -1,22 +0,0 @@
-import { Command } from "commander";
-
-import { bundleFileArgument, gatlingHomeOption, gatlingHomeOptionValueWithDefaults } from "./options";
-import { installBundleFile, resolveBundle } from "../dependencies";
-import { logger } from "../log";
-
-export default (program: Command): void => {
-  program
-    .command("install")
-    .description("Install all required components and dependencies for Gatling")
-    .addOption(gatlingHomeOption)
-    .addArgument(bundleFileArgument)
-    .action(async (bundleFilePath: string | undefined, options) => {
-      const gatlingHome = gatlingHomeOptionValueWithDefaults(options);
-      const { graalvmHome, jvmClasspath } =
-        bundleFilePath !== undefined
-          ? await installBundleFile({ gatlingHome, bundleFilePath })
-          : await resolveBundle({ gatlingHome });
-      logger.info(`graalvmHome=${graalvmHome}`);
-      logger.info(`jvmClasspath=${jvmClasspath}`);
-    });
-};