envio 3.5.1 → 3.6.1

package/src/db/Table.res.mjs

@@ -16,11 +16,12 @@ function makeEnumConfig(name, variants) {
   };
 }
 
-function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNullableOpt, isPrimaryKeyOpt, isIndexOpt, linkedEntity, description, postgresDbName, clickhouseDbName) {
+function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNullableOpt, isPrimaryKeyOpt, isIndexOpt, isChainIdOpt, linkedEntity, description, postgresDbName, clickhouseDbName) {
   let isArray = isArrayOpt !== undefined ? isArrayOpt : false;
   let isNullable = isNullableOpt !== undefined ? isNullableOpt : false;
   let isPrimaryKey = isPrimaryKeyOpt !== undefined ? isPrimaryKeyOpt : false;
   let isIndex = isIndexOpt !== undefined ? isIndexOpt : false;
+  let isChainId = isChainIdOpt !== undefined ? isChainIdOpt : false;
   return {
     TAG: "Field",
     _0: {
@@ -31,6 +32,7 @@ function mkField(fieldName, fieldType, fieldSchema, $$default, isArrayOpt, isNul
       isNullable: isNullable,
       isPrimaryKey: isPrimaryKey,
       isIndex: isIndex,
+      isChainId: isChainId,
       linkedEntity: linkedEntity,
       defaultValue: $$default,
       description: description,
@@ -225,6 +227,18 @@ function getDerivedFromFields(table) {
   });
 }
 
+function getChainIdField(table) {
+  return Stdlib_Array.findMap(table.fields, field => {
+    if (field.TAG !== "Field") {
+      return;
+    }
+    let field$1 = field._0;
+    if (field$1.isChainId) {
+      return field$1;
+    }
+  });
+}
+
 function getFieldByName(table, fieldName) {
   return table.fields.find(field => getUserDefinedFieldName(field) === fieldName);
 }
@@ -288,7 +302,8 @@ let queryFields = Utils.$$WeakMap.memoize(table => {
   return dict;
 });
 
-function makeRowsSchema(table, rowFieldName) {
+function makeRowsSchema(table, rowFieldName, skipChainIdOpt) {
+  let skipChainId = skipChainIdOpt !== undefined ? skipChainIdOpt : false;
   return S$RescriptSchema.array(S$RescriptSchema.object(s => {
     let dict = {};
     table.fields.forEach(field => {
@@ -296,15 +311,20 @@ function makeRowsSchema(table, rowFieldName) {
         return;
       }
       let field$1 = field._0;
+      if (field$1.isChainId && skipChainId) {
+        return;
+      }
       dict[getApiFieldName(field$1)] = s.f(rowFieldName(field$1), field$1.fieldSchema);
     });
     return dict;
   }));
 }
 
-let rowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getApiFieldName));
+let rowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getApiFieldName, undefined));
+
+let pgRowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getPgDbFieldName, undefined));
 
-let pgRowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getPgDbFieldName));
+let pgEntityRowsSchema = Utils.$$WeakMap.memoize(table => makeRowsSchema(table, getPgDbFieldName, true));
 
 let NonExistingTableField = /* @__PURE__ */Primitive_exceptions.create("Table.NonExistingTableField");
 
