@feltdb/core 0.5.1 → 0.5.3

package/dist/cli/index.js

@@ -23,7 +23,7 @@ import * as path from 'path';
 import * as readline from 'readline';
 import { getClient } from './api-client.js';
 import { loadFeltDBConfig, createDefaultConfig, validateModel, } from './config.js';
-const VERSION = '0.5.1';
+const VERSION = '0.5.3';
 function prompt(question) {
     const rl = readline.createInterface({
         input: process.stdin,

package/dist/collection.d.ts

@@ -24,6 +24,8 @@ export interface UpdateIfVersionResult<T> {
     };
     /** Current version if update failed due to version mismatch */
     currentVersion?: number;
+    /** Structured backend conflict code, when available. */
+    conflictCode?: string;
 }
 /**
  * A live collection that automatically updates when underlying data changes.
@@ -47,7 +49,7 @@ export declare class Collection<T> {
     private indexBackend;
     private indexStore;
     private indexesLoaded;
-    constructor(db: JsDb, name: string, predicate?: Predicate<T>, parent?: Collection<T>);
+    constructor(db: JsDb, name: string, predicate?: Predicate<T>, parent?: Collection<T>, loadIndexes?: boolean);
     /**
      * Load indexes that were persisted from a previous session.
      */
@@ -126,7 +128,7 @@ export declare class Collection<T> {
      *   console.log('Conflict - another writer won at version', result.currentVersion);
      * }
      */
-    updateIfVersion(id: string | number, expectedVersion: number, updates: Partial<T>): Promise<UpdateIfVersionResult<T>>;
+    updateIfVersion(id: string | number, expectedVersion: number, updates: Partial<T>, expectedEpoch?: number, expectedLeaseId?: string, rejectIfDiverged?: boolean, knownCurrent?: T): Promise<UpdateIfVersionResult<T>>;
     /**
      * Delete a record from this collection.
      */

package/dist/collection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"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"}

package/dist/collection.js

@@ -17,7 +17,7 @@ import { IndexStore } from './index-store.js';
  * Uses reactive dependency graph instead of polling for efficient updates.
  */
 export class Collection {
-    constructor(db, name, predicate, parent) {
+    constructor(db, name, predicate, parent, loadIndexes = true) {
         this.predicate = null;
         this.cache = [];
         this.subscribers = new Set();
@@ -42,7 +42,10 @@ export class Collection {
             graph.registerDependency(parent.collectionId, this.collectionId);
         }
         // Load persisted indexes asynchronously
-        this.loadPersistedIndexes();
+        if (loadIndexes)
+            this.loadPersistedIndexes();
+        else
+            this.indexesLoaded = true;
     }
     /**
      * Load indexes that were persisted from a previous session.
@@ -131,13 +134,11 @@ export class Collection {
     async get(id) {
         const key = `${this.name}:${id}`;
         const result = await this.db.get(key);
-        if (result.success && result.data) {
-            try {
-                return JSON.parse(result.data);
-            }
-            catch {
-                return null;
-            }
+        if (!result.success) {
+            throw new Error(result.error || `Failed to read record ${id}`);
+        }
+        if (result.data) {
+            return JSON.parse(result.data);
         }
         return null;
     }
@@ -235,33 +236,30 @@ export class Collection {
      *   console.log('Conflict - another writer won at version', result.currentVersion);
      * }
      */
-    async updateIfVersion(id, expectedVersion, updates) {
-        const current = await this.get(id);
+    async updateIfVersion(id, expectedVersion, updates, expectedEpoch, expectedLeaseId, rejectIfDiverged, knownCurrent) {
+        const current = knownCurrent ?? await this.get(id);
         if (!current) {
             throw new Error(`Record ${id} not found`);
         }
-        const currentVersion = current.__version ?? 1;
-        if (currentVersion !== expectedVersion) {
-            return {
-                updated: false,
-                currentVersion,
-            };
-        }
-        // Prepare updated record with incremented version
+        // Prepare updated record (no version increment - backend will handle it)
         // User updates should not include __version
         const cleanUpdates = { ...updates };
         delete cleanUpdates.__version;
-        const newVersion = currentVersion + 1;
-        const updated = { ...current, ...cleanUpdates, __version: newVersion };
+        const updated = { ...current, ...cleanUpdates };
         const key = `${this.name}:${id}`;
         // Use CAS for atomic version-checked update
         if (!this.db.cas) {
             throw new Error(`updateIfVersion is not supported by this FeltDB runtime. ` +
                 `Only FileJsDb (Node.js) and HTTP/Server backends support atomic version-checked updates.`);
         }
+        // Delegate authoritative version and epoch check to the backend
+        // The backend will atomically verify both predicates
         const casResult = await this.db.cas({
             key,
-            expectedVersion: currentVersion,
+            expectedVersion,
+            expectedEpoch,
+            expectedLeaseId,
+            rejectIfDiverged,
             value: JSON.stringify(updated),
         });
         if (!casResult.updated) {
@@ -269,22 +267,27 @@ export class Collection {
             return {
                 updated: false,
                 currentVersion: casResult.currentVersion,
+                conflictCode: casResult.conflictCode,
             };
         }
+        // Use the item returned by cas() which has the correct incremented version
+        const finalItem = (casResult.item || updated);
+        // CAS operation on backend increments version atomically - update finalItem to match
+        finalItem.__version = casResult.currentVersion;
         // Update indexes
-        this.indexBackend.updateRecord(String(id), current, updated);
+        this.indexBackend.updateRecord(String(id), current, finalItem);
         // Emit change through reactive dependency graph
         const change = {
             type: 'update',
             key,
-            value: updated,
+            value: finalItem,
             timestamp: Date.now(),
         };
         const graph = getReactiveDependencyGraph();
         await graph.emitChange(this.name, change);
         return {
             updated: true,
-            item: updated,
+            item: finalItem,
         };
     }
     /**

package/dist/create/package-versions.js

@@ -1,4 +1,4 @@
 // One release train keeps generated applications installable. The repository
 // validation script checks these values against every workspace manifest.
-export const FELTDB_PACKAGE_VERSION = '0.5.1';
+export const FELTDB_PACKAGE_VERSION = '0.5.3';
 export const feltdbPackageRange = `^${FELTDB_PACKAGE_VERSION}`;

package/dist/create/server-source/crates/feltdb/src/lib.rs

@@ -2,6 +2,8 @@
 mod acceptance_tests;
 #[cfg(test)]
 mod admission_contract_tests;
+#[cfg(test)]
+mod managed_cas_tests;
 mod acquisition;
 pub mod admission;
 pub mod application;
@@ -329,6 +331,32 @@ pub struct AtomicCommit {
     pub rows: Vec<StoredRow>,
     pub duplicate: bool,
 }
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum JsonCasResult {
+    Updated {
+        current_version: u64,
+        current_epoch: u64,
+        value: Value,
+    },
+    VersionConflict {
+        current_version: u64,
+        current_epoch: u64,
+    },
+    AuthorityConflict {
+        current_version: u64,
+        current_epoch: u64,
+    },
+    LeaseConflict {
+        current_version: u64,
+        current_epoch: u64,
+    },
+    ReplicationConflict {
+        current_version: u64,
+        current_epoch: u64,
+    },
+    NotFound,
+}
 #[derive(Debug, Clone, Serialize, Deserialize)]
 struct TransactionLogRecord {
     record_type: String,
@@ -478,6 +506,151 @@ impl FeltDb {
         Ok(())
     }
 
+    /// Atomically compare the logical record version and authority epoch before
+    /// durably replacing a JSON object. Failed predicates append no operation
+    /// and emit no change event.
+    pub fn compare_and_set_json(
+        &self,
+        key: &str,
+        expected_version: u64,
+        expected_epoch: Option<u64>,
+        expected_lease_id: Option<&str>,
+        reject_if_diverged: bool,
+        mut value: Value,
+    ) -> Result<JsonCasResult> {
+        let capability = key
+            .split_once(':')
+            .map(|(cap, _)| cap)
+            .unwrap_or("default")
+            .to_string();
+        let rust_type = type_name::<Value>().to_string();
+        let (result, event) = {
+            let mut inner = self.inner.lock().expect("lock poisoned");
+            let Some(current) = inner.rows.get(&capability).and_then(|rows| rows.get(key)) else {
+                return Ok(JsonCasResult::NotFound);
+            };
+            let current_version = current
+                .value
+                .get("__version")
+                .and_then(Value::as_u64)
+                .unwrap_or(1);
+            let current_epoch = current
+                .value
+                .pointer("/authority/epoch")
+                .and_then(Value::as_u64)
+                .unwrap_or(0);
+            if current_version != expected_version {
+                return Ok(JsonCasResult::VersionConflict {
+                    current_version,
+                    current_epoch,
+                });
+            }
+            if expected_epoch.is_some_and(|expected| expected != current_epoch) {
+                return Ok(JsonCasResult::AuthorityConflict {
+                    current_version,
+                    current_epoch,
+                });
+            }
+            let persisted_lease = current.value.get("lease").filter(|lease| !lease.is_null());
+            let lease_matches = match (persisted_lease, expected_lease_id) {
+                (None, None) => true,
+                (None, Some(_)) => false,
+                (Some(lease), Some(expected_id)) => {
+                    lease.get("leaseId").and_then(Value::as_str) == Some(expected_id)
+                        && lease
+                            .get("expiresAt")
+                            .and_then(Value::as_u64)
+                            .is_some_and(|expires_at| expires_at > now_ms() as u64)
+                }
+                (Some(lease), None) => lease
+                    .get("expiresAt")
+                    .and_then(Value::as_u64)
+                    .is_some_and(|expires_at| expires_at <= now_ms() as u64),
+            };
+            if !lease_matches {
+                return Ok(JsonCasResult::LeaseConflict {
+                    current_version,
+                    current_epoch,
+                });
+            }
+            if reject_if_diverged && capability == "_cells" {
+                let replica_key = key
+                    .strip_prefix("_cells:")
+                    .map(|suffix| format!("_replicas:{suffix}"));
+                let divergent = replica_key.as_ref().and_then(|replica_key| {
+                    inner
+                        .rows
+                        .get("_replicas")
+                        .and_then(|rows| rows.get(replica_key))
+                        .and_then(|row| row.value.get("divergent"))
+                        .and_then(Value::as_bool)
+                }) == Some(true);
+                if divergent {
+                    return Ok(JsonCasResult::ReplicationConflict {
+                        current_version,
+                        current_epoch,
+                    });
+                }
+            }
+
+            let object = value.as_object_mut().ok_or_else(|| {
+                FlowError::CapabilityError("CAS value must be a JSON object".to_string())
+            })?;
+            object.insert("__version".to_string(), Value::from(expected_version + 1));
+
+            inner.sequence += 1;
+            inner.sync_state.increment_vector_clock();
+            let vector_clock = inner.sync_state.get_or_init_vector_clock().clone();
+            let operation = Operation::update(
+                inner.sequence,
+                inner.instance_id.clone(),
+                inner.sequence,
+                key.to_string(),
+                value.clone(),
+                rust_type.clone(),
+                capability.clone(),
+            )
+            .with_vector_clock(vector_clock);
+            let row = StoredRow {
+                capability: capability.clone(),
+                key: key.to_string(),
+                rust_type: rust_type.clone(),
+                value: value.clone(),
+                unix_ms: now_ms(),
+                content_hash: Some(operation.content_hash.clone()),
+                flow_ref: None,
+                deleted: false,
+                operation: Some(operation.clone()),
+            };
+            append_event(&inner.path, &row)?;
+            inner.change_log.add_operation(operation);
+            inner
+                .rows
+                .entry(capability.clone())
+                .or_default()
+                .insert(key.to_string(), row.clone());
+            let event = ChangeEvent {
+                capability,
+                key: key.to_string(),
+                rust_type,
+                unix_ms: row.unix_ms,
+            };
+            (
+                JsonCasResult::Updated {
+                    current_version: expected_version + 1,
+                    current_epoch: value
+                        .pointer("/authority/epoch")
+                        .and_then(Value::as_u64)
+                        .unwrap_or(current_epoch),
+                    value,
+                },
+                event,
+            )
+        };
+        let _ = self.event_tx.send(event);
+        Ok(result)
+    }
+
     /// Delete a record with vector clock tracking
     pub fn delete(&self, key: &str) -> Result<()> {
         let capability = key

package/dist/create/server-source/crates/feltdb/src/managed_cas_tests.rs

@@ -0,0 +1,231 @@
+use std::{fs, path::PathBuf};
+
+use serde_json::json;
+
+use crate::{FeltDb, JsonCasResult};
+
+fn database(name: &str) -> (FeltDb, PathBuf) {
+    let path = std::env::temp_dir().join(format!(
+        "feltdb-managed-cas-{name}-{}-{}.log",
+        std::process::id(),
+        std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)
+            .unwrap()
+            .as_nanos()
+    ));
+    (FeltDb::open(&path).unwrap(), path)
+}
+
+#[test]
+fn version_and_epoch_are_one_atomic_predicate() {
+    let (db, path) = database("predicate");
+    let key = "_cells:cell-1";
+    db.insert(
+        key,
+        json!({
+            "id": "cell-1",
+            "version": 42,
+            "value": "before",
+            "authority": { "owner": "A", "epoch": 7, "lifecycle": "active" },
+            "__version": 1
+        }),
+    )
+    .unwrap();
+
+    let stale_epoch = db
+        .compare_and_set_json(
+            key,
+            1,
+            Some(6),
+            None,
+            false,
+            json!({
+                "id": "cell-1",
+                "version": 42,
+                "value": "stale",
+                "authority": { "owner": "stale", "epoch": 7, "lifecycle": "active" }
+            }),
+        )
+        .unwrap();
+    assert_eq!(
+        stale_epoch,
+        JsonCasResult::AuthorityConflict {
+            current_version: 1,
+            current_epoch: 7,
+        }
+    );
+    assert_eq!(db.get_value(key).unwrap().unwrap()["value"], "before");
+
+    let updated = db
+        .compare_and_set_json(
+            key,
+            1,
+            Some(7),
+            None,
+            false,
+            json!({
+                "id": "cell-1",
+                "version": 42,
+                "value": "after",
+                "authority": { "owner": "B", "epoch": 8, "lifecycle": "active" }
+            }),
+        )
+        .unwrap();
+    assert!(matches!(
+        updated,
+        JsonCasResult::Updated {
+            current_version: 2,
+            current_epoch: 8,
+            ..
+        }
+    ));
+
+    let stale_version = db
+        .compare_and_set_json(key, 1, Some(8), None, false, json!({ "value": "lost" }))
+        .unwrap();
+    assert_eq!(
+        stale_version,
+        JsonCasResult::VersionConflict {
+            current_version: 2,
+            current_epoch: 8,
+        }
+    );
+    let final_value = db.get_value(key).unwrap().unwrap();
+    assert_eq!(final_value["value"], "after");
+    assert_eq!(final_value["__version"], 2);
+    assert_eq!(final_value["authority"]["epoch"], 8);
+
+    drop(db);
+    let _ = fs::remove_file(path);
+}
+
+#[test]
+fn lease_is_checked_with_the_server_clock_inside_cas() {
+    let (db, path) = database("lease");
+    let key = "_cells:leased";
+    let future = crate::now_ms() as u64 + 60_000;
+    db.insert(
+        key,
+        json!({
+            "value": "before",
+            "authority": { "epoch": 3 },
+            "lease": { "leaseId": "lease-good", "expiresAt": future },
+            "__version": 1
+        }),
+    )
+    .unwrap();
+
+    for expected_lease_id in [None, Some("lease-wrong")] {
+        assert_eq!(
+            db.compare_and_set_json(
+                key,
+                1,
+                Some(3),
+                expected_lease_id,
+                false,
+                json!({ "value": "rejected", "authority": { "epoch": 3 } }),
+            )
+            .unwrap(),
+            JsonCasResult::LeaseConflict {
+                current_version: 1,
+                current_epoch: 3,
+            }
+        );
+        assert_eq!(db.get_value(key).unwrap().unwrap()["value"], "before");
+    }
+
+    assert!(matches!(
+        db.compare_and_set_json(
+            key,
+            1,
+            Some(3),
+            Some("lease-good"),
+            false,
+            json!({ "value": "accepted", "authority": { "epoch": 3 }, "lease": { "leaseId": "lease-good", "expiresAt": future } }),
+        )
+        .unwrap(),
+        JsonCasResult::Updated { .. }
+    ));
+
+    let expired_key = "_cells:expired";
+    db.insert(
+        expired_key,
+        json!({
+            "value": "before",
+            "authority": { "epoch": 3 },
+            "lease": { "leaseId": "lease-expired", "expiresAt": 1 },
+            "__version": 1
+        }),
+    )
+    .unwrap();
+    assert_eq!(
+        db.compare_and_set_json(
+            expired_key,
+            1,
+            Some(3),
+            Some("lease-expired"),
+            false,
+            json!({ "value": "rejected", "authority": { "epoch": 3 } }),
+        )
+        .unwrap(),
+        JsonCasResult::LeaseConflict {
+            current_version: 1,
+            current_epoch: 3,
+        }
+    );
+    assert_eq!(db.get_value(expired_key).unwrap().unwrap()["value"], "before");
+
+    drop(db);
+    let _ = fs::remove_file(path);
+}
+
+#[test]
+fn divergent_replica_blocks_promotion_inside_cas() {
+    let (db, path) = database("divergence");
+    let cell_key = "_cells:replica";
+    let replica_key = "_replicas:replica";
+    db.insert(
+        cell_key,
+        json!({
+            "version": 42,
+            "value": "A",
+            "authority": { "owner": "A", "epoch": 7 },
+            "lease": null,
+            "__version": 42
+        }),
+    )
+    .unwrap();
+    db.insert(
+        replica_key,
+        json!({ "version": 42, "value": "B", "divergent": true }),
+    )
+    .unwrap();
+    let sequence_before = db.sequence().unwrap();
+    let value_before = db.get_value(cell_key).unwrap().unwrap();
+
+    assert_eq!(
+        db.compare_and_set_json(
+            cell_key,
+            42,
+            Some(7),
+            None,
+            true,
+            json!({
+                "version": 43,
+                "value": "A",
+                "authority": { "owner": "B", "epoch": 8 },
+                "lease": null
+            }),
+        )
+        .unwrap(),
+        JsonCasResult::ReplicationConflict {
+            current_version: 42,
+            current_epoch: 7,
+        }
+    );
+    assert_eq!(db.sequence().unwrap(), sequence_before);
+    assert_eq!(db.get_value(cell_key).unwrap().unwrap(), value_before);
+
+    drop(db);
+    let _ = fs::remove_file(path);
+}