envio 2.32.2 → 2.32.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v2.32.2",
+  "version": "v2.32.6",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
   "main": "./index.js",
@@ -25,22 +25,23 @@
   },
   "homepage": "https://envio.dev",
   "optionalDependencies": {
-    "envio-linux-x64": "v2.32.2",
-    "envio-linux-arm64": "v2.32.2",
-    "envio-darwin-x64": "v2.32.2",
-    "envio-darwin-arm64": "v2.32.2"
+    "envio-linux-x64": "v2.32.6",
+    "envio-linux-arm64": "v2.32.6",
+    "envio-darwin-x64": "v2.32.6",
+    "envio-darwin-arm64": "v2.32.6"
   },
   "dependencies": {
-    "@envio-dev/hypersync-client": "0.6.6",
+    "@elastic/ecs-pino-format": "1.4.0",
+    "@envio-dev/hypersync-client": "0.7.0-hyperindex-v2-compatible",
     "@envio-dev/hyperfuel-client": "1.2.2",
-    "rescript": "11.1.3",
-    "rescript-schema": "9.3.0",
-    "viem": "2.21.0",
     "bignumber.js": "9.1.2",
+    "eventsource": "4.1.0",
     "pino": "8.16.1",
     "pino-pretty": "10.2.3",
-    "@elastic/ecs-pino-format": "1.4.0",
-    "prom-client": "15.0.0"
+    "prom-client": "15.0.0",
+    "rescript": "11.1.3",
+    "rescript-schema": "9.3.0",
+    "viem": "2.21.0"
   },
   "files": [
     "bin.js",

package/src/Utils.res

@@ -653,3 +653,12 @@ let prettifyExn = exn => {
   | exn => exn
   }
 }
+
+module EnvioPackage = {
+  type t = {version: string}
+
+  %%private(let getPackageJson = (): t => %raw(`require("../package.json")`))
+  let json: t = try getPackageJson() catch {
+  | _ => Js.Exn.raiseError("Failed to get package.json in envio package")
+  }
+}

package/src/Utils.res.js

@@ -580,6 +580,23 @@ function prettifyExn(exn) {
   }
 }
 
+function getPackageJson() {
+  return (require("../package.json"));
+}
+
+var json;
+
+try {
+  json = getPackageJson();
+}
+catch (exn){
+  json = Js_exn.raiseError("Failed to get package.json in envio package");
+}
+
+var EnvioPackage = {
+  json: json
+};
+
 exports.delay = delay;
 exports.$$Object = $$Object;
 exports.$$Error = $$Error;
@@ -600,4 +617,5 @@ exports.$$Map = $$Map;
 exports.$$Proxy = $$Proxy;
 exports.Hash = Hash;
 exports.prettifyExn = prettifyExn;
+exports.EnvioPackage = EnvioPackage;
 /* variantTag Not a pure module */

package/src/bindings/EventSource.res

@@ -0,0 +1,13 @@
+type t
+
+type options = {headers?: Js.Dict.t<string>}
+
+@module("eventsource") @new
+external create: (~url: string, ~options: options=?) => t = "EventSource"
+
+@set external onopen: (t, unit => unit) => unit = "onopen"
+@set external onerror: (t, Js.Exn.t => unit) => unit = "onerror"
+
+type event = {data: string}
+@send external addEventListener: (t, string, event => unit) => unit = "addEventListener"
+@send external close: t => unit = "close"

package/src/bindings/EventSource.res.js

@@ -0,0 +1,2 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

package/src/sources/HyperSyncClient.res

