envio 2.32.6 → 2.32.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v2.32.6",
+  "version": "v2.32.8",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
   "main": "./index.js",
@@ -25,14 +25,14 @@
   },
   "homepage": "https://envio.dev",
   "optionalDependencies": {
-    "envio-linux-x64": "v2.32.6",
-    "envio-linux-arm64": "v2.32.6",
-    "envio-darwin-x64": "v2.32.6",
-    "envio-darwin-arm64": "v2.32.6"
+    "envio-linux-x64": "v2.32.8",
+    "envio-linux-arm64": "v2.32.8",
+    "envio-darwin-x64": "v2.32.8",
+    "envio-darwin-arm64": "v2.32.8"
   },
   "dependencies": {
     "@elastic/ecs-pino-format": "1.4.0",
-    "@envio-dev/hypersync-client": "0.7.0-hyperindex-v2-compatible",
+    "@envio-dev/hypersync-client": "1.1.0",
     "@envio-dev/hyperfuel-client": "1.2.2",
     "bignumber.js": "9.1.2",
     "eventsource": "4.1.0",

package/src/bindings/EventSource.res

@@ -1,6 +1,13 @@
 type t
 
-type options = {headers?: Js.Dict.t<string>}
+module Fetch = {
+  type args = {body?: unknown, headers?: dict<string>, method?: string, path?: string}
+  type t = (string, ~args: args) => promise<unknown>
+  // NOTE: don't try make the type t. Rescript 11 will curry the args which breaks
+  // keet the type inline. This is a workaround for now.
+  external fetch: (string, ~args: args) => promise<unknown> = "fetch"
+}
+type options = {fetch?: Fetch.t}
 
 @module("eventsource") @new
 external create: (~url: string, ~options: options=?) => t = "EventSource"

package/src/bindings/EventSource.res.js

@@ -1,2 +1,8 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+'use strict';
+
+
+var Fetch = {};
+
+exports.Fetch = Fetch;
+/* No side effect */

package/src/sources/HyperSync.res

@@ -101,12 +101,20 @@ module GetLogs = {
     ~nonOptionalBlockFieldNames,
     ~nonOptionalTransactionFieldNames,
   ): logsQueryPageItem => {
+    // Remap "type" -> "kind" on the transaction object at runtime before validation.
+    // The latest hypersync client renamed "kind" to "type" but v2 consumers expect "kind".
+    let transaction: Js.Dict.t<unknown> = event.transaction->Utils.magic
+    switch transaction->Js.Dict.get("type") {
+    | Some(v) => transaction->Js.Dict.set("kind", v)
+    | None => ()
+    }
+
     let missingParams = []
     missingParams->addMissingParams(Log.fieldNames, event.log, ~prefix="log")
     missingParams->addMissingParams(nonOptionalBlockFieldNames, event.block, ~prefix="block")
     missingParams->addMissingParams(
       nonOptionalTransactionFieldNames,
-      event.transaction,
+      transaction->Utils.magic,
       ~prefix="transaction",
     )
     if missingParams->Array.length > 0 {
@@ -126,7 +134,7 @@ module GetLogs = {
     {
       log,
       block: event.block->Utils.magic,
-      transaction: event.transaction->Utils.magic,
+      transaction: transaction->Utils.magic,
     }
   }
 

package/src/sources/HyperSync.res.js

@@ -6,6 +6,7 @@ var Time = require("../Time.res.js");
 var Utils = require("../Utils.res.js");
 var $$BigInt = require("../bindings/BigInt.res.js");
 var Js_exn = require("rescript/lib/js/js_exn.js");
+var Js_dict = require("rescript/lib/js/js_dict.js");
 var Logging = require("../Logging.res.js");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
 var Belt_Option = require("rescript/lib/js/belt_Option.js");
@@ -75,6 +76,11 @@ async function query(client, fromBlock, toBlock, logSelections, fieldSelection,
         };
   }
   var items = Belt_Array.map(res.data, (function (item) {
+          var transaction = item.transaction;
+          var v = Js_dict.get(transaction, "type");
+          if (v !== undefined) {
+            transaction["kind"] = Caml_option.valFromOption(v);
+          }
           var missingParams = [];
           var returnedObj = item.log;
           if (Utils.$$Array.notEmpty(fieldNames)) {
@@ -108,12 +114,11 @@ async function query(client, fromBlock, toBlock, logSelections, fieldSelection,
               missingParams.push("block");
             }
           }
-          var returnedObj$2 = item.transaction;
           if (Utils.$$Array.notEmpty(nonOptionalTransactionFieldNames)) {
-            if (returnedObj$2) {
+            if (transaction) {
               for(var idx$2 = 0 ,idx_finish$2 = nonOptionalTransactionFieldNames.length; idx$2 < idx_finish$2; ++idx$2){
                 var fieldName$2 = nonOptionalTransactionFieldNames[idx$2];
-                var match$2 = returnedObj$2[fieldName$2];
+                var match$2 = transaction[fieldName$2];
                 if (match$2 !== undefined) {
                   
                 } else {
@@ -154,7 +159,7 @@ async function query(client, fromBlock, toBlock, logSelections, fieldSelection,
           return {
                   log: log,
                   block: item.block,
-                  transaction: item.transaction
+                  transaction: transaction
                 };
         }));
   return {

package/src/sources/HyperSyncClient.res

@@ -88,7 +88,7 @@ module QueryTypes = {
     | GasUsed
     | ContractAddress
     | LogsBloom
-    | Kind
+    | Type
     | Root
     | Status
     | L1Fee
@@ -383,7 +383,7 @@ module ResponseTypes = {
     gasUsed?: bigint,
     contractAddress?: string,
     logsBloom?: string,
-    kind?: int,
+    @as("type") type_?: int,
     root?: string,
     status?: int,
     l1Fee?: bigint,

package/src/sources/HyperSyncHeightStream.res

@@ -1,28 +1,15 @@
 /*
-Pure js implementation of the HyperSync height stream.
+Pure subscription-based implementation of the HyperSync height stream.
 */
 
-type t = {
-  heightRef: ref<int>,
-  errorRef: ref<option<string>>,
-  timeoutIdRef: ref<Js.Global.timeoutId>,
-  eventsourceRef: ref<option<EventSource.t>>,
-}
-
-let make = (~hyperSyncUrl, ~apiToken) => {
-  /**
-  On every successful ping or height event, clear the timeout and set a new one.
+let subscribe = (~hyperSyncUrl, ~apiToken, ~onHeight: int => unit): (unit => unit) => {
+  let eventsourceRef = ref(None)
+  // Timeout doesn't do anything for initialization
+  let timeoutIdRef = ref(Js.Global.setTimeout(() => (), 0))
 
-  if the timeout lapses, close and reconnect the EventSource.
-  */
-  let rec updateTimeoutId = (
-    ~eventsourceRef: ref<option<EventSource.t>>,
-    ~timeoutIdRef: ref<Js.Global.timeoutId>,
-    ~hyperSyncUrl,
-    ~apiToken,
-    ~heightRef: ref<int>,
-    ~errorRef: ref<option<string>>,
-  ) => {
+  // On every successful ping or height event, clear the timeout and set a new one.
+  // If the timeout lapses, close and reconnect the EventSource.
+  let rec updateTimeoutId = () => {
     timeoutIdRef.contents->Js.Global.clearTimeout
 
     // Should receive a ping at least every 5s, so 15s is a safe margin
@@ -34,31 +21,15 @@ let make = (~hyperSyncUrl, ~apiToken) => {
         "url": hyperSyncUrl,
         "staleTimeMillis": staleTimeMillis,
       })
-      refreshEventSource(
-        ~eventsourceRef,
-        ~hyperSyncUrl,
-        ~apiToken,
-        ~heightRef,
-        ~errorRef,
-        ~timeoutIdRef,
-      )
+      refreshEventSource()
     }, staleTimeMillis)
 
     timeoutIdRef := newTimeoutId
   }
-  and /**
-    Instantiate a new EventSource and set it to the shared refs.
-    Add the necessary event listeners, handle errors
-    and update the timeout.
-    */
-  refreshEventSource = (
-    ~eventsourceRef: ref<option<EventSource.t>>,
-    ~hyperSyncUrl,
-    ~apiToken,
-    ~heightRef: ref<int>,
-    ~errorRef: ref<option<string>>,
-    ~timeoutIdRef: ref<Js.Global.timeoutId>,
-  ) => {
+  // Instantiate a new EventSource and set it to the shared refs.
+  // Add the necessary event listeners, handle errors
+  // and update the timeout.
+  and refreshEventSource = () => {
     // Close the old EventSource if it exists (on a new connection after timeout)
     switch eventsourceRef.contents {
     | Some(es) => es->EventSource.close
@@ -69,17 +40,25 @@ let make = (~hyperSyncUrl, ~apiToken) => {
     let es = EventSource.create(
       ~url=`${hyperSyncUrl}/height/sse`,
       ~options={
-        headers: Js.Dict.fromArray([
-          ("Authorization", `Bearer ${apiToken}`),
-          ("User-Agent", userAgent),
-        ]),
+        fetch: (url, ~args) => {
+          EventSource.Fetch.fetch(
+            url,
+            ~args={
+              ...args,
+              headers: Js.Dict.fromArray([
+                ("Authorization", `Bearer ${apiToken}`),
+                ("User-Agent", userAgent),
+              ]),
+            },
+          )
+        },
       },
     )
 
     // Set the new EventSource to the shared ref
     eventsourceRef := Some(es)
     // Update the timeout in case connection goes stale
-    updateTimeoutId(~eventsourceRef, ~timeoutIdRef, ~hyperSyncUrl, ~apiToken, ~heightRef, ~errorRef)
+    updateTimeoutId()
 
     es->EventSource.onopen(_ => {
       Logging.trace({"msg": "SSE connection opened for height stream", "url": hyperSyncUrl})
@@ -90,90 +69,37 @@ let make = (~hyperSyncUrl, ~apiToken) => {
         "msg": "EventSource error",
         "error": error->Js.Exn.message,
       })
-      // On errors, set the error ref
-      // so that getHeight can raise an error
-      errorRef :=
-        Some(error->Js.Exn.message->Belt.Option.getWithDefault("Unexpected no error.message"))
     })
 
     es->EventSource.addEventListener("ping", _event => {
       // ping lets us know from the server that the connection is still alive
-      // and that the height hasn't updated for 5seconds
+      // and that the height hasn't updated for 5 seconds
       // update the timeout on each successful ping received
-      updateTimeoutId(
-        ~eventsourceRef,
-        ~timeoutIdRef,
-        ~hyperSyncUrl,
-        ~apiToken,
-        ~heightRef,
-        ~errorRef,
-      )
-      // reset the error ref, since we had a successful ping
-      errorRef := None
+      updateTimeoutId()
     })
 
     es->EventSource.addEventListener("height", event => {
       switch event.data->Belt.Int.fromString {
       | Some(height) =>
         // On a successful height event, update the timeout
-        // and reset the error ref
-        updateTimeoutId(
-          ~eventsourceRef,
-          ~timeoutIdRef,
-          ~hyperSyncUrl,
-          ~apiToken,
-          ~heightRef,
-          ~errorRef,
-        )
-        errorRef := None
-        // Set the actual height ref
-        heightRef := height
+        updateTimeoutId()
+        // Call the callback with the new height
+        onHeight(height)
       | None =>
         Logging.trace({"msg": "Height was not a number in event.data", "data": event.data})
-        errorRef := Some("Height was not a number in event.data")
       }
     })
   }
 
-  // Refs used between the functions
-
-  let heightRef = ref(0)
-  let errorRef = ref(None)
-  let eventsourceRef = ref(None)
-  // Timeout doesn't do anything for initalization
-  let timeoutIdRef = ref(Js.Global.setTimeout(() => (), 0))
-  refreshEventSource(
-    ~eventsourceRef,
-    ~hyperSyncUrl,
-    ~apiToken,
-    ~heightRef,
-    ~errorRef,
-    ~timeoutIdRef,
-  )
-
-  {
-    heightRef,
-    errorRef,
-    timeoutIdRef,
-    eventsourceRef,
-  }
-}
+  // Start the EventSource connection
+  refreshEventSource()
 
-let getHeight = async (t: t) => {
-  while t.heightRef.contents == 0 && t.errorRef.contents == None {
-    // Poll internally until height is over 0
-    await Utils.delay(200)
-  }
-  switch t.errorRef.contents {
-  | None => t.heightRef.contents
-  | Some(error) => Js.Exn.raiseError(error)
-  }
-}
-
-let close = t => {
-  t.timeoutIdRef.contents->Js.Global.clearTimeout
-  switch t.eventsourceRef.contents {
-  | Some(es) => es->EventSource.close
-  | None => ()
+  // Return unsubscribe function
+  () => {
+    timeoutIdRef.contents->Js.Global.clearTimeout
+    switch eventsourceRef.contents {
+    | Some(es) => es->EventSource.close
+    | None => ()
+    }
   }
 }

package/src/sources/HyperSyncHeightStream.res.js

@@ -2,16 +2,23 @@
 'use strict';
 
 var Utils = require("../Utils.res.js");
-var Js_exn = require("rescript/lib/js/js_exn.js");
 var Js_dict = require("rescript/lib/js/js_dict.js");
 var Logging = require("../Logging.res.js");
 var Belt_Int = require("rescript/lib/js/belt_Int.js");
-var Belt_Option = require("rescript/lib/js/belt_Option.js");
+var Caml_obj = require("rescript/lib/js/caml_obj.js");
 var Caml_option = require("rescript/lib/js/caml_option.js");
 var Eventsource = require("eventsource");
 
-function make(hyperSyncUrl, apiToken) {
-  var updateTimeoutId = function (eventsourceRef, timeoutIdRef, hyperSyncUrl, apiToken, heightRef, errorRef) {
+function subscribe(hyperSyncUrl, apiToken, onHeight) {
+  var eventsourceRef = {
+    contents: undefined
+  };
+  var timeoutIdRef = {
+    contents: setTimeout((function () {
+            
+          }), 0)
+  };
+  var updateTimeoutId = function () {
     clearTimeout(timeoutIdRef.contents);
     var newTimeoutId = setTimeout((function () {
             Logging.trace({
@@ -19,30 +26,33 @@ function make(hyperSyncUrl, apiToken) {
                   url: hyperSyncUrl,
                   staleTimeMillis: 15000
                 });
-            refreshEventSource(eventsourceRef, hyperSyncUrl, apiToken, heightRef, errorRef, timeoutIdRef);
+            refreshEventSource();
           }), 15000);
     timeoutIdRef.contents = newTimeoutId;
   };
-  var refreshEventSource = function (eventsourceRef, hyperSyncUrl, apiToken, heightRef, errorRef, timeoutIdRef) {
+  var refreshEventSource = function () {
     var es = eventsourceRef.contents;
     if (es !== undefined) {
       Caml_option.valFromOption(es).close();
     }
     var userAgent = "hyperindex/" + Utils.EnvioPackage.json.version;
     var es$1 = new Eventsource.EventSource(hyperSyncUrl + "/height/sse", {
-          headers: Js_dict.fromArray([
-                [
-                  "Authorization",
-                  "Bearer " + apiToken
-                ],
-                [
-                  "User-Agent",
-                  userAgent
-                ]
-              ])
+          fetch: (function (url, args) {
+              var newrecord = Caml_obj.obj_dup(args);
+              return fetch(url, (newrecord.headers = Js_dict.fromArray([
+                                [
+                                  "Authorization",
+                                  "Bearer " + apiToken
+                                ],
+                                [
+                                  "User-Agent",
+                                  userAgent
+                                ]
+                              ]), newrecord));
+            })
         });
     eventsourceRef.contents = Caml_option.some(es$1);
-    updateTimeoutId(eventsourceRef, timeoutIdRef, hyperSyncUrl, apiToken, heightRef, errorRef);
+    updateTimeoutId();
     es$1.onopen = (function () {
         Logging.trace({
               msg: "SSE connection opened for height stream",
@@ -54,73 +64,34 @@ function make(hyperSyncUrl, apiToken) {
               msg: "EventSource error",
               error: error.message
             });
-        errorRef.contents = Belt_Option.getWithDefault(error.message, "Unexpected no error.message");
       });
     es$1.addEventListener("ping", (function (_event) {
-            updateTimeoutId(eventsourceRef, timeoutIdRef, hyperSyncUrl, apiToken, heightRef, errorRef);
-            errorRef.contents = undefined;
+            updateTimeoutId();
           }));
     es$1.addEventListener("height", (function ($$event) {
             var height = Belt_Int.fromString($$event.data);
             if (height !== undefined) {
-              updateTimeoutId(eventsourceRef, timeoutIdRef, hyperSyncUrl, apiToken, heightRef, errorRef);
-              errorRef.contents = undefined;
-              heightRef.contents = height;
+              updateTimeoutId();
+              return onHeight(height);
             } else {
-              Logging.trace({
-                    msg: "Height was not a number in event.data",
-                    data: $$event.data
-                  });
-              errorRef.contents = "Height was not a number in event.data";
+              return Logging.trace({
+                          msg: "Height was not a number in event.data",
+                          data: $$event.data
+                        });
             }
           }));
   };
-  var heightRef = {
-    contents: 0
-  };
-  var errorRef = {
-    contents: undefined
-  };
-  var eventsourceRef = {
-    contents: undefined
-  };
-  var timeoutIdRef = {
-    contents: setTimeout((function () {
-            
-          }), 0)
-  };
-  refreshEventSource(eventsourceRef, hyperSyncUrl, apiToken, heightRef, errorRef, timeoutIdRef);
-  return {
-          heightRef: heightRef,
-          errorRef: errorRef,
-          timeoutIdRef: timeoutIdRef,
-          eventsourceRef: eventsourceRef
-        };
-}
-
-async function getHeight(t) {
-  while(t.heightRef.contents === 0 && t.errorRef.contents === undefined) {
-    await Utils.delay(200);
+  refreshEventSource();
+  return function () {
+    clearTimeout(timeoutIdRef.contents);
+    var es = eventsourceRef.contents;
+    if (es !== undefined) {
+      Caml_option.valFromOption(es).close();
+      return ;
+    }
+    
   };
-  var error = t.errorRef.contents;
-  if (error !== undefined) {
-    return Js_exn.raiseError(error);
-  } else {
-    return t.heightRef.contents;
-  }
-}
-
-function close(t) {
-  clearTimeout(t.timeoutIdRef.contents);
-  var es = t.eventsourceRef.contents;
-  if (es !== undefined) {
-    Caml_option.valFromOption(es).close();
-    return ;
-  }
-  
 }
 
-exports.make = make;
-exports.getHeight = getHeight;
-exports.close = close;
+exports.subscribe = subscribe;
 /* Utils Not a pure module */

package/src/sources/HyperSyncSource.res

@@ -73,7 +73,10 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
     ->(Utils.magic: array<string> => array<HyperSyncClient.QueryTypes.blockField>),
     transaction: capitalizedTransactionFields
     ->Utils.Set.toArray
-    ->(Utils.magic: array<string> => array<HyperSyncClient.QueryTypes.transactionField>),
+    ->(Utils.magic: array<string> => array<HyperSyncClient.QueryTypes.transactionField>)
+    ->// Currently the api for underlying "Type" field is still "Kind"
+    // transform this to use the new client
+    Array.map(field => (field :> string) !== "Kind" ? field : Type),
   }
 
   let noAddressesLogSelection = LogSelection.make(
@@ -551,32 +554,30 @@ let make = (
       ~logger,
     )->Promise.thenResolve(HyperSync.mapExn)
 
-  let malformedTokenMessage = `Your token is malformed. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens.`
+  let jsonApiClient = Rest.client(endpointUrl)
 
-  let heightStream = HyperSyncHeightStream.make(~hyperSyncUrl=endpointUrl, ~apiToken)
+  let malformedTokenMessage = `Your token is malformed. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens.`
 
   {
     name,
     sourceFor: Sync,
     chain,
-    pollingInterval: 32, // purely internal state polling since we now stream the height to the state
+    pollingInterval: 100,
     poweredByHyperSync: true,
     getBlockHashes,
-    getHeightOrThrow: async () => {
-      try await heightStream->HyperSyncHeightStream.getHeight catch {
-      | Js.Exn.Error(exn)
-        if exn
-        ->Js.Exn.message
-        ->Option.getWithDefault("")
-        ->Js.String2.includes(malformedTokenMessage) =>
+    getHeightOrThrow: async () =>
+      switch await HyperSyncJsonApi.heightRoute->Rest.fetch(apiToken, ~client=jsonApiClient) {
+      | Value(height) => height
+      | ErrorMessage(m) if m === malformedTokenMessage =>
         Logging.error(`Your ENVIO_API_TOKEN is malformed. The indexer will not be able to fetch events. Update the token and restart the indexer using 'pnpm envio start'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens`)
         // Don't want to retry if the token is malformed
         // So just block forever
         let _ = await Promise.make((_, _) => ())
         0
-      | exn => raise(exn)
-      }
-    },
+      | ErrorMessage(m) => Js.Exn.raiseError(m)
+      },
     getItemsOrThrow,
+    createHeightSubscription: (~onHeight) =>
+      HyperSyncHeightStream.subscribe(~hyperSyncUrl=endpointUrl, ~apiToken, ~onHeight),
   }
 }

package/src/sources/HyperSyncSource.res.js

@@ -1,6 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
+var Rest = require("../vendored/Rest.res.js");
 var Viem = require("../bindings/Viem.res.js");
 var Utils = require("../Utils.res.js");
 var Hrtime = require("../bindings/Hrtime.res.js");
@@ -16,6 +17,7 @@ var ErrorHandling = require("../ErrorHandling.res.js");
 var Caml_exceptions = require("rescript/lib/js/caml_exceptions.js");
 var HyperSyncClient = require("./HyperSyncClient.res.js");
 var Caml_splice_call = require("rescript/lib/js/caml_splice_call.js");
+var HyperSyncJsonApi = require("./HyperSyncJsonApi.res.js");
 var Caml_js_exceptions = require("rescript/lib/js/caml_js_exceptions.js");
 var HyperSyncHeightStream = require("./HyperSyncHeightStream.res.js");
 
@@ -51,7 +53,13 @@ function getSelectionConfig(selection, chain) {
           Caml_splice_call.spliceObjApply(noAddressesTopicSelections, "push", [tmp]);
         }));
   var fieldSelection_block = Array.from(capitalizedBlockFields);
-  var fieldSelection_transaction = Array.from(capitalizedTransactionFields);
+  var fieldSelection_transaction = Belt_Array.map(Array.from(capitalizedTransactionFields), (function (field) {
+          if (field !== "Kind") {
+            return field;
+          } else {
+            return "Type";
+          }
+        }));
   var fieldSelection_log = [
     "Address",
     "Data",
@@ -384,38 +392,36 @@ function make(param) {
   var getBlockHashes = function (blockNumbers, logger) {
     return HyperSync.queryBlockDataMulti(endpointUrl, apiToken, blockNumbers, logger).then(HyperSync.mapExn);
   };
-  var heightStream = HyperSyncHeightStream.make(endpointUrl, apiToken);
+  var jsonApiClient = Rest.client(endpointUrl, undefined);
   return {
           name: "HyperSync",
           sourceFor: "Sync",
           chain: chain,
           poweredByHyperSync: true,
-          pollingInterval: 32,
+          pollingInterval: 100,
           getBlockHashes: getBlockHashes,
           getHeightOrThrow: (async function () {
-              try {
-                return await HyperSyncHeightStream.getHeight(heightStream);
-              }
-              catch (raw_exn){
-                var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                if (exn.RE_EXN_ID === Js_exn.$$Error) {
-                  if (Belt_Option.getWithDefault(exn._1.message, "").includes("Your token is malformed. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens.")) {
-                    Logging.error("Your ENVIO_API_TOKEN is malformed. The indexer will not be able to fetch events. Update the token and restart the indexer using 'pnpm envio start'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens");
-                    await new Promise((function (param, param$1) {
-                            
-                          }));
-                    return 0;
-                  }
-                  throw exn;
-                }
-                throw exn;
+              var height = await Rest.$$fetch(HyperSyncJsonApi.heightRoute, apiToken, jsonApiClient);
+              if (typeof height === "number") {
+                return height;
+              } else if (height === "Your token is malformed. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens.") {
+                Logging.error("Your ENVIO_API_TOKEN is malformed. The indexer will not be able to fetch events. Update the token and restart the indexer using 'pnpm envio start'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens");
+                await new Promise((function (param, param$1) {
+                        
+                      }));
+                return 0;
+              } else {
+                return Js_exn.raiseError(height);
               }
             }),
-          getItemsOrThrow: getItemsOrThrow
+          getItemsOrThrow: getItemsOrThrow,
+          createHeightSubscription: (function (onHeight) {
+              return HyperSyncHeightStream.subscribe(endpointUrl, apiToken, onHeight);
+            })
         };
 }
 
 exports.getSelectionConfig = getSelectionConfig;
 exports.memoGetSelectionConfig = memoGetSelectionConfig;
 exports.make = make;
-/* Viem Not a pure module */
+/* Rest Not a pure module */