zen-fs-config 0.5.0 → 0.5.2

package/dist/index.js

@@ -533,6 +533,22 @@ var LOCAL_IDB_BACKEND_ID = "local-idb";
 function tombstoneFileName(filePath) {
   return filePath.replace(/^\//, "").replace(/\//g, "__").replace(/\./g, "++") + ".json";
 }
+function stableOptionsKey(options) {
+  if (!options || typeof options !== "object") return "{}";
+  return JSON.stringify(sortKeysDeep(options));
+}
+function sortKeysDeep(obj) {
+  if (obj === null || typeof obj !== "object") return obj;
+  if (Array.isArray(obj)) return obj.map(sortKeysDeep);
+  const sorted = {};
+  for (const key of Object.keys(obj).sort()) {
+    sorted[key] = sortKeysDeep(obj[key]);
+  }
+  return sorted;
+}
+function backendDedupKey(desc) {
+  return `${desc.type}:${stableOptionsKey(desc.options)}`;
+}
 var ConfigRepo = class {
   appId;
   nodeId;
@@ -1163,7 +1179,7 @@ var ConfigRepo = class {
       const seen = /* @__PURE__ */ new Map();
       const duplicates = [];
       for (const item of items) {
-        const key = `${item.desc.type}:${JSON.stringify(item.desc.options ?? {})}`;
+        const key = backendDedupKey(item.desc);
         const existing = seen.get(key);
         if (existing) {
           if (item.mtime < existing.mtime) {
@@ -1181,7 +1197,12 @@ var ConfigRepo = class {
           `[ConfigRepo] readAllBackendDescriptors: removing ${duplicates.length} duplicate(s): ${duplicates.join(", ")}`
         );
         for (const dupId of duplicates) {
-          await this.removeBackendDescriptor(dupId);
+          const descPath = this.backendFilePath(dupId);
+          try {
+            await this.deleteFile(descPath);
+          } catch {
+            await this.removeBackendDescriptor(dupId);
+          }
         }
       }
       return Array.from(seen.values()).map((i) => i.desc);
@@ -1244,7 +1265,12 @@ var ConfigRepo = class {
     const current = await this.readAllBackendDescriptors();
     for (const desc of current) {
       if (!keepIds.has(desc.id)) {
-        await this.removeBackendDescriptor(desc.id);
+        const descPath = this.backendFilePath(desc.id);
+        try {
+          await this.deleteFile(descPath);
+        } catch {
+          await this.removeBackendDescriptor(desc.id);
+        }
       }
     }
   }
@@ -1260,6 +1286,13 @@ var ConfigRepo = class {
     if (existing.some((b) => b.id === id)) {
       throw new Error(`Backend "${id}" already exists. Use removeBackend() first.`);
     }
+    const newKey = backendDedupKey({ id, type, options });
+    const dup = existing.find((b) => backendDedupKey(b) === newKey);
+    if (dup) {
+      throw new Error(
+        `Backend "${id}" has the same configuration as existing backend "${dup.id}" (type=${type}). Use removeBackend("${dup.id}") first, or connect with the existing backend's ID.`
+      );
+    }
     console.log(`[ConfigRepo] addBackend: creating ${id} (${type})...`);
     const instance = await createBackend({ type, options });
     const syncable = backendToSyncableFS(instance, `${type}(${id})`);
@@ -1292,14 +1325,27 @@ var ConfigRepo = class {
     if (!replica) {
       throw new Error(`Backend "${id}" is not a registered replica`);
     }
+    const descPath = this.backendFilePath(id);
+    try {
+      await replica.instance.unlink(descPath);
+    } catch {
+    }
+    try {
+      await replica.instance.unlink(versionPathFor(descPath));
+    } catch {
+    }
+    try {
+      await this.deleteFile(descPath);
+    } catch {
+      await this.removeBackendDescriptor(id);
+    }
     this.syncEngine.removePair(replica.pairId);
     console.log(`[ConfigRepo] removeBackend: sync pair ${replica.pairId} removed`);
     this.replicaBackends.delete(id);
     if (replica.instance?.dispose) {
       await replica.instance.dispose();
     }
-    await this.removeBackendDescriptor(id);
-    console.log(`[ConfigRepo] removeBackend: ${id} removed`);
+    console.log(`[ConfigRepo] removeBackend: ${id} removed (tombstone written, remote cleaned)`);
   }
   // -----------------------------------------------------------------------
   // IConfigRepo — Group Type
@@ -1655,13 +1701,21 @@ async function createConfigRepo(appId, options = {}) {
     const replicaId = options.primaryBackendId || `${options.backendInfo.type}-replica`;
     const allBackends2 = await tempRepo.readAllBackendDescriptors();
     const hasReplica = allBackends2.some((b) => b.id === replicaId);
-    if (!hasReplica) {
+    const newKey = backendDedupKey({
+      id: replicaId,
+      type: options.backendInfo.type,
+      options: options.backendInfo.options
+    });
+    const dupConfig = allBackends2.find((b) => backendDedupKey(b) === newKey);
+    if (!hasReplica && !dupConfig) {
       await tempRepo.writeBackendDescriptor({
         id: replicaId,
         type: options.backendInfo.type,
         options: options.backendInfo.options
       });
       console.log(`[createConfigRepo] Added replica backend: ${replicaId} (${options.backendInfo.type})`);
+    } else if (dupConfig) {
+      console.log(`[createConfigRepo] Replica with same config already registered as "${dupConfig.id}", skipping`);
     } else {
       console.log(`[createConfigRepo] Replica ${replicaId} already registered`);
     }

package/dist/index.mjs

@@ -476,6 +476,22 @@ var LOCAL_IDB_BACKEND_ID = "local-idb";
 function tombstoneFileName(filePath) {
   return filePath.replace(/^\//, "").replace(/\//g, "__").replace(/\./g, "++") + ".json";
 }
+function stableOptionsKey(options) {
+  if (!options || typeof options !== "object") return "{}";
+  return JSON.stringify(sortKeysDeep(options));
+}
+function sortKeysDeep(obj) {
+  if (obj === null || typeof obj !== "object") return obj;
+  if (Array.isArray(obj)) return obj.map(sortKeysDeep);
+  const sorted = {};
+  for (const key of Object.keys(obj).sort()) {
+    sorted[key] = sortKeysDeep(obj[key]);
+  }
+  return sorted;
+}
+function backendDedupKey(desc) {
+  return `${desc.type}:${stableOptionsKey(desc.options)}`;
+}
 var ConfigRepo = class {
   appId;
   nodeId;
@@ -1106,7 +1122,7 @@ var ConfigRepo = class {
       const seen = /* @__PURE__ */ new Map();
       const duplicates = [];
       for (const item of items) {
-        const key = `${item.desc.type}:${JSON.stringify(item.desc.options ?? {})}`;
+        const key = backendDedupKey(item.desc);
         const existing = seen.get(key);
         if (existing) {
           if (item.mtime < existing.mtime) {
@@ -1124,7 +1140,12 @@ var ConfigRepo = class {
           `[ConfigRepo] readAllBackendDescriptors: removing ${duplicates.length} duplicate(s): ${duplicates.join(", ")}`
         );
         for (const dupId of duplicates) {
-          await this.removeBackendDescriptor(dupId);
+          const descPath = this.backendFilePath(dupId);
+          try {
+            await this.deleteFile(descPath);
+          } catch {
+            await this.removeBackendDescriptor(dupId);
+          }
         }
       }
       return Array.from(seen.values()).map((i) => i.desc);
@@ -1187,7 +1208,12 @@ var ConfigRepo = class {
     const current = await this.readAllBackendDescriptors();
     for (const desc of current) {
       if (!keepIds.has(desc.id)) {
-        await this.removeBackendDescriptor(desc.id);
+        const descPath = this.backendFilePath(desc.id);
+        try {
+          await this.deleteFile(descPath);
+        } catch {
+          await this.removeBackendDescriptor(desc.id);
+        }
       }
     }
   }
@@ -1203,6 +1229,13 @@ var ConfigRepo = class {
     if (existing.some((b) => b.id === id)) {
       throw new Error(`Backend "${id}" already exists. Use removeBackend() first.`);
     }
+    const newKey = backendDedupKey({ id, type, options });
+    const dup = existing.find((b) => backendDedupKey(b) === newKey);
+    if (dup) {
+      throw new Error(
+        `Backend "${id}" has the same configuration as existing backend "${dup.id}" (type=${type}). Use removeBackend("${dup.id}") first, or connect with the existing backend's ID.`
+      );
+    }
     console.log(`[ConfigRepo] addBackend: creating ${id} (${type})...`);
     const instance = await createBackend({ type, options });
     const syncable = backendToSyncableFS(instance, `${type}(${id})`);
@@ -1235,14 +1268,27 @@ var ConfigRepo = class {
     if (!replica) {
       throw new Error(`Backend "${id}" is not a registered replica`);
     }
+    const descPath = this.backendFilePath(id);
+    try {
+      await replica.instance.unlink(descPath);
+    } catch {
+    }
+    try {
+      await replica.instance.unlink(versionPathFor(descPath));
+    } catch {
+    }
+    try {
+      await this.deleteFile(descPath);
+    } catch {
+      await this.removeBackendDescriptor(id);
+    }
     this.syncEngine.removePair(replica.pairId);
     console.log(`[ConfigRepo] removeBackend: sync pair ${replica.pairId} removed`);
     this.replicaBackends.delete(id);
     if (replica.instance?.dispose) {
       await replica.instance.dispose();
     }
-    await this.removeBackendDescriptor(id);
-    console.log(`[ConfigRepo] removeBackend: ${id} removed`);
+    console.log(`[ConfigRepo] removeBackend: ${id} removed (tombstone written, remote cleaned)`);
   }
   // -----------------------------------------------------------------------
   // IConfigRepo — Group Type
@@ -1598,13 +1644,21 @@ async function createConfigRepo(appId, options = {}) {
     const replicaId = options.primaryBackendId || `${options.backendInfo.type}-replica`;
     const allBackends2 = await tempRepo.readAllBackendDescriptors();
     const hasReplica = allBackends2.some((b) => b.id === replicaId);
-    if (!hasReplica) {
+    const newKey = backendDedupKey({
+      id: replicaId,
+      type: options.backendInfo.type,
+      options: options.backendInfo.options
+    });
+    const dupConfig = allBackends2.find((b) => backendDedupKey(b) === newKey);
+    if (!hasReplica && !dupConfig) {
       await tempRepo.writeBackendDescriptor({
         id: replicaId,
         type: options.backendInfo.type,
         options: options.backendInfo.options
       });
       console.log(`[createConfigRepo] Added replica backend: ${replicaId} (${options.backendInfo.type})`);
+    } else if (dupConfig) {
+      console.log(`[createConfigRepo] Replica with same config already registered as "${dupConfig.id}", skipping`);
     } else {
       console.log(`[createConfigRepo] Replica ${replicaId} already registered`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-fs-config",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Distributed config management library built on ZenFS, zen-fs-cache, and zen-fs-sync",
   "main": "dist/index.js",
   "module": "dist/index.mjs",