@usejourney/cli 0.1.3 → 0.1.5

package/dist/index.js

@@ -499,6 +499,40 @@ function overallOk(results) {
   return results.every((r) => r.ok);
 }
 
+// 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 } : {}
+    }
+  });
+  setGlobalDispatcher(agent);
+  globalThis.fetch = undiciFetch;
+  current = { key, agent };
+  if (insecure && !warnedInsecure) {
+    warnedInsecure = true;
+    console.error("journey: WARNING \u2014 TLS verification disabled (--insecure)");
+  }
+  return agent;
+}
+
 // src/util/projectCoreLink.ts
 import { existsSync, readFileSync } from "fs";
 import { mkdir as mkdir3, symlink } from "fs/promises";
@@ -529,16 +563,6 @@ async function ensureProjectCoreLink(projectDir) {
 }
 
 // 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);
@@ -559,14 +583,20 @@ async function runCommand(opts) {
   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")
   });
   if (subCache) ctx.subJourneyCache = subCache;
   if (opts.cacheTtlMs !== void 0) ctx.subJourneyCacheTtlMs = opts.cacheTtlMs;
+  if (opts.timeoutMs !== void 0) {
+    ctx.defaultTimeoutMs = opts.timeoutMs === 0 ? null : opts.timeoutMs;
+  }
   const results = await runAllRegistered(ctx);
   printResults(results);
   const cacheDir = join5(opts.projectDir, ".journey", "cache");
@@ -699,10 +729,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) {
@@ -722,6 +752,9 @@ async function runJourneyFile(opts) {
   if (opts.subJourneyCacheTtlMs !== void 0) {
     ctx.subJourneyCacheTtlMs = opts.subJourneyCacheTtlMs;
   }
+  if (opts.timeoutMs !== void 0) {
+    ctx.defaultTimeoutMs = opts.timeoutMs === 0 ? null : opts.timeoutMs;
+  }
   const unpatchConsole = logger ? patchConsole(logger) : () => {
   };
   let results;
@@ -1191,13 +1224,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];
@@ -1334,7 +1367,7 @@ async function proxyRequest(body) {
     durationMs: Date.now() - started
   };
 }
-async function route(req, res, projectDir, debug, setProjectDir, cacheFor, cacheTtlMs) {
+async function route(req, res, projectDir, debug, setProjectDir, cacheFor, cacheTtlMs, timeoutMs) {
   if (req.method === "OPTIONS") {
     res.writeHead(204, {
       "access-control-allow-origin": "*",
@@ -1553,7 +1586,8 @@ async function route(req, res, projectDir, debug, setProjectDir, cacheFor, cache
         ...typeof body.upToStepIdx === "number" ? { upToStepIdx: body.upToStepIdx } : {},
         ...debug ? { debug: true } : {},
         ...subJourneyCache !== void 0 ? { subJourneyCache } : {},
-        ...cacheTtlMs !== void 0 ? { subJourneyCacheTtlMs: cacheTtlMs } : {}
+        ...cacheTtlMs !== void 0 ? { subJourneyCacheTtlMs: cacheTtlMs } : {},
+        ...timeoutMs !== void 0 ? { timeoutMs } : {}
       });
       if (body.stream) {
         runPromise.catch((err) => {
@@ -1659,7 +1693,8 @@ async function startServer(opts) {
       opts.debug ?? false,
       setProjectDir,
       cacheFor,
-      opts.cacheTtlMs
+      opts.cacheTtlMs,
+      opts.timeoutMs
     );
   });
   await new Promise((resolve7, reject) => {
@@ -1677,14 +1712,19 @@ 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 } : {},
     ...opts.port !== void 0 ? { port: opts.port } : {},
     ...opts.debug !== void 0 ? { debug: opts.debug } : {},
     ...opts.cache !== void 0 ? { cache: opts.cache } : {},
-    ...opts.cacheTtlMs !== void 0 ? { cacheTtlMs: opts.cacheTtlMs } : {}
+    ...opts.cacheTtlMs !== void 0 ? { cacheTtlMs: opts.cacheTtlMs } : {},
+    ...opts.timeoutMs !== void 0 ? { timeoutMs: opts.timeoutMs } : {}
   });
   console.log(`Journey API listening at ${srv.url}`);
   console.log(`For the GUI, run: pnpm --filter @usejourney/gui dev`);
@@ -1741,7 +1781,15 @@ function buildProgram() {
     "Sub-journey output cache: off|run|process|disk",
     parseCacheMode,
     "process"
-  ).option("--cache-ttl <ms>", "Default sub-journey cache TTL in ms", (v) => parseInt(v, 10)).description("Run one or more journeys (or --all)").action(
+  ).option("--cache-ttl <ms>", "Default sub-journey cache TTL in ms", (v) => parseInt(v, 10)).option(
+    "--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({
         projectDir: process.cwd(),
@@ -1752,7 +1800,9 @@ function buildProgram() {
         ...options.watch !== void 0 ? { watch: options.watch } : {},
         ...options.insecure !== void 0 ? { insecure: options.insecure } : {},
         ...options.cache !== void 0 ? { cache: options.cache } : {},
-        ...options.cacheTtl !== void 0 ? { cacheTtlMs: options.cacheTtl } : {}
+        ...options.cacheTtl !== void 0 ? { cacheTtlMs: options.cacheTtl } : {},
+        ...options.timeout !== void 0 ? { timeoutMs: options.timeout } : {},
+        ...options.connectTimeout !== void 0 ? { connectTimeoutMs: options.connectTimeout } : {}
       })
     )
   );
@@ -1816,7 +1866,15 @@ function buildProgram() {
     "Sub-journey output cache: off|run|process|disk",
     parseCacheMode,
     "process"
-  ).option("--cache-ttl <ms>", "Default sub-journey cache TTL in ms", (v) => parseInt(v, 10)).description("Run the GUI backend API for the current project").action(
+  ).option("--cache-ttl <ms>", "Default sub-journey cache TTL in ms", (v) => parseInt(v, 10)).option(
+    "--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();
       return handle(
@@ -1827,7 +1885,9 @@ function buildProgram() {
           ...options.debug !== void 0 ? { debug: options.debug } : {},
           ...options.insecure !== void 0 ? { insecure: options.insecure } : {},
           ...options.cache !== void 0 ? { cache: options.cache } : {},
-          ...options.cacheTtl !== void 0 ? { cacheTtlMs: options.cacheTtl } : {}
+          ...options.cacheTtl !== void 0 ? { cacheTtlMs: options.cacheTtl } : {},
+          ...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.3",
+  "version": "0.1.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,10 +23,10 @@
     "commander": "^12.1.0",
     "tsx": "^4.21.0",
     "undici": "^8.3.0",
-    "@usejourney/core": "0.1.3",
-    "@usejourney/postman-adapter": "^0.1.3",
-    "@usejourney/k6-adapter": "^0.1.3",
-    "@usejourney/codegen": "^0.1.3"
+    "@usejourney/codegen": "^0.1.5",
+    "@usejourney/core": "0.1.5",
+    "@usejourney/k6-adapter": "^0.1.5",
+    "@usejourney/postman-adapter": "^0.1.5"
   },
   "devDependencies": {
     "@types/newman": "^5.3.6",