envio 3.13.0-alpha.0 → 3.13.0

package/src/sources/EvmRpcWs.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Rpc from "./Rpc.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as HeightStream from "./HeightStream.res.mjs";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
@@ -30,12 +29,16 @@ function refusesSubscribe(id, subscribed) {
   }
 }
 
+let hexIntSchema = S$RescriptSchema.transform(S$RescriptSchema.string, param => ({
+  p: str => Number(str)
+}));
+
 let wsMessageSchema = S$RescriptSchema.union([
   S$RescriptSchema.object(s => {
     s.f("method", S$RescriptSchema.literal("eth_subscription"));
     return {
       TAG: "NewHead",
-      _0: s.f("params", S$RescriptSchema.object(s => s.f("result", S$RescriptSchema.object(s => s.f("number", Rpc.hexIntSchema)))))
+      _0: s.f("params", S$RescriptSchema.object(s => s.f("result", S$RescriptSchema.object(s => s.f("number", hexIntSchema)))))
     };
   }),
   S$RescriptSchema.object(s => {
@@ -111,6 +114,7 @@ export {
   subscribeRequestJson,
   responseIdSchema,
   refusesSubscribe,
+  hexIntSchema,
   wsMessageSchema,
   subscribe,
 }

package/src/sources/FuelHyperSyncSource.res

@@ -47,6 +47,8 @@ let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}
 
     let startFetchingBatchTimeRef = Performance.now()
 
+    let fetchStats = () => RequestStat.single(~method="getLogs", ~sentAt=startFetchingBatchTimeRef)
+
     //fetch batch
     let pageUnsafe = try await FuelHyperSync.GetLogs.query(
       ~client,
@@ -57,12 +59,12 @@ let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}
       ~clientFilteredContracts=selection.clientFilteredContracts,
     ) catch {
     | FuelHyperSync.GetLogs.Error(WrongInstance) =>
-      throw(Source.SourceBehindHead({blockNumber: fromBlock, requestStats: []}))
+      throw(Source.SourceBehindHead({blockNumber: fromBlock, requestStats: fetchStats()}))
     | FuelHyperSync.GetLogs.Error(UnexpectedMissingParams({missingParams})) =>
       throw(
         Source.GetItemsError(
           Source.FailedGettingItems({
-            exn: %raw(`null`),
+            requestStats: fetchStats(),
             attemptedToBlock: toBlock->Option.getOr(knownHeight),
             retry: ImpossibleForTheQuery({
               message: `Source returned invalid data with missing required fields: ${missingParams->Array.joinUnsafe(
@@ -76,6 +78,7 @@ let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}
       throw(
         Source.GetItemsError(
           Source.FailedGettingItems({
+            requestStats: fetchStats(),
             exn,
             attemptedToBlock: toBlock->Option.getOr(knownHeight),
             retry: WithBackoff({
@@ -91,7 +94,7 @@ let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}
     }
 
     let pageFetchTime = startFetchingBatchTimeRef->Performance.secondsSince
-    let requestStats = [{Source.method: "getLogs", seconds: pageFetchTime}]
+    let requestStats = fetchStats()
 
     //set height and next from block
     let knownHeight = pageUnsafe.archiveHeight
@@ -192,7 +195,6 @@ let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}
       latestFetchedBlockNumber: heighestBlockQueried,
       stats,
       knownHeight,
-      fromBlockQueried: fromBlock,
       requestStats,
     }
   }

package/src/sources/FuelHyperSyncSource.res.mjs

@@ -4,6 +4,7 @@ import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as HyperSync from "./HyperSync.res.mjs";
 import * as Performance from "../bindings/Performance.res.mjs";
+import * as RequestStat from "./RequestStat.res.mjs";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as FuelHyperSync from "./FuelHyperSync.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -42,7 +43,7 @@ function make(param) {
           throw {
             RE_EXN_ID: Source.SourceBehindHead,
             blockNumber: fromBlock,
-            requestStats: [],
+            requestStats: RequestStat.single("getLogs", startFetchingBatchTimeRef),
             Error: new Error()
           };
         }
@@ -50,12 +51,12 @@ function make(param) {
           RE_EXN_ID: Source.GetItemsError,
           _1: {
             TAG: "FailedGettingItems",
-            exn: null,
             attemptedToBlock: Stdlib_Option.getOr(toBlock, knownHeight),
             retry: {
               TAG: "ImpossibleForTheQuery",
               message: `Source returned invalid data with missing required fields: ` + match.missingParams.join(", ")
-            }
+            },
+            requestStats: RequestStat.single("getLogs", startFetchingBatchTimeRef)
           },
           Error: new Error()
         };
@@ -70,16 +71,14 @@ function make(param) {
             TAG: "WithBackoff",
             message: `Unexpected issue while fetching events from HyperFuel client. Attempt a retry.`,
             backoffMillis: retry !== 0 ? 1000 * retry | 0 : 500
-          }
+          },
+          requestStats: RequestStat.single("getLogs", startFetchingBatchTimeRef)
         },
         Error: new Error()
       };
     }
     let pageFetchTime = Performance.secondsSince(startFetchingBatchTimeRef);
-    let requestStats = [{
-        method: "getLogs",
-        seconds: pageFetchTime
-      }];
+    let requestStats = RequestStat.single("getLogs", startFetchingBatchTimeRef);
     let knownHeight$1 = pageUnsafe.archiveHeight;
     let heighestBlockQueried = pageUnsafe.nextBlock - 1 | 0;
     let parsingTimeRef = Performance.now();
@@ -164,7 +163,6 @@ function make(param) {
       parsedQueueItems: parsedQueueItems,
       transactionStore: undefined,
       blockStore: pageUnsafe.blockStore,
-      fromBlockQueried: fromBlock,
       latestFetchedBlockNumber: heighestBlockQueried,
       stats: stats,
       requestStats: requestStats

package/src/sources/HeightFeed.res

@@ -335,7 +335,13 @@ let pollOnce = async (feed: t) => {
     (feed->currentInterval, Cadence)
   | TimedOut =>
     feed->backOff(~what=`did not answer within ${(pollTimeoutMillis / 1000)->Int.toString}s`)
-  | Failed(exn) => feed->backOff(~what="failed", ~exn)
+  | Failed(exn) =>
+    // The request reached the endpoint and is billed whether or not it
+    // answered, so it counts; unwrapping also keeps the log the provider's own
+    // message rather than the envelope carrying it.
+    let failure = exn->Source.unpackNativeRequestFailure
+    feed.recordRequestStats(failure.requestStats)
+    feed->backOff(~what="failed", ~exn=failure.cause)
   }
 }
 

package/src/sources/HeightFeed.res.mjs

@@ -214,14 +214,16 @@ async function pollOnce(feed) {
   if (typeof res !== "object") {
     return backOff(feed, `did not answer within ` + (60).toString() + `s`, undefined);
   }
-  if (res.TAG !== "Answered") {
-    return backOff(feed, "failed", res._0);
+  if (res.TAG === "Answered") {
+    recordAnswer(feed, generation, res._0);
+    return [
+      currentInterval(feed),
+      "Cadence"
+    ];
   }
-  recordAnswer(feed, generation, res._0);
-  return [
-    currentInterval(feed),
-    "Cadence"
-  ];
+  let failure = Source.unpackNativeRequestFailure(res._0);
+  feed.recordRequestStats(failure.requestStats);
+  return backOff(feed, "failed", failure.cause);
 }
 
 async function runPollLoop(feed) {

package/src/sources/HyperSyncClient.res

@@ -267,20 +267,7 @@ module EventItems = {
     includeAllBlocks?: bool,
   }
 
-  type item = {
-    logIndex: int,
-    srcAddress: Address.t,
-    // Number of the block this log belongs to; the block itself is resolved from
-    // `response.blocks`, deduplicated across items sharing a block.
-    blockNumber: int,
-    // Key (with the block number) into the transaction store; the transaction
-    // is resolved from the store on demand.
-    transactionIndex: int,
-    // The registration this log routed to, by chain-scoped index. Logs that
-    // route to no registration never cross the boundary.
-    onEventRegistrationIndex: int,
-    params: Internal.eventParams,
-  }
+  type item = EvmEventItem.t
 
   type response = {
     archiveHeight: option<int>,

package/src/sources/RequestStat.res

@@ -10,3 +10,10 @@ type t = {
   // blocks, so a zero always means the request came back empty.
   responseBlocks?: int,
 }
+
+// The one request a source method made, timed from when it was sent. Every
+// way out of a fetch carries it: the request was made, and is billed, whether
+// or not it answered.
+let single = (~method, ~sentAt: Performance.timeRef) => [
+  {method, seconds: sentAt->Performance.secondsSince},
+]

package/src/sources/RequestStat.res.mjs

@@ -1,2 +1,15 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+
+import * as Performance from "../bindings/Performance.res.mjs";
+
+function single(method, sentAt) {
+  return [{
+      method: method,
+      seconds: Performance.secondsSince(sentAt)
+    }];
+}
+
+export {
+  single,
+}
+/* No side effect */