zen-fs-config 0.4.0 → 0.4.2

package/dist/index.d.mts

@@ -399,7 +399,13 @@ declare class ConfigRepo implements IConfigRepo {
     readMetaFile<T>(path: string): Promise<T | null>;
     /** Path for a single backend descriptor: .meta/backends/{id}.json */
     backendFilePath(id: string): string;
-    /** Read all backend descriptors from .meta/backends/*.json */
+    /**
+     * Read all backend descriptors from .meta/backends/*.json.
+     *
+     * If duplicate backends are detected (same type + options but different id),
+     * only the first one (sorted by id) is kept and the rest are removed
+     * (including their version sidecar files).
+     */
     readAllBackendDescriptors(): Promise<BackendDescriptor[]>;
     /** Write a single backend descriptor as .meta/backends/{id}.json */
     writeBackendDescriptor(desc: BackendDescriptor): Promise<void>;

package/dist/index.d.ts

@@ -399,7 +399,13 @@ declare class ConfigRepo implements IConfigRepo {
     readMetaFile<T>(path: string): Promise<T | null>;
     /** Path for a single backend descriptor: .meta/backends/{id}.json */
     backendFilePath(id: string): string;
-    /** Read all backend descriptors from .meta/backends/*.json */
+    /**
+     * Read all backend descriptors from .meta/backends/*.json.
+     *
+     * If duplicate backends are detected (same type + options but different id),
+     * only the first one (sorted by id) is kept and the rest are removed
+     * (including their version sidecar files).
+     */
     readAllBackendDescriptors(): Promise<BackendDescriptor[]>;
     /** Write a single backend descriptor as .meta/backends/{id}.json */
     writeBackendDescriptor(desc: BackendDescriptor): Promise<void>;

package/dist/index.js

@@ -485,7 +485,6 @@ var BACKENDS_DIR = `${META_DIR}/backends`;
 var CONFLICTS_DIR = `${META_DIR}/.conflicts`;
 var DELETIONS_DIR = `${META_DIR}/.deleted`;
 var NODES_DIR = "/nodes";
-var NODE_ID_FILE = `${NODES_DIR}/.node-id`;
 var LOCAL_IDB_BACKEND_ID = "local-idb";
 function tombstoneFileName(filePath) {
   return filePath.replace(/^\//, "").replace(/\//g, "__").replace(/\./g, "++") + ".json";
@@ -1080,7 +1079,13 @@ var ConfigRepo = class {
   backendFilePath(id) {
     return `${BACKENDS_DIR}/${id}.json`;
   }
-  /** Read all backend descriptors from .meta/backends/*.json */
+  /**
+   * Read all backend descriptors from .meta/backends/*.json.
+   *
+   * If duplicate backends are detected (same type + options but different id),
+   * only the first one (sorted by id) is kept and the rest are removed
+   * (including their version sidecar files).
+   */
   async readAllBackendDescriptors() {
     try {
       const entries = await this.cachedFS.readdir(BACKENDS_DIR);
@@ -1089,11 +1094,33 @@ var ConfigRepo = class {
         if (!entry.endsWith(".json")) continue;
         try {
           const raw = await this.cachedFS.readFile(`${BACKENDS_DIR}/${entry}`);
-          descriptors.push(JSON.parse(new TextDecoder().decode(toUint8Array(raw))));
+          const desc = JSON.parse(new TextDecoder().decode(toUint8Array(raw)));
+          if (desc.id && desc.type) {
+            descriptors.push(desc);
+          }
         } catch {
         }
       }
-      return descriptors;
+      const seen = /* @__PURE__ */ new Map();
+      const duplicates = [];
+      descriptors.sort((a, b) => a.id.localeCompare(b.id));
+      for (const desc of descriptors) {
+        const key = `${desc.type}:${JSON.stringify(desc.options ?? {})}`;
+        if (seen.has(key)) {
+          duplicates.push(desc.id);
+        } else {
+          seen.set(key, desc.id);
+        }
+      }
+      if (duplicates.length > 0) {
+        console.log(
+          `[ConfigRepo] readAllBackendDescriptors: removing ${duplicates.length} duplicate(s): ${duplicates.join(", ")}`
+        );
+        for (const dupId of duplicates) {
+          await this.removeBackendDescriptor(dupId);
+        }
+      }
+      return descriptors.filter((d) => !duplicates.includes(d.id));
     } catch {
       return [];
     }
@@ -1291,22 +1318,9 @@ async function createConfigRepo(appId, options = {}) {
   const allBackends = await tempRepo.readAllBackendDescriptors();
   console.log(`[createConfigRepo] Replica backends: ${allBackends.map((b) => b.id).join(", ") || "(none)"}`);
   let nodeId = options.nodeId;
-  if (!nodeId && typeof process !== "undefined" && process.env?.NODE_ID) {
-    nodeId = process.env.NODE_ID;
-  }
-  if (!nodeId) {
-    try {
-      const raw = await cachedFS.readFile(NODE_ID_FILE);
-      nodeId = new TextDecoder().decode(toUint8Array(raw)).trim();
-    } catch {
-    }
-  }
   if (!nodeId) {
     nodeId = `node-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
-    try {
-      await cachedFS.writeFile(NODE_ID_FILE, new TextEncoder().encode(nodeId));
-    } catch {
-    }
+    console.log(`[createConfigRepo] Generated nodeId: ${nodeId}`);
   }
   const serializer = createSerializerChain(options.serializer);
   const repo = new ConfigRepo(

package/dist/index.mjs

@@ -433,7 +433,6 @@ var BACKENDS_DIR = `${META_DIR}/backends`;
 var CONFLICTS_DIR = `${META_DIR}/.conflicts`;
 var DELETIONS_DIR = `${META_DIR}/.deleted`;
 var NODES_DIR = "/nodes";
-var NODE_ID_FILE = `${NODES_DIR}/.node-id`;
 var LOCAL_IDB_BACKEND_ID = "local-idb";
 function tombstoneFileName(filePath) {
   return filePath.replace(/^\//, "").replace(/\//g, "__").replace(/\./g, "++") + ".json";
@@ -1028,7 +1027,13 @@ var ConfigRepo = class {
   backendFilePath(id) {
     return `${BACKENDS_DIR}/${id}.json`;
   }
-  /** Read all backend descriptors from .meta/backends/*.json */
+  /**
+   * Read all backend descriptors from .meta/backends/*.json.
+   *
+   * If duplicate backends are detected (same type + options but different id),
+   * only the first one (sorted by id) is kept and the rest are removed
+   * (including their version sidecar files).
+   */
   async readAllBackendDescriptors() {
     try {
       const entries = await this.cachedFS.readdir(BACKENDS_DIR);
@@ -1037,11 +1042,33 @@ var ConfigRepo = class {
         if (!entry.endsWith(".json")) continue;
         try {
           const raw = await this.cachedFS.readFile(`${BACKENDS_DIR}/${entry}`);
-          descriptors.push(JSON.parse(new TextDecoder().decode(toUint8Array(raw))));
+          const desc = JSON.parse(new TextDecoder().decode(toUint8Array(raw)));
+          if (desc.id && desc.type) {
+            descriptors.push(desc);
+          }
         } catch {
         }
       }
-      return descriptors;
+      const seen = /* @__PURE__ */ new Map();
+      const duplicates = [];
+      descriptors.sort((a, b) => a.id.localeCompare(b.id));
+      for (const desc of descriptors) {
+        const key = `${desc.type}:${JSON.stringify(desc.options ?? {})}`;
+        if (seen.has(key)) {
+          duplicates.push(desc.id);
+        } else {
+          seen.set(key, desc.id);
+        }
+      }
+      if (duplicates.length > 0) {
+        console.log(
+          `[ConfigRepo] readAllBackendDescriptors: removing ${duplicates.length} duplicate(s): ${duplicates.join(", ")}`
+        );
+        for (const dupId of duplicates) {
+          await this.removeBackendDescriptor(dupId);
+        }
+      }
+      return descriptors.filter((d) => !duplicates.includes(d.id));
     } catch {
       return [];
     }
@@ -1239,22 +1266,9 @@ async function createConfigRepo(appId, options = {}) {
   const allBackends = await tempRepo.readAllBackendDescriptors();
   console.log(`[createConfigRepo] Replica backends: ${allBackends.map((b) => b.id).join(", ") || "(none)"}`);
   let nodeId = options.nodeId;
-  if (!nodeId && typeof process !== "undefined" && process.env?.NODE_ID) {
-    nodeId = process.env.NODE_ID;
-  }
-  if (!nodeId) {
-    try {
-      const raw = await cachedFS.readFile(NODE_ID_FILE);
-      nodeId = new TextDecoder().decode(toUint8Array(raw)).trim();
-    } catch {
-    }
-  }
   if (!nodeId) {
     nodeId = `node-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
-    try {
-      await cachedFS.writeFile(NODE_ID_FILE, new TextEncoder().encode(nodeId));
-    } catch {
-    }
+    console.log(`[createConfigRepo] Generated nodeId: ${nodeId}`);
   }
   const serializer = createSerializerChain(options.serializer);
   const repo = new ConfigRepo(

package/package.json

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