paratix 0.7.0 → 0.8.0

package/README.md

@@ -104,7 +104,7 @@ Signals are deferred side effects such as `service.reload(...)` or `service.rest
 
 For Podman-native services, Paratix now also includes `quadlet.container(...)`. It writes a `.container` file under `/etc/containers/systemd`, reloads systemd when the content changes, and works cleanly with `service.enabled(...)` and `service.running(...)` for the generated service.
 
-When you need a targeted image refresh outside the normal deploy flow, `quadlet.updateImage(...)` pulls exactly one image, reuses existing Podman registry auth on the host, optionally supports `authFile`, and only restarts the generated service when the pull actually downloaded a newer image. Changed runs now also print the new image ID in parentheses in the CLI output.
+When you need a targeted image refresh outside the normal deploy flow, `quadlet.updateImage(...)` pulls exactly one image, reuses existing Podman registry auth on the host, optionally supports `authFile`, and only restarts the generated service when the pull actually downloaded a newer image. Changed runs now also print the new registry digest in parentheses in the CLI output, with a local image ID fallback when no repo digest is available.
 
 ### Guards
 

package/dist/{chunk-IUY5BJHA.js → chunk-47PTUZZR.js}

@@ -2,7 +2,7 @@ import {
   CommandError,
   assertValidModuleMetaEntries,
   mergeEnvironmentFromMeta
-} from "./chunk-JJRF37BP.js";
+} from "./chunk-NRDLYHJL.js";
 
 // src/output.ts
 import pc from "picocolors";
@@ -492,4 +492,4 @@ export {
   printSummary,
   runSignalModules
 };
-//# sourceMappingURL=chunk-IUY5BJHA.js.map
+//# sourceMappingURL=chunk-47PTUZZR.js.map

package/dist/{chunk-D4CS2GCH.js → chunk-FFQ6FR4N.js}

@@ -9,7 +9,7 @@ import {
   shellQuote,
   sshdPortMeta,
   validateMode
-} from "./chunk-JJRF37BP.js";
+} from "./chunk-NRDLYHJL.js";
 
 // src/moduleFailure.ts
 function firstNonEmptyLine(text) {
@@ -3522,12 +3522,6 @@ function buildQuadletImagePullCommand(options) {
   const authFileFlag = options.authFile == null ? "" : ` --authfile ${shellQuoteForQuadlet(options.authFile)}`;
   return `podman pull${authFileFlag} ${shellQuoteForQuadlet(options.image)} 2>&1`;
 }
-function buildQuadletImageInspectCommand(image) {
-  return `podman image inspect --format '{{.Id}}' ${shellQuoteForQuadlet(image)}`;
-}
-function formatQuadletImageIdDetail(imageId) {
-  return `(${imageId})`;
-}
 function getQuadletContainerFilePath(name) {
   return `${CONTAINERS_SYSTEMD_DIRECTORY}/${name}.container`;
 }
@@ -3537,13 +3531,6 @@ function getQuadletContainerServiceName(options) {
 function quadletPullOutputIndicatesChange(output) {
   return QUADLET_PULL_CHANGED_OUTPUT_PATTERNS.some((pattern) => output.includes(pattern));
 }
-function readQuadletImageIdFromInspectOutput(output) {
-  for (const line of output.split("\n")) {
-    const trimmed = line.trim();
-    if (trimmed.length > 0) return trimmed;
-  }
-  return null;
-}
 var UNIT_NAME_PATTERN2 = new RegExp("^[\\w@.\\-]+$", "v");
 function validateQuadletName(name) {
   if (!UNIT_NAME_PATTERN2.test(name)) {
@@ -3555,6 +3542,62 @@ function shellQuoteForQuadlet(value) {
   return `'${value.replaceAll("'", escapedQuote)}'`;
 }
 
