@git.zone/cli 3.2.0 → 4.0.0

package/ts/helpers.smartconfig.ts

@@ -1,7 +1,8 @@
 import * as plugins from "./plugins.js";
-import { rename, writeFile } from "fs/promises";
+import { withInterProcessLock } from "./mod_services/classes.interprocesslock.js";
 
 export const CLI_NAMESPACE = "@git.zone/cli";
+const smartconfigSnapshots = new WeakMap<Record<string, any>, string | undefined>();
 
 const isPlainObject = (value: unknown): value is Record<string, any> => {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -16,7 +17,9 @@ export const readSmartconfigFile = async (
 ): Promise<Record<string, any>> => {
   const smartconfigPath = getSmartconfigPath(cwd);
   if (!(await plugins.smartfs.file(smartconfigPath).exists())) {
-    return {};
+    const data = {};
+    smartconfigSnapshots.set(data, undefined);
+    return data;
   }
 
   const content = (await plugins.smartfs
@@ -24,9 +27,16 @@ export const readSmartconfigFile = async (
     .encoding("utf8")
     .read()) as string;
   if (content.trim() === "") {
-    return {};
+    const data = {};
+    smartconfigSnapshots.set(data, content);
+    return data;
+  }
+  const parsed = JSON.parse(content);
+  if (!isPlainObject(parsed)) {
+    throw new Error(".smartconfig.json must contain a JSON object at its root.");
   }
-  return JSON.parse(content);
+  smartconfigSnapshots.set(parsed, content);
+  return parsed;
 };
 
 export const writeSmartconfigFile = async (
@@ -34,10 +44,48 @@ export const writeSmartconfigFile = async (
   cwd: string = process.cwd(),
 ): Promise<void> => {
   const smartconfigPath = getSmartconfigPath(cwd);
-  const tempPath = `${smartconfigPath}.tmp-${Date.now()}`;
-  const content = JSON.stringify(data, null, 2);
-  await writeFile(tempPath, content, "utf8");
-  await rename(tempPath, smartconfigPath);
+  if (!smartconfigSnapshots.has(data)) {
+    throw new Error("Refusing to write .smartconfig.json without a loaded file snapshot.");
+  }
+  await withInterProcessLock(
+    {
+      lockPath: `${smartconfigPath}.lock`,
+      description: "Project smartconfig",
+    },
+    async () => {
+      let currentSnapshot: string | undefined;
+      try {
+        currentSnapshot = await plugins.fs.readFile(smartconfigPath, "utf8");
+      } catch (error) {
+        if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+          throw error;
+        }
+      }
+      if (currentSnapshot !== smartconfigSnapshots.get(data)) {
+        throw new Error(
+          "Refusing to overwrite .smartconfig.json because it changed after loading.",
+        );
+      }
+
+      const content = `${JSON.stringify(data, null, 2)}\n`;
+      const tempPath = `${smartconfigPath}.tmp-${process.pid}-${plugins.crypto
+        .randomBytes(12)
+        .toString("hex")}`;
+      try {
+        await plugins.fs.writeFile(tempPath, content, {
+          encoding: "utf8",
+          flag: "wx",
+        });
+        await plugins.fs.rename(tempPath, smartconfigPath);
+        smartconfigSnapshots.set(data, content);
+      } catch (error) {
+        await plugins.fs.rm(tempPath, { force: true }).catch(() => {});
+        throw new Error("Could not persist .smartconfig.json atomically.", {
+          cause: error,
+        });
+      }
+    },
+  );
 };
 
 export const normalizeCliConfigPath = (configPath: string): string => {
@@ -69,10 +117,13 @@ export const getCliNamespaceConfig = (
   smartconfigData: Record<string, any>,
 ): Record<string, any> => {
   const cliConfig = smartconfigData[CLI_NAMESPACE];
+  if (cliConfig === undefined) {
+    return {};
+  }
   if (isPlainObject(cliConfig)) {
     return cliConfig;
   }
-  return {};
+  throw new Error(`${CLI_NAMESPACE} in .smartconfig.json must be a JSON object.`);
 };
 
 export const getCliConfigValueFromData = (
@@ -121,8 +172,10 @@ export const setCliConfigValueInData = (
 ): Record<string, any> => {
   const segments = getCliConfigPathSegments(configPath);
 
-  if (!isPlainObject(smartconfigData[CLI_NAMESPACE])) {
+  if (smartconfigData[CLI_NAMESPACE] === undefined) {
     smartconfigData[CLI_NAMESPACE] = {};
+  } else if (!isPlainObject(smartconfigData[CLI_NAMESPACE])) {
+    throw new Error(`${CLI_NAMESPACE} in .smartconfig.json must be a JSON object.`);
   }
 
   if (segments.length === 0) {

package/ts/mod_config/index.ts

@@ -1175,7 +1175,7 @@ async function handleServices(mode: ICliMode): Promise<void> {
   const { ServiceManager } =
     await import("../mod_services/classes.servicemanager.js");
   const serviceManager = new ServiceManager();
-  await serviceManager.init();
+  await serviceManager.init("config");
   await serviceManager.configureServices();
 }
 

package/ts/mod_docker/classes.dockerpruner.ts

@@ -117,6 +117,12 @@ export class DockerPruner {
     if (!labelsArg) {
       return false;
     }
+    if (labelsArg['git.zone.operation'] === 'service-bind-operation') {
+      return false;
+    }
+    if (labelsArg['git.zone.service'] === 'minio') {
+      return false;
+    }
     return (
       typeof labelsArg[toolLabelKey] === 'string' &&
       !!labelsArg[toolLabelKey] &&

package/ts/mod_release/index.ts

@@ -343,6 +343,9 @@ type TDockerCommandWorkflow = Pick<
 
 export function buildTsdockerPushCommand(workflow: TDockerCommandWorkflow): string {
   const commandParts = ["pnpm", "exec", "tsdocker", "push"];
+  for (const pattern of workflow.dockerPatterns) {
+    commandParts.push(shellQuote(pattern));
+  }
   if (workflow.dockerRegistry) {
     commandParts.push(`--registry=${shellQuote(workflow.dockerRegistry)}`);
   }
@@ -366,9 +369,6 @@ export function buildTsdockerPushCommand(workflow: TDockerCommandWorkflow): stri
   if (workflow.dockerContext) {
     commandParts.push(`--context=${shellQuote(workflow.dockerContext)}`);
   }
-  for (const pattern of workflow.dockerPatterns) {
-    commandParts.push(shellQuote(pattern));
-  }
   return commandParts.join(" ");
 }