ponder 0.9.2 → 0.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ponder",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "An open-source framework for crypto application backends",
   "license": "MIT",
   "type": "module",

package/src/bin/commands/codegen.ts

@@ -2,9 +2,10 @@ import { runCodegen } from "@/bin/utils/codegen.js";
 import { createLogger } from "@/internal/logger.js";
 import { MetricsService } from "@/internal/metrics.js";
 import { buildOptions } from "@/internal/options.js";
+import { createShutdown } from "@/internal/shutdown.js";
 import { createTelemetry } from "@/internal/telemetry.js";
 import type { CliOptions } from "../ponder.js";
-import { setupShutdown } from "../utils/shutdown.js";
+import { createExit } from "../utils/exit.js";
 
 export async function codegen({ cliOptions }: { cliOptions: CliOptions }) {
   const options = buildOptions({ cliOptions });
@@ -22,19 +23,16 @@ export async function codegen({ cliOptions }: { cliOptions: CliOptions }) {
       service: "process",
       msg: `Invalid Node.js version. Expected >=18.14, detected ${major}.${minor}.`,
     });
-    await logger.kill();
+
     process.exit(1);
   }
 
   const metrics = new MetricsService();
-  const telemetry = createTelemetry({ options, logger });
-  const common = { options, logger, metrics, telemetry };
-
-  const cleanup = async () => {
-    await telemetry.kill();
-  };
+  const shutdown = createShutdown();
+  const telemetry = createTelemetry({ options, logger, shutdown });
+  const common = { options, logger, metrics, telemetry, shutdown };
 
-  const shutdown = setupShutdown({ common, cleanup });
+  const exit = createExit({ common });
 
   telemetry.record({
     name: "lifecycle:session_start",
@@ -45,5 +43,5 @@ export async function codegen({ cliOptions }: { cliOptions: CliOptions }) {
 
   logger.info({ service: "codegen", msg: "Wrote ponder-env.d.ts" });
 
-  await shutdown({ reason: "Success", code: 0 });
+  await exit({ reason: "Success", code: 0 });
 }

package/src/bin/commands/dev.ts

@@ -5,15 +5,16 @@ import { type Database, createDatabase } from "@/database/index.js";
 import { createLogger } from "@/internal/logger.js";
 import { MetricsService } from "@/internal/metrics.js";
 import { buildOptions } from "@/internal/options.js";
+import { createShutdown } from "@/internal/shutdown.js";
 import { buildPayload, createTelemetry } from "@/internal/telemetry.js";
 import type { IndexingBuild } from "@/internal/types.js";
 import { createUi } from "@/ui/index.js";
 import { type Result, mergeResults } from "@/utils/result.js";
 import { createQueue } from "@ponder/common";
 import type { CliOptions } from "../ponder.js";
+import { createExit } from "../utils/exit.js";
 import { run } from "../utils/run.js";
 import { runServer } from "../utils/runServer.js";
-import { setupShutdown } from "../utils/shutdown.js";
 
 export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
   const options = buildOptions({ cliOptions });
@@ -31,7 +32,6 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
       service: "process",
       msg: `Invalid Node.js version. Expected >=18.14, detected ${major}.${minor}.`,
     });
-    await logger.kill();
     process.exit(1);
   }
 
@@ -49,29 +49,25 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
   });
 
   const metrics = new MetricsService();
-  const telemetry = createTelemetry({ options, logger });
+  let indexingShutdown = createShutdown();
+  let apiShutdown = createShutdown();
+  const shutdown = createShutdown();
+  const telemetry = createTelemetry({ options, logger, shutdown });
   const common = { options, logger, metrics, telemetry };
 
-  const build = await createBuild({ common, cliOptions });
-
-  const ui = createUi({ common });
-
-  let indexingCleanupReloadable = () => Promise.resolve();
-  let apiCleanupReloadable = () => Promise.resolve();
+  const build = await createBuild({
+    common: { ...common, shutdown },
+    cliOptions,
+  });
 
-  const cleanup = async () => {
-    await indexingCleanupReloadable();
-    await apiCleanupReloadable();
+  shutdown.add(async () => {
+    await indexingShutdown.kill();
+    await apiShutdown.kill();
+  });
 
-    if (database) {
-      await database.kill();
-    }
-    await build.kill();
-    await telemetry.kill();
-    ui.kill();
-  };
+  createUi({ common: { ...common, shutdown } });
 