@@ -465,6 +485,7 @@ export {
   getNonDefaultFields,
   getLinkedEntityFields,
   getDerivedFromFields,
+  getChainIdField,
   getFieldByName,
   NoIdField,
   getIdFieldOrThrow,
@@ -477,6 +498,7 @@ export {
   makeRowsSchema,
   rowsSchema,
   pgRowsSchema,
+  pgEntityRowsSchema,
   NonExistingTableField,
   getUnfilteredCompositeIndexesUnsafe,
   toSqlParams,

package/src/sources/SourceManager.res

@@ -468,16 +468,16 @@ let getSourceNewHeight = async (
               // head on every (re)connect; waking the wait loop on a height we already
               // know spins it and leaks fallback pollers (#1270).
               if newHeight > sourceState.knownHeight {
+                sourceState->recordRequestStats([{Source.method: "heightPush", seconds: 0.}])
                 sourceState.knownHeight = newHeight
                 let resolvers = sourceState.pendingHeightResolvers
                 sourceState.pendingHeightResolvers = []
                 resolvers->Array.forEach(resolve => resolve(newHeight))
+              } else {
+                sourceState->recordRequestStats([{Source.method: "heightPushIgnored", seconds: 0.}])
               }
             })
             sourceState.unsubscribe = Some(unsubscribe)
-            // Count a subscription (re)start rather than every pushed height —
-            // there's no request/response to time here.
-            sourceState->recordRequestStats([{Source.method: "heightSubscription", seconds: 0.}])
           | _ =>
             // Slowdown polling when the chain isn't progressing
             let pollingInterval = if reducedPolling {
@@ -724,9 +724,7 @@ let executeQuery = async (
     ) {
     | Some(s) =>
       if s.source !== sourceManager.activeSource {
-        let logger = Logging.createChild(
-          ~params={"chainId": sourceManager.activeSource.chainId},
-        )
+        let logger = Logging.createChild(~params={"chainId": sourceManager.activeSource.chainId})
         logger->Logging.childInfo({
           "msg": "Switching data-source",
           "source": s.source.name,
@@ -736,9 +734,7 @@ let executeQuery = async (
       }
       s
     | None =>
-      let logger = Logging.createChild(
-        ~params={"chainId": sourceManager.activeSource.chainId},
-      )
+      let logger = Logging.createChild(~params={"chainId": sourceManager.activeSource.chainId})
       %raw(`null`)->ErrorHandling.mkLogAndRaise(~logger, ~msg=noSourcesError)
     }
     sourceManager.activeSource = sourceState.source
@@ -895,9 +891,7 @@ let getBlockHashes = async (sourceManager: t, ~blockNumbers: array<int>, ~isReal
     let sourceState = switch sourceManager->getNextSource(~isRealtime) {
     | Some(s) => s
     | None =>
-      let logger = Logging.createChild(
-        ~params={"chainId": sourceManager.activeSource.chainId},
-      )
+      let logger = Logging.createChild(~params={"chainId": sourceManager.activeSource.chainId})
       %raw(`null`)->ErrorHandling.mkLogAndRaise(
         ~logger,
         ~msg="No data-sources available for fetching block hashes.",

package/src/sources/SourceManager.res.mjs

@@ -388,18 +388,21 @@ async function getSourceNewHeight(sourceManager, sourceState, knownHeight, stall
           if (createSubscription !== undefined && isRealtime) {
             let unsubscribe = createSubscription(newHeight => {
               if (newHeight <= sourceState.knownHeight) {
-                return;
+                return recordRequestStats(sourceState, [{
+                    method: "heightPushIgnored",
+                    seconds: 0
+                  }]);
               }
+              recordRequestStats(sourceState, [{
+                  method: "heightPush",
+                  seconds: 0
+                }]);
               sourceState.knownHeight = newHeight;
               let resolvers = sourceState.pendingHeightResolvers;
               sourceState.pendingHeightResolvers = [];
               resolvers.forEach(resolve => resolve(newHeight));
             });
             sourceState.unsubscribe = unsubscribe;
-            recordRequestStats(sourceState, [{
-                method: "heightSubscription",
-                seconds: 0
-              }]);
           } else {
             exit = 1;
           }

package/svm.schema.json

@@ -49,6 +49,13 @@
         }
       ]
     },
+    "disable_default_cross_chain": {
+      "description": "Make entities and effect caches per-chain instead of shared across every chain (recommended). Sharing then becomes explicit — add `@crossChain` to an entity in schema.graphql or `crossChain: true` to an effect. (default: false)",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
     "ecosystem": {
       "description": "Ecosystem of the project.",
       "$ref": "#/$defs/EcosystemTag"