envio 3.4.0 → 3.5.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "3.4.0",
+  "version": "3.5.0-alpha.0",
   "type": "module",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.mjs",
@@ -69,10 +69,10 @@
     "tsx": "4.21.0"
   },
   "optionalDependencies": {
-    "envio-linux-x64": "3.4.0",
-    "envio-linux-x64-musl": "3.4.0",
-    "envio-linux-arm64": "3.4.0",
-    "envio-darwin-x64": "3.4.0",
-    "envio-darwin-arm64": "3.4.0"
+    "envio-linux-x64": "3.5.0-alpha.0",
+    "envio-linux-x64-musl": "3.5.0-alpha.0",
+    "envio-linux-arm64": "3.5.0-alpha.0",
+    "envio-darwin-x64": "3.5.0-alpha.0",
+    "envio-darwin-arm64": "3.5.0-alpha.0"
   }
 }

package/src/Bin.res

@@ -52,8 +52,8 @@ let applyEnv = (env: dict<JSON.t>) =>
 let run = async args => {
   try {
     switch (await Core.runCli(args))->Null.toOption {
-    // Rust-only command (codegen / init / stop / docker / metrics / help /
-    // version / scripts) — nothing for JS to do, exit cleanly.
+    // Rust-only command (codegen / init / serve / stop / docker / metrics /
+    // help / version / scripts) — nothing for JS to do, exit cleanly.
     | None => ()
     | Some(json) =>
       switch decodeCommand(json->JSON.parseOrThrow) {

package/src/Config.res

@@ -995,10 +995,14 @@ let fromPublic = (publicConfigJson: JSON.t) => {
 
   let allEntities = userEntities->Array.concat([EnvioAddresses.entityConfig])
 
+  // Keyed by the capitalized entity name to match the handler-context
+  // accessor (`context.Pool_snapshots`) the generated types expose, while
+  // entityConfig.name stays the original schema name used for the physical
+  // Postgres/ClickHouse tables.
   let userEntitiesByName =
     userEntities
     ->Array.map(entityConfig => {
-      (entityConfig.name, entityConfig)
+      (entityConfig.name->Utils.String.capitalize, entityConfig)
     })
     ->Dict.fromArray
 

package/src/Config.res.mjs

@@ -704,7 +704,7 @@ function fromPublic(publicConfigJson) {
   let userEntities = parseEntitiesFromJson(Stdlib_Option.getOr(publicConfig.entities, []), enumConfigsByName, globalStorage);
   let allEntities = userEntities.concat([entityConfig]);
   let userEntitiesByName = Object.fromEntries(userEntities.map(entityConfig => [
-    entityConfig.name,
+    Utils.$$String.capitalize(entityConfig.name),
     entityConfig
   ]));
   let contractHandlers = publicContractsConfig !== undefined ? Object.entries(publicContractsConfig).map(param => ({

package/src/Core.res

@@ -27,6 +27,7 @@ type addon = {
   encodeIndexedTopic: (~abiType: string, ~value: unknown) => EvmTypes.Hex.t,
   fromUserApi: (string, fromUserApiOptions) => fromUserApiResult,
   runCli: (~args: array<string>, ~envioPackageDir: Null.t<string>) => promise<Null.t<string>>,
+  requestShutdown: unit => unit,
   @as("EvmHyperSyncClient")
   evmHyperSyncClient: evmHyperSyncClientCtor,
   @as("EvmRpcClient")
@@ -228,7 +229,40 @@ let fromUserApi = (~schema=?, ~env=?, ~files=?, ~withIndexerTypes=false, yaml) =
   )
 }
 
+let runWithShutdownSignals = %raw(`function(run, requestShutdown) {
+  var onShutdown = function() { requestShutdown(); };
+  process.once("SIGINT", onShutdown);
+  process.once("SIGTERM", onShutdown);
+  return run().finally(function() {
+    process.off("SIGINT", onShutdown);
+    process.off("SIGTERM", onShutdown);
+  });
+}`)
+
+// True only when the parsed subcommand is `serve`. The subcommand is the
+// first positional arg; global value-taking flags (`-d`/`--directory`/
+// `--config`) consume the token after them, and other leading flags are
+// skipped — so an unrelated arg value that happens to equal "serve" (e.g.
+// `envio init --name serve`) does not trigger the serve-only shutdown wiring.
+let isServeCommand: array<string> => bool = %raw(`function(args) {
+  var valueFlags = { "-d": true, "--directory": true, "--config": true };
+  for (var i = 0; i < args.length; i++) {
+    var a = args[i];
+    if (a[0] === "-") {
+      if (a.indexOf("=") === -1 && valueFlags[a]) { i++; }
+      continue;
+    }
+    return a === "serve";
+  }
+  return false;
+}`)
+
 let runCli = args => {
   let addon = getAddon()
-  addon.runCli(~args, ~envioPackageDir=Null.make(envioPackageDir))
+  let invoke = () => addon.runCli(~args, ~envioPackageDir=Null.make(envioPackageDir))
+  if isServeCommand(args) {
+    runWithShutdownSignals(invoke, () => addon.requestShutdown())
+  } else {
+    invoke()
+  }
 }

package/src/Core.res.mjs

@@ -191,9 +191,37 @@ function fromUserApi(schema, env, files, withIndexerTypesOpt, yaml) {
   });
 }
 
+let runWithShutdownSignals = (function(run, requestShutdown) {
+  var onShutdown = function() { requestShutdown(); };
+  process.once("SIGINT", onShutdown);
+  process.once("SIGTERM", onShutdown);
+  return run().finally(function() {
+    process.off("SIGINT", onShutdown);
+    process.off("SIGTERM", onShutdown);
+  });
+});
+
+let isServeCommand = (function(args) {
+  var valueFlags = { "-d": true, "--directory": true, "--config": true };
+  for (var i = 0; i < args.length; i++) {
+    var a = args[i];
+    if (a[0] === "-") {
+      if (a.indexOf("=") === -1 && valueFlags[a]) { i++; }
+      continue;
+    }
+    return a === "serve";
+  }
+  return false;
+});
+
 function runCli(args) {
   let addon = getAddon();
-  return addon.runCli(args, envioPackageDir);
+  let invoke = () => addon.runCli(args, envioPackageDir);
+  if (isServeCommand(args)) {
+    return runWithShutdownSignals(invoke, () => addon.requestShutdown());
+  } else {
+    return addon.runCli(args, envioPackageDir);
+  }
 }
 
 export {
@@ -208,6 +236,8 @@ export {
   getAddon,
   getConfigJson,
   fromUserApi,
+  runWithShutdownSignals,
+  isServeCommand,
   runCli,
 }
 /* envioPackageDir Not a pure module */

package/src/TestIndexer.res

@@ -199,7 +199,11 @@ let handleWriteBatch = (
           if deleted->Array.length > 0 {
             entityObj->Dict.set("deleted", deleted->(Utils.magic: array<string> => unknown))
           }
-          change->Dict.set(entityName, entityObj->(Utils.magic: dict<unknown> => unknown))
+          // Match the capitalized entity accessor the generated change types expose.
+          change->Dict.set(
+            entityName->Utils.String.capitalize,
+            entityObj->(Utils.magic: dict<unknown> => unknown),
+          )
         }
       })
     | None => ()
@@ -699,7 +703,9 @@ let createTestIndexer = (): t<'processConfig> => {
   entityOpsDict
   ->Dict.toArray
   ->Array.forEach(((name, ops)) => {
-    result->Dict.set(name, ops->(Utils.magic: entityOperations => unknown))
+    // Expose the capitalized accessor (indexer.Pool_snapshots) the generated
+    // types declare, matching the handler-context keys.
+    result->Dict.set(name->Utils.String.capitalize, ops->(Utils.magic: entityOperations => unknown))
   })
 
   result->Dict.set(

package/src/TestIndexer.res.mjs

@@ -146,7 +146,7 @@ function handleWriteBatch(state, updatedEntities, checkpointIds, checkpointChain
         if (deleted.length !== 0) {
           entityObj$1["deleted"] = deleted;
         }
-        change[entityName] = entityObj$1;
+        change[Utils.$$String.capitalize(entityName)] = entityObj$1;
       });
     }
     state.processChanges.push(change);
@@ -470,7 +470,7 @@ function createTestIndexer() {
   result["chainIds"] = chainIds;
   result["chains"] = chains;
   Object.entries(entityOpsDict).forEach(param => {
-    result[param[0]] = param[1];
+    result[Utils.$$String.capitalize(param[0])] = param[1];
   });
   result["process"] = processConfig => {
     if (state.processInProgress) {