paratix 0.12.2 → 0.12.4

package/dist/{chunk-YOSHYUST.js → chunk-QVU4YEKK.js}

@@ -1268,19 +1268,32 @@ async function writeFlagLockHolderMarker(ssh2, lockName) {
       kind: "failed"
     };
   }
-  const holderToken = await ssh2.output(`awk 'NR==1{print $1}' -- ${quotedMarker}`).then((token) => token.trim()).catch(() => "");
-  if (holderToken.length === 0) {
+  const readbackResult = await ssh2.exec(`awk 'NR==1{print $1}' ${quotedMarker}`, { ignoreExitCode: true, silent: true }).catch(() => null);
+  const holderToken = readbackResult?.stdout.trim() ?? "";
+  if (readbackResult?.code !== 0 || holderToken.length === 0) {
     await ssh2.exec(`rm -f -- ${markerPath2}`, { ignoreExitCode: true, silent: true });
     await ssh2.exec(`rmdir -- ${lock}`, { ignoreExitCode: true, silent: true });
     return {
-      failure: failed(
-        `[moduleHelpers] flag lock holder marker for ${lockName} is empty after write`
-      ),
+      failure: buildReadbackFailure(lockName, readbackResult),
       kind: "failed"
     };
   }
   return { holderToken, kind: "ok" };
 }
+function buildReadbackFailure(lockName, readbackResult) {
+  if (readbackResult == null) {
+    return failed(
+      `[moduleHelpers] flag lock holder marker for ${lockName} readback failed: ssh.exec threw before returning a result`
+    );
+  }
+  if (readbackResult.code !== 0) {
+    return failedCommand(
+      `[moduleHelpers] flag lock holder marker for ${lockName} readback failed`,
+      readbackResult
+    );
+  }
+  return failed(`[moduleHelpers] flag lock holder marker for ${lockName} is readable but empty`);
+}
 async function acquireFlagLock(ssh2, lockName) {
   validateFlagName(lockName, "lockName");
   const ensureFailure = await ensureFlagsDirectory(ssh2);
@@ -1305,7 +1318,7 @@ async function releaseFlagLock(ssh2, lockName, holderToken) {
   const markerPath2 = `${lock}/${HOLDER_MARKER_NAME}`;
   const quotedMarker = shellQuote(`${flagLockDisplayPath(lockName)}/${HOLDER_MARKER_NAME}`);
   const expectedToken = `x${holderToken}`;
-  const command2 = `awk_token=$(awk 'NR==1{print $1}' -- ${quotedMarker} 2>/dev/null); awk_status=$?; [ "$awk_status" = 0 ] && [ "x$awk_token" = ${shellQuote(expectedToken)} ] && rm -f -- ${markerPath2} && rmdir -- ${lock}`;
+  const command2 = `awk_token=$(awk 'NR==1{print $1}' ${quotedMarker} 2>/dev/null); awk_status=$?; [ "$awk_status" = 0 ] && [ "x$awk_token" = ${shellQuote(expectedToken)} ] && rm -f -- ${markerPath2} && rmdir -- ${lock}`;
   await ssh2.exec(command2, { ignoreExitCode: true, silent: true });
 }
 async function tryReclaimStaleFlagLock(ssh2, lockName, staleSeconds) {
@@ -1314,7 +1327,7 @@ async function tryReclaimStaleFlagLock(ssh2, lockName, staleSeconds) {
   const quotedMarker = shellQuote(`${flagLockDisplayPath(lockName)}/${HOLDER_MARKER_NAME}`);
   const staleMinutes = Math.max(1, Math.ceil(staleSeconds / SECONDS_PER_MINUTE));
   const mminThreshold = String(staleMinutes - 1);
-  const command2 = `if [ -d ${lock} ]; then if [ -f ${markerPath2} ]; then STALE_TOKEN="$(awk 'NR==1{print $1}' -- ${quotedMarker} 2>/dev/null)"; if find ${markerPath2} -maxdepth 0 -mmin +${mminThreshold} -print -quit | grep -q .; then [ "$(awk 'NR==1{print $1}' -- ${quotedMarker} 2>/dev/null)" = "$STALE_TOKEN" ] && rm -f -- ${markerPath2} && rmdir -- ${lock}; else exit 1; fi; else if find ${lock} -maxdepth 0 -mmin +${mminThreshold} -print -quit | grep -q .; then find ${lock} -maxdepth 0 -mmin +${mminThreshold} -print -quit | grep -q . && rm -f -- ${markerPath2} && rmdir -- ${lock}; else exit 1; fi; fi; else exit 1; fi`;
+  const command2 = `if [ -d ${lock} ]; then if [ -f ${markerPath2} ]; then STALE_TOKEN="$(awk 'NR==1{print $1}' ${quotedMarker} 2>/dev/null)"; if find ${markerPath2} -maxdepth 0 -mmin +${mminThreshold} -print -quit | grep -q .; then [ "$(awk 'NR==1{print $1}' ${quotedMarker} 2>/dev/null)" = "$STALE_TOKEN" ] && rm -f -- ${markerPath2} && rmdir -- ${lock}; else exit 1; fi; else if find ${lock} -maxdepth 0 -mmin +${mminThreshold} -print -quit | grep -q .; then find ${lock} -maxdepth 0 -mmin +${mminThreshold} -print -quit | grep -q . && rm -f -- ${markerPath2} && rmdir -- ${lock}; else exit 1; fi; fi; else exit 1; fi`;
   const result = await ssh2.exec(command2, { ignoreExitCode: true, silent: true });
   return result.code === 0;
 }
@@ -19055,4 +19068,4 @@ export {
   ufw,
   user
 };
-//# sourceMappingURL=chunk-YOSHYUST.js.map
+//# sourceMappingURL=chunk-QVU4YEKK.js.map