@apibara/plugin-mongo 2.1.0-beta.10 → 2.1.0-beta.12

package/dist/index.cjs

@@ -360,6 +360,7 @@ function mongoStorage({
   return plugins.defineIndexerPlugin((indexer) => {
     let indexerId = "";
     const alwaysReindex = process.env["APIBARA_ALWAYS_REINDEX"] === "true";
+    let prevFinality;
     indexer.hooks.hook("run:before", async () => {
       const { indexerName } = plugins$1.useInternalContext();
       indexerId = internal.generateIndexerId(indexerName, identifier);
@@ -461,16 +462,19 @@ function mongoStorage({
     });
     indexer.hooks.hook("handler:middleware", async ({ use }) => {
       use(async (context, next) => {
-        const { endCursor } = context;
+        const { endCursor, finality, cursor } = context;
         if (!endCursor) {
           throw new MongoStorageError("end cursor is undefined");
         }
         await withTransaction(client, async (session) => {
           const db = client.db(dbName, dbOptions);
           context[MONGO_PROPERTY] = new MongoStorage(db, session, endCursor);
+          if (prevFinality === "pending") {
+            await invalidate(db, session, cursor, collections);
+          }
           await next();
           delete context[MONGO_PROPERTY];
-          if (enablePersistence) {
+          if (enablePersistence && finality !== "pending") {
             await persistState({
               db,
               endCursor,
@@ -478,6 +482,7 @@ function mongoStorage({
               indexerId
             });
           }
+          prevFinality = finality;
         });
       });
     });

package/dist/index.mjs

@@ -358,6 +358,7 @@ function mongoStorage({
   return defineIndexerPlugin((indexer) => {
     let indexerId = "";
     const alwaysReindex = process.env["APIBARA_ALWAYS_REINDEX"] === "true";
+    let prevFinality;
     indexer.hooks.hook("run:before", async () => {
       const { indexerName } = useInternalContext();
       indexerId = generateIndexerId(indexerName, identifier);
@@ -459,16 +460,19 @@ function mongoStorage({
     });
     indexer.hooks.hook("handler:middleware", async ({ use }) => {
       use(async (context, next) => {
-        const { endCursor } = context;
+        const { endCursor, finality, cursor } = context;
         if (!endCursor) {
           throw new MongoStorageError("end cursor is undefined");
         }
         await withTransaction(client, async (session) => {
           const db = client.db(dbName, dbOptions);
           context[MONGO_PROPERTY] = new MongoStorage(db, session, endCursor);
+          if (prevFinality === "pending") {
+            await invalidate(db, session, cursor, collections);
+          }
           await next();
           delete context[MONGO_PROPERTY];
-          if (enablePersistence) {
+          if (enablePersistence && finality !== "pending") {
             await persistState({
               db,
               endCursor,
@@ -476,6 +480,7 @@ function mongoStorage({
               indexerId
             });
           }
+          prevFinality = finality;
         });
       });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apibara/plugin-mongo",
-  "version": "2.1.0-beta.10",
+  "version": "2.1.0-beta.12",
   "type": "module",
   "files": [
     "dist",
@@ -35,7 +35,7 @@
     "mongodb": "^6.12.0"
   },
   "dependencies": {
-    "@apibara/indexer": "2.1.0-beta.10",
-    "@apibara/protocol": "2.1.0-beta.10"
+    "@apibara/indexer": "2.1.0-beta.12",
+    "@apibara/protocol": "2.1.0-beta.12"
   }
 }

package/src/index.ts

@@ -4,6 +4,7 @@ import type { DbOptions, MongoClient } from "mongodb";
 
 import { generateIndexerId } from "@apibara/indexer/internal";
 import { useInternalContext } from "@apibara/indexer/internal/plugins";
+import type { Cursor, DataFinality } from "@apibara/protocol";
 import { cleanupStorage, finalize, invalidate } from "./mongo";
 import {
   finalizeState,
@@ -62,6 +63,7 @@ export function mongoStorage<TFilter, TBlock>({
   return defineIndexerPlugin<TFilter, TBlock>((indexer) => {
     let indexerId = "";
     const alwaysReindex = process.env["APIBARA_ALWAYS_REINDEX"] === "true";
+    let prevFinality: DataFinality | undefined;
 
     indexer.hooks.hook("run:before", async () => {
       const { indexerName } = useInternalContext();
@@ -189,7 +191,11 @@ export function mongoStorage<TFilter, TBlock>({
 
     indexer.hooks.hook("handler:middleware", async ({ use }) => {
       use(async (context, next) => {
-        const { endCursor } = context;
+        const { endCursor, finality, cursor } = context as {
+          cursor: Cursor;
+          endCursor: Cursor;
+          finality: DataFinality;
+        };
 
         if (!endCursor) {
           throw new MongoStorageError("end cursor is undefined");
@@ -199,10 +205,16 @@ export function mongoStorage<TFilter, TBlock>({
           const db = client.db(dbName, dbOptions);
           context[MONGO_PROPERTY] = new MongoStorage(db, session, endCursor);
 
+          if (prevFinality === "pending") {
+            // invalidate if previous block's finality was "pending"
+            await invalidate(db, session, cursor, collections);
+          }
+
           await next();
+
           delete context[MONGO_PROPERTY];
 
-          if (enablePersistence) {
+          if (enablePersistence && finality !== "pending") {
             await persistState({
               db,
               endCursor,
@@ -210,6 +222,8 @@ export function mongoStorage<TFilter, TBlock>({
               indexerId,
             });
           }
+
+          prevFinality = finality;
         });
       });
     });