@fireproof/core 0.20.0-dev-preview-40 → 0.20.0-dev-preview-41

package/tests/fireproof/all-gateway.test.ts

@@ -43,21 +43,22 @@ describe("noop Gateway", function () {
   const sthis = ensureSuperThis();
   let ctx: { loader: bs.Loadable };
 
-  afterEach(async function () {
+  afterEach(async () => {
     await db.close();
     await db.destroy();
   });
-  beforeEach(async function () {
+  beforeEach(async () => {
     db = LedgerFactory("test-gateway-" + sthis.nextId().str, {
       logger: sthis.logger,
     });
-    ctx = { loader: await db.crdt.blockstore.loader };
+    await db.ready();
+    ctx = { loader: db.crdt.blockstore.loader };
 
     // Extract stores from the loader
-    carStore = (await ctx.loader.carStore()) as bs.DataStore;
-    metaStore = (await ctx.loader.metaStore()) as bs.MetaStore;
-    fileStore = (await ctx.loader.fileStore()) as bs.DataStore;
-    walStore = (await ctx.loader.WALStore()) as bs.WALStore;
+    carStore = ctx.loader.attachedStores.local().active.car;
+    metaStore = ctx.loader.attachedStores.local().active.meta;
+    fileStore = ctx.loader.attachedStores.local().active.file;
+    walStore = ctx.loader.attachedStores.local().active.wal;
 
     // Extract and log gateways
     carGateway = carStore.realGateway;
@@ -66,7 +67,7 @@ describe("noop Gateway", function () {
     walGateway = walStore.realGateway;
   });
 
-  it("should have valid stores and gateways", async function () {
+  it("should have valid stores and gateways", async () => {
     // Add assertions
     expect(carStore).toBeTruthy();
     expect(metaStore).toBeTruthy();
@@ -79,7 +80,7 @@ describe("noop Gateway", function () {
     expect(walGateway).toBeTruthy();
   });
 
-  it("should have correct store names", async function () {
+  it("should have correct store names", async () => {
     // Check that all stores have the correct name
     expect(carStore.url().getParam(PARAM.NAME)).toContain("test-gateway");
     expect(metaStore.url().getParam(PARAM.NAME)).toContain("test-gateway");
@@ -87,7 +88,7 @@ describe("noop Gateway", function () {
     expect(walStore.url().getParam(PARAM.NAME)).toContain("test-gateway");
   });
 
-  it("should have correct store types in URLs", async function () {
+  it("should have correct store types in URLs", async () => {
     // Check that all stores have the correct store type in their URL
     expect(carStore.url().toString()).toContain("store=data");
     expect(carStore.url().toString()).toContain("suffix=.car");
@@ -96,7 +97,7 @@ describe("noop Gateway", function () {
     expect(walStore.url().toString()).toContain("store=wal");
   });
 
-  it("should have version specified in URLs", async function () {
+  it("should have version specified in URLs", async () => {
     // Verify that all stores have a version specified
     expect(carStore.url().toString()).toContain("version=");
     expect(metaStore.url().toString()).toContain("version=");
@@ -104,7 +105,7 @@ describe("noop Gateway", function () {
     expect(walStore.url().toString()).toContain("version=");
   });
 
-  it("should have correct gateway types", async function () {
+  it("should have correct gateway types", async () => {
     // Check that all gateways are instances of the expected gateway class
     expect(typeof carGateway).toBe("object");
     expect(typeof metaGateway).toBe("object");
@@ -112,18 +113,18 @@ describe("noop Gateway", function () {
     expect(typeof walGateway).toBe("object");
   });
 
-  it("should build CAR Gateway URL", async function () {
+  it("should build CAR Gateway URL", async () => {
     const testKey = "bafkreidxwt2nhvbl4fnqfw3ctlt6zbrir4kqwmjo5im6rf4q5si27kgo2i";
     const carUrl = await carGateway.buildUrl(ctx, carStore.url(), testKey);
     expect(carUrl.Ok().hasParam("key")).toBeTruthy();
   });
 
-  it("should start CAR Gateway", async function () {
+  it("should start CAR Gateway", async () => {
     const url = await carGateway.start(ctx, carStore.url());
     expect(url.Ok().asObj()).toEqual(carStore.url().asObj());
   });
 
-  it("should put data in CAR Gateway", async function () {
+  it("should put data in CAR Gateway", async () => {
     const carUrl = await carGateway.buildUrl(ctx, carStore.url(), fileContent.cid);
     await carGateway.start(ctx, carStore.url());
     const carPutResult = await carGateway.put(ctx, carUrl.Ok(), {
@@ -133,7 +134,7 @@ describe("noop Gateway", function () {
     expect(carPutResult.isOk()).toBeTruthy();
   });
 
-  it("should get data from CAR Gateway", async function () {
+  it("should get data from CAR Gateway", async () => {
     const carUrl = await carGateway.buildUrl(ctx, carStore.url(), fileContent.cid);
     await carGateway.start(ctx, carStore.url());
     await carGateway.put(ctx, carUrl.Ok(), {
@@ -146,7 +147,7 @@ describe("noop Gateway", function () {
     // customExpect(carGetResult.Ok(), (v) => expect(v).toEqual(testData), "carGetResult should match testData");
   });
 
-  it("should delete data from CAR Gateway", async function () {
+  it("should delete data from CAR Gateway", async () => {
     const carUrl = await carGateway.buildUrl(ctx, carStore.url(), fileContent.cid);
     await carGateway.start(ctx, carStore.url());
     await carGateway.put(ctx, carUrl.Ok(), {
@@ -157,33 +158,33 @@ describe("noop Gateway", function () {
     expect(carDeleteResult.isOk()).toBeTruthy();
   });
 
-  it("should close CAR Gateway", async function () {
+  it("should close CAR Gateway", async () => {
     await carGateway.close(ctx, carStore.url());
   });
-  it("should build Meta Gateway URL", async function () {
+  it("should build Meta Gateway URL", async () => {
     const metaUrl = await metaGateway.buildUrl(ctx, metaStore.url(), "main");
     expect(metaUrl.Ok()).toBeTruthy();
   });
 
-  it("should start Meta Gateway", async function () {
+  it("should start Meta Gateway", async () => {
     await metaGateway.start(ctx, metaStore.url());
   });
 
-  it("should close Meta Gateway", async function () {
+  it("should close Meta Gateway", async () => {
     await metaGateway.start(ctx, metaStore.url());
     await metaGateway.close(ctx, metaStore.url());
   });
 
-  it("should build File Gateway URL", async function () {
+  it("should build File Gateway URL", async () => {
     const fileUrl = await fileGateway.buildUrl(ctx, fileStore.url(), fileContent.cid);
     expect(fileUrl.Ok()).toBeTruthy();
   });
 
-  it("should start File Gateway", async function () {
+  it("should start File Gateway", async () => {
     await fileGateway.start(ctx, fileStore.url());
   });
 
-  it("should put data to File Gateway", async function () {
+  it("should put data to File Gateway", async () => {
     const fileUrl = await fileGateway.buildUrl(ctx, fileStore.url(), fileContent.cid);
     await fileGateway.start(ctx, fileStore.url());
     const filePutResult = await fileGateway.put(ctx, fileUrl.Ok(), {
@@ -193,7 +194,7 @@ describe("noop Gateway", function () {
     expect(filePutResult.Ok()).toBeFalsy();
   });
 
-  it("should get data from File Gateway", async function () {
+  it("should get data from File Gateway", async () => {
     const fileUrl = await fileGateway.buildUrl(ctx, fileStore.url(), fileContent.cid);
     await fileGateway.start(ctx, fileStore.url());
     await fileGateway.put(ctx, fileUrl.Ok(), {
@@ -205,7 +206,7 @@ describe("noop Gateway", function () {
     expect(fileGetResult.Ok().payload).toEqual(fileContent.block);
   });
 
-  it("should delete data from File Gateway", async function () {
+  it("should delete data from File Gateway", async () => {
     const fileUrl = await fileGateway.buildUrl(ctx, fileStore.url(), fileContent.cid);
     await fileGateway.start(ctx, fileStore.url());
     await fileGateway.put(ctx, fileUrl.Ok(), {
@@ -216,20 +217,20 @@ describe("noop Gateway", function () {
     expect(fileDeleteResult.isOk()).toBeTruthy();
   });
 
-  it("should close File Gateway", async function () {
+  it("should close File Gateway", async () => {
     await fileGateway.close(ctx, fileStore.url());
   });
-  it("should build WAL Gateway URL", async function () {
+  it("should build WAL Gateway URL", async () => {
     const testKey = "bafkreidxwt2nhvbl4fnqfw3ctlt6zbrir4kqwmjo5im6rf4q5si27kgo2i";
     const walUrl = await walGateway.buildUrl(ctx, walStore.url(), testKey);
     expect(walUrl.Ok()).toBeTruthy();
   });
 
-  it("should start WAL Gateway", async function () {
+  it("should start WAL Gateway", async () => {
     await walGateway.start(ctx, walStore.url());
   });
 
-  it("should put data to WAL Gateway", async function () {
+  it("should put data to WAL Gateway", async () => {
     const testKey = "bafkreidxwt2nhvbl4fnqfw3ctlt6zbrir4kqwmjo5im6rf4q5si27kgo2i";
     const walUrl = await walGateway.buildUrl(ctx, walStore.url(), testKey);
     await walGateway.start(ctx, walStore.url());
@@ -246,7 +247,7 @@ describe("noop Gateway", function () {
     expect(walPutResult.Ok()).toBeFalsy();
   });
 
-  it("should get data from WAL Gateway", async function () {
+  it("should get data from WAL Gateway", async () => {
     const testKey = "bafkreidxwt2nhvbl4fnqfw3ctlt6zbrir4kqwmjo5im6rf4q5si27kgo2i";
     const walUrl = await walGateway.buildUrl(ctx, walStore.url(), testKey);
     await walGateway.start(ctx, walStore.url());
@@ -285,7 +286,7 @@ describe("noop Gateway", function () {
     expect(ref).toEqual(walGetResult.Ok().payload);
   });
 
-  it("should delete data from WAL Gateway", async function () {
+  it("should delete data from WAL Gateway", async () => {
     const testKey = "bafkreidxwt2nhvbl4fnqfw3ctlt6zbrir4kqwmjo5im6rf4q5si27kgo2i";
     const walUrl = await walGateway.buildUrl(ctx, walStore.url(), testKey);
     await walGateway.start(ctx, walStore.url());
@@ -315,12 +316,12 @@ describe("noop Gateway", function () {
     expect(walDeleteResult.isOk()).toBeTruthy();
   });
 
-  it("should close WAL Gateway", async function () {
+  it("should close WAL Gateway", async () => {
     await walGateway.start(ctx, walStore.url());
     await walGateway.close(ctx, walStore.url());
   });
 
-  // it("should have correct CAR Gateway properties", async function () {
+  // it("should have correct CAR Gateway properties", async () =>{
   //   // CAR Gateway assertions
   //   expect(carGateway.fidLength).toBe(4);
   //   expect(carGateway.headerSize).toBe(36);
@@ -331,7 +332,7 @@ describe("noop Gateway", function () {
   //   expect(carStore.).toHaveProperty("url");
   // });
 
-  // it("should have correct Meta Gateway properties", async function () {
+  // it("should have correct Meta Gateway properties", async () =>{
   //   // Meta Gateway assertions
   //   expect(metaGateway.fidLength).toBe(4);
   //   expect(metaGateway.headerSize).toBe(36);
@@ -342,7 +343,7 @@ describe("noop Gateway", function () {
   //   expect(last).not.toHaveProperty("url");
   // });
 
-  // it("should have correct File Gateway properties", async function () {
+  // it("should have correct File Gateway properties", async () =>{
   //   // File Gateway assertions
   //   expect(fileGateway.fidLength).toBe(4);
   //   expect(fileGateway.headerSize).toBe(36);
@@ -353,7 +354,7 @@ describe("noop Gateway", function () {
   //   expect(last).toHaveProperty("url");
   // });
 
-  // it("should have correct WAL Gateway properties", async function () {
+  // it("should have correct WAL Gateway properties", async () =>{
   //   // WAL Gateway assertions
   //   expect(walGateway.fidLength).toBe(4);
   //   expect(walGateway.headerSize).toBe(36);
@@ -374,20 +375,22 @@ describe("noop Gateway subscribe", function () {
   const sthis = ensureSuperThis();
   let ctx: bs.SerdeGatewayCtx;
 
-  afterEach(async function () {
+  afterEach(async () => {
     await db.close();
     await db.destroy();
   });
-  beforeEach(async function () {
+  beforeEach(async () => {
     db = fireproof("test-gateway-" + sthis.nextId().str);
 
+    await db.ready();
+
     ctx = { loader: db.ledger.crdt.blockstore.loader };
     // Extract stores from the loader
-    metaStore = (await db.ledger.crdt.blockstore.loader?.metaStore()) as bs.MetaStore;
+    metaStore = db.ledger.crdt.blockstore.loader.attachedStores.local().active.meta;
 
     metaGateway = metaStore.realGateway;
   });
-  it("should subscribe to meta Gateway", async function () {
+  it("should subscribe to meta Gateway", async () => {
     const metaUrl = await metaGateway.buildUrl(ctx, metaStore.url(), "main");
     await metaGateway.start(ctx, metaStore.url());
 
@@ -427,11 +430,11 @@ describe("Gateway", function () {
 
   let ctx: bs.SerdeGatewayCtx;
 
-  afterEach(async function () {
+  afterEach(async () => {
     await db.close();
     await db.destroy();
   });
-  beforeEach(async function () {
+  beforeEach(async () => {
     db = fireproof("test-gateway-" + sthis.nextId().str);
     ctx = { loader: db.ledger.crdt.blockstore.loader };
     const ok = await db.put({ _id: "test", foo: "bar" });
@@ -440,7 +443,7 @@ describe("Gateway", function () {
 
     // Extract stores from the loader
     // carStore = (await db.blockstore.loader.carStore()) as unknown as ExtendedStore;
-    metaStore = (await db.ledger.crdt.blockstore.loader?.metaStore()) as bs.MetaStore;
+    metaStore = db.ledger.crdt.blockstore.loader.attachedStores.local().active.meta;
     // fileStore = (await db.blockstore.loader.fileStore()) as unknown as ExtendedStore;
     // walStore = (await db.blockstore.loader.WALStore()) as unknown as ExtendedStore;
 
@@ -451,7 +454,7 @@ describe("Gateway", function () {
     // walGateway = walStore.gateway;
   });
 
-  it("should get data from Meta Gateway", async function () {
+  it("should get data from Meta Gateway", async () => {
     const metaUrl = await metaGateway.buildUrl(ctx, metaStore.url(), "main");
     await metaGateway.start(ctx, metaStore.url());
     const metaGetResult = await metaGateway.get(ctx, metaUrl.Ok());
@@ -463,7 +466,7 @@ describe("Gateway", function () {
     expect(Object.keys(meta[0])).toEqual(["eventCid", "parents", "dbMeta"]);
   });
 
-  it("should delete data from Meta Gateway", async function () {
+  it("should delete data from Meta Gateway", async () => {
     const metaUrl = await metaGateway.buildUrl(ctx, metaStore.url(), "main");
     await metaGateway.start(ctx, metaStore.url());
     // should we be testing .destroy() instead?

package/tests/fireproof/attachable.test.ts

@@ -0,0 +1,82 @@
+import { Attachable, Database, fireproof, GatewayUrlsParam } from "@fireproof/core";
+
+describe("join function", () => {
+  // export const connect: ConnectFunction = (
+  //     db: Database,
+  //     remoteDbName = "",
+  //     url = "netlify://localhost:8888?protocol=ws"
+  //   ) => {
+  //     const { sthis, name: dbName } = db;
+  //     if (!dbName) {
+  //       throw new Error("dbName is required");
+  //     }
+  //     const urlObj = BuildURI.from(url);
+  //     const existingName = urlObj.getParam("name");
+  //     urlObj.defParam("name", remoteDbName || existingName || dbName);
+  //     urlObj.defParam("localName", dbName);
+  //     urlObj.defParam("storekey", `@${dbName}:data@`);
+  //     return connectionCache.get(urlObj.toString()).once(() => {
+  //       makeKeyBagUrlExtractable(sthis);
+  //       const connection = connectionFactory(sthis, urlObj);
+  //       connection.connect(db.ledger.crdt.blockstore);
+  //       return connection;
+  //     });
+  //   };
+  class AJoinable implements Attachable {
+    readonly name: string;
+    constructor(name: string) {
+      this.name = name;
+    }
+    prepare(): Promise<GatewayUrlsParam> {
+      return Promise.resolve({
+        car: { url: "memory://${this.name}" },
+        meta: { url: "memory://${this.name}" },
+        file: { url: "memory://${this.name}" },
+      });
+    }
+  }
+  function aJoinable(name: string): Attachable {
+    return new AJoinable(name);
+  }
+
+  let db: Database;
+  beforeAll(async () => {
+    const set = Math.random().toString(16);
+    await Promise.all(
+      Array.from({ length: 10 }).map(async (_, i) => {
+        const db = fireproof(`remote-db-${i}-${set}`, {
+          storeUrls: {
+            base: `memory://remote-db-${i}-${set}`,
+          },
+        });
+        for (let j = 0; j < 10; j++) {
+          await db.put({ _id: `${i}-${j}`, value: `${i}-${set}` });
+        }
+        await db.close();
+        return db;
+      }),
+    );
+
+    db = fireproof(`db-${set}`, {
+      storeUrls: {
+        base: `memory://db-${set}`,
+      },
+    });
+  });
+  afterAll(async () => {
+    await db.close();
+  });
+
+  it("it is joinable", async () => {
+    for (let i = 0; i < 10; i++) {
+      // create  meta/car/files store from aJoinable
+      // retrieve meta from attachable and subscribe to it
+      // merge incoming meta with local
+      // the attach meta includes source url's which ref back to aJoinable Attachable
+
+      const attached = await db.attach(aJoinable("i" + i));
+      expect(attached).toBeDefined();
+      await attached.detach();
+    }
+  });
+});