More graceful close

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.13.2
+
+- Be more graceful when closing
+
 ## 0.13.1
 
 - Allow unlocking the database while closing it.

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@cross/kv",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "exports": {
     ".": "./mod.ts"
   },

src/kv.ts

@@ -162,7 +162,6 @@ export class KV extends EventEmitter {
 
     // If there is an existing ledger, close it and clear the index
     if (this.ledger) {
-      this.ledger?.close();
       this.index.clear();
     }
 
@@ -246,14 +245,6 @@ export class KV extends EventEmitter {
     // Throw if database isn't open
     if (force) this.ensureOpen();
 
-    // Ensure ledger is open and instance is not closed
-    if (this.ledger?.isClosing() || this.aborted) {
-      const error = new Error(
-        this.aborted ? "Store is closed" : "Ledger is not open",
-      );
-      return { result: "noop", error }; // Emit noop since no sync was performed
-    }
-
     if (this.blockSync && !force) {
       const error = new Error("Store synchronization is blocked");
       // @ts-ignore .emit exists
@@ -390,11 +381,7 @@ export class KV extends EventEmitter {
    * @returns True if open, false if closed.
    */
   public isOpen(): boolean {
-    if (!this.ledger || this.ledger.isClosing() || this.aborted) {
-      return false;
-    } else {
-      return true;
-    }
+    return !!this.ledger && this.ledger.isOpen();
   }
 
   /**
@@ -714,7 +701,5 @@ export class KV extends EventEmitter {
 
     // @ts-ignore emit exists
     this.emit("closing");
-
-    this.ledger?.close();
   }
 }

src/ledger.ts

@@ -54,7 +54,7 @@ interface KVLedgerResult {
 }
 
 export class KVLedger {
-  private aborted: boolean = false;
+  private opened: boolean = false;
   private dataPath: string;
   public header: KVLedgerHeader = {
     fileId: LEDGER_FILE_ID,
@@ -85,10 +85,8 @@ export class KVLedger {
     } else {
       throw new Error("Database not found.");
     }
-  }
 
-  close() {
-    this.aborted = true;
+    this.opened = true;
   }
 
   /**
@@ -400,7 +398,6 @@ export class KVLedger {
         await tempLedger.add([transaction.transaction.toUint8Array()]);
       }
       this.header.currentOffset = tempLedger.header.currentOffset;
-      tempLedger.close();
 
       // 5. Replace Original File
       await unlink(this.dataPath);
@@ -414,12 +411,8 @@ export class KVLedger {
     }
   }
 
-  public isClosing() {
-    return this.aborted;
-  }
-
   private ensureOpen(): void {
-    if (this.aborted) throw new Error("Ledger is closed.");
+    if (!this.open) throw new Error("Ledger is not opened yet.");
   }
 
   public async lock(): Promise<void> {
@@ -487,4 +480,8 @@ export class KVLedger {
       if (fd) fd.close();
     }
   }
+
+  public isOpen(): boolean {
+    return this.opened;
+  }
 }

test/ledger.test.ts

@@ -25,8 +25,6 @@ test("KVLedger: readHeader - valid header", async () => {
     "Created timestamp should be valid",
   );
   assertEquals(ledger.header.currentOffset, LEDGER_BASE_OFFSET);
-
-  ledger.close();
 });
 
 test("KVLedger: readHeader - invalid file ID", async () => {
@@ -43,8 +41,6 @@ test("KVLedger: readHeader - invalid file ID", async () => {
     () => ledger.readHeader(),
     "Invalid database file format",
   );
-
-  ledger.close();
 });
 
 test("KVLedger: readHeader - invalid version", async () => {
@@ -58,8 +54,6 @@ test("KVLedger: readHeader - invalid version", async () => {
 
   // Act & Assert: Expect an InvalidLedgerError
   await assertRejects(() => ledger.readHeader(), "Invalid version");
-
-  ledger.close();
 });
 
 test("KVLedger: writeHeader", async () => {
@@ -77,6 +71,4 @@ test("KVLedger: writeHeader", async () => {
   await ledger.readHeader(); // Re-read from disk
   assertEquals(ledger.header.created, 1234567890);
   assertEquals(ledger.header.currentOffset, 2048);
-
-  ledger.close();
 });