envio 3.0.0-alpha.10 → 3.0.0-alpha.12

package/src/TestIndexer.res.mjs

@@ -253,6 +253,34 @@ function validateBlockRange(chainId, configChain, processChainConfig, progressBl
   
 }
 
+function makeEntityGet(state, entityConfig) {
+  return function (entityId) {
+    if (state.processInProgress) {
+      Js_exn.raiseError("Cannot call " + entityConfig.name + ".get() while indexer.process() is running. Wait for process() to complete before accessing entities directly.");
+    }
+    var entityDict = Belt_Option.getWithDefault(Js_dict.get(state.entities, entityConfig.name), {});
+    return Promise.resolve(Js_dict.get(entityDict, entityId));
+  };
+}
+
+function makeEntitySet(state, entityConfig) {
+  return function (entity) {
+    if (state.processInProgress) {
+      Js_exn.raiseError("Cannot call " + entityConfig.name + ".set() while indexer.process() is running. Wait for process() to complete before modifying entities directly.");
+    }
+    var dict = Js_dict.get(state.entities, entityConfig.name);
+    var entityDict;
+    if (dict !== undefined) {
+      entityDict = dict;
+    } else {
+      var dict$1 = {};
+      state.entities[entityConfig.name] = dict$1;
+      entityDict = dict$1;
+    }
+    entityDict[entity.id] = entity;
+  };
+}
+
 function makeCreateTestIndexer(config, workerPath, allEntities) {
   return function () {
     var entities = {};
@@ -268,111 +296,125 @@ function makeCreateTestIndexer(config, workerPath, allEntities) {
       entityConfigs: entityConfigs,
       processChanges: []
     };
-    return {
-            process: (function (processConfig) {
-                if (state.processInProgress) {
-                  Js_exn.raiseError("createTestIndexer process is already running. Only one process call is allowed at a time");
-                }
-                var chains = processConfig.chains;
-                var chainKeys = Object.keys(chains);
-                var n = chainKeys.length;
-                if (n !== 0) {
-                  if (n !== 1) {
-                    Js_exn.raiseError("createTestIndexer does not support processing multiple chains at once. Found " + String(n) + " chains defined");
+    var entityOpsDict = {};
+    Belt_Array.forEach(allEntities, (function (entityConfig) {
+            if (entityConfig.name !== InternalTable.DynamicContractRegistry.name) {
+              entityOpsDict[entityConfig.name] = {
+                get: makeEntityGet(state, entityConfig),
+                set: makeEntitySet(state, entityConfig)
+              };
+              return ;
+            }
+            
+          }));
+    var result = {};
+    Belt_Array.forEach(Js_dict.entries(entityOpsDict), (function (param) {
+            result[param[0]] = param[1];
+          }));
+    result["process"] = (function (processConfig) {
+        if (state.processInProgress) {
+          Js_exn.raiseError("createTestIndexer process is already running. Only one process call is allowed at a time");
+        }
+        var chains = processConfig.chains;
+        var chainKeys = Object.keys(chains);
+        var n = chainKeys.length;
+        if (n !== 0) {
+          if (n !== 1) {
+            Js_exn.raiseError("createTestIndexer does not support processing multiple chains at once. Found " + String(n) + " chains defined");
+          }
+          
+        } else {
+          Js_exn.raiseError("createTestIndexer requires exactly one chain to be defined");
+        }
+        Belt_Array.forEach(chainKeys, (function (chainIdStr) {
+                var chainId = Belt_Option.getWithDefault(Belt_Int.fromString(chainIdStr), 0);
+                var chain = ChainMap.Chain.makeUnsafe(chainId);
+                var configChain = ChainMap.get(config.chainMap, chain);
+                var processChainConfig = chains[chainIdStr];
+                var progressBlock = Js_dict.get(state.progressBlockByChain, chainIdStr);
+                validateBlockRange(chainIdStr, configChain, processChainConfig, progressBlock);
+              }));
+        state.processChanges = [];
+        var dynamicContractsByChain = {};
+        var dcDict = Js_dict.get(state.entities, InternalTable.DynamicContractRegistry.name);
+        if (dcDict !== undefined) {
+          Belt_Array.forEach(Js_dict.values(dcDict), (function (entity) {
+                  var chainIdStr = String(entity.chain_id);
+                  var arr = Js_dict.get(dynamicContractsByChain, chainIdStr);
+                  var contracts;
+                  if (arr !== undefined) {
+                    contracts = arr;
+                  } else {
+                    var arr$1 = [];
+                    dynamicContractsByChain[chainIdStr] = arr$1;
+                    contracts = arr$1;
                   }
-                  
-                } else {
-                  Js_exn.raiseError("createTestIndexer requires exactly one chain to be defined");
-                }
-                Belt_Array.forEach(chainKeys, (function (chainIdStr) {
-                        var chainId = Belt_Option.getWithDefault(Belt_Int.fromString(chainIdStr), 0);
-                        var chain = ChainMap.Chain.makeUnsafe(chainId);
-                        var configChain = ChainMap.get(config.chainMap, chain);
-                        var processChainConfig = chains[chainIdStr];
-                        var progressBlock = Js_dict.get(state.progressBlockByChain, chainIdStr);
-                        validateBlockRange(chainIdStr, configChain, processChainConfig, progressBlock);
-                      }));
-                state.processChanges = [];
-                var dynamicContractsByChain = {};
-                var dcDict = Js_dict.get(state.entities, InternalTable.DynamicContractRegistry.name);
-                if (dcDict !== undefined) {
-                  Belt_Array.forEach(Js_dict.values(dcDict), (function (entity) {
-                          var chainIdStr = String(entity.chain_id);
-                          var arr = Js_dict.get(dynamicContractsByChain, chainIdStr);
-                          var contracts;
-                          if (arr !== undefined) {
-                            contracts = arr;
-                          } else {
-                            var arr$1 = [];
-                            dynamicContractsByChain[chainIdStr] = arr$1;
-                            contracts = arr$1;
-                          }
-                          contracts.push(toIndexingContract(entity));
-                        }));
-                }
-                var initialState = makeInitialState(config, chains, dynamicContractsByChain);
-                return new Promise((function (resolve, reject) {
-                              var workerDataObj = {
-                                processConfig: JSON.parse(Js_json.serializeExn(processConfig)),
-                                initialState: initialState
-                              };
-                              var workerData = JSON.parse(Js_json.serializeExn(workerDataObj));
-                              var worker;
-                              try {
-                                worker = new Worker_threads.Worker(workerPath, {
-                                      workerData: workerData
+                  contracts.push(toIndexingContract(entity));
+                }));
+        }
+        var initialState = makeInitialState(config, chains, dynamicContractsByChain);
+        return new Promise((function (resolve, reject) {
+                      var workerDataObj = {
+                        processConfig: JSON.parse(Js_json.serializeExn(processConfig)),
+                        initialState: initialState
+                      };
+                      var workerData = JSON.parse(Js_json.serializeExn(workerDataObj));
+                      var worker;
+                      try {
+                        worker = new Worker_threads.Worker(workerPath, {
+                              workerData: workerData
+                            });
+                      }
+                      catch (raw_exn){
+                        var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+                        reject(exn);
+                        throw exn;
+                      }
+                      state.processInProgress = true;
+                      worker.on("message", (function (msg) {
+                              var respond = function (data) {
+                                worker.postMessage({
+                                      id: msg.id,
+                                      payload: {
+                                        type: "response",
+                                        data: data
+                                      }
                                     });
+                              };
+                              var match = msg.payload;
+                              switch (match.type) {
+                                case "loadByIds" :
+                                    return respond(handleLoadByIds(state, match.tableName, match.ids));
+                                case "loadByField" :
+                                    return respond(handleLoadByField(state, match.tableName, match.fieldName, match.fieldValue, match.operator));
+                                case "writeBatch" :
+                                    handleWriteBatch(state, match.updatedEntities, match.checkpointIds, match.checkpointChainIds, match.checkpointBlockNumbers, match.checkpointBlockHashes, match.checkpointEventsProcessed);
+                                    return respond(null);
+                                
                               }
-                              catch (raw_exn){
-                                var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                                reject(exn);
-                                throw exn;
+                            }));
+                      worker.on("error", (function (err) {
+                              state.processInProgress = false;
+                              worker.terminate();
+                              reject(err);
+                            }));
+                      worker.on("exit", (function (code) {
+                              state.processInProgress = false;
+                              if (code !== 0) {
+                                return reject(new Error("Worker exited with code " + String(code)));
+                              } else {
+                                Belt_Array.forEach(chainKeys, (function (chainIdStr) {
+                                        var processChainConfig = chains[chainIdStr];
+                                        state.progressBlockByChain[chainIdStr] = processChainConfig.endBlock;
+                                      }));
+                                return resolve({
+                                            changes: state.processChanges
+                                          });
                               }
-                              state.processInProgress = true;
-                              worker.on("message", (function (msg) {
-                                      var respond = function (data) {
-                                        worker.postMessage({
-                                              id: msg.id,
-                                              payload: {
-                                                type: "response",
-                                                data: data
-                                              }
-                                            });
-                                      };
-                                      var match = msg.payload;
-                                      switch (match.type) {
-                                        case "loadByIds" :
-                                            return respond(handleLoadByIds(state, match.tableName, match.ids));
-                                        case "loadByField" :
-                                            return respond(handleLoadByField(state, match.tableName, match.fieldName, match.fieldValue, match.operator));
-                                        case "writeBatch" :
-                                            handleWriteBatch(state, match.updatedEntities, match.checkpointIds, match.checkpointChainIds, match.checkpointBlockNumbers, match.checkpointBlockHashes, match.checkpointEventsProcessed);
-                                            return respond(null);
-                                        
-                                      }
-                                    }));
-                              worker.on("error", (function (err) {
-                                      state.processInProgress = false;
-                                      worker.terminate();
-                                      reject(err);
-                                    }));
-                              worker.on("exit", (function (code) {
-                                      state.processInProgress = false;
-                                      if (code !== 0) {
-                                        return reject(new Error("Worker exited with code " + String(code)));
-                                      } else {
-                                        Belt_Array.forEach(chainKeys, (function (chainIdStr) {
-                                                var processChainConfig = chains[chainIdStr];
-                                                state.progressBlockByChain[chainIdStr] = processChainConfig.endBlock;
-                                              }));
-                                        return resolve({
-                                                    changes: state.processChanges
-                                                  });
-                                      }
-                                    }));
                             }));
-              })
-          };
+                    }));
+      });
+    return result;
   };
 }
 
@@ -406,6 +448,8 @@ export {
   handleWriteBatch ,
   makeInitialState ,
   validateBlockRange ,
+  makeEntityGet ,
+  makeEntitySet ,
   makeCreateTestIndexer ,
   initTestWorker ,
 }

package/src/Utils.res

@@ -435,6 +435,28 @@ String.replaceAll("the cat and the dog", "the", "this") == "this cat and this do
   external replaceAll: (string, string, string) => string = "replaceAll"
 }
 
+module Url = {
+  /**
+  Extracts the hostname from a URL string.
+  Returns None if the URL doesn't have a valid http:// or https:// protocol.
+  */
+  let getHostFromUrl = (url: string) => {
+    // Regular expression requiring protocol and capturing hostname
+    // - (https?:\/\/) : Required http:// or https:// (capturing group)
+    // - ([^\/?]+) : Capture hostname (one or more characters that aren't / or ?)
+    // - .* : Match rest of the string
+    let regex = %re("/https?:\/\/([^\/?]+).*/")
+    switch Js.Re.exec_(regex, url) {
+    | Some(result) =>
+      switch Js.Re.captures(result)->Belt.Array.get(1) {
+      | Some(host) => host->Js.Nullable.toOption
+      | None => None
+      }
+    | None => None
+    }
+  }
+}
+
 module Result = {
   let forEach = (result, fn) => {
     switch result {

package/src/Utils.res.mjs

@@ -389,6 +389,23 @@ var $$String = {
   capitalize: capitalize
 };
 
+function getHostFromUrl(url) {
+  var regex = /https?:\/\/([^\/?]+).*/;
+  var result = regex.exec(url);
+  if (result === null) {
+    return ;
+  }
+  var host = Belt_Array.get(result, 1);
+  if (host !== undefined) {
+    return Caml_option.nullable_to_opt(Caml_option.valFromOption(host));
+  }
+  
+}
+
+var Url = {
+  getHostFromUrl: getHostFromUrl
+};
+
 function forEach$1(result, fn) {
   if (result.TAG === "Ok") {
     fn(result._0);
@@ -643,6 +660,7 @@ export {
   UnsafeIntOperators ,
   $$Array$1 as $$Array,
   $$String ,
+  Url ,
   Result ,
   unwrapResultExn ,
   Schema ,

package/src/db/InternalTable.res

@@ -74,6 +74,7 @@ module Chains = {
   type progressFields = [
     | #progress_block
     | #events_processed
+    | #source_block
   ]
 
   type field = [
@@ -108,7 +109,6 @@ module Chains = {
   type metaFields = {
     @as("first_event_block") firstEventBlockNumber: Js.null<int>,
     @as("buffer_block") latestFetchedBlockNumber: int,
-    @as("source_block") blockHeight: int,
     @as("ready_at")
     timestampCaughtUpToHeadOrEndblock: Js.null<Js.Date.t>,
     @as("_is_hyper_sync") isHyperSync: bool,
@@ -122,6 +122,7 @@ module Chains = {
     @as("max_reorg_depth") maxReorgDepth: int,
     @as("progress_block") progressBlockNumber: int,
     @as("events_processed") numEventsProcessed: int,
+    @as("source_block") blockHeight: int,
     ...metaFields,
   }
 
@@ -212,7 +213,6 @@ VALUES ${valuesRows->Js.Array2.joinWith(",\n       ")};`,
 
   // Fields that can be updated outside of the batch transaction
   let metaFields: array<field> = [
-    #source_block,
     #buffer_block,
     #first_event_block,
     #ready_at,
@@ -279,7 +279,7 @@ FROM "${pgSchema}"."${table.tableName}" as chains;`
     ->(Utils.magic: promise<array<unknown>> => promise<array<rawInitialState>>)
   }
 
-  let progressFields: array<progressFields> = [#progress_block, #events_processed]
+  let progressFields: array<progressFields> = [#progress_block, #events_processed, #source_block]
 
   let makeProgressFieldsUpdateQuery = (~pgSchema) => {
     let setClauses = Belt.Array.mapWithIndex(progressFields, (index, field) => {
@@ -320,6 +320,7 @@ WHERE "id" = $1;`
   type progressedChain = {
     chainId: int,
     progressBlockNumber: int,
+    sourceBlockNumber: int,
     totalEventsProcessed: int,
   }
 
@@ -341,6 +342,7 @@ WHERE "id" = $1;`
           switch field {
           | #progress_block => data.progressBlockNumber->(Utils.magic: int => unknown)
           | #events_processed => data.totalEventsProcessed->(Utils.magic: int => unknown)
+          | #source_block => data.sourceBlockNumber->(Utils.magic: int => unknown)
           },
         )
         ->ignore

package/src/db/InternalTable.res.mjs

@@ -101,9 +101,9 @@ function initialFromConfig(chainConfig) {
           max_reorg_depth: chainConfig.maxReorgDepth,
           progress_block: -1,
           events_processed: 0,
+          source_block: 0,
           first_event_block: null,
           buffer_block: -1,
-          source_block: 0,
           ready_at: null,
           _is_hyper_sync: false,
           _num_batches_fetched: 0
@@ -143,7 +143,6 @@ function makeInitialValuesQuery(pgSchema, chainConfigs) {
 }
 
 var metaFields = [
-  "source_block",
   "buffer_block",
   "first_event_block",
   "ready_at",
@@ -169,7 +168,8 @@ function getInitialState(sql, pgSchema) {
 
 var progressFields = [
   "progress_block",
-  "events_processed"
+  "events_processed",
+  "source_block"
 ];
 
 function makeProgressFieldsUpdateQuery(pgSchema) {
@@ -202,7 +202,9 @@ function setProgressedChains(sql, pgSchema, progressedChains) {
         var params = [];
         params.push(data.chainId);
         progressFields.forEach(function (field) {
-              params.push(field === "progress_block" ? data.progressBlockNumber : data.totalEventsProcessed);
+              params.push(field === "source_block" ? data.sourceBlockNumber : (
+                      field === "progress_block" ? data.progressBlockNumber : data.totalEventsProcessed
+                    ));
             });
         promises.push(sql.unsafe(query, params, {prepare: true}));
       });

package/src/sources/EvmChain.res

@@ -15,6 +15,7 @@ let getSyncConfig = (
     ?backoffMillis,
     ?queryTimeoutMillis,
     ?fallbackStallTimeout,
+    ?pollingInterval,
   }: Config.sourceSyncOptions,
 ): Config.sourceSync => {
   let queryTimeoutMillis = queryTimeoutMillis->Option.getWithDefault(20_000)
@@ -39,6 +40,8 @@ let getSyncConfig = (
     // How long to wait before cancelling an RPC request
     queryTimeoutMillis,
     fallbackStallTimeout: fallbackStallTimeout->Option.getWithDefault(queryTimeoutMillis / 2),
+    // How frequently to check for new blocks in realtime (default: 1000ms)
+    pollingInterval: pollingInterval->Option.getWithDefault(1000),
   }
 }
 

package/src/sources/EvmChain.res.mjs

@@ -16,7 +16,8 @@ function getSyncConfig(param) {
           intervalCeiling: Belt_Option.getWithDefault(Env.Configurable.SyncConfig.intervalCeiling, Belt_Option.getWithDefault(param.intervalCeiling, 10000)),
           backoffMillis: Belt_Option.getWithDefault(param.backoffMillis, 5000),
           queryTimeoutMillis: queryTimeoutMillis,
-          fallbackStallTimeout: Belt_Option.getWithDefault(param.fallbackStallTimeout, queryTimeoutMillis / 2 | 0)
+          fallbackStallTimeout: Belt_Option.getWithDefault(param.fallbackStallTimeout, queryTimeoutMillis / 2 | 0),
+          pollingInterval: Belt_Option.getWithDefault(param.pollingInterval, 1000)
         };
 }
 

package/src/sources/HyperFuelSource.res

@@ -235,6 +235,7 @@ let make = ({chain, endpointUrl}: options): t => {
     let startFetchingBatchTimeRef = Hrtime.makeTimer()
 
     //fetch batch
+    Prometheus.SourceRequestCount.increment(~sourceName=name, ~chainId=chain->ChainMap.Chain.toChainId)
     let pageUnsafe = try await HyperFuel.GetLogs.query(
       ~serverUrl=endpointUrl,
       ~fromBlock,
@@ -496,7 +497,10 @@ let make = ({chain, endpointUrl}: options): t => {
     getBlockHashes,
     pollingInterval: 100,
     poweredByHyperSync: true,
-    getHeightOrThrow: () => HyperFuel.heightRoute->Rest.fetch((), ~client=jsonApiClient),
+    getHeightOrThrow: () => {
+      Prometheus.SourceRequestCount.increment(~sourceName=name, ~chainId=chain->ChainMap.Chain.toChainId)
+      HyperFuel.heightRoute->Rest.fetch((), ~client=jsonApiClient)
+    },
     getItemsOrThrow,
   }
 }

package/src/sources/HyperFuelSource.res.mjs

@@ -9,6 +9,7 @@ import * as $$Promise from "../bindings/Promise.res.mjs";
 import * as HyperFuel from "./HyperFuel.res.mjs";
 import * as HyperSync from "./HyperSync.res.mjs";
 import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
+import * as Prometheus from "../Prometheus.res.mjs";
 import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
 import * as EventRouter from "./EventRouter.res.mjs";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
@@ -185,6 +186,7 @@ function memoGetSelectionConfig(chain) {
 function make(param) {
   var endpointUrl = param.endpointUrl;
   var chain = param.chain;
+  var name = "HyperFuel";
   var getSelectionConfig = memoGetSelectionConfig(chain);
   var getItemsOrThrow = async function (fromBlock, toBlock, addressesByContractName, indexingContracts, knownHeight, param, selection, retry, logger) {
     var mkLogAndRaise = function (extra, extra$1) {
@@ -194,6 +196,7 @@ function make(param) {
     var selectionConfig = getSelectionConfig(selection);
     var recieptsSelection = selectionConfig.getRecieptsSelection(addressesByContractName);
     var startFetchingBatchTimeRef = Hrtime.makeTimer();
+    Prometheus.SourceRequestCount.increment(name, chain);
     var pageUnsafe;
     try {
       pageUnsafe = await HyperFuel.GetLogs.query(endpointUrl, fromBlock, toBlock, recieptsSelection);
@@ -421,13 +424,14 @@ function make(param) {
   };
   var jsonApiClient = Rest.client(endpointUrl, undefined);
   return {
-          name: "HyperFuel",
+          name: name,
           sourceFor: "Sync",
           chain: chain,
           poweredByHyperSync: true,
           pollingInterval: 100,
           getBlockHashes: getBlockHashes,
           getHeightOrThrow: (function () {
+              Prometheus.SourceRequestCount.increment(name, chain);
               return Rest.$$fetch(HyperFuel.heightRoute, undefined, jsonApiClient);
             }),
           getItemsOrThrow: getItemsOrThrow

package/src/sources/HyperSync.res

@@ -245,6 +245,8 @@ module BlockData = {
     ~apiToken,
     ~fromBlock,
     ~toBlock,
+    ~sourceName,
+    ~chainId,
     ~logger,
   ): queryResponse<array<ReorgDetection.blockDataWithTimestamp>> => {
     let body = makeRequestBody(~fromBlock, ~toBlock)
@@ -258,6 +260,7 @@ module BlockData = {
       },
     )
 
+    Prometheus.SourceRequestCount.increment(~sourceName, ~chainId)
     let maybeSuccessfulRes = switch await Time.retryAsyncWithExponentialBackOff(() =>
       HyperSyncJsonApi.queryRoute->Rest.fetch(
         {
@@ -281,7 +284,7 @@ module BlockData = {
           `Block #${fromBlock->Int.toString} not found in HyperSync. HyperSync has multiple instances and it's possible that they drift independently slightly from the head. Indexing should continue correctly after retrying the query in ${delayMilliseconds->Int.toString}ms.`,
         )
         await Time.resolvePromiseAfterDelay(~delayMilliseconds)
-        await queryBlockData(~serverUrl, ~apiToken, ~fromBlock, ~toBlock, ~logger)
+        await queryBlockData(~serverUrl, ~apiToken, ~fromBlock, ~toBlock, ~sourceName, ~chainId, ~logger)
       }
     | Some(res) =>
       switch res->convertResponse {
@@ -292,6 +295,8 @@ module BlockData = {
             ~apiToken,
             ~fromBlock=res.nextBlock,
             ~toBlock,
+            ~sourceName,
+            ~chainId,
             ~logger,
           )
           restRes->Result.map(rest => datas->Array.concat(rest))
@@ -301,7 +306,7 @@ module BlockData = {
     }
   }
 
-  let queryBlockDataMulti = async (~serverUrl, ~apiToken, ~blockNumbers, ~logger) => {
+  let queryBlockDataMulti = async (~serverUrl, ~apiToken, ~blockNumbers, ~sourceName, ~chainId, ~logger) => {
     switch blockNumbers->Array.get(0) {
     | None => Ok([])
     | Some(firstBlock) => {
@@ -328,6 +333,8 @@ module BlockData = {
           ~toBlock=toBlock.contents,
           ~serverUrl,
           ~apiToken,
+          ~sourceName,
+          ~chainId,
           ~logger,
         )
         let filtered = res->Result.map(datas => {
@@ -346,12 +353,14 @@ module BlockData = {
   }
 }
 
-let queryBlockData = (~serverUrl, ~apiToken, ~blockNumber, ~logger) =>
+let queryBlockData = (~serverUrl, ~apiToken, ~blockNumber, ~sourceName, ~chainId, ~logger) =>
   BlockData.queryBlockData(
     ~serverUrl,
     ~apiToken,
     ~fromBlock=blockNumber,
     ~toBlock=blockNumber,
+    ~sourceName,
+    ~chainId,
     ~logger,
   )->Promise.thenResolve(res => res->Result.map(res => res->Array.get(0)))
 let queryBlockDataMulti = BlockData.queryBlockDataMulti

package/src/sources/HyperSync.res.mjs

@@ -7,6 +7,7 @@ import * as $$BigInt from "../bindings/BigInt.res.mjs";
 import * as Js_exn from "rescript/lib/es6/js_exn.js";
 import * as Logging from "../Logging.res.mjs";
 import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
+import * as Prometheus from "../Prometheus.res.mjs";
 import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
 import * as Belt_Result from "rescript/lib/es6/belt_Result.js";
 import * as Caml_option from "rescript/lib/es6/caml_option.js";
@@ -226,13 +227,14 @@ function convertResponse(res) {
                   })));
 }
 
-async function queryBlockData(serverUrl, apiToken, fromBlock, toBlock, logger) {
+async function queryBlockData(serverUrl, apiToken, fromBlock, toBlock, sourceName, chainId, logger) {
   var body = makeRequestBody$1(fromBlock, toBlock);
   var logger$1 = Logging.createChildFrom(logger, {
         logType: "HyperSync get block hash query",
         fromBlock: fromBlock,
         toBlock: toBlock
       });
+  Prometheus.SourceRequestCount.increment(sourceName, chainId);
   var maybeSuccessfulRes;
   var exit = 0;
   var res;
@@ -260,7 +262,7 @@ async function queryBlockData(serverUrl, apiToken, fromBlock, toBlock, logger) {
       return err;
     }
     var datas = err._0;
-    var restRes = await queryBlockData(serverUrl, apiToken, maybeSuccessfulRes.nextBlock, toBlock, logger$1);
+    var restRes = await queryBlockData(serverUrl, apiToken, maybeSuccessfulRes.nextBlock, toBlock, sourceName, chainId, logger$1);
     return Belt_Result.map(restRes, (function (rest) {
                   return Belt_Array.concat(datas, rest);
                 }));
@@ -270,10 +272,10 @@ async function queryBlockData(serverUrl, apiToken, fromBlock, toBlock, logger) {
       });
   Logging.childInfo(logger$2, "Block #" + String(fromBlock) + " not found in HyperSync. HyperSync has multiple instances and it's possible that they drift independently slightly from the head. Indexing should continue correctly after retrying the query in " + String(100) + "ms.");
   await Time.resolvePromiseAfterDelay(100);
-  return await queryBlockData(serverUrl, apiToken, fromBlock, toBlock, logger$2);
+  return await queryBlockData(serverUrl, apiToken, fromBlock, toBlock, sourceName, chainId, logger$2);
 }
 
-async function queryBlockDataMulti(serverUrl, apiToken, blockNumbers, logger) {
+async function queryBlockDataMulti(serverUrl, apiToken, blockNumbers, sourceName, chainId, logger) {
   var firstBlock = Belt_Array.get(blockNumbers, 0);
   if (firstBlock === undefined) {
     return {
@@ -297,7 +299,7 @@ async function queryBlockDataMulti(serverUrl, apiToken, blockNumbers, logger) {
   if ((toBlock - fromBlock | 0) > 1000) {
     Js_exn.raiseError("Invalid block data request. Range of block numbers is too large. Max range is 1000. Requested range: " + String(fromBlock) + "-" + String(toBlock));
   }
-  var res = await queryBlockData(serverUrl, apiToken, fromBlock, toBlock, logger);
+  var res = await queryBlockData(serverUrl, apiToken, fromBlock, toBlock, sourceName, chainId, logger);
   var filtered = Belt_Result.map(res, (function (datas) {
           return Belt_Array.keep(datas, (function (data) {
                         return set.delete(data.blockNumber);
@@ -309,8 +311,8 @@ async function queryBlockDataMulti(serverUrl, apiToken, blockNumbers, logger) {
   return filtered;
 }
 
-function queryBlockData$1(serverUrl, apiToken, blockNumber, logger) {
-  return queryBlockData(serverUrl, apiToken, blockNumber, blockNumber, logger).then(function (res) {
+function queryBlockData$1(serverUrl, apiToken, blockNumber, sourceName, chainId, logger) {
+  return queryBlockData(serverUrl, apiToken, blockNumber, blockNumber, sourceName, chainId, logger).then(function (res) {
               return Belt_Result.map(res, (function (res) {
                             return Belt_Array.get(res, 0);
                           }));

package/src/sources/HyperSync.resi

@@ -56,6 +56,8 @@ let queryBlockData: (
   ~serverUrl: string,
   ~apiToken: string,
   ~blockNumber: int,
+  ~sourceName: string,
+  ~chainId: int,
   ~logger: Pino.t,
 ) => promise<queryResponse<option<ReorgDetection.blockDataWithTimestamp>>>
 
@@ -63,6 +65,8 @@ let queryBlockDataMulti: (
   ~serverUrl: string,
   ~apiToken: string,
   ~blockNumbers: array<int>,
+  ~sourceName: string,
+  ~chainId: int,
   ~logger: Pino.t,
 ) => promise<queryResponse<array<ReorgDetection.blockDataWithTimestamp>>>