serializable-bptree 7.0.2 → 7.0.4

package/dist/cjs/index.cjs

@@ -475,24 +475,13 @@ var BPTree = class _BPTree {
   option;
   order;
   rootId;
-  /**
-   * Returns the ID of the root node.
-   * @returns The root node ID.
-   */
-  getRootId() {
-    return this.rootId;
-  }
-  /**
-   * Returns the order of the B+Tree.
-   * @returns The order of the tree.
-   */
-  getOrder() {
-    return this.order;
-  }
   _strategyDirty;
   _nodeCreateBuffer;
   _nodeUpdateBuffer;
   _nodeDeleteBuffer;
+  sharedDeleteCache = /* @__PURE__ */ new Map();
+  activeTransactions = /* @__PURE__ */ new Set();
+  lastTransactionId = 0;
   verifierMap = {
     gt: (nv, v) => this.comparator.isHigher(nv, v),
     gte: (nv, v) => this.comparator.isHigher(nv, v) || this.comparator.isSame(nv, v),
@@ -653,6 +642,20 @@ var BPTree = class _BPTree {
     }
     return best;
   }
+  /**
+   * Returns the ID of the root node.
+   * @returns The root node ID.
+   */
+  getRootId() {
+    return this.rootId;
+  }
+  /**
+   * Returns the order of the B+Tree.
+   * @returns The order of the tree.
+   */
+  getOrder() {
+    return this.order;
+  }
   /**
    * Verified if the value satisfies the condition.
    * 
@@ -772,6 +775,38 @@ var BPTree = class _BPTree {
     this._cachedRegexp.clear();
     this.nodes.clear();
   }
+  registerTransaction(txId) {
+    this.activeTransactions.add(txId);
+  }
+  unregisterTransaction(txId) {
+    this.activeTransactions.delete(txId);
+  }
+  pruneObsoleteNodes() {
+    if (this.activeTransactions.size === 0) {
+      this.sharedDeleteCache.clear();
+      return;
+    }
+    const minActiveTxId = Math.min(...this.activeTransactions);
+    for (const [id, entry] of this.sharedDeleteCache) {
+      if (entry.obsoleteAt < minActiveTxId) {
+        this.sharedDeleteCache.delete(id);
+      }
+    }
+  }
+  getObsoleteNode(id) {
+    return this.sharedDeleteCache.get(id)?.node;
+  }
+  addObsoleteNode(node, obsoleteAt) {
+    this.sharedDeleteCache.set(node.id, { node, obsoleteAt });
+  }
+  getNextTransactionId() {
+    let nextId = Date.now();
+    if (nextId <= this.lastTransactionId) {
+      nextId = this.lastTransactionId + 1e-3;
+    }
+    this.lastTransactionId = nextId;
+    return nextId;
+  }
 };
 
 // src/base/BPTreeSyncBase.ts
@@ -1360,7 +1395,9 @@ var BPTreeSyncBase = class extends BPTree {
     this._nodeUpdateBuffer.clear();
   }
   commitNodeDeleteBuffer() {
+    const obsoleteAt = this.getNextTransactionId();
     for (const node of this._nodeDeleteBuffer.values()) {
+      this.addObsoleteNode(node, obsoleteAt);
       this.strategy.delete(node.id);
       this.nodes.delete(node.id);
     }
@@ -1522,6 +1559,7 @@ var BPTreeSyncBase = class extends BPTree {
 var SerializeStrategy = class {
   order;
   head;
+  lastCommittedTransactionId = 0;
   constructor(order) {
     this.order = order;
     this.head = {
@@ -1550,13 +1588,13 @@ var SerializeStrategySync = class extends SerializeStrategy {
     this.setHeadData(key, next);
     return current;
   }
-  compareAndSwapHead(oldRoot, newRoot) {
-    if (this.head.root !== oldRoot) {
-      return false;
-    }
+  getLastCommittedTransactionId() {
+    return this.lastCommittedTransactionId;
+  }
+  compareAndSwapHead(newRoot, newTxId) {
     this.head.root = newRoot;
+    this.lastCommittedTransactionId = newTxId;
     this.writeHead(this.head);
-    return true;
   }
 };
 var InMemoryStoreStrategySync = class extends SerializeStrategySync {
@@ -1625,8 +1663,11 @@ var BPTreeSyncSnapshotStrategy = class extends SerializeStrategySync {
     this.snapshotHead.root = head.root;
     this.snapshotHead.data = { ...head.data };
   }
-  compareAndSwapHead(oldRoot, newRoot) {
-    return this.baseStrategy.compareAndSwapHead(oldRoot, newRoot);
+  compareAndSwapHead(newRoot, newTxId) {
+    this.baseStrategy.compareAndSwapHead(newRoot, newTxId);
+  }
+  getLastCommittedTransactionId() {
+    return this.baseStrategy.getLastCommittedTransactionId();
   }
   getHeadData(key, defaultValue) {
     return this.snapshotHead.data[key] ?? defaultValue;
@@ -1647,8 +1688,11 @@ var BPTreeSyncTransaction = class extends BPTreeSyncBase {
   dirtyIds;
   createdInTx;
   deletedIds;
+  originalNodes = /* @__PURE__ */ new Map();
   initialRootId;
   transactionRootId;
+  transactionId;
+  initialLastCommittedTransactionId = 0;
   constructor(baseTree) {
     super(baseTree.strategy, baseTree.comparator, baseTree.option);
     this.realBaseTree = baseTree;
@@ -1659,6 +1703,7 @@ var BPTreeSyncTransaction = class extends BPTreeSyncBase {
     this.dirtyIds = /* @__PURE__ */ new Set();
     this.createdInTx = /* @__PURE__ */ new Set();
     this.deletedIds = /* @__PURE__ */ new Set();
+    this.transactionId = Date.now() + Math.random();
   }
   /**
    * Initializes the transaction by capturing the current state of the tree.
@@ -1675,6 +1720,7 @@ var BPTreeSyncTransaction = class extends BPTreeSyncBase {
       const root = this._createNode(true, [], [], true);
       this.initialRootId = root.id;
     }
+    this.initialLastCommittedTransactionId = this.realBaseStrategy.getLastCommittedTransactionId();
     this.transactionRootId = this.initialRootId;
     this.rootId = this.transactionRootId;
     const snapshotStrategy = new BPTreeSyncSnapshotStrategy(this.realBaseStrategy, this.initialRootId);
@@ -1683,6 +1729,7 @@ var BPTreeSyncTransaction = class extends BPTreeSyncBase {
     this.dirtyIds.clear();
     this.createdInTx.clear();
     this.deletedIds.clear();
+    this.realBaseTree.registerTransaction(this.transactionId);
   }
   getNode(id) {
     if (this.txNodes.has(id)) {
@@ -1691,7 +1738,13 @@ var BPTreeSyncTransaction = class extends BPTreeSyncBase {
     if (this.deletedIds.has(id)) {
       throw new Error(`The tree attempted to reference deleted node '${id}'`);
     }
-    const baseNode = this.realBaseStrategy.read(id);
+    let baseNode = this.realBaseTree.getObsoleteNode(id);
+    if (!baseNode) {
+      baseNode = this.realBaseStrategy.read(id);
+    }
+    if (!this.originalNodes.has(id) && !this.createdInTx.has(id)) {
+      this.originalNodes.set(id, JSON.parse(JSON.stringify(baseNode)));
+    }
     const clone = JSON.parse(JSON.stringify(baseNode));
     this.txNodes.set(id, clone);
     return clone;
@@ -1781,9 +1834,10 @@ var BPTreeSyncTransaction = class extends BPTreeSyncBase {
    * Attempts to commit the transaction.
    * Uses Optimistic Locking (Compare-And-Swap) on the root node ID to detect conflicts.
    * 
+   * @param cleanup Whether to clean up obsolete nodes after commit. Defaults to true.
    * @returns The transaction result.
    */
-  commit() {
+  commit(cleanup = true) {
     const idMapping = /* @__PURE__ */ new Map();
     const finalNodes = [];
     for (const oldId of this.dirtyIds) {
@@ -1831,24 +1885,46 @@ var BPTreeSyncTransaction = class extends BPTreeSyncBase {
     if (idMapping.has(this.rootId)) {
       newRootId = idMapping.get(this.rootId);
     }
-    for (const node of finalNodes) {
-      this.realBaseStrategy.write(node.id, node);
+    let success = false;
+    if (finalNodes.length === 0) {
+      success = true;
+    } else if (this.realBaseStrategy.getLastCommittedTransactionId() === this.initialLastCommittedTransactionId) {
+      for (const node of finalNodes) {
+        this.realBaseStrategy.write(node.id, node);
+      }
+      this.realBaseStrategy.compareAndSwapHead(newRootId, this.transactionId);
+      success = true;
     }
-    const success = this.realBaseStrategy.compareAndSwapHead(this.initialRootId, newRootId);
     if (success) {
       const distinctObsolete = /* @__PURE__ */ new Set();
       for (const oldId of this.dirtyIds) {
-        if (!this.createdInTx.has(oldId) && this.txNodes.has(oldId)) {
+        if (this.createdInTx.has(oldId)) {
+          continue;
+        }
+        if (this.txNodes.has(oldId) || this.deletedIds.has(oldId)) {
           distinctObsolete.add(oldId);
         }
       }
+      if (cleanup) {
+        for (const obsoleteId of distinctObsolete) {
+          if (this.originalNodes.has(obsoleteId)) {
+            this.realBaseTree.addObsoleteNode(
+              this.originalNodes.get(obsoleteId),
+              this.transactionId
+            );
+          }
+          this.realBaseStrategy.delete(obsoleteId);
+        }
+      }
+      this.realBaseTree.unregisterTransaction(this.transactionId);
+      this.realBaseTree.pruneObsoleteNodes();
       return {
         success: true,
         createdIds: newCreatedIds,
         obsoleteIds: Array.from(distinctObsolete)
       };
     } else {
-      this.rollback();
+      this.rollback(cleanup);
       return {
         success: false,
         createdIds: newCreatedIds,
@@ -1872,8 +1948,16 @@ var BPTreeSyncTransaction = class extends BPTreeSyncBase {
         this.realBaseStrategy.delete(id);
       }
     }
+    this.realBaseTree.unregisterTransaction(this.transactionId);
+    this.realBaseTree.pruneObsoleteNodes();
     return createdIds;
   }
+  readLock(fn) {
+    return fn();
+  }
+  writeLock(fn) {
+    return fn();
+  }
   // Override to do nothing, as transaction handles its own commits
   commitHeadBuffer() {
   }
@@ -2511,7 +2595,9 @@ var BPTreeAsyncBase = class extends BPTree {
     this._nodeUpdateBuffer.clear();
   }
   async commitNodeDeleteBuffer() {
+    const obsoleteAt = this.getNextTransactionId();
     for (const node of this._nodeDeleteBuffer.values()) {
+      this.addObsoleteNode(node, obsoleteAt);
       await this.strategy.delete(node.id);
       this.nodes.delete(node.id);
     }
@@ -2676,8 +2762,276 @@ var BPTreeAsyncBase = class extends BPTree {
   }
 };
 
+// node_modules/ryoiki/dist/esm/index.mjs
+var Ryoiki = class _Ryoiki {
+  readings;
+  writings;
+  readQueue;
+  writeQueue;
+  static async CatchError(promise) {
+    return await promise.then((v) => [void 0, v]).catch((err) => [err]);
+  }
+  static IsRangeOverlap(a, b) {
+    const [start1, end1] = a;
+    const [start2, end2] = b;
+    if (end1 <= start2 || end2 <= start1) {
+      return false;
+    }
+    return true;
+  }
+  static ERR_ALREADY_EXISTS(lockId) {
+    return new Error(`The '${lockId}' task already existing in queue or running.`);
+  }
+  static ERR_NOT_EXISTS(lockId) {
+    return new Error(`The '${lockId}' task not existing in task queue.`);
+  }
+  static ERR_TIMEOUT(lockId, timeout) {
+    return new Error(`The task with ID '${lockId}' failed to acquire the lock within the timeout(${timeout}ms).`);
+  }
+  /**
+   * Constructs a new instance of the Ryoiki class.
+   */
+  constructor() {
+    this.readings = /* @__PURE__ */ new Map();
+    this.writings = /* @__PURE__ */ new Map();
+    this.readQueue = /* @__PURE__ */ new Map();
+    this.writeQueue = /* @__PURE__ */ new Map();
+  }
+  /**
+   * Creates a range based on a start value and length.
+   * @param start - The starting value of the range.
+   * @param length - The length of the range.
+   * @returns A range tuple [start, start + length].
+   */
+  range(start, length) {
+    return [start, start + length];
+  }
+  rangeOverlapping(tasks, range) {
+    return Array.from(tasks.values()).some((t) => _Ryoiki.IsRangeOverlap(t.range, range));
+  }
+  isSameRange(a, b) {
+    const [a1, a2] = a;
+    const [b1, b2] = b;
+    return a1 === b1 && a2 === b2;
+  }
+  fetchUnitAndRun(queue, workspaces) {
+    for (const [id, unit] of queue) {
+      if (!unit.condition()) {
+        continue;
+      }
+      this._alloc(queue, workspaces, id);
+    }
+  }
+  _handleOverload(args, handlers, argPatterns) {
+    for (const [key, pattern] of Object.entries(argPatterns)) {
+      if (this._matchArgs(args, pattern)) {
+        return handlers[key](...args);
+      }
+    }
+    throw new Error("Invalid arguments");
+  }
+  _matchArgs(args, pattern) {
+    return args.every((arg, index) => {
+      const expectedType = pattern[index];
+      if (expectedType === void 0) return typeof arg === "undefined";
+      if (expectedType === Function) return typeof arg === "function";
+      if (expectedType === Number) return typeof arg === "number";
+      if (expectedType === Array) return Array.isArray(arg);
+      return false;
+    });
+  }
+  _createRandomId() {
+    const timestamp = Date.now().toString(36);
+    const random = Math.random().toString(36).substring(2);
+    return `${timestamp}${random}`;
+  }
+  _alloc(queue, workspaces, lockId) {
+    const unit = queue.get(lockId);
+    if (!unit) {
+      throw _Ryoiki.ERR_NOT_EXISTS(lockId);
+    }
+    workspaces.set(lockId, unit);
+    queue.delete(lockId);
+    unit.alloc();
+  }
+  _free(workspaces, lockId) {
+    const unit = workspaces.get(lockId);
+    if (!unit) {
+      throw _Ryoiki.ERR_NOT_EXISTS(lockId);
+    }
+    workspaces.delete(lockId);
+    unit.free();
+  }
+  _lock(queue, range, timeout, task, condition) {
+    return new Promise((resolve, reject) => {
+      let timeoutId = null;
+      if (timeout >= 0) {
+        timeoutId = setTimeout(() => {
+          reject(_Ryoiki.ERR_TIMEOUT(id, timeout));
+        }, timeout);
+      }
+      const id = this._createRandomId();
+      const alloc = async () => {
+        if (timeoutId !== null) {
+          clearTimeout(timeoutId);
+        }
+        const [err, v] = await _Ryoiki.CatchError(task(id));
+        if (err) reject(err);
+        else resolve(v);
+      };
+      const fetch = () => {
+        this.fetchUnitAndRun(this.readQueue, this.readings);
+        this.fetchUnitAndRun(this.writeQueue, this.writings);
+      };
+      queue.set(id, { id, range, condition, alloc, free: fetch });
+      fetch();
+    });
+  }
+  _checkWorking(range, workspaces) {
+    let isLocked = false;
+    for (const lock of workspaces.values()) {
+      if (_Ryoiki.IsRangeOverlap(range, lock.range)) {
+        isLocked = true;
+        break;
+      }
+    }
+    return isLocked;
+  }
+  /**
+   * Checks if there is any active read lock within the specified range.
+   * @param range The range to check for active read locks.
+   * @returns `true` if there is an active read lock within the range, `false` otherwise.
+   */
+  isReading(range) {
+    return this._checkWorking(range, this.readings);
+  }
+  /**
+   * Checks if there is any active write lock within the specified range.
+   * @param range The range to check for active write locks.
+   * @returns `true` if there is an active write lock within the range, `false` otherwise.
+   */
+  isWriting(range) {
+    return this._checkWorking(range, this.writings);
+  }
+  /**
+   * Checks if a read lock can be acquired within the specified range.
+   * @param range The range to check for read lock availability.
+   * @returns `true` if a read lock can be acquired, `false` otherwise.
+   */
+  canRead(range) {
+    const writing = this.isWriting(range);
+    return !writing;
+  }
+  /**
+   * Checks if a write lock can be acquired within the specified range.
+   * @param range The range to check for write lock availability.
+   * @returns `true` if a write lock can be acquired, `false` otherwise.
+   */
+  canWrite(range) {
+    const reading = this.isReading(range);
+    const writing = this.isWriting(range);
+    return !reading && !writing;
+  }
+  /**
+   * Internal implementation of the read lock. Handles both overloads.
+   * @template T - The return type of the task.
+   * @param arg0 - Either a range or a task callback.
+   * If a range is provided, the task is the second argument.
+   * @param arg1 - The task to execute, required if a range is provided.
+   * @param arg2 - The timeout for acquiring the lock.
+   * If the lock cannot be acquired within this period, an error will be thrown.
+   * If this value is not provided, no timeout will be set.
+   * @returns A promise resolving to the result of the task execution.
+   */
+  readLock(arg0, arg1, arg2) {
+    const [range, task, timeout] = this._handleOverload(
+      [arg0, arg1, arg2],
+      {
+        rangeTask: (range2, task2) => [range2, task2, -1],
+        rangeTaskTimeout: (range2, task2, timeout2) => [range2, task2, timeout2],
+        task: (task2) => [[-Infinity, Infinity], task2, -1],
+        taskTimeout: (task2, timeout2) => [[-Infinity, Infinity], task2, timeout2]
+      },
+      {
+        task: [Function],
+        taskTimeout: [Function, Number],
+        rangeTask: [Array, Function],
+        rangeTaskTimeout: [Array, Function, Number]
+      }
+    );
+    return this._lock(
+      this.readQueue,
+      range,
+      timeout,
+      task,
+      () => !this.rangeOverlapping(this.writings, range)
+    );
+  }
+  /**
+   * Internal implementation of the write lock. Handles both overloads.
+   * @template T - The return type of the task.
+   * @param arg0 - Either a range or a task callback.
+   * If a range is provided, the task is the second argument.
+   * @param arg1 - The task to execute, required if a range is provided.
+   * @param arg2 - The timeout for acquiring the lock.
+   * If the lock cannot be acquired within this period, an error will be thrown.
+   * If this value is not provided, no timeout will be set.
+   * @returns A promise resolving to the result of the task execution.
+   */
+  writeLock(arg0, arg1, arg2) {
+    const [range, task, timeout] = this._handleOverload(
+      [arg0, arg1, arg2],
+      {
+        rangeTask: (range2, task2) => [range2, task2, -1],
+        rangeTaskTimeout: (range2, task2, timeout2) => [range2, task2, timeout2],
+        task: (task2) => [[-Infinity, Infinity], task2, -1],
+        taskTimeout: (task2, timeout2) => [[-Infinity, Infinity], task2, timeout2]
+      },
+      {
+        task: [Function],
+        taskTimeout: [Function, Number],
+        rangeTask: [Array, Function],
+        rangeTaskTimeout: [Array, Function, Number]
+      }
+    );
+    return this._lock(
+      this.writeQueue,
+      range,
+      timeout,
+      task,
+      () => {
+        return !this.rangeOverlapping(this.writings, range) && !this.rangeOverlapping(this.readings, range);
+      }
+    );
+  }
+  /**
+   * Releases a read lock by its lock ID.
+   * @param lockId - The unique identifier for the lock to release.
+   */
+  readUnlock(lockId) {
+    this._free(this.readings, lockId);
+  }
+  /**
+   * Releases a write lock by its lock ID.
+   * @param lockId - The unique identifier for the lock to release.
+   */
+  writeUnlock(lockId) {
+    this._free(this.writings, lockId);
+  }
+};
+
 // src/SerializeStrategyAsync.ts
 var SerializeStrategyAsync = class extends SerializeStrategy {
+  lock = new Ryoiki();
+  async acquireLock(action) {
+    let lockId;
+    return this.lock.writeLock((_lockId) => {
+      lockId = _lockId;
+      return action();
+    }).finally(() => {
+      this.lock.writeUnlock(lockId);
+    });
+  }
   async getHeadData(key, defaultValue) {
     if (!Object.hasOwn(this.head.data, key)) {
       await this.setHeadData(key, defaultValue);
@@ -2694,13 +3048,13 @@ var SerializeStrategyAsync = class extends SerializeStrategy {
     await this.setHeadData(key, next);
     return current;
   }
-  async compareAndSwapHead(oldRoot, newRoot) {
-    if (this.head.root !== oldRoot) {
-      return false;
-    }
+  async getLastCommittedTransactionId() {
+    return this.lastCommittedTransactionId;
+  }
+  async compareAndSwapHead(newRoot, newTxId) {
     this.head.root = newRoot;
+    this.lastCommittedTransactionId = newTxId;
     await this.writeHead(this.head);
-    return true;
   }
 };
 var InMemoryStoreStrategyAsync = class extends SerializeStrategyAsync {
@@ -2769,8 +3123,11 @@ var BPTreeAsyncSnapshotStrategy = class extends SerializeStrategyAsync {
     this.snapshotHead.root = head.root;
     this.snapshotHead.data = { ...head.data };
   }
-  async compareAndSwapHead(oldRoot, newRoot) {
-    return await this.baseStrategy.compareAndSwapHead(oldRoot, newRoot);
+  async compareAndSwapHead(newRoot, newTxId) {
+    await this.baseStrategy.compareAndSwapHead(newRoot, newTxId);
+  }
+  async getLastCommittedTransactionId() {
+    return await this.baseStrategy.getLastCommittedTransactionId();
   }
   async getHeadData(key, defaultValue) {
     return this.snapshotHead.data[key] ?? defaultValue;
@@ -2791,8 +3148,11 @@ var BPTreeAsyncTransaction = class extends BPTreeAsyncBase {
   dirtyIds;
   createdInTx;
   deletedIds;
+  originalNodes = /* @__PURE__ */ new Map();
   initialRootId;
   transactionRootId;
+  transactionId;
+  initialLastCommittedTransactionId = 0;
   constructor(baseTree) {
     super(baseTree.strategy, baseTree.comparator, baseTree.option);
     this.realBaseTree = baseTree;
@@ -2803,6 +3163,7 @@ var BPTreeAsyncTransaction = class extends BPTreeAsyncBase {
     this.dirtyIds = /* @__PURE__ */ new Set();
     this.createdInTx = /* @__PURE__ */ new Set();
     this.deletedIds = /* @__PURE__ */ new Set();
+    this.transactionId = Date.now() + Math.random();
   }
   /**
    * Initializes the transaction by capturing the current state of the tree.
@@ -2819,6 +3180,7 @@ var BPTreeAsyncTransaction = class extends BPTreeAsyncBase {
       const root = await this._createNode(true, [], [], true);
       this.initialRootId = root.id;
     }
+    this.initialLastCommittedTransactionId = await this.realBaseStrategy.getLastCommittedTransactionId();
     this.transactionRootId = this.initialRootId;
     this.rootId = this.transactionRootId;
     const snapshotStrategy = new BPTreeAsyncSnapshotStrategy(this.realBaseStrategy, this.initialRootId);
@@ -2827,6 +3189,7 @@ var BPTreeAsyncTransaction = class extends BPTreeAsyncBase {
     this.dirtyIds.clear();
     this.createdInTx.clear();
     this.deletedIds.clear();
+    this.realBaseTree.registerTransaction(this.transactionId);
   }
   async getNode(id) {
     if (this.txNodes.has(id)) {
@@ -2835,7 +3198,13 @@ var BPTreeAsyncTransaction = class extends BPTreeAsyncBase {
     if (this.deletedIds.has(id)) {
       throw new Error(`The tree attempted to reference deleted node '${id}'`);
     }
-    const baseNode = await this.realBaseStrategy.read(id);
+    let baseNode = this.realBaseTree.getObsoleteNode(id);
+    if (!baseNode) {
+      baseNode = await this.realBaseStrategy.read(id);
+    }
+    if (!this.originalNodes.has(id) && !this.createdInTx.has(id)) {
+      this.originalNodes.set(id, JSON.parse(JSON.stringify(baseNode)));
+    }
     const clone = JSON.parse(JSON.stringify(baseNode));
     this.txNodes.set(id, clone);
     return clone;
@@ -2925,9 +3294,10 @@ var BPTreeAsyncTransaction = class extends BPTreeAsyncBase {
    * Attempts to commit the transaction.
    * Uses Optimistic Locking (Compare-And-Swap) on the root node ID to detect conflicts.
    * 
+   * @param cleanup Whether to clean up obsolete nodes after commit. Defaults to true.
    * @returns A promise that resolves to the transaction result.
    */
-  async commit() {
+  async commit(cleanup = true) {
     const idMapping = /* @__PURE__ */ new Map();
     const finalNodes = [];
     for (const oldId of this.dirtyIds) {
@@ -2975,24 +3345,51 @@ var BPTreeAsyncTransaction = class extends BPTreeAsyncBase {
     if (idMapping.has(this.rootId)) {
       newRootId = idMapping.get(this.rootId);
     }
-    for (const node of finalNodes) {
-      await this.realBaseStrategy.write(node.id, node);
+    let success = false;
+    if (finalNodes.length === 0) {
+      success = true;
+    } else {
+      success = await this.realBaseStrategy.acquireLock(async () => {
+        if (await this.realBaseStrategy.getLastCommittedTransactionId() === this.initialLastCommittedTransactionId) {
+          for (const node of finalNodes) {
+            await this.realBaseStrategy.write(node.id, node);
+          }
+          await this.realBaseStrategy.compareAndSwapHead(newRootId, this.transactionId);
+          return true;
+        }
+        return false;
+      });
     }
-    const success = await this.realBaseStrategy.compareAndSwapHead(this.initialRootId, newRootId);
     if (success) {
       const distinctObsolete = /* @__PURE__ */ new Set();
       for (const oldId of this.dirtyIds) {
-        if (!this.createdInTx.has(oldId) && this.txNodes.has(oldId)) {
+        if (this.createdInTx.has(oldId)) {
+          continue;
+        }
+        if (this.txNodes.has(oldId) || this.deletedIds.has(oldId)) {
           distinctObsolete.add(oldId);
         }
       }
+      if (cleanup) {
+        for (const obsoleteId of distinctObsolete) {
+          if (this.originalNodes.has(obsoleteId)) {
+            this.realBaseTree.addObsoleteNode(
+              this.originalNodes.get(obsoleteId),
+              this.transactionId
+            );
+          }
+          await this.realBaseStrategy.delete(obsoleteId);
+        }
+      }
+      this.realBaseTree.unregisterTransaction(this.transactionId);
+      this.realBaseTree.pruneObsoleteNodes();
       return {
         success: true,
         createdIds: newCreatedIds,
         obsoleteIds: Array.from(distinctObsolete)
       };
     } else {
-      await this.rollback();
+      await this.rollback(cleanup);
       return {
         success: false,
         createdIds: newCreatedIds,
@@ -3016,6 +3413,8 @@ var BPTreeAsyncTransaction = class extends BPTreeAsyncBase {
         await this.realBaseStrategy.delete(id);
       }
     }
+    this.realBaseTree.unregisterTransaction(this.transactionId);
+    this.realBaseTree.pruneObsoleteNodes();
     return createdIds;
   }
   async readLock(fn) {