@fireproof/core 0.20.0-dev-preview-23 → 0.20.0-dev-preview-25

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

@@ -127,7 +127,7 @@ describe("noop Gateway", function () {
     const carUrl = await carGateway.buildUrl(ctx, carStore.url(), fileContent.cid);
     await carGateway.start(ctx, carStore.url());
     const carPutResult = await carGateway.put(ctx, carUrl.Ok(), {
-      type: bs.FPEnvelopeType.CAR,
+      type: bs.FPEnvelopeTypes.CAR,
       payload: fileContent.block,
     });
     expect(carPutResult.isOk()).toBeTruthy();
@@ -137,7 +137,7 @@ describe("noop Gateway", function () {
     const carUrl = await carGateway.buildUrl(ctx, carStore.url(), fileContent.cid);
     await carGateway.start(ctx, carStore.url());
     await carGateway.put(ctx, carUrl.Ok(), {
-      type: bs.FPEnvelopeType.CAR,
+      type: bs.FPEnvelopeTypes.CAR,
       payload: fileContent.block,
     });
     const carGetResult = await carGateway.get(ctx, carUrl.Ok());
@@ -150,7 +150,7 @@ describe("noop Gateway", function () {
     const carUrl = await carGateway.buildUrl(ctx, carStore.url(), fileContent.cid);
     await carGateway.start(ctx, carStore.url());
     await carGateway.put(ctx, carUrl.Ok(), {
-      type: bs.FPEnvelopeType.CAR,
+      type: bs.FPEnvelopeTypes.CAR,
       payload: fileContent.block,
     });
     const carDeleteResult = await carGateway.delete(ctx, carUrl.Ok());
@@ -187,7 +187,7 @@ describe("noop Gateway", function () {
     const fileUrl = await fileGateway.buildUrl(ctx, fileStore.url(), fileContent.cid);
     await fileGateway.start(ctx, fileStore.url());
     const filePutResult = await fileGateway.put(ctx, fileUrl.Ok(), {
-      type: bs.FPEnvelopeType.FILE,
+      type: bs.FPEnvelopeTypes.FILE,
       payload: fileContent.block,
     });
     expect(filePutResult.Ok()).toBeFalsy();
@@ -197,7 +197,7 @@ describe("noop Gateway", function () {
     const fileUrl = await fileGateway.buildUrl(ctx, fileStore.url(), fileContent.cid);
     await fileGateway.start(ctx, fileStore.url());
     await fileGateway.put(ctx, fileUrl.Ok(), {
-      type: bs.FPEnvelopeType.FILE,
+      type: bs.FPEnvelopeTypes.FILE,
       payload: fileContent.block,
     });
     const fileGetResult = await fileGateway.get(ctx, fileUrl.Ok());
@@ -209,7 +209,7 @@ describe("noop Gateway", function () {
     const fileUrl = await fileGateway.buildUrl(ctx, fileStore.url(), fileContent.cid);
     await fileGateway.start(ctx, fileStore.url());
     await fileGateway.put(ctx, fileUrl.Ok(), {
-      type: bs.FPEnvelopeType.FILE,
+      type: bs.FPEnvelopeTypes.FILE,
       payload: fileContent.block,
     });
     const fileDeleteResult = await fileGateway.delete(ctx, fileUrl.Ok());
@@ -236,7 +236,7 @@ describe("noop Gateway", function () {
     // const walTestDataString = JSON.stringify();
     // const walTestData = sthis.txt.encode(walTestDataString);
     const walPutResult = await walGateway.put(ctx, walUrl.Ok(), {
-      type: bs.FPEnvelopeType.WAL,
+      type: bs.FPEnvelopeTypes.WAL,
       payload: {
         operations: [],
         noLoaderOps: [],
@@ -275,7 +275,7 @@ describe("noop Gateway", function () {
     // });
     // const walTestData = sthis.txt.encode(walTestDataString);
     await walGateway.put(ctx, walUrl.Ok(), {
-      type: bs.FPEnvelopeType.WAL,
+      type: bs.FPEnvelopeTypes.WAL,
       payload: ref,
     });
     const walGetResult = await walGateway.get(ctx, walUrl.Ok());
@@ -308,7 +308,7 @@ describe("noop Gateway", function () {
       ],
     };
     await walGateway.put(ctx, walUrl.Ok(), {
-      type: bs.FPEnvelopeType.WAL,
+      type: bs.FPEnvelopeTypes.WAL,
       payload: ref,
     });
     const walDeleteResult = await walGateway.delete(ctx, walUrl.Ok());
@@ -394,12 +394,16 @@ describe("noop Gateway subscribe", function () {
     let didCall = false;
     const p = new Future<void>();
 
-    const metaSubscribeResult = (await metaGateway.subscribe(ctx, metaUrl.Ok(), async (data: bs.FPEnvelopeMeta) => {
-      // const decodedData = sthis.txt.decode(data);
-      expect(Array.isArray(data.payload)).toBeTruthy();
-      didCall = true;
-      p.resolve();
-    })) as bs.UnsubscribeResult;
+    const metaSubscribeResult = (await metaGateway.subscribe(
+      ctx,
+      metaUrl.Ok().build().setParam(PARAM.SELF_REFLECT, "x").URI(),
+      async (data: bs.FPEnvelopeMeta) => {
+        // const decodedData = sthis.txt.decode(data);
+        expect(Array.isArray(data.payload)).toBeTruthy();
+        didCall = true;
+        p.resolve();
+      },
+    )) as bs.UnsubscribeResult;
     expect(metaSubscribeResult.isOk()).toBeTruthy();
     const ok = await db.put({ _id: "key1", hello: "world1" });
     expect(ok).toBeTruthy();

package/tests/gateway/fp-envelope-serialize.test.ts

@@ -3,15 +3,13 @@ import { mockSuperThis, simpleCID } from "../helpers.js";
 import { BuildURI, Result } from "@adviser/cement";
 import { toJSON } from "multiformats/link";
 
-const FPEnvelopeType = bs.FPEnvelopeType;
-
 describe("storage-content", () => {
   const sthis = mockSuperThis();
   it("car", async () => {
     const raw = new Uint8Array([55, 56, 57]);
     const res = await rt.gw.fpDeserialize(sthis, BuildURI.from("http://x.com?store=data&suffix=.car").URI(), Result.Ok(raw));
     expect(res.isOk()).toBeTruthy();
-    expect(res.unwrap().type).toEqual(FPEnvelopeType.CAR);
+    expect(res.unwrap().type).toEqual(bs.FPEnvelopeTypes.CAR);
     expect(res.unwrap().payload).toEqual(raw);
   });
 
@@ -19,7 +17,7 @@ describe("storage-content", () => {
     const raw = new Uint8Array([55, 56, 57]);
     const res = await rt.gw.fpDeserialize(sthis, BuildURI.from("http://x.com?store=data").URI(), Result.Ok(raw));
     expect(res.isOk()).toBeTruthy();
-    expect(res.unwrap().type).toEqual(FPEnvelopeType.FILE);
+    expect(res.unwrap().type).toEqual(bs.FPEnvelopeTypes.FILE);
     expect(res.unwrap().payload).toEqual(raw);
   });
 
@@ -34,7 +32,7 @@ describe("storage-content", () => {
     const raw = sthis.txt.encode(JSON.stringify(ref));
     const res = await rt.gw.fpDeserialize(sthis, BuildURI.from("http://x.com?store=meta").URI(), Result.Ok(raw));
     expect(res.isOk()).toBeTruthy();
-    expect(res.unwrap().type).toEqual(FPEnvelopeType.META);
+    expect(res.unwrap().type).toEqual(bs.FPEnvelopeTypes.META);
     const dbMetas = res.unwrap().payload as bs.DbMetaEvent[];
     expect(dbMetas.length).toBe(1);
     const dbMeta = dbMetas[0];
@@ -71,7 +69,7 @@ describe("storage-content", () => {
     const raw = sthis.txt.encode(JSON.stringify(ref));
     const res = await rt.gw.fpDeserialize(sthis, BuildURI.from("http://x.com?store=wal").URI(), Result.Ok(raw));
     expect(res.isOk()).toBeTruthy();
-    expect(res.unwrap().type).toEqual(FPEnvelopeType.WAL);
+    expect(res.unwrap().type).toEqual(bs.FPEnvelopeTypes.WAL);
     const walstate = res.unwrap().payload as bs.WALState;
     expect(
       walstate.fileOperations.map((i) => ({
@@ -96,7 +94,7 @@ describe("de-serialize", () => {
   const sthis = mockSuperThis();
   it("car", async () => {
     const msg = {
-      type: FPEnvelopeType.CAR,
+      type: bs.FPEnvelopeTypes.CAR,
       payload: new Uint8Array([55, 56, 57]),
     } satisfies bs.FPEnvelopeCar;
     const res = await rt.gw.fpSerialize(sthis, msg);
@@ -105,7 +103,7 @@ describe("de-serialize", () => {
 
   it("file", async () => {
     const msg = {
-      type: FPEnvelopeType.FILE,
+      type: bs.FPEnvelopeTypes.FILE,
       payload: new Uint8Array([55, 56, 57]),
     } satisfies bs.FPEnvelopeFile;
     const res = await rt.gw.fpSerialize(sthis, msg);
@@ -114,7 +112,7 @@ describe("de-serialize", () => {
 
   it("meta", async () => {
     const msg = {
-      type: FPEnvelopeType.META,
+      type: bs.FPEnvelopeTypes.META,
       payload: [
         await bs.createDbMetaEvent(
           sthis,
@@ -137,7 +135,7 @@ describe("de-serialize", () => {
 
   it("wal", async () => {
     const msg = {
-      type: FPEnvelopeType.WAL,
+      type: bs.FPEnvelopeTypes.WAL,
       payload: {
         fileOperations: [
           {
@@ -171,7 +169,7 @@ describe("de-serialize", () => {
     const raw = new Uint8Array([55, 56, 57]);
     const res = await rt.gw.fpDeserialize(sthis, BuildURI.from("http://x.com?store=data&suffix=.car").URI(), Result.Ok(raw));
     expect(res.isOk()).toBeTruthy();
-    expect(res.unwrap().type).toEqual(FPEnvelopeType.CAR);
+    expect(res.unwrap().type).toEqual(bs.FPEnvelopeTypes.CAR);
     expect(res.unwrap().payload).toEqual(raw);
   });
 
@@ -179,7 +177,7 @@ describe("de-serialize", () => {
     const raw = new Uint8Array([55, 56, 57]);
     const res = await rt.gw.fpDeserialize(sthis, BuildURI.from("http://x.com?store=data&suffix=.car").URI(), Promise.resolve(raw));
     expect(res.isOk()).toBeTruthy();
-    expect(res.unwrap().type).toEqual(FPEnvelopeType.CAR);
+    expect(res.unwrap().type).toEqual(bs.FPEnvelopeTypes.CAR);
     expect(res.unwrap().payload).toEqual(raw);
   });
 
@@ -191,7 +189,7 @@ describe("de-serialize", () => {
       Promise.resolve(Result.Ok(raw)),
     );
     expect(res.isOk()).toBeTruthy();
-    expect(res.unwrap().type).toEqual(FPEnvelopeType.CAR);
+    expect(res.unwrap().type).toEqual(bs.FPEnvelopeTypes.CAR);
     expect(res.unwrap().payload).toEqual(raw);
   });
 
@@ -218,7 +216,7 @@ describe("de-serialize", () => {
 
   it("attach Key to Meta", async () => {
     const msg = {
-      type: FPEnvelopeType.META,
+      type: bs.FPEnvelopeTypes.META,
       payload: [
         await bs.createDbMetaEvent(
           sthis,