-  const shutdown = setupShutdown({ common, cleanup });
+  const exit = createExit({ common: { ...common, shutdown } });
 
   let isInitialBuild = true;
 
@@ -80,27 +76,21 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
     concurrency: 1,
     worker: async (result: Result<never> & { kind: "indexing" | "api" }) => {
       if (result.kind === "indexing") {
-        await indexingCleanupReloadable();
+        await indexingShutdown.kill();
+        indexingShutdown = createShutdown();
       }
-      await apiCleanupReloadable();
+      await apiShutdown.kill();
+      apiShutdown = createShutdown();
 
       if (result.status === "error") {
         // This handles indexing function build failures on hot reload.
         metrics.ponder_indexing_has_error.set(1);
-        if (result.kind === "indexing") {
-          indexingCleanupReloadable = () => Promise.resolve();
-        }
-        apiCleanupReloadable = () => Promise.resolve();
         return;
       }
 
       if (result.kind === "indexing") {
         metrics.resetIndexingMetrics();
 
-        if (database) {
-          await database.kill();
-        }
-
         const configResult = await build.executeConfig();
         if (configResult.status === "error") {
           buildQueue.add({
@@ -164,7 +154,7 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
         indexingBuild = indexingBuildResult.result;
 
         database = await createDatabase({
-          common,
+          common: { ...common, shutdown: indexingShutdown },
           namespace,
           preBuild,
           schemaBuild,
@@ -215,19 +205,20 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
 
         metrics.resetApiMetrics();
 
-        apiCleanupReloadable = await runServer({
-          common,
+        runServer({
+          common: { ...common, shutdown: apiShutdown },
           database,
           apiBuild: apiBuildResult.result,
         });
 
-        indexingCleanupReloadable = await run({
-          common,
+        run({
+          common: { ...common, shutdown: indexingShutdown },
           database,
+          preBuild,
           schemaBuild,
           indexingBuild: indexingBuildResult.result,
           onFatalError: () => {
-            shutdown({ reason: "Received fatal error", code: 1 });
+            exit({ reason: "Received fatal error", code: 1 });
           },
           onReloadableError: (error) => {
             buildQueue.clear();
@@ -264,8 +255,8 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
 
         const apiBuild = buildResult.result;
 
-        apiCleanupReloadable = await runServer({
-          common,
+        runServer({
+          common: { ...common, shutdown: apiShutdown },
           database: database!,
           apiBuild,
         });
@@ -288,8 +279,5 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
 
   buildQueue.add({ status: "success", kind: "indexing" });
 
-  return async () => {
-    buildQueue.pause();
-    await cleanup();
-  };
+  return shutdown.kill;
 }

package/src/bin/commands/list.ts

@@ -7,12 +7,13 @@ import {
 import { createLogger } from "@/internal/logger.js";
 import { MetricsService } from "@/internal/metrics.js";
 import { buildOptions } from "@/internal/options.js";
+import { createShutdown } from "@/internal/shutdown.js";
 import { createTelemetry } from "@/internal/telemetry.js";
 import { printTable } from "@/ui/Table.js";
 import { formatEta } from "@/utils/format.js";
 import { type SelectQueryBuilder, sql } from "kysely";
 import type { CliOptions } from "../ponder.js";
-import { setupShutdown } from "../utils/shutdown.js";
+import { createExit } from "../utils/exit.js";
 
 const emptySchemaBuild = {
   schema: {},
@@ -32,28 +33,24 @@ export async function list({ cliOptions }: { cliOptions: CliOptions }) {
   });
 
   const metrics = new MetricsService();
-  const telemetry = createTelemetry({ options, logger });
-  const common = { options, logger, metrics, telemetry };
+  const shutdown = createShutdown();
+  const telemetry = createTelemetry({ options, logger, shutdown });
+  const common = { options, logger, metrics, telemetry, shutdown };
 
   const build = await createBuild({ common, cliOptions });
 
-  const cleanup = async () => {
-    await build.kill();
-    await telemetry.kill();
-  };
-
-  const shutdown = setupShutdown({ common, cleanup });
+  const exit = createExit({ common });
 
   const configResult = await build.executeConfig();
   if (configResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
+    await exit({ reason: "Failed intial build", code: 1 });
     return;
   }
 
   const buildResult = build.preCompile(configResult.result);
 
   if (buildResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
+    await exit({ reason: "Failed intial build", code: 1 });
     return;
   }
 
@@ -136,7 +133,5 @@ export async function list({ cliOptions }: { cliOptions: CliOptions }) {
       })),
   });
 
-  await database.kill();
-
-  await shutdown({ reason: "Success", code: 0 });
+  await exit({ reason: "Success", code: 0 });
 }

package/src/bin/commands/serve.ts

@@ -4,11 +4,12 @@ import { createDatabase } from "@/database/index.js";
 import { createLogger } from "@/internal/logger.js";
 import { MetricsService } from "@/internal/metrics.js";
 import { buildOptions } from "@/internal/options.js";
+import { createShutdown } from "@/internal/shutdown.js";
 import { buildPayload, createTelemetry } from "@/internal/telemetry.js";
 import { createServer } from "@/server/index.js";
 import { mergeResults } from "@/utils/result.js";
 import type { CliOptions } from "../ponder.js";
-import { setupShutdown } from "../utils/shutdown.js";
+import { createExit } from "../utils/exit.js";
 
 export async function serve({ cliOptions }: { cliOptions: CliOptions }) {
   const options = buildOptions({ cliOptions });
@@ -26,7 +27,6 @@ export async function serve({ cliOptions }: { cliOptions: CliOptions }) {
       service: "process",
       msg: `Invalid Node.js version. Expected >=18.14, detected ${major}.${minor}.`,
     });
-    await logger.kill();
     process.exit(1);
   }
 
@@ -37,38 +37,32 @@ export async function serve({ cliOptions }: { cliOptions: CliOptions }) {
   });
 
   const metrics = new MetricsService();
-  const telemetry = createTelemetry({ options, logger });
-  const common = { options, logger, metrics, telemetry };
+  const shutdown = createShutdown();
+  const telemetry = createTelemetry({ options, logger, shutdown });
+  const common = { options, logger, metrics, telemetry, shutdown };
 
   const build = await createBuild({ common, cliOptions });
 
-  let cleanupReloadable = () => Promise.resolve();
-
-  const cleanup = async () => {
-    await cleanupReloadable();
-    await telemetry.kill();
-  };
-
-  const shutdown = setupShutdown({ common, cleanup });
+  const exit = createExit({ common });
   const namespaceResult = build.namespaceCompile();
 
   if (namespaceResult.status === "error") {
-    await shutdown({ reason: "Failed to initialize namespace", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed to initialize namespace", code: 1 });
+    return;
   }
 
   const configResult = await build.executeConfig();
   if (configResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const schemaResult = await build.executeSchema({
     namespace: namespaceResult.result,
   });
   if (schemaResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const buildResult1 = mergeResults([
@@ -77,24 +71,24 @@ export async function serve({ cliOptions }: { cliOptions: CliOptions }) {
   ]);
 
   if (buildResult1.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const [preBuild, schemaBuild] = buildResult1.result;
 
   if (preBuild.databaseConfig.kind === "pglite") {
-    await shutdown({
+    await exit({
       reason: "The 'ponder serve' command does not support PGlite",
       code: 1,
     });
-    return cleanup;
+    return;
   }
 
   const indexingResult = await build.executeIndexingFunctions();
   if (indexingResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const indexingBuildResult = await build.compileIndexing({
@@ -104,8 +98,8 @@ export async function serve({ cliOptions }: { cliOptions: CliOptions }) {
   });
 
   if (indexingBuildResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const database = await createDatabase({
@@ -120,17 +114,15 @@ export async function serve({ cliOptions }: { cliOptions: CliOptions }) {
     database,
   });
   if (apiResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
-  await build.kill();
-
   const buildResult2 = await build.compileApi({ apiResult: apiResult.result });
 
   if (buildResult2.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const apiBuild = buildResult2.result;
@@ -146,16 +138,11 @@ export async function serve({ cliOptions }: { cliOptions: CliOptions }) {
     },
   });
 
-  const server = await createServer({
+  createServer({
     common,
     database,
     apiBuild,
   });
 
-  cleanupReloadable = async () => {
-    await server.kill();
-    await database.kill();
-  };
-
-  return cleanup;
+  return shutdown.kill;
 }

package/src/bin/commands/start.ts

@@ -4,12 +4,13 @@ import { type Database, createDatabase } from "@/database/index.js";
 import { createLogger } from "@/internal/logger.js";
 import { MetricsService } from "@/internal/metrics.js";
 import { buildOptions } from "@/internal/options.js";
+import { createShutdown } from "@/internal/shutdown.js";
 import { buildPayload, createTelemetry } from "@/internal/telemetry.js";
 import { mergeResults } from "@/utils/result.js";
 import type { CliOptions } from "../ponder.js";
+import { createExit } from "../utils/exit.js";
 import { run } from "../utils/run.js";
 import { runServer } from "../utils/runServer.js";
-import { setupShutdown } from "../utils/shutdown.js";
 
 export async function start({ cliOptions }: { cliOptions: CliOptions }) {
   const options = buildOptions({ cliOptions });
@@ -27,7 +28,6 @@ export async function start({ cliOptions }: { cliOptions: CliOptions }) {
       service: "process",
       msg: `Invalid Node.js version. Expected >=18.14, detected ${major}.${minor}.`,
     });
-    await logger.kill();
     process.exit(1);
   }
 
@@ -38,48 +38,36 @@ export async function start({ cliOptions }: { cliOptions: CliOptions }) {
   });
 
   const metrics = new MetricsService();
-  const telemetry = createTelemetry({ options, logger });
-  const common = { options, logger, metrics, telemetry };
+  const shutdown = createShutdown();
+  const telemetry = createTelemetry({ options, logger, shutdown });
+  const common = { options, logger, metrics, telemetry, shutdown };
+  const exit = createExit({ common });
 
   const build = await createBuild({ common, cliOptions });
 
-  let cleanupReloadable = () => Promise.resolve();
-  let cleanupReloadableServer = () => Promise.resolve();
-
   // biome-ignore lint/style/useConst: <explanation>
   let database: Database | undefined;
 
-  const cleanup = async () => {
-    await cleanupReloadable();
-    await cleanupReloadableServer();
-
-    if (database) {
-      await database.kill();
-    }
-
-    await telemetry.kill();
-  };
-
-  const shutdown = setupShutdown({ common, cleanup });
+  // const shutdown = setupShutdown({ common, cleanup });
 
   const namespaceResult = build.namespaceCompile();
   if (namespaceResult.status === "error") {
-    await shutdown({ reason: "Failed to initialize namespace", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed to initialize namespace", code: 1 });
+    return;
   }
 
   const configResult = await build.executeConfig();
   if (configResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const schemaResult = await build.executeSchema({
     namespace: namespaceResult.result,
   });
   if (schemaResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const buildResult1 = mergeResults([
@@ -88,16 +76,16 @@ export async function start({ cliOptions }: { cliOptions: CliOptions }) {
   ]);
 
   if (buildResult1.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const [preBuild, schemaBuild] = buildResult1.result;
 
   const indexingResult = await build.executeIndexingFunctions();
   if (indexingResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const indexingBuildResult = await build.compileIndexing({
@@ -107,8 +95,8 @@ export async function start({ cliOptions }: { cliOptions: CliOptions }) {
   });
 
   if (indexingBuildResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   database = await createDatabase({
@@ -124,8 +112,8 @@ export async function start({ cliOptions }: { cliOptions: CliOptions }) {
     database,
   });
   if (apiResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
   const apiBuildResult = await build.compileApi({
@@ -133,12 +121,10 @@ export async function start({ cliOptions }: { cliOptions: CliOptions }) {
   });
 
   if (apiBuildResult.status === "error") {
-    await shutdown({ reason: "Failed intial build", code: 1 });
-    return cleanup;
+    await exit({ reason: "Failed intial build", code: 1 });
+    return;
   }
 
-  await build.kill();
-
   telemetry.record({
     name: "lifecycle:session_start",
     properties: {
@@ -151,24 +137,25 @@ export async function start({ cliOptions }: { cliOptions: CliOptions }) {
     },
   });
 
-  cleanupReloadable = await run({
+  run({
     common,
     database,
+    preBuild,
     schemaBuild,
     indexingBuild: indexingBuildResult.result,
     onFatalError: () => {
-      shutdown({ reason: "Received fatal error", code: 1 });
+      exit({ reason: "Received fatal error", code: 1 });
     },
     onReloadableError: () => {
-      shutdown({ reason: "Encountered indexing error", code: 1 });
+      exit({ reason: "Encountered indexing error", code: 1 });
     },
   });
 
-  cleanupReloadableServer = await runServer({
+  runServer({
     common,
     database,
     apiBuild: apiBuildResult.result,
   });
 
-  return cleanup;
+  return shutdown.kill;
 }