@rmartz/merge-safety 0.14.0 → 0.15.0

package/dist/bin/merge-safety.js

@@ -53,16 +53,35 @@ var MAX_RETRIES = 2;
 var BACKOFF_BASE_MS = 1e3;
 var BACKOFF_CAP_MS = 8e3;
 var realSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var GhTransientError = class extends Error {
+  constructor(stderr) {
+    super(`transient GitHub API failure: ${stderr}`);
+    this.stderr = stderr;
+    this.name = "GhTransientError";
+  }
+  stderr;
+};
 function isRateLimited(text) {
   const t = (text ?? "").toLowerCase();
   return t.includes("rate limit") || t.includes("rate-limit");
 }
+var TRANSIENT_PATTERNS = [
+  /\bHTTP 5\d\d\b/,
+  /bad gateway|service unavailable|gateway time-?out|internal server error/i,
+  /timed out|timeout/i,
+  /connection (?:reset|refused)/i,
+  /could not resolve host|no such host|tls handshake|unexpected eof/i
+];
+function isTransientGhFailure(stderr) {
+  return isRateLimited(stderr) || TRANSIENT_PATTERNS.some((p) => p.test(stderr));
+}
 async function runTransport({ argv, stdin }, cwd) {
   const [command, ...args] = argv;
   if (command === void 0) return { stdout: null, stderr: "empty argv" };
   try {
     const r = await boundedRun(command, args, { timeoutMs: GH_API_TIMEOUT_MS, cwd, input: stdin });
     if (r.code === 0) return { stdout: r.stdout, stderr: "" };
+    if (r.timedOut) return { stdout: null, stderr: `gh timed out after ${GH_API_TIMEOUT_MS}ms` };
     return { stdout: null, stderr: r.stderr || "" };
   } catch (err) {
     return { stdout: null, stderr: err instanceof Error ? err.message : String(err) };
@@ -70,17 +89,22 @@ async function runTransport({ argv, stdin }, cwd) {
 }
 async function ghCall(primary, fallback, opts = {}) {
   const sleep = opts.sleep ?? realSleep;
+  let lastStderr = "";
   for (const transport of [primary, fallback]) {
     if (!transport) continue;
     for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
       const { stdout, stderr } = await runTransport(transport, opts.cwd);
       if (stdout !== null) return stdout;
+      lastStderr = stderr;
       if (isRateLimited(stderr)) break;
       if (attempt < MAX_RETRIES) {
         await sleep(Math.min(BACKOFF_BASE_MS * 2 ** attempt, BACKOFF_CAP_MS));
       }
     }
   }
+  if (opts.throwOnTransient && isTransientGhFailure(lastStderr)) {
+    throw new GhTransientError(lastStderr.trim());
+  }
   return null;
 }
 function parseSlugFromRemoteUrl(url) {
@@ -225,6 +249,40 @@ async function postCheckRun(repo, headSha, output, conclusion, cwd) {
   );
 }
 
+// src/lib/cancel-run.ts
+var EXIT_TRANSIENT = 75;
+var CANCEL_GRACE_MS = 12e4;
+async function requestRunCancel(opts = {}) {
+  const { GITHUB_ACTIONS, GITHUB_REPOSITORY, GITHUB_RUN_ID } = opts.env ?? process.env;
+  if (GITHUB_ACTIONS !== "true" || !GITHUB_REPOSITORY || !GITHUB_RUN_ID) return false;
+  const out = await ghCall(
+    {
+      argv: [
+        "gh",
+        "api",
+        "-X",
+        "POST",
+        `repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/cancel`
+      ]
+    },
+    null,
+    { cwd: opts.cwd }
+  );
+  return out !== null;
+}
+async function abandonRunAsCancelled(err, opts = {}) {
+  console.warn(
+    `::warning title=merge-safety cancelled::${err.message} \u2014 cancelling this run; the next event re-evaluates.`
+  );
+  process.exitCode = EXIT_TRANSIENT;
+  if (!await requestRunCancel(opts)) {
+    console.error("could not request cancellation of this run; exiting as failed");
+    return;
+  }
+  const wait = opts.wait ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  await wait(CANCEL_GRACE_MS);
+}
+
 // src/conventional-commits.ts
 var BREAKING_SUBJECT_RE = /^[a-z]+(?:!(?:\([^)]*\))?|(?:\([^)]*\))?!):/;
 var BREAKING_FOOTER_RE = /^BREAKING[ -]CHANGE:/m;
@@ -644,7 +702,7 @@ function parse(argv) {
   return args;
 }
 async function ghJson(argv, cwd) {
-  const out = await ghCall({ argv }, null, { cwd });
+  const out = await ghCall({ argv }, null, { cwd, throwOnTransient: true });
   if (out === null) return null;
   try {
     return JSON.parse(out);
@@ -835,8 +893,18 @@ async function main() {
     console.error("error: could not resolve target repo (pass --repo <owner/repo>)");
     process.exit(2);
   }
-  if (args.mode === "evaluate") await runEvaluate(repo, args.pr, args);
-  else await runInvalidate(repo, args);
+  try {
+    if (args.mode === "evaluate") await runEvaluate(repo, args.pr, args);
+    else await runInvalidate(repo, args);
+  } catch (err) {
+    if (!(err instanceof GhTransientError)) throw err;
+    if (args.json) {
+      console.error(`error: ${err.message}`);
+      process.exitCode = EXIT_TRANSIENT;
+    } else {
+      await abandonRunAsCancelled(err, { cwd: args.cwd });
+    }
+  }
 }
 function isDirectRun() {
   const entry = process.argv[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmartz/merge-safety",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "The pre-auto-merge safety verdict for a PR (base-currency, breaking-change, and conflict facts), posted as the `merge-safety` check-run and distributed through the `rmartz/merge-safety-action` composite action kept current by Dependabot.",
   "keywords": [
     "ci",