@apibara/plugin-mongo 2.0.0-beta.36 → 2.0.0-beta.38

package/dist/index.cjs

@@ -2,6 +2,8 @@
 
 const indexer = require('@apibara/indexer');
 const plugins = require('@apibara/indexer/plugins');
+const internal = require('@apibara/indexer/internal');
+const plugins$1 = require('@apibara/indexer/internal/plugins');
 
 async function invalidate(db, session, cursor, collections) {
   const orderKeyValue = Number(cursor.orderKey);
@@ -51,10 +53,10 @@ async function initializePersistentState(db, session) {
   await filter.createIndex({ id: 1, fromBlock: 1 }, { session });
 }
 async function persistState(props) {
-  const { db, session, endCursor, filter, indexerName } = props;
+  const { db, session, endCursor, filter, indexerId } = props;
   if (endCursor) {
     await db.collection(checkpointCollectionName).updateOne(
-      { id: indexerName },
+      { id: indexerId },
       {
         $set: {
           orderKey: Number(endCursor.orderKey),
@@ -65,13 +67,13 @@ async function persistState(props) {
     );
     if (filter) {
       await db.collection(filterCollectionName).updateMany(
-        { id: indexerName, toBlock: null },
+        { id: indexerId, toBlock: null },
         { $set: { toBlock: Number(endCursor.orderKey) } },
         { session }
       );
       await db.collection(filterCollectionName).updateOne(
         {
-          id: indexerName,
+          id: indexerId,
           fromBlock: Number(endCursor.orderKey)
         },
         {
@@ -87,10 +89,10 @@ async function persistState(props) {
   }
 }
 async function getState(props) {
-  const { db, session, indexerName } = props;
+  const { db, session, indexerId } = props;
   let cursor;
   let filter;
-  const checkpointRow = await db.collection(checkpointCollectionName).findOne({ id: indexerName }, { session });
+  const checkpointRow = await db.collection(checkpointCollectionName).findOne({ id: indexerId }, { session });
   if (checkpointRow) {
     cursor = {
       orderKey: BigInt(checkpointRow.orderKey),
@@ -99,7 +101,7 @@ async function getState(props) {
   }
   const filterRow = await db.collection(filterCollectionName).findOne(
     {
-      id: indexerName,
+      id: indexerId,
       toBlock: null
     },
     { session }
@@ -110,22 +112,22 @@ async function getState(props) {
   return { cursor, filter };
 }
 async function invalidateState(props) {
-  const { db, session, cursor, indexerName } = props;
+  const { db, session, cursor, indexerId } = props;
   await db.collection(filterCollectionName).deleteMany(
-    { id: indexerName, fromBlock: { $gt: Number(cursor.orderKey) } },
+    { id: indexerId, fromBlock: { $gt: Number(cursor.orderKey) } },
     { session }
   );
   await db.collection(filterCollectionName).updateMany(
-    { id: indexerName, toBlock: { $gt: Number(cursor.orderKey) } },
+    { id: indexerId, toBlock: { $gt: Number(cursor.orderKey) } },
     { $set: { toBlock: null } },
     { session }
   );
 }
 async function finalizeState(props) {
-  const { db, session, cursor, indexerName } = props;
+  const { db, session, cursor, indexerId } = props;
   await db.collection(filterCollectionName).deleteMany(
     {
-      id: indexerName,
+      id: indexerId,
       toBlock: { $lte: Number(cursor.orderKey) }
     },
     { session }
@@ -332,10 +334,13 @@ function mongoStorage({
   dbOptions,
   collections,
   persistState: enablePersistence = true,
-  indexerName = "default"
+  indexerName: identifier = "default"
 }) {
   return plugins.defineIndexerPlugin((indexer) => {
+    let indexerId = "";
     indexer.hooks.hook("run:before", async () => {
+      const { indexerName } = plugins$1.useInternalContext();
+      indexerId = internal.generateIndexerId(indexerName, identifier);
       await withTransaction(client, async (session) => {
         const db = client.db(dbName, dbOptions);
         if (enablePersistence) {
@@ -352,7 +357,7 @@ function mongoStorage({
         const { cursor, filter } = await getState({
           db,
           session,
-          indexerName
+          indexerId
         });
         if (cursor) {
           request.startingCursor = cursor;
@@ -371,7 +376,7 @@ function mongoStorage({
         const db = client.db(dbName, dbOptions);
         await invalidate(db, session, cursor, collections);
         if (enablePersistence) {
-          await invalidateState({ db, session, cursor, indexerName });
+          await invalidateState({ db, session, cursor, indexerId });
         }
       });
     });
@@ -387,7 +392,7 @@ function mongoStorage({
             endCursor,
             session,
             filter: request.filter[1],
-            indexerName
+            indexerId
           });
         }
       });
@@ -401,7 +406,7 @@ function mongoStorage({
         const db = client.db(dbName, dbOptions);
         await finalize(db, session, cursor, collections);
         if (enablePersistence) {
-          await finalizeState({ db, session, cursor, indexerName });
+          await finalizeState({ db, session, cursor, indexerId });
         }
       });
     });
@@ -414,7 +419,7 @@ function mongoStorage({
         const db = client.db(dbName, dbOptions);
         await invalidate(db, session, cursor, collections);
         if (enablePersistence) {
-          await invalidateState({ db, session, cursor, indexerName });
+          await invalidateState({ db, session, cursor, indexerId });
         }
       });
     });
@@ -430,7 +435,12 @@ function mongoStorage({
           await next();
           delete context[MONGO_PROPERTY];
           if (enablePersistence) {
-            await persistState({ db, endCursor, session, indexerName });
+            await persistState({
+              db,
+              endCursor,
+              session,
+              indexerId
+            });
           }
         });
       });

package/dist/index.d.cts

@@ -44,6 +44,6 @@ interface MongoStorageOptions {
  * @param options.persistState - Whether to persist the indexer's state. Defaults to true.
  * @param options.indexerName - The name of the indexer. Defaults value is 'default'.
  */
-declare function mongoStorage<TFilter, TBlock>({ client, dbName, dbOptions, collections, persistState: enablePersistence, indexerName, }: MongoStorageOptions): _apibara_indexer_plugins.IndexerPlugin<TFilter, TBlock>;
+declare function mongoStorage<TFilter, TBlock>({ client, dbName, dbOptions, collections, persistState: enablePersistence, indexerName: identifier, }: MongoStorageOptions): _apibara_indexer_plugins.IndexerPlugin<TFilter, TBlock>;
 
 export { MongoCollection, MongoStorage, type MongoStorageOptions, mongoStorage, useMongoStorage };

package/dist/index.d.mts

@@ -44,6 +44,6 @@ interface MongoStorageOptions {
  * @param options.persistState - Whether to persist the indexer's state. Defaults to true.
  * @param options.indexerName - The name of the indexer. Defaults value is 'default'.
  */
-declare function mongoStorage<TFilter, TBlock>({ client, dbName, dbOptions, collections, persistState: enablePersistence, indexerName, }: MongoStorageOptions): _apibara_indexer_plugins.IndexerPlugin<TFilter, TBlock>;
+declare function mongoStorage<TFilter, TBlock>({ client, dbName, dbOptions, collections, persistState: enablePersistence, indexerName: identifier, }: MongoStorageOptions): _apibara_indexer_plugins.IndexerPlugin<TFilter, TBlock>;
 
 export { MongoCollection, MongoStorage, type MongoStorageOptions, mongoStorage, useMongoStorage };

package/dist/index.d.ts

@@ -44,6 +44,6 @@ interface MongoStorageOptions {
  * @param options.persistState - Whether to persist the indexer's state. Defaults to true.
  * @param options.indexerName - The name of the indexer. Defaults value is 'default'.
  */
-declare function mongoStorage<TFilter, TBlock>({ client, dbName, dbOptions, collections, persistState: enablePersistence, indexerName, }: MongoStorageOptions): _apibara_indexer_plugins.IndexerPlugin<TFilter, TBlock>;
+declare function mongoStorage<TFilter, TBlock>({ client, dbName, dbOptions, collections, persistState: enablePersistence, indexerName: identifier, }: MongoStorageOptions): _apibara_indexer_plugins.IndexerPlugin<TFilter, TBlock>;
 
 export { MongoCollection, MongoStorage, type MongoStorageOptions, mongoStorage, useMongoStorage };

package/dist/index.mjs

@@ -1,5 +1,7 @@
 import { useIndexerContext } from '@apibara/indexer';
 import { defineIndexerPlugin } from '@apibara/indexer/plugins';
+import { generateIndexerId } from '@apibara/indexer/internal';
+import { useInternalContext } from '@apibara/indexer/internal/plugins';
 
 async function invalidate(db, session, cursor, collections) {
   const orderKeyValue = Number(cursor.orderKey);
@@ -49,10 +51,10 @@ async function initializePersistentState(db, session) {
   await filter.createIndex({ id: 1, fromBlock: 1 }, { session });
 }
 async function persistState(props) {
-  const { db, session, endCursor, filter, indexerName } = props;
+  const { db, session, endCursor, filter, indexerId } = props;
   if (endCursor) {
     await db.collection(checkpointCollectionName).updateOne(
-      { id: indexerName },
+      { id: indexerId },
       {
         $set: {
           orderKey: Number(endCursor.orderKey),
@@ -63,13 +65,13 @@ async function persistState(props) {
     );
     if (filter) {
       await db.collection(filterCollectionName).updateMany(
-        { id: indexerName, toBlock: null },
+        { id: indexerId, toBlock: null },
         { $set: { toBlock: Number(endCursor.orderKey) } },
         { session }
       );
       await db.collection(filterCollectionName).updateOne(
         {
-          id: indexerName,
+          id: indexerId,
           fromBlock: Number(endCursor.orderKey)
         },
         {
@@ -85,10 +87,10 @@ async function persistState(props) {
   }
 }
 async function getState(props) {
-  const { db, session, indexerName } = props;
+  const { db, session, indexerId } = props;
   let cursor;
   let filter;
-  const checkpointRow = await db.collection(checkpointCollectionName).findOne({ id: indexerName }, { session });
+  const checkpointRow = await db.collection(checkpointCollectionName).findOne({ id: indexerId }, { session });
   if (checkpointRow) {
     cursor = {
       orderKey: BigInt(checkpointRow.orderKey),
@@ -97,7 +99,7 @@ async function getState(props) {
   }
   const filterRow = await db.collection(filterCollectionName).findOne(
     {
-      id: indexerName,
+      id: indexerId,
       toBlock: null
     },
     { session }
@@ -108,22 +110,22 @@ async function getState(props) {
   return { cursor, filter };
 }
 async function invalidateState(props) {
-  const { db, session, cursor, indexerName } = props;
+  const { db, session, cursor, indexerId } = props;
   await db.collection(filterCollectionName).deleteMany(
-    { id: indexerName, fromBlock: { $gt: Number(cursor.orderKey) } },
+    { id: indexerId, fromBlock: { $gt: Number(cursor.orderKey) } },
     { session }
   );
   await db.collection(filterCollectionName).updateMany(
-    { id: indexerName, toBlock: { $gt: Number(cursor.orderKey) } },
+    { id: indexerId, toBlock: { $gt: Number(cursor.orderKey) } },
     { $set: { toBlock: null } },
     { session }
   );
 }
 async function finalizeState(props) {
-  const { db, session, cursor, indexerName } = props;
+  const { db, session, cursor, indexerId } = props;
   await db.collection(filterCollectionName).deleteMany(
     {
-      id: indexerName,
+      id: indexerId,
       toBlock: { $lte: Number(cursor.orderKey) }
     },
     { session }
@@ -330,10 +332,13 @@ function mongoStorage({
   dbOptions,
   collections,
   persistState: enablePersistence = true,
-  indexerName = "default"
+  indexerName: identifier = "default"
 }) {
   return defineIndexerPlugin((indexer) => {
+    let indexerId = "";
     indexer.hooks.hook("run:before", async () => {
+      const { indexerName } = useInternalContext();
+      indexerId = generateIndexerId(indexerName, identifier);
       await withTransaction(client, async (session) => {
         const db = client.db(dbName, dbOptions);
         if (enablePersistence) {
@@ -350,7 +355,7 @@ function mongoStorage({
         const { cursor, filter } = await getState({
           db,
           session,
-          indexerName
+          indexerId
         });
         if (cursor) {
           request.startingCursor = cursor;
@@ -369,7 +374,7 @@ function mongoStorage({
         const db = client.db(dbName, dbOptions);
         await invalidate(db, session, cursor, collections);
         if (enablePersistence) {
-          await invalidateState({ db, session, cursor, indexerName });
+          await invalidateState({ db, session, cursor, indexerId });
         }
       });
     });
@@ -385,7 +390,7 @@ function mongoStorage({
             endCursor,
             session,
             filter: request.filter[1],
-            indexerName
+            indexerId
           });
         }
       });
@@ -399,7 +404,7 @@ function mongoStorage({
         const db = client.db(dbName, dbOptions);
         await finalize(db, session, cursor, collections);
         if (enablePersistence) {
-          await finalizeState({ db, session, cursor, indexerName });
+          await finalizeState({ db, session, cursor, indexerId });
         }
       });
     });
@@ -412,7 +417,7 @@ function mongoStorage({
         const db = client.db(dbName, dbOptions);
         await invalidate(db, session, cursor, collections);
         if (enablePersistence) {
-          await invalidateState({ db, session, cursor, indexerName });
+          await invalidateState({ db, session, cursor, indexerId });
         }
       });
     });
@@ -428,7 +433,12 @@ function mongoStorage({
           await next();
           delete context[MONGO_PROPERTY];
           if (enablePersistence) {
-            await persistState({ db, endCursor, session, indexerName });
+            await persistState({
+              db,
+              endCursor,
+              session,
+              indexerId
+            });
           }
         });
       });

package/package.json

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

package/src/index.ts

@@ -2,6 +2,8 @@ import { useIndexerContext } from "@apibara/indexer";
 import { defineIndexerPlugin } from "@apibara/indexer/plugins";
 import type { DbOptions, MongoClient } from "mongodb";
 
+import { generateIndexerId } from "@apibara/indexer/internal";
+import { useInternalContext } from "@apibara/indexer/internal/plugins";
 import { finalize, invalidate } from "./mongo";
 import {
   finalizeState,
@@ -54,10 +56,15 @@ export function mongoStorage<TFilter, TBlock>({
   dbOptions,
   collections,
   persistState: enablePersistence = true,
-  indexerName = "default",
+  indexerName: identifier = "default",
 }: MongoStorageOptions) {
   return defineIndexerPlugin<TFilter, TBlock>((indexer) => {
+    let indexerId = "";
+
     indexer.hooks.hook("run:before", async () => {
+      const { indexerName } = useInternalContext();
+      indexerId = generateIndexerId(indexerName, identifier);
+
       await withTransaction(client, async (session) => {
         const db = client.db(dbName, dbOptions);
         if (enablePersistence) {
@@ -76,7 +83,7 @@ export function mongoStorage<TFilter, TBlock>({
         const { cursor, filter } = await getState<TFilter>({
           db,
           session,
-          indexerName,
+          indexerId,
         });
 
         if (cursor) {
@@ -102,7 +109,7 @@ export function mongoStorage<TFilter, TBlock>({
         await invalidate(db, session, cursor, collections);
 
         if (enablePersistence) {
-          await invalidateState({ db, session, cursor, indexerName });
+          await invalidateState({ db, session, cursor, indexerId });
         }
       });
     });
@@ -119,7 +126,7 @@ export function mongoStorage<TFilter, TBlock>({
             endCursor,
             session,
             filter: request.filter[1],
-            indexerName,
+            indexerId,
           });
         }
       });
@@ -137,7 +144,7 @@ export function mongoStorage<TFilter, TBlock>({
         await finalize(db, session, cursor, collections);
 
         if (enablePersistence) {
-          await finalizeState({ db, session, cursor, indexerName });
+          await finalizeState({ db, session, cursor, indexerId });
         }
       });
     });
@@ -154,7 +161,7 @@ export function mongoStorage<TFilter, TBlock>({
         await invalidate(db, session, cursor, collections);
 
         if (enablePersistence) {
-          await invalidateState({ db, session, cursor, indexerName });
+          await invalidateState({ db, session, cursor, indexerId });
         }
       });
     });
@@ -175,7 +182,12 @@ export function mongoStorage<TFilter, TBlock>({
           delete context[MONGO_PROPERTY];
 
           if (enablePersistence) {
-            await persistState({ db, endCursor, session, indexerName });
+            await persistState({
+              db,
+              endCursor,
+              session,
+              indexerId,
+            });
           }
         });
       });

package/src/persistence.ts

@@ -38,13 +38,13 @@ export async function persistState<TFilter>(props: {
   session: ClientSession;
   endCursor: Cursor;
   filter?: TFilter;
-  indexerName: string;
+  indexerId: string;
 }) {
-  const { db, session, endCursor, filter, indexerName } = props;
+  const { db, session, endCursor, filter, indexerId } = props;
 
   if (endCursor) {
     await db.collection<CheckpointSchema>(checkpointCollectionName).updateOne(
-      { id: indexerName },
+      { id: indexerId },
       {
         $set: {
           orderKey: Number(endCursor.orderKey),
@@ -59,7 +59,7 @@ export async function persistState<TFilter>(props: {
       await db
         .collection<FilterSchema>(filterCollectionName)
         .updateMany(
-          { id: indexerName, toBlock: null },
+          { id: indexerId, toBlock: null },
           { $set: { toBlock: Number(endCursor.orderKey) } },
           { session },
         );
@@ -67,7 +67,7 @@ export async function persistState<TFilter>(props: {
       // Insert new filter
       await db.collection<FilterSchema>(filterCollectionName).updateOne(
         {
-          id: indexerName,
+          id: indexerId,
           fromBlock: Number(endCursor.orderKey),
         },
         {
@@ -86,16 +86,16 @@ export async function persistState<TFilter>(props: {
 export async function getState<TFilter>(props: {
   db: Db;
   session: ClientSession;
-  indexerName: string;
+  indexerId: string;
 }): Promise<{ cursor?: Cursor; filter?: TFilter }> {
-  const { db, session, indexerName } = props;
+  const { db, session, indexerId } = props;
 
   let cursor: Cursor | undefined;
   let filter: TFilter | undefined;
 
   const checkpointRow = await db
     .collection<CheckpointSchema>(checkpointCollectionName)
-    .findOne({ id: indexerName }, { session });
+    .findOne({ id: indexerId }, { session });
 
   if (checkpointRow) {
     cursor = {
@@ -108,7 +108,7 @@ export async function getState<TFilter>(props: {
     .collection<FilterSchema>(filterCollectionName)
     .findOne(
       {
-        id: indexerName,
+        id: indexerId,
         toBlock: null,
       },
       { session },
@@ -125,21 +125,21 @@ export async function invalidateState(props: {
   db: Db;
   session: ClientSession;
   cursor: Cursor;
-  indexerName: string;
+  indexerId: string;
 }) {
-  const { db, session, cursor, indexerName } = props;
+  const { db, session, cursor, indexerId } = props;
 
   await db
     .collection<FilterSchema>(filterCollectionName)
     .deleteMany(
-      { id: indexerName, fromBlock: { $gt: Number(cursor.orderKey) } },
+      { id: indexerId, fromBlock: { $gt: Number(cursor.orderKey) } },
       { session },
     );
 
   await db
     .collection<FilterSchema>(filterCollectionName)
     .updateMany(
-      { id: indexerName, toBlock: { $gt: Number(cursor.orderKey) } },
+      { id: indexerId, toBlock: { $gt: Number(cursor.orderKey) } },
       { $set: { toBlock: null } },
       { session },
     );
@@ -149,13 +149,13 @@ export async function finalizeState(props: {
   db: Db;
   session: ClientSession;
   cursor: Cursor;
-  indexerName: string;
+  indexerId: string;
 }) {
-  const { db, session, cursor, indexerName } = props;
+  const { db, session, cursor, indexerId } = props;
 
   await db.collection<FilterSchema>(filterCollectionName).deleteMany(
     {
-      id: indexerName,
+      id: indexerId,
       toBlock: { $lte: Number(cursor.orderKey) },
     },
     { session },