@apibara/indexer 2.1.0-beta.3 → 2.1.0-beta.30

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.d.cts

@@ -1,5 +1,5 @@
-import { b as IndexerPlugin } from '../shared/indexer.fedcd831.cjs';
-export { d as defineIndexerPlugin } from '../shared/indexer.fedcd831.cjs';
+import { b as IndexerPlugin } from '../shared/indexer.7668fe34.cjs';
+export { d as defineIndexerPlugin } from '../shared/indexer.7668fe34.cjs';
 import { ConsolaReporter, ConsolaInstance } from 'consola';
 export { ConsolaInstance, ConsolaReporter } from 'consola';
 import '@apibara/protocol';

package/dist/plugins/index.d.mts

@@ -1,5 +1,5 @@
-import { b as IndexerPlugin } from '../shared/indexer.fedcd831.mjs';
-export { d as defineIndexerPlugin } from '../shared/indexer.fedcd831.mjs';
+import { b as IndexerPlugin } from '../shared/indexer.7668fe34.mjs';
+export { d as defineIndexerPlugin } from '../shared/indexer.7668fe34.mjs';
 import { ConsolaReporter, ConsolaInstance } from 'consola';
 export { ConsolaInstance, ConsolaReporter } from 'consola';
 import '@apibara/protocol';

package/dist/plugins/index.d.ts

@@ -1,5 +1,5 @@
-import { b as IndexerPlugin } from '../shared/indexer.fedcd831.js';
-export { d as defineIndexerPlugin } from '../shared/indexer.fedcd831.js';
+import { b as IndexerPlugin } from '../shared/indexer.7668fe34.js';
+export { d as defineIndexerPlugin } from '../shared/indexer.7668fe34.js';
 import { ConsolaReporter, ConsolaInstance } from 'consola';
 export { ConsolaInstance, ConsolaReporter } from 'consola';
 import '@apibara/protocol';

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.fedcd831.d.cts → indexer.7668fe34.d.cts}

