@piwitests/reporter 0.63.0 → 0.65.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -34,9 +34,6 @@ __export(global_setup_module_exports, {
34
34
  });
35
35
  module.exports = __toCommonJS(global_setup_module_exports);
36
36
 
37
- // src/public/global-setup.ts
38
- var path8 = __toESM(require("path"));
39
-
40
37
  // src/internal/support/errors.ts
41
38
  function errorMessage(error) {
42
39
  if (error instanceof Error) return error.message;
@@ -225,7 +222,12 @@ var PIWI_DESKTOP_CONFIG_ENV = "PIWI_DESKTOP_CONFIG";
225
222
  var PIWI_SHARD_ENV = "PIWI_SHARD";
226
223
  function readBool(val) {
227
224
  if (val === void 0) return void 0;
228
- return val === "true";
225
+ return ["true", "1", "yes", "on"].includes(val.trim().toLowerCase());
226
+ }
227
+ function readNumber(val) {
228
+ const trimmed = val.trim();
229
+ const number = Number(trimmed);
230
+ return trimmed !== "" && Number.isFinite(number) && number >= 0 ? number : void 0;
229
231
  }
230
232
  var ENV_FALLBACK_SPECS = [
231
233
  { option: "serverUrl", env: PIWI_ENV_KEYS.serverUrl, kind: "string" },
@@ -272,16 +274,22 @@ function desktopAppMode(option, envValue) {
272
274
  var desktopDiscovered = false;
273
275
  var desktopReplacedServerUrl = null;
274
276
  var dotEnvUse = null;
277
+ var ignoredEnv = [];
275
278
  function resolveOptions(raw, configDir) {
276
279
  const env = process.env;
277
280
  const mergedRaw = { ...raw };
281
+ ignoredEnv = [];
278
282
  for (const spec of ENV_FALLBACK_SPECS) {
279
283
  if (mergedRaw[spec.option] !== void 0) continue;
280
284
  const value = env[spec.env];
281
285
  if (spec.kind === "bool") {
282
286
  if (value !== void 0) mergedRaw[spec.option] = readBool(value);
287
+ } else if (value && spec.kind === "number") {
288
+ const number = readNumber(value);
289
+ if (number === void 0) ignoredEnv.push({ name: spec.env, value, fallback: DEFAULTS[spec.option] });
290
+ else mergedRaw[spec.option] = number;
283
291
  } else if (value) {
284
- mergedRaw[spec.option] = spec.kind === "number" ? Number(value) : value;
292
+ mergedRaw[spec.option] = value;
285
293
  }
286
294
  }
287
295
  dotEnvUse = null;
@@ -335,7 +343,7 @@ function resolveOptions(raw, configDir) {
335
343
  externalId.onDuplicate = externalIdOnDuplicate;
336
344
  if (Object.keys(externalId).length > 0) mergedRaw.externalId = externalId;
337
345
  const opts = { ...DEFAULTS, ...mergedRaw };
338
- if (env[PIWI_ENV_KEYS.verbose] !== void 0) opts.verbose = env[PIWI_ENV_KEYS.verbose] === "true";
346
+ if (env[PIWI_ENV_KEYS.verbose] !== void 0) opts.verbose = readBool(env[PIWI_ENV_KEYS.verbose]);
339
347
  return opts;
340
348
  }
341
349
 
@@ -369,15 +377,6 @@ var Logger = class {
369
377
  };
370
378
 
371
379
  // src/internal/transport/http-client.ts
372
- function parseErrorMessage(text) {
373
- try {
374
- const parsed = JSON.parse(text);
375
- const message = parsed?.message;
376
- return typeof message === "string" ? message : void 0;
377
- } catch {
378
- return void 0;
379
- }
380
- }
381
380
  var HttpError = class extends Error {
382
381
  constructor(status, message = `Request failed with status ${status}`) {
383
382
  super(message);
@@ -385,19 +384,62 @@ var HttpError = class extends Error {
385
384
  this.name = "HttpError";
386
385
  }
387
386
  };
387
+ var FAILURE_DETAIL_MAX = 500;
388
+ function failureDetail(res) {
389
+ let text = null;
390
+ try {
391
+ const body = JSON.parse(res.text);
392
+ text = typeof body?.message === "string" ? body.message : body?.statusMessage;
393
+ } catch {
394
+ if (/^text\/plain\b/i.test(res.headers["content-type"] ?? "")) text = res.text;
395
+ }
396
+ if (typeof text !== "string") return null;
397
+ const line = text.replace(/[\p{Cc}\s]+/gu, " ").trim();
398
+ if (!line) return null;
399
+ return line.length > FAILURE_DETAIL_MAX ? `${line.slice(0, FAILURE_DETAIL_MAX - 1)}\u2026` : line;
400
+ }
401
+ function failedRequest(res) {
402
+ const detail = failureDetail(res);
403
+ return new HttpError(res.status, `Request failed with status ${res.status}${detail ? `: ${detail}` : ""}`);
404
+ }
405
+ function parseAnswer(pathname, res) {
406
+ try {
407
+ return JSON.parse(res.text);
408
+ } catch {
409
+ const contentType = res.headers["content-type"] || "no content type";
410
+ throw new Error(
411
+ `The answer to ${pathname} is not JSON (${contentType}): check that serverUrl is the dashboard's address and that no sign-in page or proxy answers in its place.`
412
+ );
413
+ }
414
+ }
415
+ function serverUrlProblem(serverUrl) {
416
+ let url;
417
+ try {
418
+ url = new import_node_url.URL(serverUrl);
419
+ } catch {
420
+ return `serverUrl "${serverUrl}" is not a URL: give the dashboard's whole address, such as https://piwi.example.com.`;
421
+ }
422
+ if (url.protocol !== "http:" && url.protocol !== "https:") {
423
+ return `serverUrl "${serverUrl}" is not an http:// or https:// URL: give the dashboard's whole address, such as https://piwi.example.com.`;
424
+ }
425
+ return null;
426
+ }
427
+ function abortError(signal) {
428
+ return signal.reason instanceof Error ? signal.reason : new Error("The request was cancelled");
429
+ }
388
430
  var HttpClient = class {
389
431
  /**
390
432
  * @param serverUrl Base URL of the Piwi Dashboard server (e.g. `http://localhost:3000`).
391
433
  * @param logger Prefixed logger for verbose diagnostics.
392
434
  * @param timeout Socket inactivity timeout in ms (default 30s), so a hung
393
435
  * server fails fast rather than stalling the reporter.
394
- * @param uploadTimeout Socket inactivity timeout of a multipart upload in ms
395
- * (default 10 min): the dashboard answers one only once it
396
- * has stored every report and trace in it.
436
+ * @param uploadTimeout Socket inactivity timeout of a multipart upload, or of
437
+ * a run's results sent as JSON, in ms (default 10 min): the
438
+ * dashboard answers one only once it has stored all of it.
397
439
  */
398
- constructor(serverUrl, logger = new Logger(), timeout = 3e4, uploadTimeout = 10 * 60 * 1e3) {
440
+ constructor(serverUrl, logger2 = new Logger(), timeout = 3e4, uploadTimeout = 10 * 60 * 1e3) {
399
441
  this.serverUrl = serverUrl;
400
- this.logger = logger;
442
+ this.logger = logger2;
401
443
  this.timeout = timeout;
402
444
  this.uploadTimeout = uploadTimeout;
403
445
  /** Requests in flight, so `close` can abort them. */
@@ -502,28 +544,32 @@ var HttpClient = class {
502
544
  return null;
503
545
  }
504
546
  }
505
- /** Send a JSON POST request. `auth` can be an API key (prefix `pd_`) or a session cookie string. */
506
- async postJSON(pathname, payload, auth) {
547
+ /**
548
+ * Send a JSON POST request. `auth` can be an API key (prefix `pd_`) or a session cookie string. Resolves to the
549
+ * answer's JSON; an answer that is not JSON fails, and `signal` ends the request. With `upload`, the answer may come
550
+ * as late as a multipart upload's: the body is a run's results, which the dashboard stores before it answers.
551
+ * `headers` go with the request beside its own.
552
+ */
553
+ async postJSON(pathname, payload, auth, signal, { upload = false, headers = {} } = {}) {
507
554
  const body = JSON.stringify(payload);
508
555
  const res = await this.request("POST", pathname, {
509
556
  headers: {
557
+ ...headers,
510
558
  "Content-Type": "application/json",
511
559
  "Content-Length": Buffer.byteLength(body)
512
560
  },
513
561
  body,
514
- auth
562
+ auth,
563
+ signal,
564
+ ...upload && { timeout: this.uploadTimeout }
515
565
  });
516
566
  if (res.status < 200 || res.status >= 300) {
517
567
  this.logger.debugError(`Response: ${res.text}`);
518
- throw new HttpError(res.status);
519
- }
520
- try {
521
- return JSON.parse(res.text);
522
- } catch {
523
- return {};
568
+ throw failedRequest(res);
524
569
  }
570
+ return parseAnswer(pathname, res);
525
571
  }
526
- /** Send a JSON PUT request. Used for the declared-surface manifest upload. */
572
+ /** Send a JSON PUT request. Used for the declared-surface manifest upload. An answer that is not JSON fails. */
527
573
  async putJSON(pathname, payload, auth) {
528
574
  const body = JSON.stringify(payload);
529
575
  const res = await this.request("PUT", pathname, {
@@ -536,39 +582,43 @@ var HttpClient = class {
536
582
  });
537
583
  if (res.status < 200 || res.status >= 300) {
538
584
  this.logger.debugError(`Response: ${res.text}`);
539
- throw new HttpError(res.status);
540
- }
541
- try {
542
- return JSON.parse(res.text);
543
- } catch {
544
- return {};
585
+ throw failedRequest(res);
545
586
  }
587
+ return parseAnswer(pathname, res);
546
588
  }
547
- /** Send a multipart form-data POST request. Used for report and trace uploads. */
548
- async postFormData(pathname, form, auth) {
589
+ /**
590
+ * Send a multipart form-data POST request. Used for report and trace uploads. An answer that is not JSON fails, and
591
+ * `signal` ends the upload.
592
+ */
593
+ async postFormData(pathname, form, auth, signal) {
549
594
  const headers = form.getHeaders();
550
- const res = await this.request("POST", pathname, { headers, form, auth, timeout: this.uploadTimeout });
595
+ const res = await this.request("POST", pathname, { headers, form, auth, timeout: this.uploadTimeout, signal });
551
596
  if (res.status < 200 || res.status >= 300) {
552
597
  this.logger.debugError(`Response: ${res.text}`);
553
- const detail = parseErrorMessage(res.text);
554
- throw new HttpError(
555
- res.status,
556
- detail ? `Request failed with status ${res.status}: ${detail}` : `Request failed with status ${res.status}`
557
- );
558
- }
559
- try {
560
- return JSON.parse(res.text);
561
- } catch {
562
- return {};
598
+ throw failedRequest(res);
563
599
  }
600
+ return parseAnswer(pathname, res);
564
601
  }
565
- /** Unified request core: transport, headers, auth, response accumulation, timeout. */
602
+ /**
603
+ * Unified request core: transport, headers, auth, response accumulation, timeout. Nothing is sent to a `serverUrl`
604
+ * that is not an `http://` or `https://` URL.
605
+ */
566
606
  request(method, pathname, opts) {
567
- return new Promise((resolve3, reject) => {
607
+ return new Promise((resolve4, reject) => {
568
608
  if (this.closedReason !== null) {
569
609
  reject(new Error(this.closedReason));
570
610
  return;
571
611
  }
612
+ const problem = serverUrlProblem(this.serverUrl);
613
+ if (problem) {
614
+ reject(new Error(problem));
615
+ return;
616
+ }
617
+ const signal = opts.signal;
618
+ if (signal?.aborted) {
619
+ reject(abortError(signal));
620
+ return;
621
+ }
572
622
  const url = new import_node_url.URL(pathname, this.serverUrl);
573
623
  const transport = url.protocol === "https:" ? https : http;
574
624
  const headers = { ...opts.headers };
@@ -582,12 +632,16 @@ var HttpClient = class {
582
632
  headers
583
633
  },
584
634
  (res) => {
585
- let data = "";
635
+ const chunks = [];
586
636
  res.on("data", (chunk) => {
587
- data += chunk;
637
+ chunks.push(chunk);
588
638
  });
589
639
  res.on("end", () => {
590
- resolve3({ status: res.statusCode ?? 0, text: data, headers: res.headers });
640
+ resolve4({
641
+ status: res.statusCode ?? 0,
642
+ text: Buffer.concat(chunks).toString("utf8"),
643
+ headers: res.headers
644
+ });
591
645
  });
592
646
  res.on("error", reject);
593
647
  res.on("close", () => {
@@ -598,7 +652,12 @@ var HttpClient = class {
598
652
  }
599
653
  );
600
654
  this.inFlight.add(req);
601
- req.on("close", () => this.inFlight.delete(req));
655
+ const onAbort = () => req.destroy(abortError(signal));
656
+ signal?.addEventListener("abort", onAbort, { once: true });
657
+ req.on("close", () => {
658
+ this.inFlight.delete(req);
659
+ signal?.removeEventListener("abort", onAbort);
660
+ });
602
661
  req.on("error", reject);
603
662
  const timeout = opts.timeout ?? this.timeout;
604
663
  req.setTimeout(timeout, () => {
@@ -652,6 +711,7 @@ function resolveShardInfo(config, env = process.env) {
652
711
 
653
712
  // src/internal/collect/metadata-collector.ts
654
713
  var import_node_child_process = require("child_process");
714
+ var import_node_util = require("util");
655
715
 
656
716
  // src/internal/support/test-paths.ts
657
717
  var path3 = __toESM(require("path"));
@@ -690,6 +750,82 @@ function normalizeRef(ref) {
690
750
  return ref.replace(/^refs\/heads\//, "");
691
751
  }
692
752
 
753
+ // ../core/src/locator-chain.ts
754
+ var LOCATING_METHODS = /* @__PURE__ */ new Set([
755
+ "getByRole",
756
+ "getByTestId",
757
+ "getByText",
758
+ "getByLabel",
759
+ "getByPlaceholder",
760
+ "getByAltText",
761
+ "getByTitle",
762
+ "locator",
763
+ "frameLocator"
764
+ ]);
765
+ var NARROWING_METHODS = /* @__PURE__ */ new Set([
766
+ "filter",
767
+ "first",
768
+ "last",
769
+ "nth",
770
+ "and",
771
+ "or",
772
+ "visible",
773
+ "contentFrame",
774
+ "owner"
775
+ ]);
776
+ var LOCATOR_CHAIN_METHODS = /* @__PURE__ */ new Set([...LOCATING_METHODS, ...NARROWING_METHODS]);
777
+
778
+ // ../core/src/mask.ts
779
+ var SECRET_AUTOCOMPLETE = [
780
+ "current-password",
781
+ "new-password",
782
+ "one-time-code",
783
+ "cc-number",
784
+ "cc-csc"
785
+ ];
786
+ var SECRET_FIELD_SELECTOR = [
787
+ 'input[type="password" i]',
788
+ ...SECRET_AUTOCOMPLETE.flatMap((token) => [
789
+ `input[autocomplete~="${token}" i]`,
790
+ `textarea[autocomplete~="${token}" i]`
791
+ ])
792
+ ].join(", ");
793
+ var SHAPES = [
794
+ { re: /\beyJ[\w-]{5,}\.[\w-]{5,}\.[\w-]*/g, starts: ["eyJ"] },
795
+ { re: /\bBearer(?:\s+|%20)[\w.~+/-]{8,}=*/gi, starts: ["Bearer"] },
796
+ {
797
+ re: /\b(?:sk|rk)_(?:live|test)_[A-Za-z0-9]{8,}/g,
798
+ starts: ["sk_live_", "sk_test_", "rk_live_", "rk_test_"]
799
+ },
800
+ { re: /\bwhsec_[A-Za-z0-9]{20,}/g, starts: ["whsec_"] },
801
+ { re: /\bsk-(?=[\w-]{0,200}\d)(?=[\w-]{0,200}[A-Z])[\w-]{32,}/g, starts: ["sk-"] },
802
+ { re: /\bglpat-[\w-]{20,}/g, starts: ["glpat-"] },
803
+ { re: /\bnpm_[A-Za-z0-9]{36}\b/g, starts: ["npm_"] },
804
+ { re: /\bSK[0-9a-f]{32}\b/g, starts: ["SK"] },
805
+ { re: /\bAKIA[0-9A-Z]{16}\b/g, starts: ["AKIA"] },
806
+ { re: /\bAIza[\w-]{30,}/g, starts: ["AIza"] },
807
+ { re: /\bgh[opsu]_[A-Za-z0-9]{20,}/g, starts: ["gho_", "ghp_", "ghs_", "ghu_"] },
808
+ { re: /\bgithub_pat_\w{20,}/g, starts: ["github_pat_"] },
809
+ { re: /\bxox[abprs]-[\w-]{8,}/g, starts: ["xoxa-", "xoxb-", "xoxp-", "xoxr-", "xoxs-"] },
810
+ // Piwi's: an API key or the desktop app's token, an extension's device code, an MCP client's secret, authorization
811
+ // code, access and refresh tokens, a share link's and an assistant turn's token; a live view's key.
812
+ {
813
+ re: /\b(?:pd[acor]?|mcps|psl|pwt)_[0-9a-f]{32,}/g,
814
+ starts: ["pd_", "pda_", "pdc_", "pdo_", "pdr_", "mcps_", "psl_", "pwt_"]
815
+ },
816
+ { re: /\bpdl_[\w-]{40,}/g, starts: ["pdl_"] }
817
+ ];
818
+ var SECRET_SHAPES = SHAPES.map((shape) => shape.re);
819
+ var SECRET_SHAPE_STARTS = SHAPES.flatMap(
820
+ ({ re, starts }) => starts.map((start) => ({ start, anyCase: re.flags.includes("i") }))
821
+ );
822
+ var COLORED_SHAPES = SECRET_SHAPES.map(
823
+ (re) => new RegExp(`(\\u001b\\[[\\d;]*m)${re.source.replace(/^\\b/, "")}`, re.flags)
824
+ );
825
+ var WHOLE_SHAPES = SECRET_SHAPES.map(
826
+ (re) => new RegExp(`^(?:${re.source})$`, re.flags.replace("g", ""))
827
+ );
828
+
693
829
  // ../core/src/live-view.ts
694
830
  var LIVE_FRAME_BYTE_RATE = 256 * 1024;
695
831
  var MAX_LIVE_FRAME = 192 * 1024;
@@ -701,36 +837,63 @@ function isLiveViewKey(value) {
701
837
  }
702
838
 
703
839
  // src/internal/support/setup-file.ts
704
- var path4 = __toESM(require("path"));
705
- var os3 = __toESM(require("os"));
840
+ var path5 = __toESM(require("path"));
841
+ var fs4 = __toESM(require("fs"));
842
+
843
+ // src/internal/support/private-file.ts
844
+ var crypto2 = __toESM(require("crypto"));
706
845
  var fs3 = __toESM(require("fs"));
707
- function getSetupFilePath(projectName) {
708
- return path4.join(os3.tmpdir(), `piwi-dashboard-setup-${hashForProject(projectName)}.json`);
846
+ var os3 = __toESM(require("os"));
847
+ var path4 = __toESM(require("path"));
848
+ function privateTempDir() {
849
+ if (process.platform !== "win32") return os3.tmpdir();
850
+ const dir = path4.join(process.env.LOCALAPPDATA || path4.join(os3.homedir(), "AppData", "Local"), "piwi", "tmp");
851
+ try {
852
+ fs3.mkdirSync(dir, { recursive: true });
853
+ } catch {
854
+ }
855
+ return dir;
856
+ }
857
+ var NO_FOLLOW = fs3.constants.O_NOFOLLOW ?? 0;
858
+ var NO_WAIT = fs3.constants.O_NONBLOCK ?? 0;
859
+ function writePrivateFile(file, text) {
860
+ const temp = `${file}.${process.pid}.${crypto2.randomBytes(6).toString("hex")}.tmp`;
861
+ try {
862
+ fs3.writeFileSync(temp, text, { encoding: "utf8", flag: "wx", mode: 384 });
863
+ fs3.renameSync(temp, file);
864
+ } catch (error) {
865
+ fs3.rmSync(temp, { force: true });
866
+ throw error;
867
+ }
868
+ }
869
+
870
+ // src/internal/support/setup-file.ts
871
+ var logger = new Logger();
872
+ function getSetupFilePath(projectName, pid = process.pid) {
873
+ return path5.join(privateTempDir(), `piwi-dashboard-setup-${hashForProject(projectName)}-${pid}.json`);
709
874
  }
710
875
  function writeSetupInfo(info) {
711
- const setupFile = getSetupFilePath(info.projectName);
712
- fs3.writeFileSync(setupFile, JSON.stringify(info), { mode: 384 });
876
+ writePrivateFile(getSetupFilePath(info.projectName), JSON.stringify(info));
713
877
  }
714
878
 
715
879
  // src/internal/support/aria-sampling.ts
716
- var path5 = __toESM(require("path"));
717
- var os4 = __toESM(require("os"));
718
- var fs4 = __toESM(require("fs"));
880
+ var path6 = __toESM(require("path"));
881
+ var fs5 = __toESM(require("fs"));
719
882
  function ariaSampleIdentity(filePath, title) {
720
883
  return `${filePath}\0${title}`;
721
884
  }
722
885
  function getAriaSampleFilePath(projectName) {
723
- return path5.join(os4.tmpdir(), `piwi-dashboard-aria-sample-${hashForProject(projectName)}.json`);
886
+ return path6.join(privateTempDir(), `piwi-dashboard-aria-sample-${hashForProject(projectName)}.json`);
724
887
  }
725
888
  function writeAriaSampleFile(projectName, identities) {
726
889
  try {
727
- fs4.writeFileSync(getAriaSampleFilePath(projectName), JSON.stringify({ projectName, identities }));
890
+ writePrivateFile(getAriaSampleFilePath(projectName), JSON.stringify({ projectName, identities }));
728
891
  } catch {
729
892
  }
730
893
  }
731
894
  function clearAriaSampleFile(projectName) {
732
895
  try {
733
- fs4.rmSync(getAriaSampleFilePath(projectName), { force: true });
896
+ fs5.rmSync(getAriaSampleFilePath(projectName), { force: true });
734
897
  } catch {
735
898
  }
736
899
  }
@@ -896,7 +1059,7 @@ async function checkBaseUrl(target, options = {}) {
896
1059
  } else {
897
1060
  reason = outcome.error;
898
1061
  }
899
- if (attempt < attempts) await new Promise((resolve3) => setTimeout(resolve3, delayMs));
1062
+ if (attempt < attempts) await new Promise((resolve4) => setTimeout(resolve4, delayMs));
900
1063
  }
901
1064
  return `${reason} (${attempts} ${attempts === 1 ? "attempt" : "attempts"})`;
902
1065
  }
@@ -927,8 +1090,8 @@ async function checkBaseUrls(config, options = {}) {
927
1090
  }
928
1091
 
929
1092
  // src/internal/manifest/collect.ts
930
- var fs5 = __toESM(require("fs"));
931
- var path6 = __toESM(require("path"));
1093
+ var fs6 = __toESM(require("fs"));
1094
+ var path7 = __toESM(require("path"));
932
1095
 
933
1096
  // src/internal/transport/backend-request.ts
934
1097
  var http2 = __toESM(require("http"));
@@ -962,10 +1125,10 @@ function hasInstrumentationHeader(headers) {
962
1125
  return INSTRUMENTATION_HEADERS.some((h) => get(h) != null && get(h) !== "");
963
1126
  }
964
1127
  function readCommittedManifest(configDir) {
965
- const file = path6.join(configDir, COMMITTED_MANIFEST_FILE);
1128
+ const file = path7.join(configDir, COMMITTED_MANIFEST_FILE);
966
1129
  try {
967
- if (!fs5.existsSync(file)) return null;
968
- return parseManifestJson(fs5.readFileSync(file, "utf8"));
1130
+ if (!fs6.existsSync(file)) return null;
1131
+ return parseManifestJson(fs6.readFileSync(file, "utf8"));
969
1132
  } catch {
970
1133
  return null;
971
1134
  }
@@ -975,8 +1138,8 @@ var MAX_MANIFEST_BYTES = 4 * 1024 * 1024;
975
1138
  function instrumentationManifestUrls(baseUrl) {
976
1139
  const base = new URL(baseUrl);
977
1140
  const root = new URL(INSTRUMENTATION_MANIFEST_PATH, base).toString();
978
- const path9 = base.pathname.replace(/\/+$/, "");
979
- return path9 ? [new URL(`${path9}${INSTRUMENTATION_MANIFEST_PATH}`, base).toString(), root] : [root];
1141
+ const path11 = base.pathname.replace(/\/+$/, "");
1142
+ return path11 ? [new URL(`${path11}${INSTRUMENTATION_MANIFEST_PATH}`, base).toString(), root] : [root];
980
1143
  }
981
1144
  async function fetchInstrumentationManifest(baseUrl, fetchImpl = fetch) {
982
1145
  try {
@@ -1003,14 +1166,14 @@ async function lookupProjectId(httpClient, auth, projectName) {
1003
1166
  (p) => p.name.toLowerCase() === projectName.toLowerCase()
1004
1167
  )?.id;
1005
1168
  }
1006
- async function uploadManifest(httpClient, auth, projectId, upload, logger) {
1007
- await httpClient.putJSON(`/api/projects/${projectId}/surface/manifest`, upload, auth).catch((e) => logger.debug(`Manifest upload (${upload.source}) skipped: ${errorMessage(e)}`));
1169
+ async function uploadManifest(httpClient, auth, projectId, upload, logger2) {
1170
+ await httpClient.putJSON(`/api/projects/${projectId}/surface/manifest`, upload, auth).catch((e) => logger2.debug(`Manifest upload (${upload.source}) skipped: ${errorMessage(e)}`));
1008
1171
  }
1009
1172
 
1010
1173
  // src/internal/collect/source-checksums.ts
1011
- var crypto2 = __toESM(require("crypto"));
1012
- var fs6 = __toESM(require("fs"));
1013
- var path7 = __toESM(require("path"));
1174
+ var crypto3 = __toESM(require("crypto"));
1175
+ var fs7 = __toESM(require("fs"));
1176
+ var path8 = __toESM(require("path"));
1014
1177
 
1015
1178
  // src/internal/collect/server-coverage.ts
1016
1179
  var DEFAULT_COLLECTOR_LIMITS = {
@@ -1029,39 +1192,67 @@ function baseUrlsFromConfig(config) {
1029
1192
  return [...new Set(urls.filter((url) => typeof url === "string" && url !== ""))];
1030
1193
  }
1031
1194
 
1195
+ // src/internal/support/reporter-entry.ts
1196
+ var path9 = __toESM(require("path"));
1197
+ var import_node_module = require("module");
1198
+ var PIWI_REPORTER_MODULE = "@piwitests/reporter";
1199
+ var OWN_ENTRY = path9.resolve(__dirname, "index.js");
1200
+ function resolveFrom(id, dir) {
1201
+ try {
1202
+ return (0, import_node_module.createRequire)(path9.join(dir, "noop.js")).resolve(id);
1203
+ } catch {
1204
+ return null;
1205
+ }
1206
+ }
1207
+ function isPiwiReporterModule(id, dir) {
1208
+ if (id === PIWI_REPORTER_MODULE) return true;
1209
+ const file = resolveFrom(id, dir);
1210
+ if (!file) return false;
1211
+ return file === OWN_ENTRY || file === resolveFrom(PIWI_REPORTER_MODULE, dir);
1212
+ }
1213
+
1214
+ // src/internal/support/reporter-version.ts
1215
+ var fs8 = __toESM(require("fs"));
1216
+ var path10 = __toESM(require("path"));
1217
+ var cachedVersion = null;
1218
+ var CANDIDATE_OFFSETS = ["..", "../../.."];
1219
+ function findOwnPackageJson(fromDir) {
1220
+ for (const offset of CANDIDATE_OFFSETS) {
1221
+ try {
1222
+ const pkgPath = path10.resolve(fromDir, offset, "package.json");
1223
+ const pkg = JSON.parse(fs8.readFileSync(pkgPath, "utf-8"));
1224
+ const { name, version } = pkg;
1225
+ if (name === "@piwitests/reporter" && typeof version === "string")
1226
+ return { version, root: path10.dirname(pkgPath) };
1227
+ } catch {
1228
+ }
1229
+ }
1230
+ return void 0;
1231
+ }
1232
+ function getReporterVersion() {
1233
+ if (cachedVersion) return cachedVersion;
1234
+ cachedVersion = findOwnPackageJson(__dirname)?.version ?? "unknown";
1235
+ return cachedVersion;
1236
+ }
1237
+
1032
1238
  // src/public/global-setup.ts
1033
1239
  function createGlobalSetup(options, userSetup) {
1034
1240
  return async function globalSetupFn(config) {
1035
- const piwiReporterPath = path8.resolve(__dirname, "./index.js");
1036
- let inlineReporterOptions = {};
1037
- if (Array.isArray(config?.reporter)) {
1038
- for (const r of config.reporter) {
1039
- if (!Array.isArray(r) || typeof r[0] !== "string") continue;
1040
- const isPiwi = r[0].toLowerCase().includes("piwi") || (() => {
1041
- try {
1042
- return path8.resolve(require.resolve(r[0])) === piwiReporterPath;
1043
- } catch {
1044
- return false;
1045
- }
1046
- })();
1047
- if (isPiwi && r[1] && typeof r[1] === "object") {
1048
- inlineReporterOptions = r[1];
1049
- break;
1050
- }
1051
- }
1052
- }
1053
- const opts = resolveOptions(
1054
- { ...inlineReporterOptions, ...options },
1055
- configDirFromConfig(config)
1056
- );
1057
- const logger = new Logger(opts.verbose ?? false);
1241
+ const configDir = configDirFromConfig(config);
1242
+ const piwiReporter = Array.isArray(config?.reporter) ? config.reporter.find(
1243
+ (r) => Array.isArray(r) && typeof r[0] === "string" && isPiwiReporterModule(r[0], configDir)
1244
+ ) : void 0;
1245
+ const inline = piwiReporter?.[1];
1246
+ const inlineReporterOptions = inline && typeof inline === "object" ? inline : {};
1247
+ const opts = resolveOptions({ ...inlineReporterOptions, ...options }, configDir);
1248
+ const logger2 = new Logger(opts.verbose ?? false);
1058
1249
  if (isUiMode()) {
1059
- logger.debug("UI mode detected \u2014 skipping run registration.");
1250
+ logger2.debug("UI mode detected \u2014 skipping run registration.");
1060
1251
  if (userSetup) return userSetup(config);
1061
1252
  return;
1062
1253
  }
1063
1254
  if (isListMode()) {
1064
- logger.debug("List mode detected \u2014 skipping run registration.");
1255
+ logger2.debug("List mode detected \u2014 skipping run registration.");
1065
1256
  if (userSetup) return userSetup(config);
1066
1257
  return;
1067
1258
  }
@@ -1070,67 +1261,28 @@ function createGlobalSetup(options, userSetup) {
1070
1261
  for (const target of checked) {
1071
1262
  const note = remoteBrowserNote(target);
1072
1263
  if (note) {
1073
- logger.info(
1264
+ logger2.info(
1074
1265
  `Base URL answered: ${target.url}. ${note} A navigation failure from that browser can mean its machine cannot reach the app, not that the app is down.`
1075
1266
  );
1076
1267
  } else {
1077
- logger.debug(`Base URL answered: ${target.url}`);
1268
+ logger2.debug(`Base URL answered: ${target.url}`);
1078
1269
  }
1079
1270
  }
1080
1271
  }
1081
1272
  if (opts.enabled === false || !opts.serverUrl) {
1082
- logger.info("Not enabled \u2014 set PIWI_DASHBOARD_URL or serverUrl to enable.");
1273
+ logger2.info("Not enabled \u2014 set PIWI_DASHBOARD_URL or serverUrl to enable.");
1083
1274
  if (userSetup) return userSetup(config);
1084
1275
  return;
1085
1276
  }
1086
- const hasPiwi = Object.keys(inlineReporterOptions).length > 0 || Array.isArray(config?.reporter) && config.reporter.some((r) => {
1087
- if (!Array.isArray(r) || typeof r[0] !== "string") return false;
1088
- if (r[0].toLowerCase().includes("piwi")) return true;
1089
- try {
1090
- return path8.resolve(require.resolve(r[0])) === piwiReporterPath;
1091
- } catch {
1092
- return false;
1093
- }
1094
- });
1095
- if (!hasPiwi) {
1096
- logger.debug("Not reporting \u2014 Piwi is not in the Playwright reporters list.");
1277
+ if (!piwiReporter) {
1278
+ logger2.debug("Not reporting \u2014 Piwi is not in the Playwright reporters list.");
1097
1279
  if (userSetup) return userSetup(config);
1098
1280
  return;
1099
1281
  }
1100
- const httpClient = new HttpClient(opts.serverUrl, logger);
1282
+ const httpClient = new HttpClient(opts.serverUrl, logger2);
1101
1283
  try {
1102
1284
  const auth = await httpClient.resolveAuth(opts);
1103
- const shard = resolveShardInfo(config);
1104
- const response = await httpClient.postJSON(
1105
- "/api/test-runs/setup",
1106
- {
1107
- projectName: opts.projectName,
1108
- projectDescription: opts.projectDescription,
1109
- environment: opts.environment || null,
1110
- label: opts.label || null,
1111
- keep: opts.keep === true,
1112
- startTime: (/* @__PURE__ */ new Date()).toISOString(),
1113
- instanceId: computeInstanceId(opts.projectName, resolveRunLabel(opts.runLabel, shard !== null)),
1114
- shardIndex: shard?.current,
1115
- shardTotal: shard?.total,
1116
- // A key for the run's live view: the instance hands one out only for a project that turned it on, and the
1117
- // desktop app none. A CI run's workers stream with it at once; a run outside CI sends nothing with it until a
1118
- // person shares the run.
1119
- liveView: true
1120
- },
1121
- auth
1122
- );
1123
- if (response?.runId && response?.setupToken) {
1124
- const liveViewKey = response.liveView?.key;
1125
- writeSetupInfo({
1126
- runId: response.runId,
1127
- setupToken: response.setupToken,
1128
- projectName: opts.projectName,
1129
- ...isLiveViewKey(liveViewKey) ? { liveViewKey } : {},
1130
- ...response.liveView?.refused === "local" ? { liveViewLocal: true } : {}
1131
- });
1132
- logger.debug(`Global setup: initializing run #${response.runId}`);
1133
- }
1285
+ if (opts.streaming !== false) await registerRun(httpClient, auth, opts, config, logger2);
1134
1286
  if (opts.projectName) clearAriaSampleFile(opts.projectName);
1135
1287
  const wantsAria = opts.sampleAriaOnPass !== false && !!opts.projectName;
1136
1288
  const committedManifest = opts.uploadManifest !== false ? readCommittedManifest(configDirFromConfig(config)) : null;
@@ -1146,7 +1298,7 @@ function createGlobalSetup(options, userSetup) {
1146
1298
  if (tests) {
1147
1299
  const identities = tests.filter((t) => typeof t.filePath === "string" && typeof t.title === "string").map((t) => ariaSampleIdentity(t.filePath, t.title));
1148
1300
  writeAriaSampleFile(opts.projectName, identities);
1149
- logger.debug(`Green ARIA sampling: ${identities.length} test(s) due a sample.`);
1301
+ logger2.debug(`Green ARIA sampling: ${identities.length} test(s) due a sample.`);
1150
1302
  }
1151
1303
  }
1152
1304
  if (wantsManifest && projectId != null) {
@@ -1157,22 +1309,57 @@ function createGlobalSetup(options, userSetup) {
1157
1309
  auth,
1158
1310
  projectId,
1159
1311
  { source: "committed", branch, manifest: committedManifest },
1160
- logger
1312
+ logger2
1161
1313
  );
1162
1314
  }
1163
1315
  const declared = await Promise.all(manifestBaseUrls.map((url) => fetchInstrumentationManifest(url)));
1164
1316
  for (const manifest of declared) {
1165
1317
  if (manifest) {
1166
- await uploadManifest(httpClient, auth, projectId, { source: "instrumentation", branch, manifest }, logger);
1318
+ await uploadManifest(httpClient, auth, projectId, { source: "instrumentation", branch, manifest }, logger2);
1167
1319
  }
1168
1320
  }
1169
1321
  }
1170
1322
  } catch (error) {
1171
- logger.warn(`Could not register global setup: ${errorMessage(error)}`);
1323
+ logger2.warn(`Could not register global setup: ${errorMessage(error)}`);
1172
1324
  }
1173
1325
  if (userSetup) return userSetup(config);
1174
1326
  };
1175
1327
  }
1328
+ async function registerRun(httpClient, auth, opts, config, logger2) {
1329
+ const shard = resolveShardInfo(config);
1330
+ const response = await httpClient.postJSON(
1331
+ "/api/test-runs/setup",
1332
+ {
1333
+ projectName: opts.projectName,
1334
+ projectDescription: opts.projectDescription,
1335
+ environment: opts.environment || null,
1336
+ label: opts.label || null,
1337
+ keep: opts.keep === true,
1338
+ startTime: (/* @__PURE__ */ new Date()).toISOString(),
1339
+ instanceId: computeInstanceId(opts.projectName, resolveRunLabel(opts.runLabel, shard !== null)),
1340
+ shardIndex: shard?.current,
1341
+ shardTotal: shard?.total,
1342
+ // The dashboard reads from it whether the run's `/begin` carries its setup token in a header too.
1343
+ reporterVersion: getReporterVersion(),
1344
+ // A key for the run's live view: the instance hands one out only for a project that turned it on, and the
1345
+ // desktop app none. A CI run's workers stream with it at once; a run outside CI sends nothing with it until a
1346
+ // person shares the run.
1347
+ liveView: true
1348
+ },
1349
+ auth
1350
+ );
1351
+ if (response?.runId && response?.setupToken) {
1352
+ const liveViewKey = response.liveView?.key;
1353
+ writeSetupInfo({
1354
+ runId: response.runId,
1355
+ setupToken: response.setupToken,
1356
+ projectName: opts.projectName,
1357
+ ...isLiveViewKey(liveViewKey) ? { liveViewKey } : {},
1358
+ ...response.liveView?.refused === "local" ? { liveViewLocal: true } : {}
1359
+ });
1360
+ logger2.debug(`Global setup: initializing run #${response.runId}`);
1361
+ }
1362
+ }
1176
1363
 
1177
1364
  // src/global-setup-module.ts
1178
1365
  var global_setup_module_default = createGlobalSetup();