[WIP] improve internal error handling

packages/core/src/bin/commands/createViews.ts

@@ -111,8 +111,20 @@ export async function createViews({
     return;
   }
 
+  const database = createDatabase({
+    common,
+    // Note: `namespace` is not used in this command
+    namespace: {
+      schema: cliOptions.schema!,
+      viewsSchema: undefined,
+    },
+    preBuild: buildResult.result,
+    schemaBuild: emptySchemaBuild,
+  });
+
   const databaseDiagnostic = await build.databaseDiagnostic({
     preBuild: buildResult.result,
+    database,
   });
   if (databaseDiagnostic.status === "error") {
     common.logger.error({
@@ -124,17 +136,6 @@ export async function createViews({
     return;
   }
 
-  const database = createDatabase({
-    common,
-    // Note: `namespace` is not used in this command
-    namespace: {
-      schema: cliOptions.schema!,
-      viewsSchema: undefined,
-    },
-    preBuild: buildResult.result,
-    schemaBuild: emptySchemaBuild,
-  });
-
   const endClock = startClock();
 
   const schemaExists = await database.adminQB

packages/core/src/bin/commands/dev.ts

@@ -3,7 +3,11 @@ import path from "node:path";
 import { createBuild } from "@/build/index.js";
 import { type Database, createDatabase } from "@/database/index.js";
 import type { Common } from "@/internal/common.js";
-import { NonRetryableUserError, ShutdownError } from "@/internal/errors.js";
+import {
+  BaseError,
+  ShutdownError,
+  isUserDerivedError,
+} from "@/internal/errors.js";
 import { createLogger } from "@/internal/logger.js";
 import { MetricsService } from "@/internal/metrics.js";
 import { buildOptions } from "@/internal/options.js";
@@ -102,12 +106,6 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
       }
 
       if (result.status === "error") {
-        if (isInitialBuild === false) {
-          common.logger.error({
-            error: result.error,
-          });
-        }
-
         // This handles indexing function build failures on hot reload.
         metrics.hasError = true;
         return;
@@ -162,23 +160,6 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
           return;
         }
 
-        const databaseDiagnostic = await build.databaseDiagnostic({
-          preBuild: preCompileResult.result,
-        });
-        if (databaseDiagnostic.status === "error") {
-          common.logger.error({
-            msg: "Build failed",
-            stage: "diagnostic",
-            error: databaseDiagnostic.error,
-          });
-          buildQueue.add({
-            status: "error",
-            kind: "indexing",
-            error: databaseDiagnostic.error,
-          });
-          return;
-        }
-
         const compileSchemaResult = build.compileSchema({
           ...schemaResult.result,
           preBuild: preCompileResult.result,
@@ -276,11 +257,40 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
           preBuild: preCompileResult.result,
           schemaBuild: compileSchemaResult.result,
         });
-        crashRecoveryCheckpoint = await database.migrate({
-          buildId: indexingBuildResult.result.buildId,
-          chains: indexingBuildResult.result.chains,
-          finalizedBlocks: indexingBuildResult.result.finalizedBlocks,
+
+        const databaseDiagnostic = await build.databaseDiagnostic({
+          preBuild: preCompileResult.result,
+          database,
         });
+        if (databaseDiagnostic.status === "error") {
+          common.logger.error({
+            msg: "Build failed",
+            stage: "diagnostic",
+            error: databaseDiagnostic.error,
+          });
+          buildQueue.add({
+            status: "error",
+            kind: "indexing",
+            error: databaseDiagnostic.error,
+          });
+          return;
+        }
+
+        crashRecoveryCheckpoint = await database
+          .migrate({
+            buildId: indexingBuildResult.result.buildId,
+            chains: indexingBuildResult.result.chains,
+            finalizedBlocks: indexingBuildResult.result.finalizedBlocks,
+          })
+          .catch((error) => {
+            common.logger.error({
+              msg: "Database migration failed",
+              stage: "migration",
+              error: error as Error,
+            });
+
+            throw error;
+          });
 
         await database.migrateSync();
 
@@ -437,37 +447,31 @@ export async function dev({ cliOptions }: { cliOptions: CliOptions }) {
 
   process.on("uncaughtException", (error: Error) => {
     if (error instanceof ShutdownError) return;
-    if (error instanceof NonRetryableUserError) {
-      common.logger.error({
-        msg: "uncaughtException",
-        error,
-      });
-
-      buildQueue.clear();
-      buildQueue.add({ status: "error", kind: "indexing", error });
+    if (error instanceof BaseError) {
+      common.logger.error({ msg: `uncaughtException: ${error.name}` });
+      if (isUserDerivedError(error)) {
+        buildQueue.clear();
+        buildQueue.add({ status: "error", kind: "indexing", error });
+      } else {
+        exit({ code: 75 });
+      }
     } else {
-      common.logger.error({
-        msg: "uncaughtException",
-        error,
-      });
+      common.logger.error({ msg: "uncaughtException", error });
       exit({ code: 75 });
     }
   });
   process.on("unhandledRejection", (error: Error) => {
     if (error instanceof ShutdownError) return;
-    if (error instanceof NonRetryableUserError) {
-      common.logger.error({
-        msg: "unhandledRejection",
-        error,
-      });
-
-      buildQueue.clear();
-      buildQueue.add({ status: "error", kind: "indexing", error });
+    if (error instanceof BaseError) {
+      common.logger.error({ msg: `unhandledRejection: ${error.name}` });
+      if (isUserDerivedError(error)) {
+        buildQueue.clear();
+        buildQueue.add({ status: "error", kind: "indexing", error });
+      } else {
+        exit({ code: 75 });
+      }
     } else {
-      common.logger.error({
-        msg: "unhandledRejection",
-        error,
-      });
+      common.logger.error({ msg: "unhandledRejection", error });
       exit({ code: 75 });
     }
   });

packages/core/src/bin/commands/list.ts

@@ -84,8 +84,17 @@ export async function list({ cliOptions }: { cliOptions: CliOptions }) {
     return;
   }
 
+  const database = createDatabase({
+    common,
+    // Note: `namespace` is not used in this command
+    namespace: { schema: "public", viewsSchema: undefined },
+    preBuild: buildResult.result,
+    schemaBuild: emptySchemaBuild,
+  });
+
   const databaseDiagnostic = await build.databaseDiagnostic({
     preBuild: buildResult.result,
+    database,
   });
   if (databaseDiagnostic.status === "error") {
     common.logger.error({
@@ -97,14 +106,6 @@ export async function list({ cliOptions }: { cliOptions: CliOptions }) {
     return;
   }
 
-  const database = createDatabase({
-    common,
-    // Note: `namespace` is not used in this command
-    namespace: { schema: "public", viewsSchema: undefined },
-    preBuild: buildResult.result,
-    schemaBuild: emptySchemaBuild,
-  });
-
   const ponderSchemas = await database.adminQB.wrap((db) =>
     db
       .select({ schema: TABLES.table_schema })

packages/core/src/bin/commands/prune.ts

@@ -91,8 +91,17 @@ export async function prune({ cliOptions }: { cliOptions: CliOptions }) {
     return;
   }
 
+  const database = createDatabase({
+    common,
+    // Note: `namespace` is not used in this command
+    namespace: { schema: "public", viewsSchema: undefined },
+    preBuild: buildResult.result,
+    schemaBuild: emptySchemaBuild,
+  });
+
   const databaseDiagnostic = await build.databaseDiagnostic({
     preBuild: buildResult.result,
+    database,
   });
   if (databaseDiagnostic.status === "error") {
     common.logger.error({
@@ -104,14 +113,6 @@ export async function prune({ cliOptions }: { cliOptions: CliOptions }) {
     return;
   }
 
-  const database = createDatabase({
-    common,
-    // Note: `namespace` is not used in this command
-    namespace: { schema: "public", viewsSchema: undefined },
-    preBuild: buildResult.result,
-    schemaBuild: emptySchemaBuild,
-  });
-
   const ponderSchemas = await database.adminQB.wrap((db) =>
     db
       .select({ schema: TABLES.table_schema, tableCount: count() })

packages/core/src/bin/commands/serve.ts

@@ -113,19 +113,6 @@ export async function serve({ cliOptions }: { cliOptions: CliOptions }) {
     return;
   }
 
-  const databaseDiagnostic = await build.databaseDiagnostic({
-    preBuild: preCompileResult.result,
-  });
-  if (databaseDiagnostic.status === "error") {
-    common.logger.error({
-      msg: "Build failed",
-      stage: "diagnostic",
-      error: databaseDiagnostic.error,
-    });
-    await exit({ code: 75 });
-    return;
-  }
-
   const compileSchemaResult = build.compileSchema({
     ...schemaResult.result,
     preBuild: preCompileResult.result,
@@ -164,6 +151,20 @@ export async function serve({ cliOptions }: { cliOptions: CliOptions }) {
     schemaBuild: compileSchemaResult.result,
   });
 
+  const databaseDiagnostic = await build.databaseDiagnostic({
+    preBuild: preCompileResult.result,
+    database,
+  });
+  if (databaseDiagnostic.status === "error") {
+    common.logger.error({
+      msg: "Build failed",
+      stage: "diagnostic",
+      error: databaseDiagnostic.error,
+    });
+    await exit({ code: 75 });
+    return;
+  }
+
   const schemaExists = await database.adminQB
     .wrap((db) =>
       db

packages/core/src/bin/commands/start.ts

@@ -137,19 +137,6 @@ export async function start({
     return;
   }
 
-  const databaseDiagnostic = await build.databaseDiagnostic({
-    preBuild: preCompileResult.result,
-  });
-  if (databaseDiagnostic.status === "error") {
-    common.logger.error({
-      msg: "Build failed",
-      stage: "diagnostic",
-      error: databaseDiagnostic.error,
-    });
-    await exit({ code: 75 });
-    return;
-  }
-
   const compileSchemaResult = build.compileSchema({
     ...schemaResult.result,
     preBuild: preCompileResult.result,
@@ -225,11 +212,36 @@ export async function start({
     preBuild: preCompileResult.result,
     schemaBuild: compileSchemaResult.result,
   });
-  const crashRecoveryCheckpoint = await database.migrate({
-    buildId: indexingBuildResult.result.buildId,
-    chains: indexingBuildResult.result.chains,
-    finalizedBlocks: indexingBuildResult.result.finalizedBlocks,
+
+  const databaseDiagnostic = await build.databaseDiagnostic({
+    preBuild: preCompileResult.result,
+    database,
   });
+  if (databaseDiagnostic.status === "error") {
+    common.logger.error({
+      msg: "Build failed",
+      stage: "diagnostic",
+      error: databaseDiagnostic.error,
+    });
+    await exit({ code: 75 });
+    return;
+  }
+
+  const crashRecoveryCheckpoint = await database
+    .migrate({
+      buildId: indexingBuildResult.result.buildId,
+      chains: indexingBuildResult.result.chains,
+      finalizedBlocks: indexingBuildResult.result.finalizedBlocks,
+    })
+    .catch((error) => {
+      common.logger.error({
+        msg: "Database migration failed",
+        stage: "migration",
+        error: error as Error,
+      });
+
+      throw error;
+    });
 
   await database.migrateSync();