@@ -1,4 +1,4 @@
-import { StreamDataRequest, StreamDataOptions, Cursor, StreamDataResponse, Invalidate, Finalize, Heartbeat, SystemMessage, DataFinality, StreamConfig, Client } from '@apibara/protocol';
+import { StreamDataRequest, StreamDataOptions, Cursor, StreamDataResponse, Invalidate, Finalize, SystemMessage, DataFinality, StreamConfig, Client } from '@apibara/protocol';
 import { NestedHooks, Hookable } from 'hookable';
 
 interface IndexerContext extends Record<string, any> {
@@ -38,9 +38,7 @@ interface IndexerHooks<TFilter, TBlock> {
     "message:finalize": ({ message }: {
         message: Finalize;
     }) => void;
-    "message:heartbeat": ({ message }: {
-        message: Heartbeat;
-    }) => void;
+    "message:heartbeat": () => void;
     "message:systemMessage": ({ message }: {
         message: SystemMessage;
     }) => void;

package/dist/shared/{indexer.fedcd831.d.mts → indexer.7668fe34.d.mts}

@@ -1,4 +1,4 @@
-import { StreamDataRequest, StreamDataOptions, Cursor, StreamDataResponse, Invalidate, Finalize, Heartbeat, SystemMessage, DataFinality, StreamConfig, Client } from '@apibara/protocol';
+import { StreamDataRequest, StreamDataOptions, Cursor, StreamDataResponse, Invalidate, Finalize, SystemMessage, DataFinality, StreamConfig, Client } from '@apibara/protocol';
 import { NestedHooks, Hookable } from 'hookable';
 
 interface IndexerContext extends Record<string, any> {
@@ -38,9 +38,7 @@ interface IndexerHooks<TFilter, TBlock> {
     "message:finalize": ({ message }: {
         message: Finalize;
     }) => void;
-    "message:heartbeat": ({ message }: {
-        message: Heartbeat;
-    }) => void;
+    "message:heartbeat": () => void;
     "message:systemMessage": ({ message }: {
         message: SystemMessage;
     }) => void;

package/dist/shared/{indexer.fedcd831.d.ts → indexer.7668fe34.d.ts}

@@ -1,4 +1,4 @@
-import { StreamDataRequest, StreamDataOptions, Cursor, StreamDataResponse, Invalidate, Finalize, Heartbeat, SystemMessage, DataFinality, StreamConfig, Client } from '@apibara/protocol';
+import { StreamDataRequest, StreamDataOptions, Cursor, StreamDataResponse, Invalidate, Finalize, SystemMessage, DataFinality, StreamConfig, Client } from '@apibara/protocol';
 import { NestedHooks, Hookable } from 'hookable';
 
 interface IndexerContext extends Record<string, any> {
@@ -38,9 +38,7 @@ interface IndexerHooks<TFilter, TBlock> {
     "message:finalize": ({ message }: {
         message: Finalize;
     }) => void;
-    "message:heartbeat": ({ message }: {
-        message: Heartbeat;
-    }) => void;
+    "message:heartbeat": () => void;
     "message:systemMessage": ({ message }: {
         message: SystemMessage;
     }) => void;

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

@@ -1,12 +1,13 @@
-import { I as IndexerWithStreamConfig } from '../shared/indexer.fedcd831.cjs';
+import { I as IndexerWithStreamConfig } from '../shared/indexer.7668fe34.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

@@ -1,12 +1,13 @@
-import { I as IndexerWithStreamConfig } from '../shared/indexer.fedcd831.mjs';
+import { I as IndexerWithStreamConfig } from '../shared/indexer.7668fe34.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

@@ -1,12 +1,13 @@
-import { I as IndexerWithStreamConfig } from '../shared/indexer.fedcd831.js';
+import { I as IndexerWithStreamConfig } from '../shared/indexer.7668fe34.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.d.cts

@@ -1,5 +1,5 @@
 import { Cursor, StreamDataResponse, Client } from '@apibara/protocol';
-import { a as Indexer } from '../shared/indexer.fedcd831.cjs';
+import { a as Indexer } from '../shared/indexer.7668fe34.cjs';
 import 'hookable';
 
 type VcrConfig = {

package/dist/vcr/index.d.mts

@@ -1,5 +1,5 @@
 import { Cursor, StreamDataResponse, Client } from '@apibara/protocol';
-import { a as Indexer } from '../shared/indexer.fedcd831.mjs';
+import { a as Indexer } from '../shared/indexer.7668fe34.mjs';
 import 'hookable';
 
 type VcrConfig = {

package/dist/vcr/index.d.ts

@@ -1,5 +1,5 @@
 import { Cursor, StreamDataResponse, Client } from '@apibara/protocol';
-import { a as Indexer } from '../shared/indexer.fedcd831.js';
+import { a as Indexer } from '../shared/indexer.7668fe34.js';
 import 'hookable';
 
 type VcrConfig = {

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.3",
+  "version": "2.1.0-beta.30",
   "type": "module",
   "files": [
     "dist",
@@ -70,10 +70,10 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/protocol": "2.1.0-beta.3",
+    "@apibara/protocol": "2.1.0-beta.30",
     "@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

@@ -4,8 +4,8 @@ import {
   type Cursor,
   type DataFinality,
   type Finalize,
-  type Heartbeat,
   type Invalidate,
+  ServerError,
   Status,
   type StreamConfig,
   type StreamDataOptions,
@@ -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>,
@@ -59,7 +60,7 @@ export interface IndexerHooks<TFilter, TBlock> {
   message: ({ message }: { message: StreamDataResponse<TBlock> }) => void;
   "message:invalidate": ({ message }: { message: Invalidate }) => void;
   "message:finalize": ({ message }: { message: Finalize }) => void;
-  "message:heartbeat": ({ message }: { message: Heartbeat }) => void;
+  "message:heartbeat": () => void;
   "message:systemMessage": ({ message }: { message: SystemMessage }) => void;
 }
 
@@ -179,13 +180,18 @@ export async function runWithReconnect<TFilter, TBlock>(
 
       retryCount++;
 
-      if (error instanceof ClientError) {
+      if (error instanceof ClientError || error instanceof ServerError) {
+        const isServerError = error instanceof ServerError;
+
         if (error.code === Status.INTERNAL) {
           if (retryCount < maxRetries) {
             consola.error(
-              "Internal server error, reconnecting...",
-              error.message,
+              `Internal ${isServerError ? "server" : "client"} error: ${
+                error.message
+              }`,
             );
+            consola.start("Reconnecting...");
+            console.log();
 
             // Add jitter to the retry delay to avoid all clients retrying at the same time.
             const delay = Math.random() * (retryDelay * 0.2) + retryDelay;
@@ -216,8 +222,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.
@@ -235,13 +246,13 @@ export async function run<TFilter, TBlock>(
     }
 
     // if factory mode we add a empty filter at the end of the filter array.
-    const request = indexer.streamConfig.Request.make({
+    const request = {
       filter: isFactoryMode
         ? [indexer.options.filter, {} as TFilter]
         : [indexer.options.filter],
       finality: indexer.options.finality,
       startingCursor,
-    });
+    } as StreamDataRequest<TFilter>;
 
     const options: StreamDataOptions = {};
 
@@ -288,11 +299,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;
@@ -315,11 +334,11 @@ export async function run<TFilter, TBlock>(
                     );
 
                     // create request with new filters
-                    const request = indexer.streamConfig.Request.make({
+                    const request = {
                       filter: [indexer.options.filter, mainFilter],
                       finality: indexer.options.finality,
                       startingCursor: cursor,
-                    });
+                    } as StreamDataRequest<TFilter>;
 
                     await indexer.hooks.callHook("connect:factory", {
                       request,
@@ -364,6 +383,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,21 +396,29 @@ export async function run<TFilter, TBlock>(
         }
         case "invalidate": {
           await tracer.startActiveSpan("message invalidate", async (span) => {
-            await indexer.hooks.callHook("message:invalidate", { message });
+            // Record reorg metric
+            indexerMetrics.reorgCounter.add(1, {
+              indexer_id: indexerId,
+            });
+            await indexer.hooks.callHook("message:invalidate", {
+              message: message.invalidate,
+            });
             span.end();
           });
           break;
         }
         case "finalize": {
           await tracer.startActiveSpan("message finalize", async (span) => {
-            await indexer.hooks.callHook("message:finalize", { message });
+            await indexer.hooks.callHook("message:finalize", {
+              message: message.finalize,
+            });
             span.end();
           });
           break;
         }
         case "heartbeat": {
           await tracer.startActiveSpan("message heartbeat", async (span) => {
-            await indexer.hooks.callHook("message:heartbeat", { message });
+            await indexer.hooks.callHook("message:heartbeat");
             span.end();
           });
           break;
@@ -409,7 +441,7 @@ export async function run<TFilter, TBlock>(
               }
 
               await indexer.hooks.callHook("message:systemMessage", {
-                message,
+                message: message.systemMessage,
               });
               span.end();
             },