zen-fs-config 0.3.23 → 0.3.25

package/dist/index.d.mts

@@ -222,7 +222,7 @@ declare class ConfigRepo implements IConfigRepo {
     private onConflictCallback?;
     private disposed;
     private configCache;
-    constructor(appId: string, nodeId: string, cachedFS: MinimalAsyncFS, serializer: PathAwareSerializer, onConflict?: (conflict: ConflictInfo) => Promise<unknown | null>);
+    constructor(appId: string, nodeId: string, primaryBackendId: string, cachedFS: MinimalAsyncFS, serializer: PathAwareSerializer, onConflict?: (conflict: ConflictInfo) => Promise<unknown | null>);
     /** Full path to this node's directory on the primary backend. */
     get nodePath(): string;
     load(rawConfig?: string): Promise<void>;
@@ -244,9 +244,6 @@ declare class ConfigRepo implements IConfigRepo {
      * Called automatically by createConfigRepo() after setupSync().
      */
     syncMetaToReplicas(): Promise<void>;
-    /** Compare two file contents (handles Uint8Array, ArrayBuffer, string, Buffer). */
-    private bufferEqual;
-    private toUint8Array;
     getSyncStatuses(): Map<string, SyncPairStatus>;
     resolveConflict(conflictId: string, mergedContent: unknown): Promise<void>;
     listConflicts(): Promise<ConflictArchive[]>;

package/dist/index.d.ts

@@ -222,7 +222,7 @@ declare class ConfigRepo implements IConfigRepo {
     private onConflictCallback?;
     private disposed;
     private configCache;
-    constructor(appId: string, nodeId: string, cachedFS: MinimalAsyncFS, serializer: PathAwareSerializer, onConflict?: (conflict: ConflictInfo) => Promise<unknown | null>);
+    constructor(appId: string, nodeId: string, primaryBackendId: string, cachedFS: MinimalAsyncFS, serializer: PathAwareSerializer, onConflict?: (conflict: ConflictInfo) => Promise<unknown | null>);
     /** Full path to this node's directory on the primary backend. */
     get nodePath(): string;
     load(rawConfig?: string): Promise<void>;
@@ -244,9 +244,6 @@ declare class ConfigRepo implements IConfigRepo {
      * Called automatically by createConfigRepo() after setupSync().
      */
     syncMetaToReplicas(): Promise<void>;
-    /** Compare two file contents (handles Uint8Array, ArrayBuffer, string, Buffer). */
-    private bufferEqual;
-    private toUint8Array;
     getSyncStatuses(): Map<string, SyncPairStatus>;
     resolveConflict(conflictId: string, mergedContent: unknown): Promise<void>;
     listConflicts(): Promise<ConflictArchive[]>;

package/dist/index.js

@@ -225,8 +225,8 @@ async function ensureParentDir(absolutePath) {
 }
 
 // src/adapters.ts
-function backendToSyncableFS(backend) {
-  return {
+function backendToSyncableFS(backend, name) {
+  const syncable = {
     async readdir(path) {
       return backend.readdir(path);
     },
@@ -265,9 +265,17 @@ function backendToSyncableFS(backend) {
       return backend.exists(path);
     }
   };
+  if (name) {
+    syncable.backendName = name;
+  } else if (backend.backendName) {
+    syncable.backendName = backend.backendName;
+  } else {
+    syncable.backendName = backend.constructor.name || "Backend";
+  }
+  return syncable;
 }
-function cachedFSToSyncableFS(cached) {
-  return {
+function cachedFSToSyncableFS(cached, name) {
+  const syncable = {
     async readdir(path) {
       return cached.readdir(path);
     },
@@ -306,6 +314,8 @@ function cachedFSToSyncableFS(cached) {
       return cached.exists(path);
     }
   };
+  syncable.backendName = name || "CachedFS";
+  return syncable;
 }
 
 // src/backend-registry.ts
@@ -502,7 +512,7 @@ var ConfigRepo = class {
   onConflictCallback;
   disposed = false;
   configCache = /* @__PURE__ */ new Map();
-  constructor(appId, nodeId, cachedFS, serializer, onConflict) {
+  constructor(appId, nodeId, primaryBackendId, cachedFS, serializer, onConflict) {
     this.appId = appId;
     this.nodeId = nodeId;
     this.cachedFS = cachedFS;
@@ -510,7 +520,7 @@ var ConfigRepo = class {
     this.syncEngine = new import_zen_fs_sync.ZenFSSync();
     this.replicaBackends = /* @__PURE__ */ new Map();
     this.onConflictCallback = onConflict;
-    this.fullFS = cachedFSToSyncableFS(cachedFS);
+    this.fullFS = cachedFSToSyncableFS(cachedFS, `CachedFS(${primaryBackendId})`);
     this.fs = createChrootFS(cachedFS, `/${appId}`);
     this.rootFS = createChrootFS(cachedFS, "/");
   }
@@ -667,59 +677,12 @@ var ConfigRepo = class {
    */
   async syncMetaToReplicas() {
     this.assertNotDisposed();
-    try {
-      const content = await this.cachedFS.readFile(BACKENDS_FILE);
-      const vPath = versionPathFor(BACKENDS_FILE);
-      let vContent;
-      try {
-        vContent = await this.cachedFS.readFile(vPath);
-      } catch {
-      }
-      for (const [id, replica] of this.replicaBackends) {
-        try {
-          let needWrite = true;
-          try {
-            const existing = await replica.syncable.readFile(BACKENDS_FILE);
-            if (this.bufferEqual(content, existing)) {
-              needWrite = false;
-              console.log(`[ConfigRepo] ${BACKENDS_FILE} already up-to-date on ${id}, skipping`);
-            }
-          } catch {
-          }
-          if (needWrite) {
-            await replica.syncable.writeFile(BACKENDS_FILE, content);
-            console.log(`[ConfigRepo] Synced ${BACKENDS_FILE} to replica ${id}`);
-          }
-          if (vContent) {
-            try {
-              await replica.syncable.writeFile(vPath, vContent);
-            } catch (err) {
-              console.error(`[ConfigRepo] Failed to sync ${vPath} to ${id}:`, err.message);
-            }
-          }
-        } catch (err) {
-          console.error(`[ConfigRepo] Failed to sync ${BACKENDS_FILE} to ${id}:`, err.message);
-        }
-      }
-    } catch {
-    }
-  }
-  /** Compare two file contents (handles Uint8Array, ArrayBuffer, string, Buffer). */
-  bufferEqual(a, b) {
-    const ua = this.toUint8Array(a);
-    const ub = this.toUint8Array(b);
-    if (ua.length !== ub.length) return false;
-    for (let i = 0; i < ua.length; i++) {
-      if (ua[i] !== ub[i]) return false;
+    const results = await this.flush();
+    for (const result of results) {
+      console.log(
+        `[ConfigRepo] syncMetaToReplicas: ${result.pairId} +${result.filesCreated}/~${result.filesUpdated}/-${result.filesDeleted} skip:${result.filesSkipped} ${result.durationMs}ms`
+      );
     }
-    return true;
-  }
-  toUint8Array(raw) {
-    if (raw instanceof ArrayBuffer) return new Uint8Array(raw);
-    if (raw instanceof Uint8Array) return raw;
-    if (typeof raw === "string") return new TextEncoder().encode(raw);
-    if (Buffer.isBuffer(raw)) return new Uint8Array(raw.buffer, raw.byteOffset, raw.byteLength);
-    return new Uint8Array(raw);
   }
   getSyncStatuses() {
     this.assertNotDisposed();
@@ -816,7 +779,7 @@ var ConfigRepo = class {
       console.log(`[ConfigRepo] Creating replica backend: id=${desc.id}, type=${desc.type}`);
       try {
         const instance = await createBackend(desc);
-        const syncable = backendToSyncableFS(instance);
+        const syncable = backendToSyncableFS(instance, `${desc.type}(${desc.id})`);
         this.replicaBackends.set(desc.id, { instance, syncable });
         console.log(`[ConfigRepo] Replica ${desc.id} created successfully`);
       } catch (err) {
@@ -1062,6 +1025,7 @@ async function createConfigRepo(appId, options) {
   const tempRepo = new ConfigRepo(
     appId,
     "",
+    options.primaryBackendId,
     cachedFS,
     createSerializerChain(),
     void 0
@@ -1118,6 +1082,7 @@ async function createConfigRepo(appId, options) {
   const repo = new ConfigRepo(
     appId,
     nodeId,
+    options.primaryBackendId,
     cachedFS,
     serializer,
     options.onConflict

package/dist/index.mjs

@@ -176,8 +176,8 @@ async function ensureParentDir(absolutePath) {
 }
 
 // src/adapters.ts
-function backendToSyncableFS(backend) {
-  return {
+function backendToSyncableFS(backend, name) {
+  const syncable = {
     async readdir(path) {
       return backend.readdir(path);
     },
@@ -216,9 +216,17 @@ function backendToSyncableFS(backend) {
       return backend.exists(path);
     }
   };
+  if (name) {
+    syncable.backendName = name;
+  } else if (backend.backendName) {
+    syncable.backendName = backend.backendName;
+  } else {
+    syncable.backendName = backend.constructor.name || "Backend";
+  }
+  return syncable;
 }
-function cachedFSToSyncableFS(cached) {
-  return {
+function cachedFSToSyncableFS(cached, name) {
+  const syncable = {
     async readdir(path) {
       return cached.readdir(path);
     },
@@ -257,6 +265,8 @@ function cachedFSToSyncableFS(cached) {
       return cached.exists(path);
     }
   };
+  syncable.backendName = name || "CachedFS";
+  return syncable;
 }
 
 // src/backend-registry.ts
@@ -453,7 +463,7 @@ var ConfigRepo = class {
   onConflictCallback;
   disposed = false;
   configCache = /* @__PURE__ */ new Map();
-  constructor(appId, nodeId, cachedFS, serializer, onConflict) {
+  constructor(appId, nodeId, primaryBackendId, cachedFS, serializer, onConflict) {
     this.appId = appId;
     this.nodeId = nodeId;
     this.cachedFS = cachedFS;
@@ -461,7 +471,7 @@ var ConfigRepo = class {
     this.syncEngine = new ZenFSSync();
     this.replicaBackends = /* @__PURE__ */ new Map();
     this.onConflictCallback = onConflict;
-    this.fullFS = cachedFSToSyncableFS(cachedFS);
+    this.fullFS = cachedFSToSyncableFS(cachedFS, `CachedFS(${primaryBackendId})`);
     this.fs = createChrootFS(cachedFS, `/${appId}`);
     this.rootFS = createChrootFS(cachedFS, "/");
   }
@@ -618,59 +628,12 @@ var ConfigRepo = class {
    */
   async syncMetaToReplicas() {
     this.assertNotDisposed();
-    try {
-      const content = await this.cachedFS.readFile(BACKENDS_FILE);
-      const vPath = versionPathFor(BACKENDS_FILE);
-      let vContent;
-      try {
-        vContent = await this.cachedFS.readFile(vPath);
-      } catch {
-      }
-      for (const [id, replica] of this.replicaBackends) {
-        try {
-          let needWrite = true;
-          try {
-            const existing = await replica.syncable.readFile(BACKENDS_FILE);
-            if (this.bufferEqual(content, existing)) {
-              needWrite = false;
-              console.log(`[ConfigRepo] ${BACKENDS_FILE} already up-to-date on ${id}, skipping`);
-            }
-          } catch {
-          }
-          if (needWrite) {
-            await replica.syncable.writeFile(BACKENDS_FILE, content);
-            console.log(`[ConfigRepo] Synced ${BACKENDS_FILE} to replica ${id}`);
-          }
-          if (vContent) {
-            try {
-              await replica.syncable.writeFile(vPath, vContent);
-            } catch (err) {
-              console.error(`[ConfigRepo] Failed to sync ${vPath} to ${id}:`, err.message);
-            }
-          }
-        } catch (err) {
-          console.error(`[ConfigRepo] Failed to sync ${BACKENDS_FILE} to ${id}:`, err.message);
-        }
-      }
-    } catch {
-    }
-  }
-  /** Compare two file contents (handles Uint8Array, ArrayBuffer, string, Buffer). */
-  bufferEqual(a, b) {
-    const ua = this.toUint8Array(a);
-    const ub = this.toUint8Array(b);
-    if (ua.length !== ub.length) return false;
-    for (let i = 0; i < ua.length; i++) {
-      if (ua[i] !== ub[i]) return false;
+    const results = await this.flush();
+    for (const result of results) {
+      console.log(
+        `[ConfigRepo] syncMetaToReplicas: ${result.pairId} +${result.filesCreated}/~${result.filesUpdated}/-${result.filesDeleted} skip:${result.filesSkipped} ${result.durationMs}ms`
+      );
     }
-    return true;
-  }
-  toUint8Array(raw) {
-    if (raw instanceof ArrayBuffer) return new Uint8Array(raw);
-    if (raw instanceof Uint8Array) return raw;
-    if (typeof raw === "string") return new TextEncoder().encode(raw);
-    if (Buffer.isBuffer(raw)) return new Uint8Array(raw.buffer, raw.byteOffset, raw.byteLength);
-    return new Uint8Array(raw);
   }
   getSyncStatuses() {
     this.assertNotDisposed();
@@ -767,7 +730,7 @@ var ConfigRepo = class {
       console.log(`[ConfigRepo] Creating replica backend: id=${desc.id}, type=${desc.type}`);
       try {
         const instance = await createBackend(desc);
-        const syncable = backendToSyncableFS(instance);
+        const syncable = backendToSyncableFS(instance, `${desc.type}(${desc.id})`);
         this.replicaBackends.set(desc.id, { instance, syncable });
         console.log(`[ConfigRepo] Replica ${desc.id} created successfully`);
       } catch (err) {
@@ -1013,6 +976,7 @@ async function createConfigRepo(appId, options) {
   const tempRepo = new ConfigRepo(
     appId,
     "",
+    options.primaryBackendId,
     cachedFS,
     createSerializerChain(),
     void 0
@@ -1069,6 +1033,7 @@ async function createConfigRepo(appId, options) {
   const repo = new ConfigRepo(
     appId,
     nodeId,
+    options.primaryBackendId,
     cachedFS,
     serializer,
     options.onConflict

package/package.json

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