chore: qol improvements and fixes

change/@apibara-indexer-3f5398ba-95bd-4752-abed-e779ea496399.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "chore: upgrade consola package",
+  "packageName": "@apibara/indexer",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@apibara-plugin-drizzle-8378f0ae-ad6a-4f2d-bf17-777c9e20e4b1.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "plugin-drizzle: use seperate schema and default connectionString to env",
+  "packageName": "@apibara/plugin-drizzle",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@apibara-plugin-mongo-63eb6fa1-cb73-4c3d-a9a2-d1eda15c982c.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "plugin-mongo: propagate error",
+  "packageName": "@apibara/plugin-mongo",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@apibara-protocol-a188449c-6a23-4c55-8e4b-1eebcb28f947.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "protocol: export nice-grpc MetaData class",
+  "packageName": "@apibara/protocol",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/apibara-d3198897-bb32-4e69-a1de-117791352c44.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "cli: add createAuthenticatedClient and improve runtimeConfig",
+  "packageName": "apibara",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

examples/beaconchain-client/package.json

@@ -13,7 +13,7 @@
     "@apibara/protocol": "workspace:*",
     "@apibara/beaconchain": "workspace:*",
     "citty": "^0.1.6",
-    "consola": "^3.2.3",
+    "consola": "^3.4.2",
     "nice-grpc": "^2.1.8"
   },
   "devDependencies": {

examples/cli-drizzle/.env.example

@@ -1 +1,8 @@
-POSTGRES_CONNECTION_STRING="postgres://postgres:postgres@localhost:5432/postgres"
+POSTGRES_CONNECTION_STRING="postgres://postgres:postgres@localhost:5432/postgres"
+# This is optional, it will be merged with the runtimeConfig and preset if provided.
+# Priority (Highest to lowest):
+# 1. APIBARA_RUNTIME_CONFIG
+# 2. Preset
+# 3. Defaults
+APIBARA_RUNTIME_CONFIG='{"evm": {"startingBlock": 10000000}, "starknet": {"startingBlock": 800000}}'
+DNA_TOKEN="your-dna-token"

examples/cli-drizzle/apibara.config.ts

@@ -3,18 +3,10 @@ import { defineConfig } from "apibara/config";
 export default defineConfig({
   runtimeConfig: {
     evm: {
-      startingBlock: 215_30_000n,
+      startingBlock: 215_30_000,
     },
     starknet: {
-      startingBlock: 10_30_000n,
-    },
-    connectionString: process.env["POSTGRES_CONNECTION_STRING"] ?? "memory://",
-  },
-  presets: {
-    dev: {
-      runtimeConfig: {
-        connectionString: "memory://",
-      },
+      startingBlock: 12_45_000,
     },
   },
 });

examples/cli-drizzle/indexers/1-evm.indexer.ts

@@ -16,21 +16,20 @@ const abi = parseAbi([
 // USDC Transfers on Ethereum
 export default function (runtimeConfig: ApibaraRuntimeConfig) {
   const {
-    connectionString,
     evm: { startingBlock },
   } = runtimeConfig;
 
+  // connectionString defaults to process.env["POSTGRES_CONNECTION_STRING"](postgresql) ?? "memory://" (in memory pglite)
   const database = drizzle({
     schema: {
       ethereumUsdcTransfers,
     },
-    connectionString,
   });
 
   return defineIndexer(EvmStream)({
     streamUrl: "https://ethereum.preview.apibara.org",
     finality: "accepted",
-    startingBlock,
+    startingBlock: BigInt(startingBlock),
     filter: {
       logs: [
         {

examples/cli-drizzle/indexers/2-starknet.indexer.ts

@@ -11,21 +11,20 @@ import { hash } from "starknet";
 // USDC Transfers on Starknet
 export default function (runtimeConfig: ApibaraRuntimeConfig) {
   const {
-    connectionString,
     starknet: { startingBlock },
   } = runtimeConfig;
 
+  // connectionString defaults to process.env["POSTGRES_CONNECTION_STRING"](postgresql) ?? "memory://" (in memory pglite)
   const database = drizzle({
     schema: {
       starknetUsdcTransfers,
     },
-    connectionString,
   });
 
   return defineIndexer(StarknetStream)({
     streamUrl: "https://starknet.preview.apibara.org",
     finality: "accepted",
-    startingBlock,
+    startingBlock: BigInt(startingBlock),
     plugins: [
       drizzleStorage({
         db: database,
@@ -67,10 +66,14 @@ export default function (runtimeConfig: ApibaraRuntimeConfig) {
       }
 
       await db.insert(starknetUsdcTransfers).values(
-        Array.from(transactionHashes).map((transactionHash) => ({
-          number: Number(endCursor?.orderKey),
-          hash: transactionHash,
-        })),
+        Array.from(transactionHashes)
+          .map((transactionHash) => ({
+            number: Number(endCursor?.orderKey),
+            hash: transactionHash,
+          }))
+          .filter(
+            ({ number }) => number !== undefined && !Number.isNaN(number),
+          ),
       );
     },
   });

examples/cli-drizzle/package.json

@@ -8,6 +8,7 @@
     "build": "apibara build",
     "dev": "apibara dev",
     "start": "apibara start",
+    "start:pg": "export POSTGRES_CONNECTION_STRING=\"postgres://postgres:postgres@localhost:5432/postgres\" && pnpm start",
     "lint": "biome check .",
     "lint:fix": "pnpm lint --write",
     "test": "vitest",

examples/cli-drizzle/test/ethereum.test.ts

@@ -7,14 +7,11 @@ import { describe, expect, it } from "vitest";
 
 const vcr = createVcr();
 
-const connectionString = "memory://ethereum";
-
 describe("Ethereum USDC Transfers indexer", () => {
   it("should work", async () => {
     const indexer = createIndexer({
-      connectionString,
-      evm: { startingBlock: 10_000_000n },
-      starknet: { startingBlock: 800_000n },
+      evm: { startingBlock: 10_000_000 },
+      starknet: { startingBlock: 800_000 },
     });
 
     const testResult = await vcr.run("ethereum-usdc-transfers", indexer, {

examples/cli-drizzle/test/starknet.test.ts

@@ -7,14 +7,12 @@ import { starknetUsdcTransfers } from "@/lib/schema";
 import { getTestDatabase } from "@apibara/plugin-drizzle/testing";
 
 const vcr = createVcr();
-const connectionString = "memory://starknet";
 
 describe("Starknet USDC Transfers indexer", () => {
   it("should work", async () => {
     const indexer = createIndexer({
-      connectionString,
-      evm: { startingBlock: 10_000_000n },
-      starknet: { startingBlock: 800_000n },
+      evm: { startingBlock: 10_000_000 },
+      starknet: { startingBlock: 800_000 },
     });
 
     const testResult = await vcr.run("starknet-usdc-transfers", indexer, {

examples/evm-client/package.json

@@ -13,7 +13,7 @@
     "@apibara/evm": "workspace:*",
     "@apibara/protocol": "workspace:*",
     "citty": "^0.1.6",
-    "consola": "^3.2.3",
+    "consola": "^3.4.2",
     "nice-grpc": "^2.1.8",
     "viem": "^2.12.4"
   },

examples/starknet-client/package.json

@@ -13,7 +13,7 @@
     "@apibara/protocol": "workspace:*",
     "@apibara/starknet": "workspace:*",
     "citty": "^0.1.6",
-    "consola": "^3.2.3",
+    "consola": "^3.4.2",
     "nice-grpc": "^2.1.8",
     "viem": "^2.22.9"
   },

packages/cli/package.json

@@ -96,7 +96,7 @@
     "c12": "^1.11.1",
     "chokidar": "^3.6.0",
     "citty": "^0.1.6",
-    "consola": "^3.2.3",
+    "consola": "^3.4.2",
     "defu": "^6.1.4",
     "fs-extra": "^11.2.0",
     "hookable": "^5.5.3",

packages/cli/src/cli/commands/dev.ts

@@ -118,12 +118,14 @@ export default defineCommand({
           stdio: "inherit",
         });
 
-        childProcess.on("close", (code) => {
-          if (code !== null) {
-            apibara.logger.log(
-              `Indexers process exited with code ${colors.red(code)}`,
-            );
-          }
+        childProcess.on("close", (code, signal) => {
+          console.log();
+          apibara.logger.log(
+            `Indexers process exited${
+              code !== null ? ` with code ${colors.red(code)}` : ""
+            }`,
+          );
+          process.exit(code ?? 0);
         });
       });
     };

packages/cli/src/cli/commands/start.ts

@@ -1,6 +1,7 @@
 import { spawn } from "node:child_process";
 import { createApibara } from "apibara/core";
 import { defineCommand } from "citty";
+import { colors } from "consola/utils";
 import fse from "fs-extra";
 import { resolve } from "pathe";
 import { commonArgs } from "../common";
@@ -55,8 +56,18 @@ export default defineCommand({
       ...(preset ? ["--preset", preset] : []),
     ];
 
-    spawn("node", childArgs, {
+    const childProcess = spawn("node", childArgs, {
       stdio: "inherit",
     });
+
+    childProcess.on("close", (code, signal) => {
+      console.log();
+      apibara.logger.log(
+        `Indexers process exited${
+          code !== null ? ` with code ${colors.red(code)}` : ""
+        }`,
+      );
+      process.exit(code ?? 0);
+    });
   },
 });

packages/cli/src/core/config/loader.ts

@@ -7,24 +7,30 @@ import { loadConfig, watchConfig } from "c12";
 import { klona } from "klona/full";
 import { ApibaraDefaults } from "./defaults";
 import { resolvePathOptions } from "./resolvers/paths.resolver";
-import { presetResolver } from "./resolvers/preset.resolver";
-import { resolveRuntimeConfigOptions } from "./resolvers/runtime-config.resolver";
 
-const configResolvers = [
-  resolvePathOptions,
-  resolveRuntimeConfigOptions,
-  presetResolver,
-] as const;
+const configResolvers = [resolvePathOptions] as const;
 
 export async function loadOptions(
   configOverrides: ApibaraConfig = {},
   opts: LoadConfigOptions = {},
   dev = false,
 ): Promise<ApibaraOptions> {
   const options = await _loadUserConfig(configOverrides, opts, dev);
+
+  // Check if the runtimeConfig is serializable
+  try {
+    JSON.stringify(options.runtimeConfig);
+  } catch (error) {
+    throw new Error(
+      "Non-serializable runtimeConfig. Please ensure the config is serializable.",
+      { cause: error },
+    );
+  }
+
   for (const resolver of configResolvers) {
     await resolver(options);
   }
+
   return options;
 }
 

packages/cli/src/core/config/resolvers/preset.resolver.ts

@@ -1,6 +1,9 @@
 import type { ApibaraOptions } from "apibara/types";
 import defu from "defu";
 
+/**
+ * @note This resolver is not in use currently, as we resolve presets in runtime files.
+ */
 export async function presetResolver(options: ApibaraOptions) {
   if (options.preset && options.presets?.[options.preset]) {
     const new_options = defu(options.presets[options.preset], options);

packages/cli/src/hooks/useRuntimeConfig.ts

@@ -1,6 +1,5 @@
 import type { ApibaraRuntimeConfig } from "apibara/types";
-import { deserialize } from "../utils/helper";
 
 export function useRuntimeConfig(): ApibaraRuntimeConfig {
-  return deserialize(process.env.APIBARA_RUNTIME_CONFIG || "{}");
+  return JSON.parse(process.env.APIBARA_RUNTIME_CONFIG_HOOK_DATA || "{}");
 }

packages/cli/src/rolldown/config.ts

@@ -9,7 +9,6 @@ import type {
   RolldownOptions,
   RolldownPluginOption,
 } from "rolldown";
-import { serialize } from "../utils/helper";
 import { appConfig } from "./plugins/config";
 import { indexers } from "./plugins/indexers";
 import { instrumentation } from "./plugins/instrumentation";
@@ -97,14 +96,14 @@ export function getRolldownConfig(apibara: Apibara): RolldownOptions {
 
 function getSerializedRuntimeConfig(apibara: Apibara) {
   try {
-    return serialize({
+    return JSON.stringify({
       runtimeConfig: apibara.options.runtimeConfig,
       preset: apibara.options.preset,
       presets: apibara.options.presets,
     });
   } catch (error) {
     throw new Error(
-      "Failed to serialize runtime config. Please ensure all values in your runtime configuration are JSON serializable. BigInt values are supported, but functions, symbols, etc. are not. Check your configuration for non-serializable values.",
+      "Failed to serialize runtime config. Please ensure all values in your runtime configuration are JSON serializable.",
       { cause: error },
     );
   }

packages/cli/src/rolldown/plugins/config.ts

@@ -11,15 +11,7 @@ export function appConfig(apibara: Apibara) {
       throw new Error("APIBARA_CONFIG is not defined");
     }
 
-    function deserialize(str) {
-      return JSON.parse(str, (_, value) =>
-        typeof value === "string" && value.match(/^\\d+n$/)
-          ? BigInt(value.slice(0, -1))
-          : value,
-      );
-    }
-
-    export const config = deserialize(serializedConfig);
+    export const config = JSON.parse(serializedConfig);
     `,
   }) as RolldownPluginOption;
 }