@usejourney/cli 0.1.4 → 0.2.0

package/dist/index.js

@@ -24,8 +24,8 @@ async function runEnvList(projectDir) {
 
 // src/commands/exportK6.ts
 import { stat } from "fs/promises";
-import { isAbsolute, resolve } from "path";
-import { exportToK6 } from "@usejourney/k6-adapter";
+import { dirname as dirname2, isAbsolute, resolve } from "path";
+import { exportToK6, findProjectDir } from "@usejourney/k6-adapter";
 
 // src/util/discover.ts
 import { readdir } from "fs/promises";
@@ -58,6 +58,35 @@ async function importJourneyFiles(files) {
   }
 }
 
+// src/util/projectCoreLink.ts
+import { existsSync, readFileSync } from "fs";
+import { mkdir, symlink } from "fs/promises";
+import { dirname, join as join2 } from "path";
+import { fileURLToPath } from "url";
+function locateJourneyCoreDir() {
+  let dir = dirname(fileURLToPath(import.meta.url));
+  for (let depth = 0; depth < 50; depth++) {
+    const pkgJson = join2(dir, "node_modules", "@usejourney", "core", "package.json");
+    if (existsSync(pkgJson)) {
+      JSON.parse(readFileSync(pkgJson, "utf8"));
+      return dirname(pkgJson);
+    }
+    const parent = dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  throw new Error("ensureProjectCoreLink: could not locate the CLI-bundled @usejourney/core");
+}
+var cachedCoreDir;
+async function ensureProjectCoreLink(projectDir) {
+  const link = join2(projectDir, "node_modules", "@usejourney", "core");
+  if (existsSync(link)) return;
+  if (!cachedCoreDir) cachedCoreDir = locateJourneyCoreDir();
+  await mkdir(dirname(link), { recursive: true });
+  const type = process.platform === "win32" ? "junction" : "dir";
+  await symlink(cachedCoreDir, link, type);
+}
+
 // src/commands/exportK6.ts
 function matches(def, tags) {
   if (tags.length === 0) return true;
@@ -97,6 +126,8 @@ async function runExportK6(opts) {
     console.log(`No .journey.ts files found in ${opts.path}`);
     return 0;
   }
+  const projectDir = findProjectDir(isDir ? target : dirname2(target)) ?? process.cwd();
+  await ensureProjectCoreLink(projectDir);
   const work = [];
   for (const file of files) {
     const defs = await loadJourneyDefs(file);
@@ -114,7 +145,10 @@ async function runExportK6(opts) {
       journeyFile: file,
       ...opts.out !== void 0 ? { outFile: opts.out } : {},
       ...opts.outDir !== void 0 ? { outDir: opts.outDir } : {},
-      ...k6Options !== void 0 ? { k6Options } : {}
+      ...k6Options !== void 0 ? { k6Options } : {},
+      ...opts.metricsPrefix !== void 0 ? { metricsPrefix: opts.metricsPrefix } : {},
+      ...opts.haltOnFailure ? { haltOnFailure: true } : {},
+      projectDir
     });
     console.log(`Wrote k6 script \u2192 ${result.outFile}`);
     exported++;
@@ -126,8 +160,8 @@ async function runExportK6(opts) {
 }
 
 // src/commands/exportPostman.ts
-import { mkdir, stat as stat2, writeFile } from "fs/promises";
-import { basename, dirname, isAbsolute as isAbsolute2, join as join2, resolve as resolve2 } from "path";
+import { mkdir as mkdir2, stat as stat2, writeFile } from "fs/promises";
+import { basename, dirname as dirname3, isAbsolute as isAbsolute2, join as join3, resolve as resolve2 } from "path";
 import {
   clearActiveEnvironment,
   collectPipeline,
@@ -232,8 +266,8 @@ function uniqueFolderName(name, seen) {
 async function exportEnvironment(environmentsDir, envName, outDir) {
   const values = await loadEnvironment(environmentsDir, envName);
   const env = buildEnvironment(envName, values);
-  const outFile = join2(outDir, `${envName}.postman_environment.json`);
-  await mkdir(dirname(outFile), { recursive: true });
+  const outFile = join3(outDir, `${envName}.postman_environment.json`);
+  await mkdir2(dirname3(outFile), { recursive: true });
   await writeFile(outFile, JSON.stringify(env, null, 2), "utf8");
   return outFile;
 }
@@ -319,8 +353,8 @@ async function runExportPostman(opts) {
       const collection = buildCollection(opts.name ?? "journeys", mergedFolders, {
         reset: opts.threadState ?? false
       });
-      const collectionOutDir = dirname(outFile);
-      await mkdir(collectionOutDir, { recursive: true });
+      const collectionOutDir = dirname3(outFile);
+      await mkdir2(collectionOutDir, { recursive: true });
       await writeFile(outFile, JSON.stringify(collection, null, 2), "utf8");
       console.log(`Wrote Postman collection \u2192 ${outFile}`);
       exported++;
@@ -351,9 +385,9 @@ async function runExportPostman(opts) {
         reset: opts.threadState ?? false
       });
       const json = JSON.stringify(collection, null, 2);
-      const outFile = opts.out ? resolve2(process.cwd(), opts.out) : opts.outDir ? resolve2(process.cwd(), opts.outDir, `${fileBase}.postman_collection.json`) : join2(dirname(file), `${fileBase}.postman_collection.json`);
-      const collectionOutDir = dirname(outFile);
-      await mkdir(collectionOutDir, { recursive: true });
+      const outFile = opts.out ? resolve2(process.cwd(), opts.out) : opts.outDir ? resolve2(process.cwd(), opts.outDir, `${fileBase}.postman_collection.json`) : join3(dirname3(file), `${fileBase}.postman_collection.json`);
+      const collectionOutDir = dirname3(outFile);
+      await mkdir2(collectionOutDir, { recursive: true });
       await writeFile(outFile, json, "utf8");
       console.log(`Wrote Postman collection \u2192 ${outFile}`);
       exported++;
@@ -388,8 +422,8 @@ async function runGenerate(projectDir) {
 }
 
 // src/commands/init.ts
-import { access, copyFile, mkdir as mkdir2, readdir as readdir2, writeFile as writeFile2 } from "fs/promises";
-import { basename as basename2, isAbsolute as isAbsolute3, join as join3, resolve as resolve3 } from "path";
+import { access, copyFile, mkdir as mkdir3, readdir as readdir2, writeFile as writeFile2 } from "fs/promises";
+import { basename as basename2, isAbsolute as isAbsolute3, join as join4, resolve as resolve3 } from "path";
 import { generate as generate2, loadSpec } from "@usejourney/codegen";
 async function isEmpty(dir) {
   try {
@@ -416,12 +450,12 @@ async function runInit(opts) {
   }
   await loadSpec(specSource);
   const specDestName = basename2(specSource);
-  const specDest = join3(projectDir, specDestName);
-  await mkdir2(projectDir, { recursive: true });
-  await mkdir2(join3(projectDir, "generated"), { recursive: true });
-  await mkdir2(join3(projectDir, "journeys"), { recursive: true });
-  await mkdir2(join3(projectDir, "environments"), { recursive: true });
-  await mkdir2(join3(projectDir, ".journey", "cache"), { recursive: true });
+  const specDest = join4(projectDir, specDestName);
+  await mkdir3(projectDir, { recursive: true });
+  await mkdir3(join4(projectDir, "generated"), { recursive: true });
+  await mkdir3(join4(projectDir, "journeys"), { recursive: true });
+  await mkdir3(join4(projectDir, "environments"), { recursive: true });
+  await mkdir3(join4(projectDir, ".journey", "cache"), { recursive: true });
   await copyFile(specSource, specDest);
   const config = {
     name: basename2(projectDir),
@@ -431,23 +465,23 @@ async function runInit(opts) {
     environmentsDir: "environments"
   };
   await writeFile2(
-    join3(projectDir, "journey.config.json"),
+    join4(projectDir, "journey.config.json"),
     `${JSON.stringify(config, null, 2)}
 `,
     "utf8"
   );
-  await writeFile2(join3(projectDir, ".gitignore"), `.journey/cache/
+  await writeFile2(join4(projectDir, ".gitignore"), `.journey/cache/
 node_modules/
 `, "utf8");
   await writeFile2(
-    join3(projectDir, "package.json"),
+    join4(projectDir, "package.json"),
     `${JSON.stringify({ name: basename2(projectDir), private: true, type: "module" }, null, 2)}
 `,
     "utf8"
   );
   const generated = await generate2({
     specPath: specDest,
-    outDir: join3(projectDir, "generated")
+    outDir: join4(projectDir, "generated")
   });
   console.log(
     `Initialized Journey project at ${projectDir} (${generated.operationCount} operations).`
@@ -461,7 +495,7 @@ node_modules/
 
 // src/commands/run.ts
 import { watch } from "fs/promises";
-import { dirname as dirname3, isAbsolute as isAbsolute4, join as join5, resolve as resolve4 } from "path";
+import { dirname as dirname4, isAbsolute as isAbsolute4, join as join5, resolve as resolve4 } from "path";
 import {
   clearActiveEnvironment as clearActiveEnvironment2,
   createConsoleLogger,
@@ -499,46 +533,41 @@ function overallOk(results) {
   return results.every((r) => r.ok);
 }
 
-// src/util/projectCoreLink.ts
-import { existsSync, readFileSync } from "fs";
-import { mkdir as mkdir3, symlink } from "fs/promises";
-import { dirname as dirname2, join as join4 } from "path";
-import { fileURLToPath } from "url";
-function locateJourneyCoreDir() {
-  let dir = dirname2(fileURLToPath(import.meta.url));
-  for (let depth = 0; depth < 50; depth++) {
-    const pkgJson = join4(dir, "node_modules", "@usejourney", "core", "package.json");
-    if (existsSync(pkgJson)) {
-      JSON.parse(readFileSync(pkgJson, "utf8"));
-      return dirname2(pkgJson);
+// src/util/dispatcher.ts
+var current;
+var warnedInsecure = false;
+var defaults = {};
+function setDispatcherDefaults(opts) {
+  defaults = opts;
+}
+async function configureDispatcher(opts) {
+  const insecure = opts.insecure === true || defaults.insecure === true;
+  const connectTimeoutMs = defaults.connectTimeoutMs ?? opts.connectTimeoutMs;
+  if (!insecure && connectTimeoutMs === void 0) return void 0;
+  const key = `${insecure}:${connectTimeoutMs ?? "default"}`;
+  if (current?.key === key) return current.agent;
+  const { Agent, fetch: undiciFetch, setGlobalDispatcher } = await import("undici");
+  const agent = new Agent({
+    ...connectTimeoutMs !== void 0 ? { connectTimeout: connectTimeoutMs } : {},
+    connect: {
+      ...insecure ? { rejectUnauthorized: false } : {},
+      // `connect.timeout` is what the connector actually reads; undici spreads
+      // `connect` last, so the top-level `connectTimeout` alone would be
+      // clobbered by this object. Set both.
+      ...connectTimeoutMs !== void 0 ? { timeout: connectTimeoutMs } : {}
     }
-    const parent = dirname2(dir);
-    if (parent === dir) break;
-    dir = parent;
+  });
+  setGlobalDispatcher(agent);
+  globalThis.fetch = undiciFetch;
+  current = { key, agent };
+  if (insecure && !warnedInsecure) {
+    warnedInsecure = true;
+    console.error("journey: WARNING \u2014 TLS verification disabled (--insecure)");
   }
-  throw new Error("ensureProjectCoreLink: could not locate the CLI-bundled @usejourney/core");
-}
-var cachedCoreDir;
-async function ensureProjectCoreLink(projectDir) {
-  const link = join4(projectDir, "node_modules", "@usejourney", "core");
-  if (existsSync(link)) return;
-  if (!cachedCoreDir) cachedCoreDir = locateJourneyCoreDir();
-  await mkdir3(dirname2(link), { recursive: true });
-  const type = process.platform === "win32" ? "junction" : "dir";
-  await symlink(cachedCoreDir, link, type);
+  return agent;
 }
 
 // src/commands/run.ts
-var insecureAgent;
-async function enableInsecureTls() {
-  if (!insecureAgent) {
-    const { Agent, setGlobalDispatcher } = await import("undici");
-    insecureAgent = new Agent({ connect: { rejectUnauthorized: false } });
-    setGlobalDispatcher(insecureAgent);
-    console.error("journey: WARNING \u2014 TLS verification disabled (--insecure)");
-  }
-  return insecureAgent;
-}
 async function runCommand(opts) {
   const loaded = await loadConfig4(opts.projectDir);
   const paths = resolveConfigPaths4(loaded);
@@ -554,14 +583,17 @@ async function runCommand(opts) {
   }
   await ensureProjectCoreLink(opts.projectDir);
   await importJourneyFiles(files);
-  const ctx = {};
+  const ctx = { baseDir: opts.projectDir };
   const baseUrl = resolveBaseUrl(loaded.config);
   if (baseUrl) ctx.baseUrl = baseUrl;
   const logger = opts.debug ? createConsoleLogger() : loggerFromEnv();
   if (logger) ctx.logger = logger;
-  if (opts.insecure || loaded.config.tlsRejectUnauthorized === false) {
-    ctx.dispatcher = await enableInsecureTls();
-  }
+  const connectTimeoutMs = opts.connectTimeoutMs ?? loaded.config.connectTimeoutMs;
+  const dispatcher = await configureDispatcher({
+    insecure: opts.insecure || loaded.config.tlsRejectUnauthorized === false,
+    ...connectTimeoutMs !== void 0 ? { connectTimeoutMs } : {}
+  });
+  if (dispatcher !== void 0) ctx.dispatcher = dispatcher;
   const subCache = createSubJourneyCache(opts.cache ?? "process", {
     diskDir: join5(opts.projectDir, ".journey", "cache", "sub-journey")
   });
@@ -597,7 +629,7 @@ async function runCommand(opts) {
     timer = setTimeout(() => void rerun(), DEBOUNCE_MS);
   };
   const dirs = /* @__PURE__ */ new Set([paths.journeysDir]);
-  for (const f of files) dirs.add(dirname3(f));
+  for (const f of files) dirs.add(dirname4(f));
   const watchers = [];
   for (const dir of dirs) {
     try {
@@ -702,10 +734,10 @@ function formatArgs(args) {
 // src/server/runner.ts
 async function runJourneyFile(opts) {
   const abs = isAbsolute5(opts.file) ? opts.file : opts.file.includes("/") || opts.file.includes("\\") ? resolve5(process.cwd(), opts.file) : join6(opts.journeysDir, opts.file);
-  let dispatcher;
-  if (opts.loaded.config.tlsRejectUnauthorized === false) {
-    dispatcher = await enableInsecureTls();
-  }
+  const dispatcher = await configureDispatcher({
+    insecure: opts.loaded.config.tlsRejectUnauthorized === false,
+    ...opts.loaded.config.connectTimeoutMs !== void 0 ? { connectTimeoutMs: opts.loaded.config.connectTimeoutMs } : {}
+  });
   clearActiveEnvironment3();
   const envName = opts.env ?? opts.loaded.config.defaultEnvironment;
   if (envName) {
@@ -714,7 +746,7 @@ async function runJourneyFile(opts) {
   }
   await ensureProjectCoreLink(opts.loaded.projectDir);
   await importJourneyFiles([abs]);
-  const ctx = {};
+  const ctx = { baseDir: opts.loaded.projectDir };
   const baseUrl = resolveBaseUrl2(opts.loaded.config);
   if (baseUrl) ctx.baseUrl = baseUrl;
   const logger = opts.logger ?? (opts.debug ? createConsoleLogger2() : loggerFromEnv2());
@@ -1197,13 +1229,13 @@ var PATCHABLE_CONFIG_KEYS = ["tlsRejectUnauthorized"];
 async function patchProjectConfig(projectDir, patch) {
   const configPath = join9(projectDir, "journey.config.json");
   const raw = await readFile2(configPath, "utf8");
-  const current = JSON.parse(raw);
+  const current2 = JSON.parse(raw);
   for (const key of Object.keys(patch)) {
     if (!PATCHABLE_CONFIG_KEYS.includes(key)) {
       throw new Error(`config key "${key}" is not patchable via the API`);
     }
   }
-  const merged = { ...current };
+  const merged = { ...current2 };
   for (const key of PATCHABLE_CONFIG_KEYS) {
     if (Object.prototype.hasOwnProperty.call(patch, key)) {
       merged[key] = patch[key];
@@ -1685,7 +1717,11 @@ async function startServer(opts) {
 
 // src/commands/serve.ts
 async function runServe(opts) {
-  if (opts.insecure) await enableInsecureTls();
+  setDispatcherDefaults({
+    ...opts.insecure !== void 0 ? { insecure: opts.insecure } : {},
+    ...opts.connectTimeoutMs !== void 0 ? { connectTimeoutMs: opts.connectTimeoutMs } : {}
+  });
+  await configureDispatcher({});
   const srv = await startServer({
     projectDir: opts.projectDir,
     ...opts.host !== void 0 ? { host: opts.host } : {},
@@ -1754,6 +1790,10 @@ function buildProgram() {
     "--timeout <ms>",
     "Request timeout in ms; 0 disables (default 60000)",
     (v) => parseInt(v, 10)
+  ).option(
+    "--connect-timeout <ms>",
+    "DNS + TCP + TLS connect timeout in ms; 0 disables (default 10000)",
+    (v) => parseInt(v, 10)
   ).description("Run one or more journeys (or --all)").action(
     (files, options) => handle(
       () => runCommand({
@@ -1766,7 +1806,8 @@ function buildProgram() {
         ...options.insecure !== void 0 ? { insecure: options.insecure } : {},
         ...options.cache !== void 0 ? { cache: options.cache } : {},
         ...options.cacheTtl !== void 0 ? { cacheTtlMs: options.cacheTtl } : {},
-        ...options.timeout !== void 0 ? { timeoutMs: options.timeout } : {}
+        ...options.timeout !== void 0 ? { timeoutMs: options.timeout } : {},
+        ...options.connectTimeout !== void 0 ? { connectTimeoutMs: options.connectTimeout } : {}
       })
     )
   );
@@ -1779,12 +1820,20 @@ function buildProgram() {
     "Only export journeys with this tag (repeatable, AND across repeats)",
     (v, prev = []) => [...prev, v],
     []
+  ).option(
+    "--metrics-prefix <prefix>",
+    "Emit custom metrics per step (<prefix>_<step>_duration Trend, <prefix>_<step>_tps Counter) and per iteration (<prefix>_flow_duration / <prefix>_flow_tps)"
+  ).option(
+    "--halt-on-failure",
+    "Stop an iteration's remaining steps when an assert fails (mirrors journey run)"
   ).description("Export one or more journeys as k6 scripts (path may be a file or directory)").action(
     (path, options) => handle(
       () => runExportK6({
         path,
         ...options.out !== void 0 ? { out: options.out } : {},
         ...options.outDir !== void 0 ? { outDir: options.outDir } : {},
+        ...options.metricsPrefix !== void 0 ? { metricsPrefix: options.metricsPrefix } : {},
+        ...options.haltOnFailure ? { haltOnFailure: true } : {},
         tags: options.tag
       })
     )
@@ -1834,6 +1883,10 @@ function buildProgram() {
     "--timeout <ms>",
     "Request timeout in ms for journey runs triggered via the API; 0 disables (default 60000)",
     (v) => parseInt(v, 10)
+  ).option(
+    "--connect-timeout <ms>",
+    "DNS + TCP + TLS connect timeout in ms; 0 disables (default 10000)",
+    (v) => parseInt(v, 10)
   ).description("Run the GUI backend API for the current project").action(
     (options) => {
       const projectDir = options.project ? resolvePath(process.cwd(), options.project) : process.cwd();
@@ -1846,7 +1899,8 @@ function buildProgram() {
           ...options.insecure !== void 0 ? { insecure: options.insecure } : {},
           ...options.cache !== void 0 ? { cache: options.cache } : {},
           ...options.cacheTtl !== void 0 ? { cacheTtlMs: options.cacheTtl } : {},
-          ...options.timeout !== void 0 ? { timeoutMs: options.timeout } : {}
+          ...options.timeout !== void 0 ? { timeoutMs: options.timeout } : {},
+          ...options.connectTimeout !== void 0 ? { connectTimeoutMs: options.connectTimeout } : {}
         })
       );
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usejourney/cli",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,10 +23,10 @@
     "commander": "^12.1.0",
     "tsx": "^4.21.0",
     "undici": "^8.3.0",
-    "@usejourney/codegen": "^0.1.4",
-    "@usejourney/core": "0.1.4",
-    "@usejourney/k6-adapter": "^0.1.4",
-    "@usejourney/postman-adapter": "^0.1.4"
+    "@usejourney/codegen": "^0.2.0",
+    "@usejourney/core": "0.2.0",
+    "@usejourney/k6-adapter": "^0.2.0",
+    "@usejourney/postman-adapter": "^0.2.0"
   },
   "devDependencies": {
     "@types/newman": "^5.3.6",