+// src/modules/quadletImageInspectHelpers.ts
+function shellQuoteForQuadletImageInspect(value) {
+  const escapedQuote = "'\\''";
+  return `'${value.replaceAll("'", escapedQuote)}'`;
+}
+function buildQuadletImageInspectCommand(image) {
+  return `podman image inspect ${shellQuoteForQuadletImageInspect(image)}`;
+}
+function formatQuadletImageIdentifierDetail(imageIdentifier) {
+  return `(${imageIdentifier})`;
+}
+function readQuadletImageIdentifierFromInspectOutput(image, output) {
+  const parsed = parseQuadletImageInspectOutput(output);
+  if (parsed == null) return null;
+  const repoDigest = findQuadletRepoDigest(image, parsed.repoDigests);
+  return repoDigest ?? parsed.id;
+}
+function findQuadletRepoDigest(image, repoDigests) {
+  const repository = getQuadletImageRepository(image);
+  for (const repoDigest of repoDigests) {
+    const separatorIndex = repoDigest.indexOf("@");
+    if (separatorIndex === -1) continue;
+    const repo = repoDigest.slice(0, separatorIndex);
+    const digest = repoDigest.slice(separatorIndex + 1);
+    if (repo === repository && digest.length > 0) return digest;
+  }
+  return null;
+}
+function getQuadletImageRepository(image) {
+  const digestSeparatorIndex = image.indexOf("@");
+  if (digestSeparatorIndex !== -1) return image.slice(0, digestSeparatorIndex);
+  const lastSlashIndex = image.lastIndexOf("/");
+  const lastColonIndex = image.lastIndexOf(":");
+  return lastColonIndex > lastSlashIndex ? image.slice(0, lastColonIndex) : image;
+}
+function parseQuadletImageInspectOutput(output) {
+  try {
+    const parsed = JSON.parse(output);
+    if (!Array.isArray(parsed) || parsed.length === 0) return null;
+    const [firstEntry] = parsed;
+    if (!isQuadletInspectEntry(firstEntry)) return null;
+    const repoDigests = Array.isArray(firstEntry.RepoDigests) ? firstEntry.RepoDigests : [];
+    return {
+      id: typeof firstEntry.Id === "string" && firstEntry.Id.length > 0 ? firstEntry.Id : null,
+      repoDigests: repoDigests.filter(
+        (entry) => typeof entry === "string" && entry.length > 0
+      )
+    };
+  } catch {
+    return null;
+  }
+}
+function isQuadletInspectEntry(value) {
+  return value != null && typeof value === "object";
+}
+
 // src/modules/quadlet.ts
 var CONTAINERS_SYSTEMD_DIRECTORY_COMMAND = "mkdir -p '/etc/containers/systemd'";
 var QUADLET_FILE_MODE = "0644";
@@ -3612,10 +3655,13 @@ async function inspectQuadletImageId(parameters) {
       inspectResult
     );
   }
-  const imageId = readQuadletImageIdFromInspectOutput(inspectResult.stdout);
+  const imageId = readQuadletImageIdentifierFromInspectOutput(
+    parameters.image,
+    inspectResult.stdout
+  );
   if (imageId == null) {
     return failed(
-      `[quadlet.updateImage: ${parameters.name}] podman image inspect returned no image ID`
+      `[quadlet.updateImage: ${parameters.name}] podman image inspect returned no digest or image ID`
     );
   }
   return imageId;
@@ -3628,7 +3674,7 @@ async function restartQuadletService(parameters) {
       silent: true
     }
   );
-  return restartResult.code === 0 ? { detail: formatQuadletImageIdDetail(parameters.imageId), status: "changed" } : failedCommand(
+  return restartResult.code === 0 ? { detail: formatQuadletImageIdentifierDetail(parameters.imageId), status: "changed" } : failedCommand(
     `[quadlet.updateImage: ${parameters.name}] systemctl restart failed`,
     restartResult
   );
@@ -3699,6 +3745,7 @@ var quadlet = {
       async apply(ssh2) {
         if (!ssh2) return failed(`[quadlet.updateImage: ${options.name}] SSH connection is required`);
         return applyQuadletImageUpdate({
+          image: options.image,
           inspectCommand,
           name: options.name,
           pullCommand,
@@ -5794,4 +5841,4 @@ export {
   ufw,
   user
 };
-//# sourceMappingURL=chunk-D4CS2GCH.js.map
+//# sourceMappingURL=chunk-FFQ6FR4N.js.map