@apibara/indexer 2.1.0-beta.13 → 2.1.0-beta.15

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,10 +179,16 @@ 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 && finality !== "pending") {
                 assert__default(indexer.options.factory !== void 0);
@@ -165,7 +197,7 @@ async function run(client, indexer, runOptions = {}) {
                 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,6 +175,12 @@ 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 && finality !== "pending") {
@@ -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,10 +2,9 @@
 
 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');
-const logger = require('../shared/indexer.2416906c.cjs');
+const logger = require('../shared/indexer.a09fa402.cjs');
 const internal_plugins = require('./plugins.cjs');
 require('node:async_hooks');
 require('unctx');
@@ -110,8 +109,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.mjs

@@ -1,9 +1,8 @@
 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 { l as logger } from '../shared/indexer.ff25c953.mjs';
+import { l as logger } from '../shared/indexer.98a921a7.mjs';
 import { internalContext } from './plugins.mjs';
 import 'node:async_hooks';
 import 'unctx';

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,10 +2,10 @@
 
 const protocol = require('@apibara/protocol');
 const ci = require('ci-info');
-const context = require('../shared/indexer.077335f3.cjs');
+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');
@@ -13,7 +13,6 @@ require('consola');
 require('hookable');
 require('node:assert');
 require('@opentelemetry/api');
-require('../shared/indexer.601ceab0.cjs');
 require('node:fs/promises');
 require('node:path');
 require('node:fs');
@@ -49,7 +48,7 @@ function createVcr() {
       ];
       const indexer = index.createIndexer(indexerConfig);
       indexer.hooks.hook("run:after", () => {
-        result = context.useIndexerContext();
+        result = config.useIndexerContext();
       });
       if (!vcr_index.isCassetteAvailable(vcrConfig, cassetteName)) {
         if (ci__default.isCI) {

package/dist/testing/index.mjs

@@ -1,9 +1,9 @@
 import { createClient } from '@apibara/protocol';
 import ci from 'ci-info';
-import { u as useIndexerContext } from '../shared/indexer.a55ad619.mjs';
+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';
@@ -11,7 +11,6 @@ import 'consola';
 import 'hookable';
 import 'node:assert';
 import '@opentelemetry/api';
-import '../shared/indexer.9b21ddd2.mjs';
 import 'node:fs/promises';
 import 'node:path';
 import 'node:fs';

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