envio 3.0.0-alpha.22 → 3.0.0-alpha.23

package/README.md

@@ -107,9 +107,9 @@ This scaffolds your entire indexer project, config, schema, and handler function
 
 From there, three files define your indexer:
 
-- `config.yaml` — networks, contracts, events, and indexing behaviour
-- `schema.graphql` — the shape of your indexed data
-- `src/EventHandlers.*` — your handler logic in TypeScript, JavaScript, or ReScript
+- `config.yaml`: networks, contracts, events, and indexing behaviour
+- `schema.graphql`: the shape of your indexed data
+- `src/EventHandlers.*`: your handler logic in TypeScript, JavaScript, or ReScript
 
 [Full getting started guide →](https://docs.envio.dev/docs/HyperIndex/getting-started)
 

package/package.json

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

package/src/Main.res

@@ -615,12 +615,14 @@ let migrate = async (~reset, ~persistedState) => {
   let persistence = PgStorage.makePersistenceFromConfig(~config)
   await persistence->Persistence.init(~reset, ~chainConfigs=config.chainMap->ChainMap.values)
   await Core.upsertPersistedState(persistedState->JSON.stringify)
+  await persistence.storage.close()
 }
 
 let dropSchema = async () => {
   let config = Config.loadWithoutRegistrations()
   let persistence = PgStorage.makePersistenceFromConfig(~config)
   await persistence.storage.reset()
+  await persistence.storage.close()
 }
 
 let start = async (

package/src/Main.res.mjs

@@ -468,13 +468,15 @@ async function migrate(reset, persistedState) {
   let config = Config.loadWithoutRegistrations();
   let persistence = PgStorage.makePersistenceFromConfig(config, undefined);
   await Persistence.init(persistence, ChainMap.values(config.chainMap), reset);
-  return await Core.upsertPersistedState(JSON.stringify(persistedState));
+  await Core.upsertPersistedState(JSON.stringify(persistedState));
+  return await persistence.storage.close();
 }
 
 async function dropSchema() {
   let config = Config.loadWithoutRegistrations();
   let persistence = PgStorage.makePersistenceFromConfig(config, undefined);
-  return await persistence.storage.reset();
+  await persistence.storage.reset();
+  return await persistence.storage.close();
 }
 
 async function start(persistence, migrate, isTestOpt, exitAfterFirstEventBlockOpt, patchConfig) {

package/src/Persistence.res

@@ -121,6 +121,9 @@ type storage = {
     ~updatedEffectsCache: array<updatedEffectCache>,
     ~updatedEntities: array<updatedEntity>,
   ) => promise<unit>,
+  // Release any long-lived resources (e.g. the postgres connection pool) so
+  // short-lived CLI commands like `db-migrate setup` can exit cleanly.
+  close: unit => promise<unit>,
 }
 
 type storageStatus =

package/src/PgStorage.res

@@ -1648,6 +1648,8 @@ SELECT id, chain_id, -1, -1, contract_name FROM unnest($1::text[],$2::int[],$3::
     )
   }
 
+  let close = () => sql->Postgres.endSql
+
   {
     name: "postgres",
     isInitialized,
@@ -1664,6 +1666,7 @@ SELECT id, chain_id, -1, -1, contract_name FROM unnest($1::text[],$2::int[],$3::
     getRollbackProgressDiff,
     getRollbackData,
     writeBatch: writeBatchMethod,
+    close,
   }
 }
 

package/src/PgStorage.res.mjs

@@ -1026,6 +1026,7 @@ SELECT id, chain_id, -1, -1, contract_name FROM unnest($1::text[],$2::int[],$3::
     await writeBatch(sql, batch, rawEvents, pgSchema, rollbackTargetCheckpointId, isInReorgThreshold, config, allEntities, setEffectCacheOrThrow, updatedEffectsCache, updatedEntities, sinkPromise, undefined);
     return Prometheus.StorageWrite.increment("postgres", Hrtime.toSecondsFloat(Hrtime.timeSince(primaryTimerRef)));
   };
+  let close = () => sql.end();
   return {
     name: "postgres",
     isInitialized: isInitialized,
@@ -1041,7 +1042,8 @@ SELECT id, chain_id, -1, -1, contract_name FROM unnest($1::text[],$2::int[],$3::
     getRollbackTargetCheckpoint: getRollbackTargetCheckpoint,
     getRollbackProgressDiff: getRollbackProgressDiff,
     getRollbackData: getRollbackData,
-    writeBatch: writeBatchMethod
+    writeBatch: writeBatchMethod,
+    close: close
   };
 }
 

package/src/TestIndexerProxyStorage.res

@@ -201,4 +201,5 @@ let makeStorage = (proxy: t): Persistence.storage => {
       "TestIndexer: Rollback is not supported. Set rollbackOnReorg to false in config.",
     )
   },
+  close: async () => (),
 }

package/src/TestIndexerProxyStorage.res.mjs

@@ -114,7 +114,8 @@ function makeStorage(proxy) {
         checkpointBlockHashes: batch.checkpointBlockHashes,
         checkpointEventsProcessed: batch.checkpointEventsProcessed
       });
-    }
+    },
+    close: async () => {}
   };
 }
 

package/src/bindings/Postgres.res

@@ -90,6 +90,11 @@ external makeSql: (~config: poolConfig) => sql = "default"
 
 @send external beginSql: (sql, sql => promise<'result>) => promise<'result> = "begin"
 
+// Graceful pool shutdown — drains in-flight queries, then closes connections.
+// Without this the pool's idle TCP sockets keep Node's event loop alive after
+// short-lived commands (db-migrate, drop-schema) finish their work.
+@send external endSql: sql => promise<unit> = "end"
+
 // TODO: can explore this approach (https://forum.rescript-lang.org/t/rfc-support-for-tagged-template-literals/3744)
 // @send @variadic
 // external sql:  array<string>  => (sql, array<string>) => int = "sql"