@effectstream/runtime 0.100.12 → 0.100.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectstream/runtime",
-  "version": "0.100.12",
+  "version": "0.100.14",
   "license": "MIT",
   "homepage": "https://effectstream.github.io/docs/",
   "repository": {
@@ -13,17 +13,17 @@
   },
   "exports": "./src/mod.ts",
   "dependencies": {
-    "@effectstream/concise": "0.100.12",
-    "@effectstream/config": "0.100.12",
-    "@effectstream/coroutine": "0.100.12",
-    "@effectstream/crypto": "0.100.12",
-    "@effectstream/db": "0.100.12",
-    "@effectstream/event-client": "0.100.12",
-    "@effectstream/event-server": "0.100.12",
-    "@effectstream/log": "0.100.12",
-    "@effectstream/sm": "0.100.12",
-    "@effectstream/sync": "0.100.12",
-    "@effectstream/utils": "0.100.12",
+    "@effectstream/concise": "0.100.14",
+    "@effectstream/config": "0.100.14",
+    "@effectstream/coroutine": "0.100.14",
+    "@effectstream/crypto": "0.100.14",
+    "@effectstream/db": "0.100.14",
+    "@effectstream/event-client": "0.100.14",
+    "@effectstream/event-server": "0.100.14",
+    "@effectstream/log": "0.100.14",
+    "@effectstream/sm": "0.100.14",
+    "@effectstream/sync": "0.100.14",
+    "@effectstream/utils": "0.100.14",
     "@fastify/cors": "^11.0.1",
     "@metamask/json-rpc-engine": "^10.0.3",
     "pg": "8.17.2",

package/src/main.ts

@@ -7,11 +7,13 @@ import {
   acquireDBMutex,
   createDynamicTables,
   getConnection,
+  getLastNonEmptyBlockHash,
   releaseDBMutex,
   resetPublicTables,
   runSnapshotLoop,
 } from "@effectstream/db";
 import { EventBroker } from "@effectstream/event-server";
+import { ENV } from "@effectstream/utils/node-env";
 import {
   BuiltinEvents,
   EventManager,
@@ -27,7 +29,7 @@ import {
   until,
 } from "effection";
 import { initTelemetry } from "./telemetry.ts";
-import { processFinalizedBlock } from "./process-blocks.ts";
+import { type PendingEvent, processFinalizedBlock } from "./process-blocks.ts";
 import { startHttpServer } from "./api/http-server.ts";
 import type { StartConfig } from "./types.ts";
 import type { Client } from "pg";
@@ -39,19 +41,6 @@ import { builtInPrimitivesMap } from "@effectstream/sm";
 import { validateAndSnapshotConfig } from "./config-snapshot.ts";
 
 export function* init() {
-  // Prevent transient network errors (broken pipes, closed connections) from
-  // crashing the process via unhandled promise rejections. The sync loop's
-  // tryYield already retries on error — this just keeps the process alive.
-  globalThis.addEventListener("unhandledrejection", (event) => {
-    log.local(
-      ComponentNames.EFFECTSTREAM_RUNTIME,
-      "unhandled-rejection",
-      SeverityNumber.WARN,
-      (l) => l("Suppressed unhandled rejection:", event.reason),
-    );
-    event.preventDefault();
-  });
-
   // initialize OpenTelemetry
   yield* initTelemetry();
 }
@@ -83,7 +72,9 @@ export function* start(config: StartConfig): Operation<void> {
   }
 
   // Create MQTT Broker
-  new EventBroker("effectstream-engine").createServer();
+  if (ENV.MQTT_BROKER) {
+    new EventBroker("effectstream-engine").createServer();
+  }
 
   yield* spawn(function* () {
     yield* startHttpServer(
@@ -134,7 +125,10 @@ export function* start(config: StartConfig): Operation<void> {
     }
   });
 
-  let blockHash: EffectstreamBlockHash | null = null;
+  const [lastHashRow] = yield* until(getLastNonEmptyBlockHash.run(undefined, dbConn));
+  let blockHash: EffectstreamBlockHash | null = lastHashRow
+    ? lastHashRow.effectstream_block_hash!.toString() as EffectstreamBlockHash
+    : null;
   if (config.snapshotConfig) {
     yield* spawn(() => runSnapshotLoop(config.snapshotConfig!));
   }
@@ -144,16 +138,25 @@ export function* start(config: StartConfig): Operation<void> {
     // For PGLite, this is not enough, as the can only be one connection at a time.
     // So we request a DBMutex as well.
     let dbClient: Client | undefined;
+    // Custom app events emitted by STFs during this block. Collected by
+    // processFinalizedBlock and flushed below ONLY after it returns — i.e.
+    // strictly after the block's COMMIT. See plan invariant I1.
+    let blockAppEvents: PendingEvent[] = [];
     try {
       yield* acquireDBMutex(`processing-blocks:${value.blockNumber}`);
       dbClient = yield* until((dbConn as any).connect()); // Client,
 
-      blockHash = yield* processFinalizedBlock(
+      const result = yield* processFinalizedBlock(
         value,
         config,
         dbClient as any, // Client,
         blockHash,
       );
+      const resultHash = result.blockHash;
+      blockAppEvents = result.events;
+      if (resultHash !== "0x0") {
+        blockHash = resultHash;
+      }
     } finally {
       releaseDBMutex(`processing-blocks:${value.blockNumber}`);
       if (dbClient) {
@@ -163,14 +166,38 @@ export function* start(config: StartConfig): Operation<void> {
 
     // Used to emit & log the block range for each protocol.
     const contentBlocksForProtocol = getRangesForSyncProtocols(value);
-  
-    yield* until(
-      emitLatestBlocks(
-        value.blockNumber,
-        value.timestamp,
-        contentBlocksForProtocol,
-      ),
+
+    // Fire-and-forget: do not stall the sync loop on broker acks.
+    //
+    // Opifex's TcpClient assigns packet IDs synchronously in client.publish()
+    // and writes to the socket via Node's net.Socket, which has its own write
+    // queue — so concurrent publish() calls land on the wire in call order.
+    // MQTT 3.1.1 §4.6 then guarantees in-order delivery to each subscriber
+    // per (publisher, topic, QoS). We don't need a wrapper queue.
+    //
+    // TODO(scaling): the broker runs in-process (see `new EventBroker(...)`
+    // above). Fan-out to N subscribers consumes the same event loop as block
+    // processing. At ~thousands of subscribers, consider:
+    //   1) moving the broker to a worker / separate process,
+    //   2) a publisher-side circuit breaker if ctx.unresolvedPublish.size > N
+    //      (drop events with a counter for observability).
+    // Today: localhost, in-process, expected O(10²) subscribers — non-issue.
+    emitLatestBlocks(
+      value.blockNumber,
+      value.timestamp,
+      contentBlocksForProtocol,
     );
+    for (const { event, payload } of blockAppEvents) {
+      EventManager.Instance.sendMessage(event, payload as any).catch((err) => {
+        log.local(
+          ComponentNames.EFFECTSTREAM_RUNTIME,
+          "event-publish",
+          SeverityNumber.WARN,
+          (l) =>
+            l(`publish ${event.path.join("/")} failed: ${String(err)}`),
+        );
+      });
+    }
 
     const lagMs = Date.now() - value.timestamp;
     const lagSuffix = lagThresholdMs != null && lagMs > lagThresholdMs
@@ -205,24 +232,40 @@ function getRangesForSyncProtocols(value: ChainBlock): Record<string, [number, n
   return contentBlocksForProtocol;
 }
 
-async function emitLatestBlocks(
+/**
+ * Publish built-in block-level events.
+ *
+ * Fire-and-forget for the same reasons as the app-event flush above
+ * (do not stall the sync loop; ordering preserved by Opifex + MQTT 3.1.1).
+ *
+ * Errors are caught locally so they don't escape to the global
+ * `unhandledrejection` handler without context.
+ */
+function emitLatestBlocks(
   rollUpBlockHeight: number,
   rollUpBlockTimestamp: number,
   syncChains: Record<string, [number, number]>,
-) {
-  return await Promise.all([
-    EventManager.Instance.sendMessage(BuiltinEvents.RollupBlock, {
-      block: rollUpBlockHeight,
-      timestamp: rollUpBlockTimestamp,
-    }),
-    ...Object.entries(syncChains).map(([chainName, [_, toBlock]]) =>
-      EventManager.Instance.sendMessage(BuiltinEvents.SyncChains, {
-        chain: chainName,
-        block: toBlock,
-        rollup: rollUpBlockHeight
-      })
-    ),
-  ]);
+): void {
+  const logFailure = (topic: string) => (err: unknown) =>
+    log.local(
+      ComponentNames.EFFECTSTREAM_RUNTIME,
+      "event-publish",
+      SeverityNumber.WARN,
+      (l) => l(`publish ${topic} failed: ${String(err)}`),
+    );
+
+  EventManager.Instance.sendMessage(BuiltinEvents.RollupBlock, {
+    block: rollUpBlockHeight,
+    timestamp: rollUpBlockTimestamp,
+  }).catch(logFailure("RollupBlock"));
+
+  for (const [chainName, [_, toBlock]] of Object.entries(syncChains)) {
+    EventManager.Instance.sendMessage(BuiltinEvents.SyncChains, {
+      chain: chainName,
+      block: toBlock,
+      rollup: rollUpBlockHeight,
+    }).catch(logFailure(`SyncChains/${chainName}`));
+  }
 }
 
 function* startup(

package/src/process-blocks.ts

@@ -1,7 +1,7 @@
 import type { ChainBlock } from "@effectstream/sync";
 import { call, type Operation, until } from "effection";
 import type { Pool } from "pg";
-import { type BaseStfInput, primitiveTransitionFunction } from "@effectstream/sm";
+import { type BaseStfInput, type EmitFn, primitiveTransitionFunction } from "@effectstream/sm";
 import { PreparedQuery } from "@pgtyped/runtime";
 import type {
   ExecPromise,
@@ -10,6 +10,7 @@ import type {
 } from "@effectstream/coroutine";
 import {
   blockHeightDone,
+  deleteEmptyBlocks,
   deleteScheduled,
   getFutureGameInputByBlockHeight,
   getFutureGameInputByMaxTimestamp,
@@ -23,6 +24,24 @@ import type { StartConfig } from "./types.ts";
 import type { BlockNumber, EffectstreamBlockHash } from "@effectstream/utils";
 import { generateEffectstreamBlockHash, Prando } from "@effectstream/crypto";
 import { applyUserMigrations } from "./version-migrations.ts";
+import type { EventPathAndDef } from "@effectstream/event-client";
+
+/**
+ * A pending app event collected during STF execution, flushed to MQTT by
+ * the caller (main.ts) only after the block-level `COMMIT` succeeds.
+ *
+ * See plan invariants I1 (post-COMMIT delivery) and I2 (rollback drops events)
+ * in /Users/edwardalvarado/.claude/plans/wild-kindling-reddy.md.
+ */
+export type PendingEvent = {
+  event: EventPathAndDef;
+  payload: Record<string, unknown>;
+};
+
+export type ProcessFinalizedBlockResult = {
+  blockHash: EffectstreamBlockHash;
+  events: PendingEvent[];
+};
 
 /** Helper to check if a SyncStateUpdateStream object is a WorldResolve */
 function isWorldResolve(value: any): value is QueuedUpdate {
@@ -127,12 +146,17 @@ export function* processFinalizedBlock(
   config: StartConfig,
   dbConn: Pool,
   previousBlockHash: EffectstreamBlockHash | null,
-): Operation<EffectstreamBlockHash> {
+): Operation<ProcessFinalizedBlockResult> {
   const { gameStateTransitions, migrations } = config;
   const blockHash: EffectstreamBlockHash = generateEffectstreamBlockHash(
     value,
     previousBlockHash,
   );
+  // Per-block event buffer. Only events from STF runs that succeeded
+  // (and survived to the post-COMMIT return) end up here. On block-level
+  // ROLLBACK below, this buffer goes out of scope unflushed.
+  const blockEvents: PendingEvent[] = [];
+  let hasOperations = false;
   try {
     /* STEP 0: Start the transaction. */
     yield* until(dbConn.query("BEGIN"));
@@ -151,8 +175,9 @@ export function* processFinalizedBlock(
     );
 
     /* STEP 2: Process the migrations. */
+    let hasMigrations = false;
     if (migrations) {
-      yield* applyUserMigrations(
+      hasMigrations = yield* applyUserMigrations(
         value.blockNumber,
         dbConn as any, // Client,
         migrations,
@@ -190,6 +215,18 @@ export function* processFinalizedBlock(
       randomGenerator.skip();
       for (const data of scheduledData) {
         let success = true;
+        // Per-input event buffer. If the STF throws below, this buffer is
+        // dropped (events from rolled-back inputs never reach MQTT — I2).
+        // On success, we promote into `blockEvents` after the catch block.
+        const inputEvents: PendingEvent[] = [];
+        const emit: EmitFn = (event, payload) => {
+          inputEvents.push({
+            event,
+            // Auto-inject blockHeight (I5). registerEvents prepends it as the
+            // first indexed field; apps never set it themselves.
+            payload: { ...payload, blockHeight: value.blockNumber },
+          });
+        };
         try {
           const input: BaseStfInput = {
             blockTimestamp: value.timestamp,
@@ -198,6 +235,7 @@ export function* processFinalizedBlock(
             signerAddress: data.from_address,
             signerAddressType: data.from_address_type,
             randomGenerator,
+            emit,
             // TODO: We might want to add this to the scheduled data.
             //
             //      Or do we resolve it here. Account might change.
@@ -210,6 +248,12 @@ export function* processFinalizedBlock(
             input,
           );
           yield* executeGeneratorStepByStep(gameSTFGenerator, dbConn);
+          // STF succeeded: promote buffered events to the block buffer.
+          // Failure path falls through the catch below and `inputEvents`
+          // simply goes out of scope.
+          if (inputEvents.length > 0) {
+            blockEvents.push(...inputEvents);
+          }
         } catch (err) {
           success = false;
           log.remote(
@@ -251,9 +295,15 @@ export function* processFinalizedBlock(
     }
 
     /* STEP 6: Mark the block as done. */
+    hasOperations = hasMigrations ||
+      value.primitives.length > 0 ||
+      scheduledData.length > 0;
+    if (!hasOperations) {
+      yield* call(() => deleteEmptyBlocks.run(undefined, dbConn));
+    }
     yield* call(() =>
       blockHeightDone.run({
-        block_hash: Buffer.from(blockHash),
+        block_hash: Buffer.from(hasOperations ? blockHash : "0x0"),
         block_height: value.blockNumber,
       }, dbConn)
     );
@@ -298,5 +348,9 @@ export function* processFinalizedBlock(
     // We cannot recover from this error.
     throw err;
   }
-  return blockHash;
+
+  return { 
+    blockHash: hasOperations ? blockHash : "0x0" as PaimaBlockHash, 
+    events: blockEvents 
+  };
 }

package/src/version-migrations.ts

@@ -95,7 +95,7 @@ export function* applyUserMigrations(
   currentBlockHeight: number,
   dbConn: Client,
   migrationOrder: DBMigrations[] | undefined,
-): Operation<void> {
+): Operation<boolean> {
   const migrations = yield* getAllUserMigrations(
     EFFECTSTREAM_ENGINE_VERSION,
     migrationOrder,
@@ -114,6 +114,7 @@ export function* applyUserMigrations(
       ),
     );
   }
+  return migrations.length > 0;
 }
 
 function* getAllUserMigrations(