Update meta-corruption with ImgFile fixes and dependency updates

.github/dependabot.yml

@@ -14,4 +14,4 @@ updates:
       - dependency-name: "drizzle-kit:*"
         versions: [">0.30.6"]
       - dependency-name: "tailwindcss:*"
-        versions: [">3.4.17"]
+        versions: ["version-update:semver-major"]

.gitignore

@@ -21,6 +21,7 @@ logs
 **/*.tgz
 *.zip
 *.tgz
+.npmrc
 
 smoke/package.json
 smoke/pnpm-lock.yaml

cli/package.json

@@ -39,23 +39,23 @@
     "url": "https://github.com/fireproof-storage/fireproof/issues"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.26",
+    "@adviser/cement": "^0.4.39",
     "@fireproof/core-runtime": "workspace:0.0.0",
     "@fireproof/core-types-base": "workspace:0.0.0",
     "@fireproof/vendor": "workspace:0.0.0",
     "aws4fetch": "^1.0.20",
     "cmd-ts": "^0.14.1",
     "find-up": "^7.0.0",
     "fs-extra": "^11.3.1",
-    "jose": "^6.0.13",
+    "jose": "^6.1.0",
     "multiformats": "^13.4.0",
     "semver": "^7.7.2",
     "zx": "^8.8.1"
   },
   "devDependencies": {
     "@fireproof/core-cli": "workspace:0.0.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/semver": "^7.7.0",
+    "@types/semver": "^7.7.1",
     "tsx": "^4.20.4",
     "vitest": "^3.2.4"
   }

cloud/3rd-party/package.json

@@ -39,14 +39,14 @@
     "url": "https://github.com/fireproof-storage/fireproof/issues"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.26",
+    "@adviser/cement": "^0.4.39",
     "react-dom": "^19.1.1",
     "use-fireproof": "workspace:0.0.0"
   },
   "devDependencies": {
-    "@types/react": "^19.1.11",
-    "@types/react-dom": "^19.1.7",
-    "@vitejs/plugin-react": "^5.0.0",
-    "vite": "^7.1.2"
+    "@types/react": "^19.1.13",
+    "@types/react-dom": "^19.1.9",
+    "@vitejs/plugin-react": "^5.0.2",
+    "vite": "^7.1.5"
   }
 }

cloud/backend/base/package.json

@@ -36,19 +36,19 @@
     "url": "https://github.com/fireproof-storage/fireproof/issues"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.26",
-    "@cloudflare/workers-types": "^4.20250810.0",
+    "@adviser/cement": "^0.4.39",
+    "@cloudflare/workers-types": "^4.20250918.0",
     "@fireproof/cloud-base": "workspace:0.0.0",
     "@fireproof/core-base": "workspace:0.0.0",
     "@fireproof/core-gateways-cloud": "workspace:0.0.0",
     "@fireproof/core-protocols-cloud": "workspace:0.0.0",
     "@fireproof/core-runtime": "workspace:0.0.0",
     "@fireproof/vendor": "workspace:0.0.0",
-    "@libsql/client": "^0.15.10",
+    "@libsql/client": "^0.15.15",
     "aws4fetch": "^1.0.20",
     "drizzle-orm": "^0.44.3",
-    "hono": "^4.9.4",
-    "jose": "^6.0.13"
+    "hono": "^4.9.8",
+    "jose": "^6.1.0"
   },
   "devDependencies": {
     "@fireproof/core-cli": "workspace:0.0.0",

cloud/backend/base/test-helper.ts

@@ -240,7 +240,7 @@ export async function mockJWK(sthis: SuperThis, claim: Partial<TokenForParam> =
     token: keys.strings.privateKey,
   });
 
-  const id = claim.id ?? sthis.nextId().str;
+  const id = claim.jti ?? sthis.nextId().str;
   const claims: ps.TokenForParam = {
     userId: `hello-${id}`,
     email: `hello-${id}@test.de`,

cloud/backend/cf-d1/package.json

@@ -39,8 +39,8 @@
     "url": "https://github.com/fireproof-storage/fireproof/issues"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.26",
-    "@cloudflare/workers-types": "^4.20250810.0",
+    "@adviser/cement": "^0.4.39",
+    "@cloudflare/workers-types": "^4.20250918.0",
     "@fireproof/cloud-backend-base": "workspace:0.0.0",
     "@fireproof/cloud-base": "workspace:0.0.0",
     "@fireproof/core-protocols-cloud": "workspace:0.0.0",
@@ -50,15 +50,15 @@
     "@fireproof/vendor": "workspace:0.0.0",
     "cmd-ts": "^0.14.1",
     "drizzle-orm": "^0.44.3",
-    "hono": "^4.9.4",
+    "hono": "^4.9.8",
     "multiformats": "^13.4.0"
   },
   "devDependencies": {
     "@fireproof/core-cli": "workspace:0.0.0",
     "drizzle-kit": "0.30.6",
     "tsx": "^4.20.4",
     "vitest": "^3.2.4",
-    "wrangler": "^4.32.0",
+    "wrangler": "^4.38.0",
     "zx": "^8.8.1"
   }
 }

cloud/backend/node/package.json

@@ -36,7 +36,7 @@
     "url": "https://github.com/fireproof-storage/fireproof/issues"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.26",
+    "@adviser/cement": "^0.4.39",
     "@fireproof/cloud-backend-base": "workspace:0.0.0",
     "@fireproof/cloud-base": "workspace:0.0.0",
     "@fireproof/core-base": "workspace:0.0.0",
@@ -45,16 +45,16 @@
     "@fireproof/core-types-base": "workspace:0.0.0",
     "@fireproof/core-types-protocols-cloud": "workspace:0.0.0",
     "@fireproof/vendor": "workspace:0.0.0",
-    "@hono/node-server": "^1.19.0",
+    "@hono/node-server": "^1.19.2",
     "@hono/node-ws": "^1.2.0",
-    "@libsql/client": "^0.15.10",
+    "@libsql/client": "^0.15.15",
     "drizzle-orm": "^0.44.3",
-    "hono": "^4.9.4",
+    "hono": "^4.9.8",
     "vitest": "^3.2.4"
   },
   "devDependencies": {
     "@fireproof/core-cli": "workspace:0.0.0",
-    "@types/node": "^24.3.0",
+    "@types/node": "^24.4.0",
     "drizzle-kit": "0.30.6",
     "zx": "^8.8.1"
   }

cloud/base/package.json

@@ -38,14 +38,14 @@
     "react": ">=18.0.0"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.26",
+    "@adviser/cement": "^0.4.39",
     "@fireproof/core-blockstore": "workspace:0.0.0",
     "@fireproof/core-runtime": "workspace:0.0.0",
     "@fireproof/core-types-base": "workspace:0.0.0",
     "@fireproof/vendor": "workspace:0.0.0",
     "aws4fetch": "^1.0.20",
     "cmd-ts": "^0.14.1",
-    "jose": "^6.0.13"
+    "jose": "^6.1.0"
   },
   "devDependencies": {
     "@fireproof/core-cli": "workspace:0.0.0",

cloud/todo-app/package.json

@@ -41,15 +41,15 @@
     "react": ">=18.0.0"
   },
   "dependencies": {
-    "@adviser/cement": "^0.4.26",
+    "@adviser/cement": "^0.4.39",
     "@fireproof/vendor": "workspace:0.0.0",
-    "@types/react": "^19.1.11",
+    "@types/react": "^19.1.13",
     "react-dom": "^19.1.0",
     "use-fireproof": "workspace:0.0.0"
   },
   "devDependencies": {
     "@fireproof/core-cli": "workspace:0.0.0",
-    "@types/react-dom": "^19.1.6",
-    "vite": "^7.1.3"
+    "@types/react-dom": "^19.1.9",
+    "vite": "^7.1.5"
   }
 }

core/base/crdt-clock.ts

@@ -64,7 +64,8 @@ export class CRDTClockImpl {
       prevHead,
       updates,
     })) {
-      return this.processUpdates(updatesAcc, all, prevHead);
+      await this.processUpdates(updatesAcc, all, prevHead);
+      return;
     }
   }
 
@@ -137,7 +138,14 @@ export class CRDTClockImpl {
       .Int("prevHeadLength", prevHead.length)
       .Int("currentHeadLength", this.head.length)
       .Msg("INT_APPLY_HEAD: Entry point");
-    // console.log("int_applyHead", this.applyHeadQueue.size(), this.head, newHead, prevHead, localUpdates);
+    this.logger
+      .Debug()
+      .Int("queueSize", this.applyHeadQueue.size())
+      .Any("currentHead", this.head)
+      .Any("newHead", newHead)
+      .Any("prevHead", prevHead)
+      .Any("localUpdates", localUpdates)
+      .Msg("int_applyHead processing");
     const ogHead = sortClockHead(this.head);
     newHead = sortClockHead(newHead);
     if (compareClockHeads(ogHead, newHead)) {
@@ -153,6 +161,20 @@ export class CRDTClockImpl {
     if (!this.blockstore) {
       throw this.logger.Error().Msg("missing blockstore").AsError();
     }
+    this.logger
+      .Debug()
+      .Str("dbName", this.blockstore?.crdtParent?.ledgerParent?.name || "unnamed")
+      .Str(
+        "carLog",
+        this.blockstore?.loader?.carLog
+          ?.asArray()
+          .map((cg) => cg.map((c) => c.toString()).join(","))
+          .join(";") || "no-carlog",
+      )
+      .Str("validatingHead", newHead.map((h) => h.toString()).join(","))
+      .Msg("PRE_VALIDATION: CarLog before block validation");
+    // Add sleep to test race condition theory
+    // await sleep(1000);
     await validateBlocks(this.logger, newHead, this.blockstore);
     if (!this.transaction) {
       this.transaction = this.blockstore.openTransaction({ noLoader, add: false });
@@ -216,7 +238,7 @@ async function validateBlocks(logger: Logger, newHead: ClockHead, blockstore?: B
   newHead.map(async (cid) => {
     const got = await blockstore.get(cid);
     if (!got) {
-      throw logger.Error().Str("cid", cid.toString()).Msg("int_applyHead missing block").AsError();
+      throw logger.Error().Str("cid", cid.toString()).Msg("validateBlocks missing block").AsError();
     }
   });
 }
@@ -230,8 +252,7 @@ async function advanceBlocks(logger: Logger, newHead: ClockHead, tblocks: CarTra
     try {
       head = await advance(toPailFetcher(tblocks), head, cid);
     } catch (e) {
-      logger.Error().Err(e).Msg("failed to advance head");
-      // console.log('failed to advance head:', cid.toString(), e)
+      logger.Error().Str("cid", cid.toString()).Err(e).Msg("failed to advance head");
       // continue;
     }
   }

core/base/crdt-helpers.ts

@@ -40,7 +40,7 @@ import {
   PARAM,
   NotFoundError,
 } from "@fireproof/core-types-base";
-import { Logger } from "@adviser/cement";
+import { exception2Result, Logger } from "@adviser/cement";
 import { Link, Version } from "multiformats";
 
 function toString<K extends IndexKeyType>(key: K, logger: Logger): string {
@@ -58,7 +58,11 @@ export function toPailFetcher(tblocks: BlockFetcher): PailBlockFetcher {
     get: async <T = unknown, C extends number = number, A extends number = number, V extends Version = 1>(
       link: Link<T, C, A, V>,
     ) => {
-      const block = await tblocks.get(link);
+      const rBlock = await exception2Result(() => tblocks.get(link));
+      if (rBlock.isErr()) {
+        return undefined;
+      }
+      const block = rBlock.Ok();
       return block
         ? ({
             cid: block.cid,

core/base/crdt.ts

@@ -105,7 +105,7 @@ export class CRDTImpl implements CRDT {
       applyMeta: async (meta: TransactionMeta) => {
         const crdtMeta = meta as CRDTMeta;
         if (!crdtMeta.head) throw this.logger.Error().Msg("missing head").AsError();
-        // console.log("applyMeta-pre", crdtMeta.head, this.clock.head);
+        this.logger.Debug().Any("incomingHead", crdtMeta.head).Any("currentHead", this.clock.head).Msg("applyMeta-pre");
         this.logger
           .Debug()
           .Str("newHead", crdtMeta.head.map((h) => h.toString()).join(","))
@@ -115,7 +115,7 @@ export class CRDTImpl implements CRDT {
           .Str("dbName", this.opts.name || "unnamed")
           .Msg("APPLY_META: Calling applyHead for REMOTE sync");
         await this.clock.applyHead(crdtMeta.head, []);
-        // console.log("applyMeta-post", crdtMeta.head, this.clock.head);
+        this.logger.Debug().Any("resultHead", crdtMeta.head).Any("clockHead", this.clock.head).Msg("applyMeta-post");
       },
       compactStrategy: rCompactStrategy.Ok(),
       gatewayInterceptor: opts.gatewayInterceptor,
@@ -209,13 +209,13 @@ export class CRDTImpl implements CRDT {
   async ready(): Promise<void> {
     return this.onceReady.once(async () => {
       try {
-        // console.log("bs-ready-pre")
+        this.logger.Debug().Msg("blockstore ready preparation");
         // await this.blockstore.ready();
-        // console.log("bs-ready-post-1")
+        this.logger.Debug().Msg("blockstore ready completed");
         // await this.indexBlockstore?.ready();
-        // console.log("bs-ready-post-2")
+        this.logger.Debug().Msg("index blockstore ready completed");
         // await this.clock.ready();
-        // console.log("bs-ready-post-3")
+        this.logger.Debug().Msg("clock ready completed");
         await Promise.all([
           this.blockstore.ready(),
           this.indexBlockstore ? this.indexBlockstore.ready() : Promise.resolve(),

core/base/database.ts

@@ -25,6 +25,7 @@ import {
   Attached,
   NotFoundError,
   QueryResult,
+  isNotFoundError,
 } from "@fireproof/core-types-base";
 import { ensureLogger, makeName } from "@fireproof/core-runtime";
 
@@ -78,7 +79,10 @@ export class DatabaseImpl implements Database {
       const { doc } = got;
       return { ...(doc as unknown as DocWithId<T>), _id: id };
     } catch (e) {
-      throw new NotFoundError(`Not found: ${id} - ${e instanceof Error ? e.message : String(e)}`);
+      if (isNotFoundError(e)) {
+        throw e;
+      }
+      throw this.logger.Error().Err(e).Msg("unexpect error").AsError();
     }
   }
 
@@ -157,7 +161,6 @@ export class DatabaseImpl implements Database {
     if (typeof opts.limit === "number" && opts.limit >= 0) {
       rows = rows.slice(0, opts.limit);
     }
-
     return { rows, clock: head, name: this.name };
   }