@@ -1,12 +1,33 @@
+/** Determines query serialization format for HTTP requests. */
+type serializationFormat =
+  // Use JSON serialization (default)
+  | Json
+  // Use Cap'n Proto binary serialization
+  | CapnProto
+
+let serializationFormatSchema = S.enum([Json, CapnProto])
+
 type cfg = {
-  url?: string,
-  bearerToken?: string,
+  /** HyperSync server URL. */
+  url: string,
+  /** HyperSync server api token. */
+  apiToken: string,
+  /** Milliseconds to wait for a response before timing out. Default: 30000. */
   httpReqTimeoutMillis?: int,
+  /** Number of retries to attempt before returning error. Default: 12. */
   maxNumRetries?: int,
+  /** Milliseconds that would be used for retry backoff increasing. Default: 500. */
   retryBackoffMs?: int,
+  /** Initial wait time for request backoff. Default: 200. */
   retryBaseMs?: int,
+  /** Ceiling time for request backoff. Default: 5000. */
   retryCeilingMs?: int,
+  /** Enable checksum addresses in responses. */
   enableChecksumAddresses?: bool,
+  /** Query serialization format to use for HTTP requests. Default: Json. */
+  serializationFormat?: serializationFormat,
+  /** Whether to use query caching when using CapnProto serialization format. */
+  enableQueryCaching?: bool,
 }
 
 module QueryTypes = {
@@ -111,7 +132,7 @@ module QueryTypes = {
     | TraceAddress
     | TransactionHash
     | TransactionPosition
-    | Kind
+    | Type
     | Error
 
   type fieldSelection = {
@@ -133,7 +154,7 @@ module QueryTypes = {
     topic3,
   )
 
-  type logSelection = {
+  type logFilter = {
     /**
      * Address of the contract, any logs that has any of these addresses will be returned.
      * Empty means match all.
@@ -148,7 +169,7 @@ module QueryTypes = {
 
   let makeLogSelection = (~address, ~topics) => {address, topics}
 
-  type transactionSelection = {
+  type transactionFilter = {
     /**
      * Address the transaction should originate from. If transaction.from matches any of these, the transaction
      *  will be returned. Keep in mind that this has an and relationship with to filter, so each transaction should
@@ -167,7 +188,8 @@ module QueryTypes = {
     /** If tx.status matches this it will be returned. */
     status?: int,
     /** If transaction.type matches any of these values, the transaction will be returned */
-    kind?: array<int>,
+    @as("type")
+    type_?: array<int>,
     contractAddress?: array<Address.t>,
   }
 
@@ -177,7 +199,8 @@ module QueryTypes = {
     address?: array<Address.t>,
     callType?: array<string>,
     rewardType?: array<string>,
-    kind?: array<string>,
+    @as("type")
+    type_?: array<string>,
     sighash?: array<string>,
   }
 
@@ -214,12 +237,12 @@ module QueryTypes = {
      * List of log selections, these have an or relationship between them, so the query will return logs
      * that match any of these selections.
      */
-    logs?: array<logSelection>,
+    logs?: array<logFilter>,
     /**
      * List of transaction selections, the query will return transactions that match any of these selections and
      *  it will return transactions that are related to the returned logs.
      */
-    transactions?: array<transactionSelection>,
+    transactions?: array<transactionFilter>,
     /**
      * List of trace selections, the query will return traces that match any of these selections and
      *  it will re turn traces that are related to the returned logs.
@@ -436,6 +459,22 @@ type streamConfig
 type queryResponse
 type queryResponseStream
 type eventStream
+
+@tag("type")
+type heightStreamEvent =
+  | Height({height: int})
+  | Connected
+  | Reconnecting({delayMillis: int, errorMsg: string})
+
+module HeightStream = {
+  type t = {
+    /** Close the height stream */
+    close: unit => promise<unit>,
+    /** Receive the next height stream event from the stream */
+    recv: unit => promise<heightStreamEvent>,
+  }
+}
+
 type t = {
   getHeight: unit => promise<int>,
   collect: (~query: query, ~config: streamConfig) => promise<queryResponse>,
@@ -445,23 +484,41 @@ type t = {
   getEvents: (~query: query) => promise<eventResponse>,
   stream: (~query: query, ~config: streamConfig) => promise<queryResponseStream>,
   streamEvents: (~query: query, ~config: streamConfig) => promise<eventStream>,
+  streamHeight: unit => promise<HeightStream.t>,
 }
 
-@module("@envio-dev/hypersync-client") @scope("HypersyncClient") external make: cfg => t = "new"
+@module("@envio-dev/hypersync-client") @scope("HypersyncClient")
+external makeWithAgent: (cfg, ~userAgent: string) => t = "newWithAgent"
+
 let make = (
   ~url,
   ~apiToken,
   ~httpReqTimeoutMillis,
   ~maxNumRetries,
   ~enableChecksumAddresses=true,
-) =>
-  make({
-    url,
-    enableChecksumAddresses,
-    bearerToken: apiToken,
-    httpReqTimeoutMillis,
-    maxNumRetries,
-  })
+  ~serializationFormat=?,
+  ~enableQueryCaching=?,
+  ~retryBaseMs=?,
+  ~retryBackoffMs=?,
+  ~retryCeilingMs=?,
+) => {
+  let envioVersion = Utils.EnvioPackage.json.version
+  makeWithAgent(
+    {
+      url,
+      enableChecksumAddresses,
+      apiToken,
+      httpReqTimeoutMillis,
+      maxNumRetries,
+      ?serializationFormat,
+      ?enableQueryCaching,
+      ?retryBaseMs,
+      ?retryBackoffMs,
+      ?retryCeilingMs,
+    },
+    ~userAgent=`hyperindex/${envioVersion}`,
+  )
+}
 
 module Decoder = {
   type rec decodedSolType<'a> = {val: 'a}

package/src/sources/HyperSyncClient.res.js

@@ -1,11 +1,17 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
+var Utils = require("../Utils.res.js");
 var Address = require("../Address.res.js");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
 var S$RescriptSchema = require("rescript-schema/src/S.res.js");
 var HypersyncClient = require("@envio-dev/hypersync-client");
 
+var serializationFormatSchema = S$RescriptSchema.$$enum([
+      "Json",
+      "CapnProto"
+    ]);
+
 function makeTopicSelection(topic0Opt, topic1Opt, topic2Opt, topic3Opt) {
   var topic0 = topic0Opt !== undefined ? topic0Opt : [];
   var topic1 = topic1Opt !== undefined ? topic1Opt : [];
@@ -57,15 +63,23 @@ var ResponseTypes = {
   authorizationListSchema: authorizationListSchema
 };
 
-function make(url, apiToken, httpReqTimeoutMillis, maxNumRetries, enableChecksumAddressesOpt) {
+var HeightStream = {};
+
+function make(url, apiToken, httpReqTimeoutMillis, maxNumRetries, enableChecksumAddressesOpt, serializationFormat, enableQueryCaching, retryBaseMs, retryBackoffMs, retryCeilingMs) {
   var enableChecksumAddresses = enableChecksumAddressesOpt !== undefined ? enableChecksumAddressesOpt : true;
-  return HypersyncClient.HypersyncClient.new({
+  var envioVersion = Utils.EnvioPackage.json.version;
+  return HypersyncClient.HypersyncClient.newWithAgent({
               url: url,
-              bearerToken: apiToken,
+              apiToken: apiToken,
               httpReqTimeoutMillis: httpReqTimeoutMillis,
               maxNumRetries: maxNumRetries,
-              enableChecksumAddresses: enableChecksumAddresses
-            });
+              retryBackoffMs: retryBackoffMs,
+              retryBaseMs: retryBaseMs,
+              retryCeilingMs: retryCeilingMs,
+              enableChecksumAddresses: enableChecksumAddresses,
+              serializationFormat: serializationFormat,
+              enableQueryCaching: enableQueryCaching
+            }, "hyperindex/" + envioVersion);
 }
 
 function toUnderlying(_d) {
@@ -98,8 +112,10 @@ var Decoder = {
   fromSignatures: fromSignatures
 };
 
+exports.serializationFormatSchema = serializationFormatSchema;
 exports.QueryTypes = QueryTypes;
 exports.ResponseTypes = ResponseTypes;
+exports.HeightStream = HeightStream;
 exports.make = make;
 exports.Decoder = Decoder;
-/* accessListSchema Not a pure module */
+/* serializationFormatSchema Not a pure module */

package/src/sources/HyperSyncHeightStream.res

@@ -0,0 +1,179 @@
+/*
+Pure js 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.
+
+  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>>,
+  ) => {
+    timeoutIdRef.contents->Js.Global.clearTimeout
+
+    // Should receive a ping at least every 5s, so 15s is a safe margin
+    // for staleness to restart the EventSource connection
+    let staleTimeMillis = 15_000
+    let newTimeoutId = Js.Global.setTimeout(() => {
+      Logging.trace({
+        "msg": "Timeout fired for height stream",
+        "url": hyperSyncUrl,
+        "staleTimeMillis": staleTimeMillis,
+      })
+      refreshEventSource(
+        ~eventsourceRef,
+        ~hyperSyncUrl,
+        ~apiToken,
+        ~heightRef,
+        ~errorRef,
+        ~timeoutIdRef,
+      )
+    }, 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>,
+  ) => {
+    // Close the old EventSource if it exists (on a new connection after timeout)
+    switch eventsourceRef.contents {
+    | Some(es) => es->EventSource.close
+    | None => ()
+    }
+
+    let userAgent = `hyperindex/${Utils.EnvioPackage.json.version}`
+    let es = EventSource.create(
+      ~url=`${hyperSyncUrl}/height/sse`,
+      ~options={
+        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)
+
+    es->EventSource.onopen(_ => {
+      Logging.trace({"msg": "SSE connection opened for height stream", "url": hyperSyncUrl})
+    })
+
+    es->EventSource.onerror(error => {
+      Logging.trace({
+        "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
+      // 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
+    })
+
+    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
+      | 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,
+  }
+}
+
+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 => ()
+  }
+}

package/src/sources/HyperSyncHeightStream.res.js

@@ -0,0 +1,126 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+'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_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) {
+    clearTimeout(timeoutIdRef.contents);
+    var newTimeoutId = setTimeout((function () {
+            Logging.trace({
+                  msg: "Timeout fired for height stream",
+                  url: hyperSyncUrl,
+                  staleTimeMillis: 15000
+                });
+            refreshEventSource(eventsourceRef, hyperSyncUrl, apiToken, heightRef, errorRef, timeoutIdRef);
+          }), 15000);
+    timeoutIdRef.contents = newTimeoutId;
+  };
+  var refreshEventSource = function (eventsourceRef, hyperSyncUrl, apiToken, heightRef, errorRef, timeoutIdRef) {
+    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
+                ]
+              ])
+        });
+    eventsourceRef.contents = Caml_option.some(es$1);
+    updateTimeoutId(eventsourceRef, timeoutIdRef, hyperSyncUrl, apiToken, heightRef, errorRef);
+    es$1.onopen = (function () {
+        Logging.trace({
+              msg: "SSE connection opened for height stream",
+              url: hyperSyncUrl
+            });
+      });
+    es$1.onerror = (function (error) {
+        Logging.trace({
+              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;
+          }));
+    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;
+            } 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";
+            }
+          }));
+  };
+  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);
+  };
+  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;
+/* Utils Not a pure module */

package/src/sources/HyperSyncSource.res

@@ -155,6 +155,8 @@ type options = {
   clientMaxRetries: int,
   clientTimeoutMillis: int,
   lowercaseAddresses: bool,
+  serializationFormat: HyperSyncClient.serializationFormat,
+  enableQueryCaching: bool,
 }
 
 let make = (
@@ -169,6 +171,8 @@ let make = (
     clientMaxRetries,
     clientTimeoutMillis,
     lowercaseAddresses,
+    serializationFormat,
+    enableQueryCaching,
   }: options,
 ): t => {
   let name = "HyperSync"
@@ -183,6 +187,8 @@ let make = (
     ~maxNumRetries=clientMaxRetries,
     ~httpReqTimeoutMillis=clientTimeoutMillis,
     ~enableChecksumAddresses=!lowercaseAddresses,
+    ~serializationFormat,
+    ~enableQueryCaching,
   )
 
   let hscDecoder: ref<option<HyperSyncClient.Decoder.t>> = ref(None)
@@ -545,28 +551,32 @@ let make = (
       ~logger,
     )->Promise.thenResolve(HyperSync.mapExn)
 
-  let jsonApiClient = Rest.client(endpointUrl)
-
   let malformedTokenMessage = `Your token is malformed. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens.`
 
+  let heightStream = HyperSyncHeightStream.make(~hyperSyncUrl=endpointUrl, ~apiToken)
+
   {
     name,
     sourceFor: Sync,
     chain,
-    pollingInterval: 100,
+    pollingInterval: 32, // purely internal state polling since we now stream the height to the state
     poweredByHyperSync: true,
     getBlockHashes,
-    getHeightOrThrow: async () =>
-      switch await HyperSyncJsonApi.heightRoute->Rest.fetch(apiToken, ~client=jsonApiClient) {
-      | Value(height) => height
-      | ErrorMessage(m) if m === malformedTokenMessage =>
+    getHeightOrThrow: async () => {
+      try await heightStream->HyperSyncHeightStream.getHeight catch {
+      | Js.Exn.Error(exn)
+        if exn
+        ->Js.Exn.message
+        ->Option.getWithDefault("")
+        ->Js.String2.includes(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
-      | ErrorMessage(m) => Js.Exn.raiseError(m)
-      },
+      | exn => raise(exn)
+      }
+    },
     getItemsOrThrow,
   }
 }

package/src/sources/HyperSyncSource.res.js

@@ -1,7 +1,6 @@
 // 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");
@@ -17,8 +16,8 @@ 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");
 
 function getSelectionConfig(selection, chain) {
   var nonOptionalBlockFieldNames = new Set();
@@ -132,7 +131,7 @@ function make(param) {
   var chain = param.chain;
   var getSelectionConfig = memoGetSelectionConfig(chain);
   var apiToken = Belt_Option.getWithDefault(param.apiToken, "3dc856dd-b0ea-494f-b27e-017b8b6b7e07");
-  var client = HyperSyncClient.make(endpointUrl, apiToken, param.clientTimeoutMillis, param.clientMaxRetries, !lowercaseAddresses);
+  var client = HyperSyncClient.make(endpointUrl, apiToken, param.clientTimeoutMillis, param.clientMaxRetries, !lowercaseAddresses, param.serializationFormat, param.enableQueryCaching, undefined, undefined, undefined);
   var hscDecoder = {
     contents: undefined
   };
@@ -385,26 +384,31 @@ function make(param) {
   var getBlockHashes = function (blockNumbers, logger) {
     return HyperSync.queryBlockDataMulti(endpointUrl, apiToken, blockNumbers, logger).then(HyperSync.mapExn);
   };
-  var jsonApiClient = Rest.client(endpointUrl, undefined);
+  var heightStream = HyperSyncHeightStream.make(endpointUrl, apiToken);
   return {
           name: "HyperSync",
           sourceFor: "Sync",
           chain: chain,
           poweredByHyperSync: true,
-          pollingInterval: 100,
+          pollingInterval: 32,
           getBlockHashes: getBlockHashes,
           getHeightOrThrow: (async function () {
-              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);
+              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;
               }
             }),
           getItemsOrThrow: getItemsOrThrow
@@ -414,4 +418,4 @@ function make(param) {
 exports.getSelectionConfig = getSelectionConfig;
 exports.memoGetSelectionConfig = memoGetSelectionConfig;
 exports.make = make;
-/* Rest Not a pure module */
+/* Viem Not a pure module */