@apibara/plugin-sqlite 2.1.0-beta.2 → 2.1.0-beta.20

package/dist/index.cjs

@@ -2,9 +2,9 @@
 
 const indexer = require('@apibara/indexer');
 const plugins = require('@apibara/indexer/plugins');
-const protocol = require('@apibara/protocol');
 const internal = require('@apibara/indexer/internal');
 const plugins$1 = require('@apibara/indexer/internal/plugins');
+const protocol = require('@apibara/protocol');
 
 class SqliteStorageError extends Error {
   constructor(message, options) {
@@ -267,6 +267,7 @@ function sqliteStorage({
 }) {
   return plugins.defineIndexerPlugin((indexer) => {
     let indexerId = "";
+    let prevFinality;
     indexer.hooks.hook("run:before", async () => {
       const { indexerName: indexerFileName, availableIndexers } = plugins$1.useInternalContext();
       indexerId = internal.generateIndexerId(indexerFileName, identifier);
@@ -368,31 +369,38 @@ function sqliteStorage({
     });
     indexer.hooks.hook("handler:middleware", ({ use }) => {
       use(async (ctx, next) => {
-        if (!ctx.finality) {
+        const { endCursor, finality, cursor } = ctx;
+        if (!finality) {
           throw new SqliteStorageError("finality is undefined");
         }
-        if (!ctx.endCursor || !protocol.isCursor(ctx.endCursor)) {
+        if (!endCursor) {
           throw new SqliteStorageError(
             "endCursor is undefined or not a cursor"
           );
         }
         await withTransaction(database, async (db) => {
+          if (prevFinality === "pending") {
+            if (enableKeyValueStore) {
+              invalidateKV(db, cursor);
+            }
+          }
           if (enableKeyValueStore) {
             ctx[KV_PROPERTY] = new KeyValueStore(
               db,
-              ctx.endCursor,
-              ctx.finality,
+              endCursor,
+              finality,
               serializeFn,
               deserializeFn
             );
           }
           await next();
-          if (enablePersistState) {
-            persistState({ db, endCursor: ctx.endCursor, indexerId });
+          if (enablePersistState && finality !== "pending") {
+            persistState({ db, endCursor, indexerId });
           }
           if (enableKeyValueStore) {
             delete ctx[KV_PROPERTY];
           }
+          prevFinality = finality;
         });
       });
     });

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { useIndexerContext } from '@apibara/indexer';
 import { defineIndexerPlugin } from '@apibara/indexer/plugins';
-import { normalizeCursor, isCursor } from '@apibara/protocol';
 import { generateIndexerId } from '@apibara/indexer/internal';
 import { useInternalContext } from '@apibara/indexer/internal/plugins';
+import { normalizeCursor } from '@apibara/protocol';
 
 class SqliteStorageError extends Error {
   constructor(message, options) {
@@ -265,6 +265,7 @@ function sqliteStorage({
 }) {
   return defineIndexerPlugin((indexer) => {
     let indexerId = "";
+    let prevFinality;
     indexer.hooks.hook("run:before", async () => {
       const { indexerName: indexerFileName, availableIndexers } = useInternalContext();
       indexerId = generateIndexerId(indexerFileName, identifier);
@@ -366,31 +367,38 @@ function sqliteStorage({
     });
     indexer.hooks.hook("handler:middleware", ({ use }) => {
       use(async (ctx, next) => {
-        if (!ctx.finality) {
+        const { endCursor, finality, cursor } = ctx;
+        if (!finality) {
           throw new SqliteStorageError("finality is undefined");
         }
-        if (!ctx.endCursor || !isCursor(ctx.endCursor)) {
+        if (!endCursor) {
           throw new SqliteStorageError(
             "endCursor is undefined or not a cursor"
           );
         }
         await withTransaction(database, async (db) => {
+          if (prevFinality === "pending") {
+            if (enableKeyValueStore) {
+              invalidateKV(db, cursor);
+            }
+          }
           if (enableKeyValueStore) {
             ctx[KV_PROPERTY] = new KeyValueStore(
               db,
-              ctx.endCursor,
-              ctx.finality,
+              endCursor,
+              finality,
               serializeFn,
               deserializeFn
             );
           }
           await next();
-          if (enablePersistState) {
-            persistState({ db, endCursor: ctx.endCursor, indexerId });
+          if (enablePersistState && finality !== "pending") {
+            persistState({ db, endCursor, indexerId });
           }
           if (enableKeyValueStore) {
             delete ctx[KV_PROPERTY];
           }
+          prevFinality = finality;
         });
       });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apibara/plugin-sqlite",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.20",
   "type": "module",
   "files": [
     "dist",
@@ -28,6 +28,7 @@
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.11",
     "@types/node": "^20.14.0",
+    "better-sqlite3": "^9.0.0",
     "unbuild": "^2.0.0",
     "vitest": "^1.6.0"
   },
@@ -35,7 +36,7 @@
     "better-sqlite3": "^9.0.0"
   },
   "dependencies": {
-    "@apibara/indexer": "2.1.0-beta.2",
-    "@apibara/protocol": "2.1.0-beta.2"
+    "@apibara/indexer": "2.1.0-beta.20",
+    "@apibara/protocol": "2.1.0-beta.20"
   }
 }

package/src/index.ts

@@ -1,6 +1,6 @@
 import { useIndexerContext } from "@apibara/indexer";
 import { defineIndexerPlugin } from "@apibara/indexer/plugins";
-import { isCursor } from "@apibara/protocol";
+import type { Cursor, DataFinality } from "@apibara/protocol";
 import type { Database as SqliteDatabase } from "better-sqlite3";
 
 import { generateIndexerId } from "@apibara/indexer/internal";
@@ -76,6 +76,7 @@ export function sqliteStorage<TFilter, TBlock>({
 }: SqliteStorageOptions) {
   return defineIndexerPlugin<TFilter, TBlock>((indexer) => {
     let indexerId = "";
+    let prevFinality: DataFinality | undefined;
 
     indexer.hooks.hook("run:before", async () => {
       const { indexerName: indexerFileName, availableIndexers } =
@@ -206,22 +207,35 @@ export function sqliteStorage<TFilter, TBlock>({
 
     indexer.hooks.hook("handler:middleware", ({ use }) => {
       use(async (ctx, next) => {
-        if (!ctx.finality) {
+        const { endCursor, finality, cursor } = ctx as {
+          cursor: Cursor;
+          endCursor: Cursor;
+          finality: DataFinality;
+        };
+
+        if (!finality) {
           throw new SqliteStorageError("finality is undefined");
         }
 
-        if (!ctx.endCursor || !isCursor(ctx.endCursor)) {
+        if (!endCursor) {
           throw new SqliteStorageError(
             "endCursor is undefined or not a cursor",
           );
         }
 
         await withTransaction(database, async (db) => {
+          if (prevFinality === "pending") {
+            // invalidate if previous block's finality was "pending"
+            if (enableKeyValueStore) {
+              invalidateKV(db, cursor);
+            }
+          }
+
           if (enableKeyValueStore) {
             ctx[KV_PROPERTY] = new KeyValueStore(
               db,
-              ctx.endCursor,
-              ctx.finality,
+              endCursor,
+              finality,
               serializeFn,
               deserializeFn,
             );
@@ -229,13 +243,15 @@ export function sqliteStorage<TFilter, TBlock>({
 
           await next();
 
-          if (enablePersistState) {
-            persistState({ db, endCursor: ctx.endCursor, indexerId });
+          if (enablePersistState && finality !== "pending") {
+            persistState({ db, endCursor, indexerId });
           }
 
           if (enableKeyValueStore) {
             delete ctx[KV_PROPERTY];
           }
+
+          prevFinality = finality;
         });
       });
     });

package/src/kv.ts

@@ -72,7 +72,7 @@ export function invalidateKV(db: Database, cursor: Cursor) {
   );
 }
 
-type KeyValueRow = {
+export type KeyValueRow = {
   from_block: number;
   to_block: number;
   k: string;

package/src/persistence.ts

@@ -100,6 +100,19 @@ export function invalidateState(props: {
   );
 }
 
+export type CheckpointRow = {
+  id: string;
+  order_key: number;
+  unique_key: string | null;
+};
+
+export type FilterRow = {
+  id: string;
+  filter: string;
+  from_block: number;
+  to_block: number | null;
+};
+
 const statements = {
   createCheckpointsTable: `
     CREATE TABLE IF NOT EXISTS checkpoints (