dsh-home-hosted 0.7.3 → 0.7.4

package/lib/index.js

@@ -2484,6 +2484,9 @@ function migrationRefusal(home) {
 var ConfigLayoutError = class extends Error {
   name = "ConfigLayoutError";
 };
+var ConfigPatchError = class extends Error {
+  name = "ConfigPatchError";
+};
 function readConfig(home, workspace = DEFAULT_WORKSPACE) {
   const refusal = migrationRefusal(home);
   if (refusal !== null)
@@ -2494,8 +2497,15 @@ function readConfig(home, workspace = DEFAULT_WORKSPACE) {
     const exists = fs8.existsSync(file);
     return { raw: null, exists, error: exists ? "the workspace config file could not be parsed" : null };
   }
+  if (!isRecordValue(raw))
+    return { raw: null, exists: true, error: "the workspace config file does not contain a JSON object" };
   if (!Array.isArray(raw.servers) && raw.servers !== void 0)
     return { raw: null, exists: true, error: "the workspace config file has a servers field that is not an array" };
+  if (Array.isArray(raw.servers)) {
+    const index = raw.servers.findIndex((entry) => !isRecordValue(entry));
+    if (index >= 0)
+      return { raw: null, exists: true, error: `the workspace config file has an entry at servers[${index}] that is not an object` };
+  }
   return { raw, exists: true, error: null };
 }
 function writeConfig(home, raw, writtenBy = "dsh-home-hosted", workspace = DEFAULT_WORKSPACE) {
@@ -2515,7 +2525,9 @@ function readGlobalSettings(home) {
     const exists = fs8.existsSync(file);
     return { raw: null, exists, error: exists ? "the panel settings file could not be parsed" : null };
   }
-  if (raw.control !== void 0 && (typeof raw.control !== "object" || raw.control === null || Array.isArray(raw.control)))
+  if (!isRecordValue(raw))
+    return { raw: null, exists: true, error: "the panel settings file does not contain a JSON object" };
+  if (raw.control !== void 0 && !isRecordValue(raw.control))
     return { raw: null, exists: true, error: "the panel settings file has a control field that is not an object" };
   return { raw, exists: true, error: null };
 }
@@ -2529,7 +2541,7 @@ function setControl(home, patch, writtenBy = "dsh-home-hosted") {
   const read = readGlobalSettings(home);
   if (read.error !== null)
     throw new ConfigLayoutError(read.error);
-  writeGlobalSettings(home, { ...read.raw ?? {}, control: { ...read.raw?.control ?? {}, ...patch } }, writtenBy);
+  writeGlobalSettings(home, patchControl(read.raw ?? {}, patch), writtenBy);
 }
 function refuseUnmigrated(home) {
   const refusal = migrationRefusal(home);
@@ -2548,17 +2560,61 @@ function upsertEntry(raw, entry) {
     servers.push(entry);
   return { ...raw, servers };
 }
+var SERVER_MERGE_KEYS = /* @__PURE__ */ new Set(["restart", "health", "stop"]);
+var CONTROL_MERGE_KEYS = /* @__PURE__ */ new Set(["auth", "tls"]);
+function isRecordValue(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function mergeGroup(target, patch) {
+  const merged = { ...target };
+  for (const [key, value] of Object.entries(patch)) {
+    if (value === void 0)
+      continue;
+    if (value === null) {
+      delete merged[key];
+      continue;
+    }
+    if (isRecordValue(value) && isRecordValue(merged[key])) {
+      merged[key] = mergeGroup(merged[key], value);
+      continue;
+    }
+    merged[key] = value;
+  }
+  return merged;
+}
 function patchEntry(raw, id, patch) {
+  for (const key of SERVER_MERGE_KEYS) {
+    if (patch[key] === null)
+      throw new ConfigPatchError(`${key} must be an object (was null): the panel refuses to boot a config that carries it`);
+  }
   const servers = (raw.servers ?? []).map((entry) => {
     if (entry.id !== id)
       return entry;
-    const merged = { ...entry, ...patch };
-    if (patch.stop !== void 0 && typeof entry.stop === "object" && entry.stop !== null)
-      merged.stop = { ...entry.stop, ...patch.stop };
+    const merged = { ...entry };
+    for (const [key, value] of Object.entries(patch)) {
+      if (value === void 0)
+        continue;
+      if (SERVER_MERGE_KEYS.has(key) && isRecordValue(value) && isRecordValue(merged[key]))
+        merged[key] = mergeGroup(merged[key], value);
+      else
+        merged[key] = value;
+    }
     return merged;
   });
   return { ...raw, servers };
 }
+function patchControl(raw, patch) {
+  const control = { ...raw.control ?? {} };
+  for (const [key, value] of Object.entries(patch)) {
+    if (value === void 0)
+      continue;
+    if (CONTROL_MERGE_KEYS.has(key) && isRecordValue(value) && isRecordValue(control[key]))
+      control[key] = mergeGroup(control[key], value);
+    else
+      control[key] = value;
+  }
+  return { ...raw, control };
+}
 function removeEntry(raw, id) {
   return { ...raw, servers: (raw.servers ?? []).filter((entry) => entry.id !== id) };
 }
@@ -4455,7 +4511,7 @@ var HomeHostedError = class extends Error {
     this.name = "HomeHostedError";
   }
 };
-function isRecordValue(value) {
+function isRecordValue2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function foreignView(entry, workspace) {
@@ -4954,7 +5010,7 @@ var HomeHostedService = class extends Service {
     const raw = readJson(this.snapshotsFile);
     if (raw === null)
       return {};
-    if (raw.version === 2 && isRecordValue(raw.entries))
+    if (raw.version === 2 && isRecordValue2(raw.entries))
       return raw.workspace === this.managedWorkspace() ? raw.entries : {};
     return this.managedWorkspace() === DEFAULT_WORKSPACE ? raw : {};
   }
@@ -5843,6 +5899,10 @@ var HomeHostedService = class extends Service {
         const target = await this.targetHome(input.home);
         const id = String(input.id);
         const patch = input.patch ?? {};
+        for (const key of ["restart", "health", "stop"]) {
+          if (patch[key] === null)
+            throw new HomeHostedError(`${key} must be an object (was null)`, "INVALID_PATCH");
+        }
         const workspace = this.callWorkspace(input, target.home, target.foreign);
         if (!target.foreign)
           return await (await this.requireClient()).updateServer(id, patch, workspace);