@apibara/indexer 2.1.0-beta.2 → 2.1.0-beta.21

package/dist/index.cjs

@@ -4,8 +4,9 @@ const protocol = require('@apibara/protocol');
 const consola = require('consola');
 const hookable = require('hookable');
 const assert = require('node:assert');
-const context = require('./shared/indexer.077335f3.cjs');
+const config = require('./shared/indexer.479ae593.cjs');
 const api = require('@opentelemetry/api');
+const internal_plugins = require('./internal/plugins.cjs');
 require('node:async_hooks');
 require('unctx');
 
@@ -43,7 +44,29 @@ function compose(middleware) {
   };
 }
 
-const tracer = api.trace.getTracer("@apibara/indexer");
+function createTracer() {
+  return api.trace.getTracer("@apibara/indexer");
+}
+function createIndexerMetrics() {
+  const meter = api.metrics.getMeter("@apibara/indexer");
+  const currentBlockGauge = meter.createGauge("current_block", {
+    description: "Current block number being processed",
+    unit: "{block}"
+  });
+  const processedBlockCounter = meter.createCounter("processed_blocks", {
+    description: "Number of blocks processed",
+    unit: "{blocks}"
+  });
+  const reorgCounter = meter.createCounter("reorgs", {
+    description: "Number of reorgs (invalidate messages) received",
+    unit: "{reorgs}"
+  });
+  return {
+    currentBlockGauge,
+    processedBlockCounter,
+    reorgCounter
+  };
+}
 
 function defineIndexer(streamConfig) {
   return (config) => ({
@@ -105,10 +128,13 @@ async function runWithReconnect(client, indexer, options = {}) {
   }
 }
 async function run(client, indexer, runOptions = {}) {
-  await context.indexerAsyncContext.callAsync({}, async () => {
-    const context$1 = context.useIndexerContext();
+  await config.indexerAsyncContext.callAsync({}, async () => {
+    const context = config.useIndexerContext();
     const middleware = await registerMiddleware(indexer);
+    const indexerMetrics = createIndexerMetrics();
+    const tracer = createTracer();
     await indexer.hooks.callHook("run:before");
+    const { indexerName: indexerId } = internal_plugins.useInternalContext();
     const isFactoryMode = indexer.options.factory !== void 0;
     let startingCursor;
     if (indexer.options.startingCursor) {
@@ -153,19 +179,25 @@ async function run(client, indexer, runOptions = {}) {
           await tracer.startActiveSpan("message data", async (span) => {
             const blocks = message.data.data;
             const { cursor, endCursor, finality } = message.data;
-            context$1.cursor = cursor;
-            context$1.endCursor = endCursor;
-            context$1.finality = finality;
-            await middleware(context$1, async () => {
+            context.cursor = cursor;
+            context.endCursor = endCursor;
+            context.finality = finality;
+            indexerMetrics.currentBlockGauge.record(
+              Number(endCursor?.orderKey),
+              {
+                indexer_id: indexerId
+              }
+            );
+            await middleware(context, async () => {
               let block;
-              if (isFactoryMode) {
+              if (isFactoryMode && finality !== "pending") {
                 assert__default(indexer.options.factory !== void 0);
                 const [factoryBlock, mainBlock] = blocks;
                 block = mainBlock;
                 if (factoryBlock !== null) {
                   const { filter } = await indexer.options.factory({
                     block: factoryBlock,
-                    context: context$1
+                    context
                   });
                   if (filter) {
                     mainFilter = indexer.streamConfig.mergeFilter(
@@ -198,7 +230,7 @@ async function run(client, indexer, runOptions = {}) {
                     cursor,
                     endCursor,
                     finality,
-                    context: context$1
+                    context
                   });
                   span2.end();
                 });
@@ -206,13 +238,19 @@ async function run(client, indexer, runOptions = {}) {
             });
             span.end();
           });
-          context$1.cursor = void 0;
-          context$1.endCursor = void 0;
-          context$1.finality = void 0;
+          indexerMetrics.processedBlockCounter.add(1, {
+            indexer_id: indexerId
+          });
+          context.cursor = void 0;
+          context.endCursor = void 0;
+          context.finality = void 0;
           break;
         }
         case "invalidate": {
           await tracer.startActiveSpan("message invalidate", async (span) => {
+            indexerMetrics.reorgCounter.add(1, {
+              indexer_id: indexerId
+            });
             await indexer.hooks.callHook("message:invalidate", { message });
             span.end();
           });
@@ -275,7 +313,7 @@ async function registerMiddleware(indexer) {
   };
 }
 
-exports.useIndexerContext = context.useIndexerContext;
+exports.useIndexerContext = config.useIndexerContext;
 exports.createIndexer = createIndexer;
 exports.defineIndexer = defineIndexer;
 exports.run = run;

package/dist/index.mjs

@@ -2,8 +2,9 @@ import { ClientError, Status } from '@apibara/protocol';
 import consola from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import assert from 'node:assert';
-import { i as indexerAsyncContext, u as useIndexerContext } from './shared/indexer.a55ad619.mjs';
-import { trace } from '@opentelemetry/api';
+import { i as indexerAsyncContext, u as useIndexerContext } from './shared/indexer.75773ef1.mjs';
+import { trace, metrics } from '@opentelemetry/api';
+import { useInternalContext } from './internal/plugins.mjs';
 import 'node:async_hooks';
 import 'unctx';
 
@@ -36,7 +37,29 @@ function compose(middleware) {
   };
 }
 
-const tracer = trace.getTracer("@apibara/indexer");
+function createTracer() {
+  return trace.getTracer("@apibara/indexer");
+}
+function createIndexerMetrics() {
+  const meter = metrics.getMeter("@apibara/indexer");
+  const currentBlockGauge = meter.createGauge("current_block", {
+    description: "Current block number being processed",
+    unit: "{block}"
+  });
+  const processedBlockCounter = meter.createCounter("processed_blocks", {
+    description: "Number of blocks processed",
+    unit: "{blocks}"
+  });
+  const reorgCounter = meter.createCounter("reorgs", {
+    description: "Number of reorgs (invalidate messages) received",
+    unit: "{reorgs}"
+  });
+  return {
+    currentBlockGauge,
+    processedBlockCounter,
+    reorgCounter
+  };
+}
 
 function defineIndexer(streamConfig) {
   return (config) => ({
@@ -101,7 +124,10 @@ async function run(client, indexer, runOptions = {}) {
   await indexerAsyncContext.callAsync({}, async () => {
     const context = useIndexerContext();
     const middleware = await registerMiddleware(indexer);
+    const indexerMetrics = createIndexerMetrics();
+    const tracer = createTracer();
     await indexer.hooks.callHook("run:before");
+    const { indexerName: indexerId } = useInternalContext();
     const isFactoryMode = indexer.options.factory !== void 0;
     let startingCursor;
     if (indexer.options.startingCursor) {
@@ -149,9 +175,15 @@ async function run(client, indexer, runOptions = {}) {
             context.cursor = cursor;
             context.endCursor = endCursor;
             context.finality = finality;
+            indexerMetrics.currentBlockGauge.record(
+              Number(endCursor?.orderKey),
+              {
+                indexer_id: indexerId
+              }
+            );
             await middleware(context, async () => {
               let block;
-              if (isFactoryMode) {
+              if (isFactoryMode && finality !== "pending") {
                 assert(indexer.options.factory !== void 0);
                 const [factoryBlock, mainBlock] = blocks;
                 block = mainBlock;
@@ -199,6 +231,9 @@ async function run(client, indexer, runOptions = {}) {
             });
             span.end();
           });
+          indexerMetrics.processedBlockCounter.add(1, {
+            indexer_id: indexerId
+          });
           context.cursor = void 0;
           context.endCursor = void 0;
           context.finality = void 0;
@@ -206,6 +241,9 @@ async function run(client, indexer, runOptions = {}) {
         }
         case "invalidate": {
           await tracer.startActiveSpan("message invalidate", async (span) => {
+            indexerMetrics.reorgCounter.add(1, {
+              indexer_id: indexerId
+            });
             await indexer.hooks.callHook("message:invalidate", { message });
             span.end();
           });

package/dist/internal/plugins.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
-const context = require('../shared/indexer.077335f3.cjs');
-const config = require('../shared/indexer.601ceab0.cjs');
+const config = require('../shared/indexer.479ae593.cjs');
 require('node:async_hooks');
 require('unctx');
 
@@ -10,7 +9,7 @@ function internalContext(values) {
   return config.defineIndexerPlugin((indexer) => {
     indexer.hooks.hook("run:before", () => {
       try {
-        const ctx = context.useIndexerContext();
+        const ctx = config.useIndexerContext();
         ctx[INTERNAL_CONTEXT_PROPERTY] = {
           ...ctx[INTERNAL_CONTEXT_PROPERTY] || {},
           ...values
@@ -24,7 +23,7 @@ function internalContext(values) {
   });
 }
 function useInternalContext() {
-  const ctx = context.useIndexerContext();
+  const ctx = config.useIndexerContext();
   if (ctx[INTERNAL_CONTEXT_PROPERTY] === void 0) {
     throw new Error(
       "Internal context is not available, possibly 'internalContext' plugin is missing!"

package/dist/internal/plugins.mjs

@@ -1,5 +1,4 @@
-import { u as useIndexerContext } from '../shared/indexer.a55ad619.mjs';
-import { d as defineIndexerPlugin } from '../shared/indexer.9b21ddd2.mjs';
+import { d as defineIndexerPlugin, u as useIndexerContext } from '../shared/indexer.75773ef1.mjs';
 import 'node:async_hooks';
 import 'unctx';
 

package/dist/internal/testing.cjs

@@ -2,13 +2,13 @@
 
 const protocol = require('@apibara/protocol');
 const testing = require('@apibara/protocol/testing');
-const context = require('../shared/indexer.077335f3.cjs');
+const config = require('../shared/indexer.479ae593.cjs');
 const index = require('../index.cjs');
-const config = require('../shared/indexer.601ceab0.cjs');
-require('consola');
+const logger = require('../shared/indexer.a09fa402.cjs');
 const internal_plugins = require('./plugins.cjs');
 require('node:async_hooks');
 require('unctx');
+require('consola');
 require('hookable');
 require('node:assert');
 require('@opentelemetry/api');
@@ -17,22 +17,29 @@ function generateMockMessages(count = 10, options) {
   const invalidateAt = options?.invalidate;
   const finalizeAt = options?.finalize;
   const messages = [];
+  const baseBlockNumber = options?.baseBlockNumber ?? BigInt(5e6);
   for (let i = 0; i < count; i++) {
+    const currentBlockNumber = baseBlockNumber + BigInt(i);
+    const uniqueKey = uniqueKeyFromOrderKey(currentBlockNumber);
     if (invalidateAt && i === invalidateAt.invalidateTriggerIndex) {
+      const invalidateToBlock = baseBlockNumber + BigInt(invalidateAt.invalidateFromIndex);
       messages.push({
         _tag: "invalidate",
         invalidate: {
           cursor: {
-            orderKey: BigInt(5e6 + invalidateAt.invalidateFromIndex)
+            orderKey: invalidateToBlock,
+            uniqueKey: options?.uniqueKey ? uniqueKeyFromOrderKey(invalidateToBlock) : void 0
           }
         }
       });
     } else if (finalizeAt && i === finalizeAt.finalizeTriggerIndex) {
+      const fianlizedToBlock = baseBlockNumber + BigInt(finalizeAt.finalizeToIndex);
       messages.push({
         _tag: "finalize",
         finalize: {
           cursor: {
-            orderKey: BigInt(5e6 + finalizeAt.finalizeToIndex)
+            orderKey: fianlizedToBlock,
+            uniqueKey: options?.uniqueKey ? uniqueKeyFromOrderKey(fianlizedToBlock) : void 0
           }
         }
       });
@@ -40,10 +47,13 @@ function generateMockMessages(count = 10, options) {
       messages.push({
         _tag: "data",
         data: {
-          cursor: { orderKey: BigInt(5e6 + i - 1) },
+          cursor: { orderKey: currentBlockNumber - 1n },
           finality: "accepted",
-          data: [{ data: `${5e6 + i}` }],
-          endCursor: { orderKey: BigInt(5e6 + i) },
+          data: [{ data: `${baseBlockNumber + BigInt(i)}` }],
+          endCursor: {
+            orderKey: currentBlockNumber,
+            uniqueKey: options?.uniqueKey ? uniqueKey : void 0
+          },
           production: "backfill"
         }
       });
@@ -51,6 +61,9 @@ function generateMockMessages(count = 10, options) {
   }
   return messages;
 }
+function uniqueKeyFromOrderKey(orderKey) {
+  return `0xff00${orderKey.toString()}`;
+}
 function getMockIndexer(params) {
   const { internalContext: contextParams, override } = params ?? {};
   const { plugins, ...rest } = override ?? {};
@@ -62,6 +75,7 @@ function getMockIndexer(params) {
       async transform() {
       },
       plugins: [
+        logger.logger(),
         internal_plugins.internalContext(
           contextParams ?? {
             availableIndexers: ["testing"],
@@ -108,8 +122,8 @@ function mockSink({
   });
 }
 function useMockSink() {
-  const context$1 = context.useIndexerContext();
-  return { output: context$1.output };
+  const context = config.useIndexerContext();
+  return { output: context.output };
 }
 
 exports.generateMockMessages = generateMockMessages;

package/dist/internal/testing.d.cts

@@ -13,6 +13,8 @@ type MockMessagesOptions = {
         finalizeToIndex: number;
         finalizeTriggerIndex: number;
     };
+    uniqueKey?: boolean;
+    baseBlockNumber?: bigint;
 };
 declare function generateMockMessages(count?: number, options?: MockMessagesOptions): MockStreamResponse[];
 type MockIndexerParams = {

package/dist/internal/testing.d.mts

@@ -13,6 +13,8 @@ type MockMessagesOptions = {
         finalizeToIndex: number;
         finalizeTriggerIndex: number;
     };
+    uniqueKey?: boolean;
+    baseBlockNumber?: bigint;
 };
 declare function generateMockMessages(count?: number, options?: MockMessagesOptions): MockStreamResponse[];
 type MockIndexerParams = {

package/dist/internal/testing.d.ts

@@ -13,6 +13,8 @@ type MockMessagesOptions = {
         finalizeToIndex: number;
         finalizeTriggerIndex: number;
     };
+    uniqueKey?: boolean;
+    baseBlockNumber?: bigint;
 };
 declare function generateMockMessages(count?: number, options?: MockMessagesOptions): MockStreamResponse[];
 type MockIndexerParams = {

package/dist/internal/testing.mjs

@@ -1,12 +1,12 @@
 import { isCursor } from '@apibara/protocol';
 import { MockStream } from '@apibara/protocol/testing';
-import { u as useIndexerContext } from '../shared/indexer.a55ad619.mjs';
+import { d as defineIndexerPlugin, u as useIndexerContext } from '../shared/indexer.75773ef1.mjs';
 import { createIndexer, defineIndexer } from '../index.mjs';
-import { d as defineIndexerPlugin } from '../shared/indexer.9b21ddd2.mjs';
-import 'consola';
+import { l as logger } from '../shared/indexer.98a921a7.mjs';
 import { internalContext } from './plugins.mjs';
 import 'node:async_hooks';
 import 'unctx';
+import 'consola';
 import 'hookable';
 import 'node:assert';
 import '@opentelemetry/api';
@@ -15,22 +15,29 @@ function generateMockMessages(count = 10, options) {
   const invalidateAt = options?.invalidate;
   const finalizeAt = options?.finalize;
   const messages = [];
+  const baseBlockNumber = options?.baseBlockNumber ?? BigInt(5e6);
   for (let i = 0; i < count; i++) {
+    const currentBlockNumber = baseBlockNumber + BigInt(i);
+    const uniqueKey = uniqueKeyFromOrderKey(currentBlockNumber);
     if (invalidateAt && i === invalidateAt.invalidateTriggerIndex) {
+      const invalidateToBlock = baseBlockNumber + BigInt(invalidateAt.invalidateFromIndex);
       messages.push({
         _tag: "invalidate",
         invalidate: {
           cursor: {
-            orderKey: BigInt(5e6 + invalidateAt.invalidateFromIndex)
+            orderKey: invalidateToBlock,
+            uniqueKey: options?.uniqueKey ? uniqueKeyFromOrderKey(invalidateToBlock) : void 0
           }
         }
       });
     } else if (finalizeAt && i === finalizeAt.finalizeTriggerIndex) {
+      const fianlizedToBlock = baseBlockNumber + BigInt(finalizeAt.finalizeToIndex);
       messages.push({
         _tag: "finalize",
         finalize: {
           cursor: {
-            orderKey: BigInt(5e6 + finalizeAt.finalizeToIndex)
+            orderKey: fianlizedToBlock,
+            uniqueKey: options?.uniqueKey ? uniqueKeyFromOrderKey(fianlizedToBlock) : void 0
           }
         }
       });
@@ -38,10 +45,13 @@ function generateMockMessages(count = 10, options) {
       messages.push({
         _tag: "data",
         data: {
-          cursor: { orderKey: BigInt(5e6 + i - 1) },
+          cursor: { orderKey: currentBlockNumber - 1n },
           finality: "accepted",
-          data: [{ data: `${5e6 + i}` }],
-          endCursor: { orderKey: BigInt(5e6 + i) },
+          data: [{ data: `${baseBlockNumber + BigInt(i)}` }],
+          endCursor: {
+            orderKey: currentBlockNumber,
+            uniqueKey: options?.uniqueKey ? uniqueKey : void 0
+          },
           production: "backfill"
         }
       });
@@ -49,6 +59,9 @@ function generateMockMessages(count = 10, options) {
   }
   return messages;
 }
+function uniqueKeyFromOrderKey(orderKey) {
+  return `0xff00${orderKey.toString()}`;
+}
 function getMockIndexer(params) {
   const { internalContext: contextParams, override } = params ?? {};
   const { plugins, ...rest } = override ?? {};
@@ -60,6 +73,7 @@ function getMockIndexer(params) {
       async transform() {
       },
       plugins: [
+        logger(),
         internalContext(
           contextParams ?? {
             availableIndexers: ["testing"],

package/dist/plugins/index.cjs

@@ -1,12 +1,11 @@
 'use strict';
 
-const config = require('../shared/indexer.601ceab0.cjs');
-const logger = require('../shared/indexer.2416906c.cjs');
+const config = require('../shared/indexer.479ae593.cjs');
+const logger = require('../shared/indexer.a09fa402.cjs');
 const protocol = require('@apibara/protocol');
-require('consola');
-require('../shared/indexer.077335f3.cjs');
 require('node:async_hooks');
 require('unctx');
+require('consola');
 
 function inMemoryPersistence() {
   return config.defineIndexerPlugin((indexer) => {

package/dist/plugins/index.mjs

@@ -1,10 +1,9 @@
-import { d as defineIndexerPlugin } from '../shared/indexer.9b21ddd2.mjs';
-export { l as logger, u as useLogger } from '../shared/indexer.ff25c953.mjs';
+import { d as defineIndexerPlugin } from '../shared/indexer.75773ef1.mjs';
+export { l as logger, u as useLogger } from '../shared/indexer.98a921a7.mjs';
 import { isCursor } from '@apibara/protocol';
-import 'consola';
-import '../shared/indexer.a55ad619.mjs';
 import 'node:async_hooks';
 import 'unctx';
+import 'consola';
 
 function inMemoryPersistence() {
   return defineIndexerPlugin((indexer) => {

package/dist/shared/{indexer.077335f3.cjs → indexer.479ae593.cjs}

@@ -11,5 +11,10 @@ function useIndexerContext() {
   return indexerAsyncContext.use();
 }
 
+function defineIndexerPlugin(def) {
+  return def;
+}
+
+exports.defineIndexerPlugin = defineIndexerPlugin;
 exports.indexerAsyncContext = indexerAsyncContext;
 exports.useIndexerContext = useIndexerContext;

package/dist/shared/{indexer.a55ad619.mjs → indexer.75773ef1.mjs}

@@ -9,4 +9,8 @@ function useIndexerContext() {
   return indexerAsyncContext.use();
 }
 
-export { indexerAsyncContext as i, useIndexerContext as u };
+function defineIndexerPlugin(def) {
+  return def;
+}
+
+export { defineIndexerPlugin as d, indexerAsyncContext as i, useIndexerContext as u };

package/dist/shared/{indexer.ff25c953.mjs → indexer.98a921a7.mjs}

@@ -1,6 +1,5 @@
 import { consola } from 'consola';
-import { u as useIndexerContext } from './indexer.a55ad619.mjs';
-import { d as defineIndexerPlugin } from './indexer.9b21ddd2.mjs';
+import { d as defineIndexerPlugin, u as useIndexerContext } from './indexer.75773ef1.mjs';
 
 function logger({
   logger: logger2

package/dist/shared/{indexer.2416906c.cjs → indexer.a09fa402.cjs}

@@ -1,15 +1,14 @@
 'use strict';
 
 const consola = require('consola');
-const context = require('./indexer.077335f3.cjs');
-const config = require('./indexer.601ceab0.cjs');
+const config = require('./indexer.479ae593.cjs');
 
 function logger({
   logger: logger2
 } = {}) {
   return config.defineIndexerPlugin((indexer) => {
     indexer.hooks.hook("run:before", () => {
-      const ctx = context.useIndexerContext();
+      const ctx = config.useIndexerContext();
       if (logger2) {
         ctx.logger = consola.consola.create({ reporters: [logger2] });
       } else {
@@ -19,7 +18,7 @@ function logger({
   });
 }
 function useLogger() {
-  const ctx = context.useIndexerContext();
+  const ctx = config.useIndexerContext();
   if (!ctx?.logger)
     throw new Error("Logger plugin is not available in context");
   return ctx.logger;

package/dist/testing/index.cjs

@@ -2,18 +2,17 @@
 
 const protocol = require('@apibara/protocol');
 const ci = require('ci-info');
+const config = require('../shared/indexer.479ae593.cjs');
 const index = require('../index.cjs');
 const internal_plugins = require('../internal/plugins.cjs');
-const logger = require('../shared/indexer.2416906c.cjs');
+const logger = require('../shared/indexer.a09fa402.cjs');
 const vcr_index = require('../vcr/index.cjs');
+require('node:async_hooks');
+require('unctx');
 require('consola');
 require('hookable');
 require('node:assert');
-require('../shared/indexer.077335f3.cjs');
-require('node:async_hooks');
-require('unctx');
 require('@opentelemetry/api');
-require('../shared/indexer.601ceab0.cjs');
 require('node:fs/promises');
 require('node:path');
 require('node:fs');
@@ -24,6 +23,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 const ci__default = /*#__PURE__*/_interopDefaultCompat(ci);
 
 function createVcr() {
+  let result;
   return {
     async run(cassetteName, indexerConfig, range) {
       const vcrConfig = {
@@ -47,6 +47,9 @@ function createVcr() {
         ...indexerConfig.plugins ?? []
       ];
       const indexer = index.createIndexer(indexerConfig);
+      indexer.hooks.hook("run:after", () => {
+        result = config.useIndexerContext();
+      });
       if (!vcr_index.isCassetteAvailable(vcrConfig, cassetteName)) {
         if (ci__default.isCI) {
           throw new Error("Cannot record cassette in CI");
@@ -59,6 +62,7 @@ function createVcr() {
       } else {
         await vcr_index.replay(vcrConfig, indexer, cassetteName);
       }
+      return result;
     }
   };
 }

package/dist/testing/index.d.cts

@@ -2,11 +2,12 @@ import { I as IndexerWithStreamConfig } from '../shared/indexer.fedcd831.cjs';
 import '@apibara/protocol';
 import 'hookable';
 
+type VcrResult = Record<string, unknown>;
 declare function createVcr(): {
     run<TFilter, TBlock>(cassetteName: string, indexerConfig: IndexerWithStreamConfig<TFilter, TBlock>, range: {
         fromBlock: bigint;
         toBlock: bigint;
-    }): Promise<void>;
+    }): Promise<VcrResult>;
 };
 
-export { createVcr };
+export { type VcrResult, createVcr };

package/dist/testing/index.d.mts

@@ -2,11 +2,12 @@ import { I as IndexerWithStreamConfig } from '../shared/indexer.fedcd831.mjs';
 import '@apibara/protocol';
 import 'hookable';
 
+type VcrResult = Record<string, unknown>;
 declare function createVcr(): {
     run<TFilter, TBlock>(cassetteName: string, indexerConfig: IndexerWithStreamConfig<TFilter, TBlock>, range: {
         fromBlock: bigint;
         toBlock: bigint;
-    }): Promise<void>;
+    }): Promise<VcrResult>;
 };
 
-export { createVcr };
+export { type VcrResult, createVcr };

package/dist/testing/index.d.ts

@@ -2,11 +2,12 @@ import { I as IndexerWithStreamConfig } from '../shared/indexer.fedcd831.js';
 import '@apibara/protocol';
 import 'hookable';
 
+type VcrResult = Record<string, unknown>;
 declare function createVcr(): {
     run<TFilter, TBlock>(cassetteName: string, indexerConfig: IndexerWithStreamConfig<TFilter, TBlock>, range: {
         fromBlock: bigint;
         toBlock: bigint;
-    }): Promise<void>;
+    }): Promise<VcrResult>;
 };
 
-export { createVcr };
+export { type VcrResult, createVcr };

package/dist/testing/index.mjs

@@ -1,23 +1,23 @@
 import { createClient } from '@apibara/protocol';
 import ci from 'ci-info';
+import { u as useIndexerContext } from '../shared/indexer.75773ef1.mjs';
 import { createIndexer } from '../index.mjs';
 import { internalContext } from '../internal/plugins.mjs';
-import { l as logger } from '../shared/indexer.ff25c953.mjs';
+import { l as logger } from '../shared/indexer.98a921a7.mjs';
 import { isCassetteAvailable, record, replay } from '../vcr/index.mjs';
+import 'node:async_hooks';
+import 'unctx';
 import 'consola';
 import 'hookable';
 import 'node:assert';
-import '../shared/indexer.a55ad619.mjs';
-import 'node:async_hooks';
-import 'unctx';
 import '@opentelemetry/api';
-import '../shared/indexer.9b21ddd2.mjs';
 import 'node:fs/promises';
 import 'node:path';
 import 'node:fs';
 import '@apibara/protocol/testing';
 
 function createVcr() {
+  let result;
   return {
     async run(cassetteName, indexerConfig, range) {
       const vcrConfig = {
@@ -41,6 +41,9 @@ function createVcr() {
         ...indexerConfig.plugins ?? []
       ];
       const indexer = createIndexer(indexerConfig);
+      indexer.hooks.hook("run:after", () => {
+        result = useIndexerContext();
+      });
       if (!isCassetteAvailable(vcrConfig, cassetteName)) {
         if (ci.isCI) {
           throw new Error("Cannot record cassette in CI");
@@ -53,6 +56,7 @@ function createVcr() {
       } else {
         await replay(vcrConfig, indexer, cassetteName);
       }
+      return result;
     }
   };
 }

package/dist/vcr/index.cjs

@@ -9,10 +9,11 @@ const testing = require('@apibara/protocol/testing');
 require('@apibara/protocol');
 require('consola');
 require('hookable');
-require('../shared/indexer.077335f3.cjs');
+require('../shared/indexer.479ae593.cjs');
 require('node:async_hooks');
 require('unctx');
 require('@opentelemetry/api');
+require('../internal/plugins.cjs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 

package/dist/vcr/index.mjs

@@ -7,10 +7,11 @@ import { MockClient } from '@apibara/protocol/testing';
 import '@apibara/protocol';
 import 'consola';
 import 'hookable';
-import '../shared/indexer.a55ad619.mjs';
+import '../shared/indexer.75773ef1.mjs';
 import 'node:async_hooks';
 import 'unctx';
 import '@opentelemetry/api';
+import '../internal/plugins.mjs';
 
 function deserialize(str) {
   return JSON.parse(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apibara/indexer",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.21",
   "type": "module",
   "files": [
     "dist",
@@ -70,10 +70,10 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/protocol": "2.1.0-beta.2",
+    "@apibara/protocol": "2.1.0-beta.21",
     "@opentelemetry/api": "^1.9.0",
     "ci-info": "^4.1.0",
-    "consola": "^3.2.3",
+    "consola": "^3.4.2",
     "hookable": "^5.5.3",
     "klona": "^2.0.6",
     "nice-grpc": "^2.1.8",

package/src/indexer.ts

@@ -28,8 +28,9 @@ import {
   indexerAsyncContext,
   useIndexerContext,
 } from "./context";
-import { tracer } from "./otel";
+import { createIndexerMetrics, createTracer } from "./otel";
 import type { IndexerPlugin } from "./plugins";
+import { useInternalContext } from "./plugins/context";
 
 export type UseMiddlewareFunction = (
   fn: MiddlewareFunction<IndexerContext>,
@@ -216,8 +217,13 @@ export async function run<TFilter, TBlock>(
     const context = useIndexerContext();
     const middleware = await registerMiddleware(indexer);
 
+    const indexerMetrics = createIndexerMetrics();
+    const tracer = createTracer();
+
     await indexer.hooks.callHook("run:before");
 
+    const { indexerName: indexerId } = useInternalContext();
+
     const isFactoryMode = indexer.options.factory !== undefined;
 
     // Give priority to startingCursor over startingBlock.
@@ -288,11 +294,19 @@ export async function run<TFilter, TBlock>(
             context.endCursor = endCursor;
             context.finality = finality;
 
+            // Record current block number being processed
+            indexerMetrics.currentBlockGauge.record(
+              Number(endCursor?.orderKey),
+              {
+                indexer_id: indexerId,
+              },
+            );
+
             await middleware(context, async () => {
               let block: TBlock | null;
 
               // when factory mode
-              if (isFactoryMode) {
+              if (isFactoryMode && finality !== "pending") {
                 assert(indexer.options.factory !== undefined);
 
                 const [factoryBlock, mainBlock] = blocks;
@@ -364,6 +378,11 @@ export async function run<TFilter, TBlock>(
             span.end();
           });
 
+          // Record processed block metric
+          indexerMetrics.processedBlockCounter.add(1, {
+            indexer_id: indexerId,
+          });
+
           context.cursor = undefined;
           context.endCursor = undefined;
           context.finality = undefined;
@@ -372,6 +391,10 @@ export async function run<TFilter, TBlock>(
         }
         case "invalidate": {
           await tracer.startActiveSpan("message invalidate", async (span) => {
+            // Record reorg metric
+            indexerMetrics.reorgCounter.add(1, {
+              indexer_id: indexerId,
+            });
             await indexer.hooks.callHook("message:invalidate", { message });
             span.end();
           });

package/src/internal/testing.ts

@@ -5,10 +5,9 @@ import {
   MockStream,
   type MockStreamResponse,
 } from "@apibara/protocol/testing";
-
 import { useIndexerContext } from "../context";
 import { type IndexerConfig, createIndexer, defineIndexer } from "../indexer";
-import { defineIndexerPlugin } from "../plugins";
+import { defineIndexerPlugin, logger } from "../plugins";
 import { type InternalContext, internalContext } from "./plugins";
 
 export type MockMessagesOptions = {
@@ -20,6 +19,8 @@ export type MockMessagesOptions = {
     finalizeToIndex: number;
     finalizeTriggerIndex: number;
   };
+  uniqueKey?: boolean;
+  baseBlockNumber?: bigint;
 };
 
 export function generateMockMessages(
@@ -30,22 +31,36 @@ export function generateMockMessages(
   const finalizeAt = options?.finalize;
   const messages: MockStreamResponse[] = [];
 
+  const baseBlockNumber = options?.baseBlockNumber ?? BigInt(5_000_000);
+
   for (let i = 0; i < count; i++) {
+    const currentBlockNumber = baseBlockNumber + BigInt(i);
+    const uniqueKey = uniqueKeyFromOrderKey(currentBlockNumber);
     if (invalidateAt && i === invalidateAt.invalidateTriggerIndex) {
+      const invalidateToBlock =
+        baseBlockNumber + BigInt(invalidateAt.invalidateFromIndex);
       messages.push({
         _tag: "invalidate",
         invalidate: {
           cursor: {
-            orderKey: BigInt(5_000_000 + invalidateAt.invalidateFromIndex),
+            orderKey: invalidateToBlock,
+            uniqueKey: options?.uniqueKey
+              ? uniqueKeyFromOrderKey(invalidateToBlock)
+              : undefined,
           },
         },
       } as Invalidate);
     } else if (finalizeAt && i === finalizeAt.finalizeTriggerIndex) {
+      const fianlizedToBlock =
+        baseBlockNumber + BigInt(finalizeAt.finalizeToIndex);
       messages.push({
         _tag: "finalize",
         finalize: {
           cursor: {
-            orderKey: BigInt(5_000_000 + finalizeAt.finalizeToIndex),
+            orderKey: fianlizedToBlock,
+            uniqueKey: options?.uniqueKey
+              ? uniqueKeyFromOrderKey(fianlizedToBlock)
+              : undefined,
           },
         },
       } as Finalize);
@@ -53,10 +68,13 @@ export function generateMockMessages(
       messages.push({
         _tag: "data",
         data: {
-          cursor: { orderKey: BigInt(5_000_000 + i - 1) },
+          cursor: { orderKey: currentBlockNumber - 1n },
           finality: "accepted",
-          data: [{ data: `${5_000_000 + i}` }],
-          endCursor: { orderKey: BigInt(5_000_000 + i) },
+          data: [{ data: `${baseBlockNumber + BigInt(i)}` }],
+          endCursor: {
+            orderKey: currentBlockNumber,
+            uniqueKey: options?.uniqueKey ? uniqueKey : undefined,
+          },
           production: "backfill",
         },
       });
@@ -66,6 +84,10 @@ export function generateMockMessages(
   return messages;
 }
 
+function uniqueKeyFromOrderKey(orderKey: bigint): `0x${string}` {
+  return `0xff00${orderKey.toString()}`;
+}
+
 type MockIndexerParams = {
   internalContext?: InternalContext;
   override?: Partial<IndexerConfig<MockFilter, MockBlock>>;
@@ -82,6 +104,7 @@ export function getMockIndexer(params?: MockIndexerParams) {
       filter: {},
       async transform() {},
       plugins: [
+        logger(),
         internalContext(
           contextParams ??
             ({

package/src/otel.ts

@@ -1,3 +1,30 @@
-import { trace } from "@opentelemetry/api";
+import { metrics, trace } from "@opentelemetry/api";
 
-export const tracer = trace.getTracer("@apibara/indexer");
+export function createTracer() {
+  return trace.getTracer("@apibara/indexer");
+}
+
+export function createIndexerMetrics() {
+  const meter = metrics.getMeter("@apibara/indexer");
+
+  const currentBlockGauge = meter.createGauge("current_block", {
+    description: "Current block number being processed",
+    unit: "{block}",
+  });
+
+  const processedBlockCounter = meter.createCounter("processed_blocks", {
+    description: "Number of blocks processed",
+    unit: "{blocks}",
+  });
+
+  const reorgCounter = meter.createCounter("reorgs", {
+    description: "Number of reorgs (invalidate messages) received",
+    unit: "{reorgs}",
+  });
+
+  return {
+    currentBlockGauge,
+    processedBlockCounter,
+    reorgCounter,
+  };
+}

package/src/testing/index.ts

@@ -1,5 +1,6 @@
 import { createClient } from "@apibara/protocol";
 import ci from "ci-info";
+import { useIndexerContext } from "../context";
 import { type IndexerWithStreamConfig, createIndexer } from "../indexer";
 import { type InternalContext, internalContext } from "../plugins/context";
 import { logger } from "../plugins/logger";
@@ -8,7 +9,11 @@ import { isCassetteAvailable } from "../vcr/helper";
 import { record } from "../vcr/record";
 import { replay } from "../vcr/replay";
 
+export type VcrResult = Record<string, unknown>;
+
 export function createVcr() {
+  let result: VcrResult;
+
   return {
     async run<TFilter, TBlock>(
       cassetteName: string,
@@ -40,6 +45,10 @@ export function createVcr() {
 
       const indexer = createIndexer(indexerConfig);
 
+      indexer.hooks.hook("run:after", () => {
+        result = useIndexerContext();
+      });
+
       if (!isCassetteAvailable(vcrConfig, cassetteName)) {
         if (ci.isCI) {
           throw new Error("Cannot record cassette in CI");
@@ -53,6 +62,8 @@ export function createVcr() {
       } else {
         await replay(vcrConfig, indexer, cassetteName);
       }
+
+      return result;
     },
   };
 }

package/dist/shared/indexer.601ceab0.cjs

@@ -1,7 +0,0 @@
-'use strict';
-
-function defineIndexerPlugin(def) {
-  return def;
-}
-
-exports.defineIndexerPlugin = defineIndexerPlugin;

package/dist/shared/indexer.9b21ddd2.mjs

@@ -1,5 +0,0 @@
-function defineIndexerPlugin(def) {
-  return def;
-}
-
-export { defineIndexerPlugin as d };