@piwitests/reporter 0.58.0 → 0.60.0

package/dist/global-setup-module.js

@@ -35,7 +35,7 @@ __export(global_setup_module_exports, {
 module.exports = __toCommonJS(global_setup_module_exports);
 
 // src/public/global-setup.ts
-var path7 = __toESM(require("path"));
+var path8 = __toESM(require("path"));
 
 // src/internal/support/errors.ts
 function errorMessage(error) {
@@ -44,7 +44,10 @@ function errorMessage(error) {
 }
 
 // src/public/global-setup.ts
-var fs6 = __toESM(require("fs"));
+var fs7 = __toESM(require("fs"));
+
+// src/internal/config/env.ts
+var path2 = __toESM(require("path"));
 
 // src/internal/config/desktop.ts
 var fs = __toESM(require("fs"));
@@ -53,6 +56,14 @@ var path = __toESM(require("path"));
 function defaultDesktopConfigPath() {
   return path.join(os.homedir(), ".piwi", "desktop.json");
 }
+function processAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
 function readDesktopConfig(filePath) {
   try {
     const parsed = JSON.parse(fs.readFileSync(filePath, "utf8"));
@@ -60,12 +71,75 @@ function readDesktopConfig(filePath) {
     const token = parsed?.token;
     if (typeof url !== "string" || !url) return null;
     if (typeof token !== "string" || !token) return null;
+    if (Number.isInteger(parsed?.pid) && parsed.pid > 0 && !processAlive(parsed.pid)) return null;
     return { url, token };
   } catch {
     return null;
   }
 }
 
+// src/internal/config/dotenv.ts
+var fs2 = __toESM(require("fs"));
+
+// ../core/src/dotenv.ts
+function parseDotEnv(text) {
+  const out = {};
+  for (const raw of text.split(/\r?\n/)) {
+    const m = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*?)\s*$/.exec(raw);
+    if (!m) continue;
+    let value = m[2];
+    const quote = value[0];
+    if ((quote === '"' || quote === "'") && value.length > 1 && value.endsWith(quote)) {
+      value = value.slice(1, -1);
+      if (quote === '"') value = value.replace(/\\n/g, "\n").replace(/\\"/g, '"');
+    } else {
+      value = value.replace(/\s+#.*$/, "");
+    }
+    out[m[1]] = value;
+  }
+  return out;
+}
+
+// src/internal/config/dotenv.ts
+function readDotEnv(filePath) {
+  try {
+    return parseDotEnv(fs2.readFileSync(filePath, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+
+// src/internal/support/ci.ts
+function detectCi(env) {
+  return Boolean(
+    env.JENKINS_URL || env.GITHUB_ACTIONS || env.GITLAB_CI || env.CIRCLECI || env.TRAVIS || env.TF_BUILD || env.BITBUCKET_BUILD_NUMBER || env.TEAMCITY_VERSION || env.CODEBUILD_BUILD_ID || env.bamboo_buildKey || env.CI && env.CI.toLowerCase() !== "false" && env.CI !== "0"
+  );
+}
+function detectCiIds(env) {
+  if (env.GITHUB_ACTIONS && env.GITHUB_RUN_ID) {
+    const run = env.GITHUB_RUN_ATTEMPT ? `${env.GITHUB_RUN_ID}-${env.GITHUB_RUN_ATTEMPT}` : env.GITHUB_RUN_ID;
+    return { run, job: env.GITHUB_JOB || null };
+  }
+  if (env.GITLAB_CI && env.CI_PIPELINE_ID) return { run: env.CI_PIPELINE_ID, job: env.CI_JOB_ID || null };
+  if (env.CIRCLECI && env.CIRCLE_WORKFLOW_ID) return { run: env.CIRCLE_WORKFLOW_ID, job: env.CIRCLE_BUILD_NUM || null };
+  if (env.TRAVIS && env.TRAVIS_BUILD_ID) return { run: env.TRAVIS_BUILD_ID, job: env.TRAVIS_JOB_ID || null };
+  if (env.TF_BUILD && env.BUILD_BUILDID) return { run: env.BUILD_BUILDID, job: env.SYSTEM_JOBID || null };
+  if (env.JENKINS_URL && env.BUILD_ID) return { run: env.BUILD_ID, job: null };
+  if (env.BUILDKITE_BUILD_ID) return { run: env.BUILDKITE_BUILD_ID, job: env.BUILDKITE_JOB_ID || null };
+  if (env.TEAMCITY_BUILD_ID) return { run: env.TEAMCITY_BUILD_ID, job: null };
+  if (env.BITBUCKET_BUILD_NUMBER) return { run: env.BITBUCKET_BUILD_NUMBER, job: env.BITBUCKET_STEP_UUID || null };
+  if (env.SEMAPHORE_WORKFLOW_ID) return { run: env.SEMAPHORE_WORKFLOW_ID, job: env.SEMAPHORE_JOB_ID || null };
+  if (env.APPVEYOR_BUILD_ID) return { run: env.APPVEYOR_BUILD_ID, job: env.APPVEYOR_JOB_ID || null };
+  if (env.DRONE_BUILD_NUMBER) return { run: env.DRONE_BUILD_NUMBER, job: null };
+  return null;
+}
+function resolveRunLabel(configured, sharded) {
+  if (configured) return configured;
+  const ci = detectCiIds(process.env);
+  if (!ci) return null;
+  return !sharded && ci.job ? `${ci.run}|${ci.job}` : ci.run;
+}
+
 // src/internal/config/env.ts
 var DEFAULTS = {
   projectName: "default-project",
@@ -102,6 +176,7 @@ var DEFAULTS = {
 };
 var PIWI_ENV_KEYS = {
   serverUrl: "PIWI_DASHBOARD_URL",
+  desktopApp: "PIWI_DESKTOP_APP",
   projectName: "PIWI_PROJECT_NAME",
   verbose: "PIWI_VERBOSE",
   apiKey: "PIWI_API_KEY",
@@ -188,8 +263,18 @@ var ENV_FALLBACK_SPECS = [
   { option: "pickLocatorOnFailure", env: PIWI_ENV_KEYS.pickLocatorOnFailure, kind: "bool" },
   { option: "outputFile", env: PIWI_ENV_KEYS.outputFile, kind: "string" }
 ];
+var DOTENV_OPTIONS = ["serverUrl", "apiKey", "projectName"];
+var DESKTOP_APP_MODES = ["prefer", "fallback", "off"];
+function desktopAppMode(option, envValue) {
+  const fromEnv = envValue?.trim().toLowerCase();
+  if (DESKTOP_APP_MODES.includes(fromEnv)) return fromEnv;
+  if (DESKTOP_APP_MODES.includes(option)) return option;
+  return "fallback";
+}
 var desktopDiscovered = false;
-function resolveOptions(raw) {
+var desktopReplacedServerUrl = null;
+var dotEnvUse = null;
+function resolveOptions(raw, configDir) {
   const env = process.env;
   const mergedRaw = { ...raw };
   for (const spec of ENV_FALLBACK_SPECS) {
@@ -201,14 +286,35 @@ function resolveOptions(raw) {
       mergedRaw[spec.option] = spec.kind === "number" ? Number(value) : value;
     }
   }
+  dotEnvUse = null;
+  if (configDir) {
+    const file = path2.join(configDir, ".env");
+    const dotEnv = readDotEnv(file);
+    const keys = [];
+    for (const option of DOTENV_OPTIONS) {
+      const value = dotEnv[PIWI_ENV_KEYS[option]];
+      if (mergedRaw[option] !== void 0 || !value) continue;
+      mergedRaw[option] = value;
+      keys.push(PIWI_ENV_KEYS[option]);
+    }
+    if (keys.length > 0) dotEnvUse = { file, keys };
+  }
   desktopDiscovered = false;
+  desktopReplacedServerUrl = null;
+  const mode = desktopAppMode(mergedRaw.desktopApp, env[PIWI_ENV_KEYS.desktopApp]);
+  mergedRaw.desktopApp = mode;
   const serverUrlUnset = mergedRaw.serverUrl === void 0;
   const apiKeyUnset = mergedRaw.apiKey === void 0 || mergedRaw.apiKey === null;
-  if (serverUrlUnset && apiKeyUnset) {
+  const nothingConfigured = serverUrlUnset && apiKeyUnset;
+  const preferLocally = mode === "prefer" && !detectCi(env);
+  if (mode !== "off" && (nothingConfigured || preferLocally)) {
     const desktop = readDesktopConfig(env[PIWI_DESKTOP_CONFIG_ENV] || defaultDesktopConfigPath());
     if (desktop) {
+      if (!serverUrlUnset && mergedRaw.serverUrl !== desktop.url) desktopReplacedServerUrl = mergedRaw.serverUrl;
       mergedRaw.serverUrl = desktop.url;
       mergedRaw.apiKey = desktop.token;
+      mergedRaw.username = null;
+      mergedRaw.password = null;
       desktopDiscovered = true;
     }
   }
@@ -528,32 +634,6 @@ function computeInstanceId(projectName, runLabel) {
   return crypto.createHash("sha256").update(seed).digest("hex").slice(0, 16);
 }
 
-// src/internal/support/ci.ts
-function detectCiIds(env) {
-  if (env.GITHUB_ACTIONS && env.GITHUB_RUN_ID) {
-    const run = env.GITHUB_RUN_ATTEMPT ? `${env.GITHUB_RUN_ID}-${env.GITHUB_RUN_ATTEMPT}` : env.GITHUB_RUN_ID;
-    return { run, job: env.GITHUB_JOB || null };
-  }
-  if (env.GITLAB_CI && env.CI_PIPELINE_ID) return { run: env.CI_PIPELINE_ID, job: env.CI_JOB_ID || null };
-  if (env.CIRCLECI && env.CIRCLE_WORKFLOW_ID) return { run: env.CIRCLE_WORKFLOW_ID, job: env.CIRCLE_BUILD_NUM || null };
-  if (env.TRAVIS && env.TRAVIS_BUILD_ID) return { run: env.TRAVIS_BUILD_ID, job: env.TRAVIS_JOB_ID || null };
-  if (env.TF_BUILD && env.BUILD_BUILDID) return { run: env.BUILD_BUILDID, job: env.SYSTEM_JOBID || null };
-  if (env.JENKINS_URL && env.BUILD_ID) return { run: env.BUILD_ID, job: null };
-  if (env.BUILDKITE_BUILD_ID) return { run: env.BUILDKITE_BUILD_ID, job: env.BUILDKITE_JOB_ID || null };
-  if (env.TEAMCITY_BUILD_ID) return { run: env.TEAMCITY_BUILD_ID, job: null };
-  if (env.BITBUCKET_BUILD_NUMBER) return { run: env.BITBUCKET_BUILD_NUMBER, job: env.BITBUCKET_STEP_UUID || null };
-  if (env.SEMAPHORE_WORKFLOW_ID) return { run: env.SEMAPHORE_WORKFLOW_ID, job: env.SEMAPHORE_JOB_ID || null };
-  if (env.APPVEYOR_BUILD_ID) return { run: env.APPVEYOR_BUILD_ID, job: env.APPVEYOR_JOB_ID || null };
-  if (env.DRONE_BUILD_NUMBER) return { run: env.DRONE_BUILD_NUMBER, job: null };
-  return null;
-}
-function resolveRunLabel(configured, sharded) {
-  if (configured) return configured;
-  const ci = detectCiIds(process.env);
-  if (!ci) return null;
-  return !sharded && ci.job ? `${ci.run}|${ci.job}` : ci.run;
-}
-
 // src/internal/support/shard-info.ts
 function parseShardSpec(raw) {
   const match = raw?.trim().match(/^(\d+)\s*\/\s*(\d+)$/);
@@ -572,9 +652,9 @@ function resolveShardInfo(config, env = process.env) {
 var import_node_child_process = require("child_process");
 
 // src/internal/support/test-paths.ts
-var path2 = __toESM(require("path"));
+var path3 = __toESM(require("path"));
 function configDirFromConfig(config) {
-  if (config?.configFile) return path2.dirname(config.configFile);
+  if (config?.configFile) return path3.dirname(config.configFile);
   if (config?.rootDir) return config.rootDir;
   return process.cwd();
 }
@@ -609,32 +689,32 @@ function normalizeRef(ref) {
 }
 
 // src/internal/support/setup-file.ts
-var path3 = __toESM(require("path"));
+var path4 = __toESM(require("path"));
 var os3 = __toESM(require("os"));
-var fs2 = __toESM(require("fs"));
+var fs3 = __toESM(require("fs"));
 function getSetupFilePath(projectName) {
-  return path3.join(os3.tmpdir(), `piwi-dashboard-setup-${hashForProject(projectName)}.json`);
+  return path4.join(os3.tmpdir(), `piwi-dashboard-setup-${hashForProject(projectName)}.json`);
 }
 
 // src/internal/support/aria-sampling.ts
-var path4 = __toESM(require("path"));
+var path5 = __toESM(require("path"));
 var os4 = __toESM(require("os"));
-var fs3 = __toESM(require("fs"));
+var fs4 = __toESM(require("fs"));
 function ariaSampleIdentity(filePath, title) {
   return `${filePath}\0${title}`;
 }
 function getAriaSampleFilePath(projectName) {
-  return path4.join(os4.tmpdir(), `piwi-dashboard-aria-sample-${hashForProject(projectName)}.json`);
+  return path5.join(os4.tmpdir(), `piwi-dashboard-aria-sample-${hashForProject(projectName)}.json`);
 }
 function writeAriaSampleFile(projectName, identities) {
   try {
-    fs3.writeFileSync(getAriaSampleFilePath(projectName), JSON.stringify({ projectName, identities }));
+    fs4.writeFileSync(getAriaSampleFilePath(projectName), JSON.stringify({ projectName, identities }));
   } catch {
   }
 }
 function clearAriaSampleFile(projectName) {
   try {
-    fs3.rmSync(getAriaSampleFilePath(projectName), { force: true });
+    fs4.rmSync(getAriaSampleFilePath(projectName), { force: true });
   } catch {
   }
 }
@@ -788,8 +868,8 @@ async function checkBaseUrls(config, options = {}) {
 }
 
 // src/internal/manifest/collect.ts
-var fs4 = __toESM(require("fs"));
-var path5 = __toESM(require("path"));
+var fs5 = __toESM(require("fs"));
+var path6 = __toESM(require("path"));
 
 // src/internal/transport/backend-request.ts
 var http2 = __toESM(require("http"));
@@ -823,10 +903,10 @@ function hasInstrumentationHeader(headers) {
   return INSTRUMENTATION_HEADERS.some((h) => get(h) != null && get(h) !== "");
 }
 function readCommittedManifest(configDir) {
-  const file = path5.join(configDir, COMMITTED_MANIFEST_FILE);
+  const file = path6.join(configDir, COMMITTED_MANIFEST_FILE);
   try {
-    if (!fs4.existsSync(file)) return null;
-    return parseManifestJson(fs4.readFileSync(file, "utf8"));
+    if (!fs5.existsSync(file)) return null;
+    return parseManifestJson(fs5.readFileSync(file, "utf8"));
   } catch {
     return null;
   }
@@ -836,8 +916,8 @@ var MAX_MANIFEST_BYTES = 4 * 1024 * 1024;
 function instrumentationManifestUrls(baseUrl) {
   const base = new URL(baseUrl);
   const root = new URL(INSTRUMENTATION_MANIFEST_PATH, base).toString();
-  const path8 = base.pathname.replace(/\/+$/, "");
-  return path8 ? [new URL(`${path8}${INSTRUMENTATION_MANIFEST_PATH}`, base).toString(), root] : [root];
+  const path9 = base.pathname.replace(/\/+$/, "");
+  return path9 ? [new URL(`${path9}${INSTRUMENTATION_MANIFEST_PATH}`, base).toString(), root] : [root];
 }
 async function fetchInstrumentationManifest(baseUrl, fetchImpl = fetch) {
   try {
@@ -870,8 +950,8 @@ async function uploadManifest(httpClient, auth, projectId, upload, logger) {
 
 // src/internal/collect/source-checksums.ts
 var crypto2 = __toESM(require("crypto"));
-var fs5 = __toESM(require("fs"));
-var path6 = __toESM(require("path"));
+var fs6 = __toESM(require("fs"));
+var path7 = __toESM(require("path"));
 
 // src/internal/collect/server-coverage.ts
 var DEFAULT_COLLECTOR_LIMITS = {
@@ -893,14 +973,14 @@ function baseUrlsFromConfig(config) {
 // src/public/global-setup.ts
 function createGlobalSetup(options, userSetup) {
   return async function globalSetupFn(config) {
-    const piwiReporterPath = path7.resolve(__dirname, "./index.js");
+    const piwiReporterPath = path8.resolve(__dirname, "./index.js");
     let inlineReporterOptions = {};
     if (Array.isArray(config?.reporter)) {
       for (const r of config.reporter) {
         if (!Array.isArray(r) || typeof r[0] !== "string") continue;
         const isPiwi = r[0].toLowerCase().includes("piwi") || (() => {
           try {
-            return path7.resolve(require.resolve(r[0])) === piwiReporterPath;
+            return path8.resolve(require.resolve(r[0])) === piwiReporterPath;
           } catch {
             return false;
           }
@@ -911,7 +991,10 @@ function createGlobalSetup(options, userSetup) {
         }
       }
     }
-    const opts = resolveOptions({ ...inlineReporterOptions, ...options });
+    const opts = resolveOptions(
+      { ...inlineReporterOptions, ...options },
+      configDirFromConfig(config)
+    );
     const logger = new Logger(opts.verbose ?? false);
     if (isUiMode()) {
       logger.debug("UI mode detected \u2014 skipping run registration.");
@@ -936,7 +1019,7 @@ function createGlobalSetup(options, userSetup) {
       if (!Array.isArray(r) || typeof r[0] !== "string") return false;
       if (r[0].toLowerCase().includes("piwi")) return true;
       try {
-        return path7.resolve(require.resolve(r[0])) === piwiReporterPath;
+        return path8.resolve(require.resolve(r[0])) === piwiReporterPath;
       } catch {
         return false;
       }
@@ -966,7 +1049,7 @@ function createGlobalSetup(options, userSetup) {
         auth
       );
       if (response?.runId && response?.setupToken) {
-        fs6.writeFileSync(
+        fs7.writeFileSync(
           getSetupFilePath(opts.projectName),
           JSON.stringify({
             runId: response.runId,

package/dist/index.d.ts

@@ -19,6 +19,18 @@ interface PiwiDashboardOptions {
     enabled?: boolean;
     /** URL of the Piwi Dashboard server */
     serverUrl?: string;
+    /**
+     * When results go to the Piwi desktop app running on this machine instead.
+     * `'fallback'` uses the app only when nothing sets a server: no `serverUrl`,
+     * no `apiKey`, and neither `PIWI_DASHBOARD_URL` nor `PIWI_API_KEY`.
+     * `'prefer'` uses it whenever it is running and the run is not on CI, even
+     * with `serverUrl` set, so local runs land in the app while CI runs, and
+     * local runs with the app closed, go to `serverUrl` with its credentials.
+     * `'off'` never uses it. Defaults to `'fallback'`. `PIWI_DESKTOP_APP`
+     * overrides this option, so setting it to `off` for one run sends that
+     * local run to `serverUrl`.
+     */
+    desktopApp?: 'prefer' | 'fallback' | 'off';
     /** Name of the project to report results under. Defaults to `'default-project'`. */
     projectName?: string;
     /** Optional description of the project */
@@ -495,6 +507,10 @@ declare class PiwiDashboardReporter {
     private readonly listMode;
     /** True when the server URL and API key came from the desktop app, not from config. */
     private viaDesktopApp;
+    /** The configured server `desktopApp: 'prefer'` set aside for the desktop app, if any. */
+    private readonly desktopReplaced;
+    /** The config folder's `.env` file and the connection variables taken from it, if any. */
+    private readonly viaDotEnv;
     private isFullRun;
     private filterDetails;
     /** Configured `maxFailures` (0 = unlimited) — disambiguates an interrupted run's unrun reason. */