apibara 2.1.0-beta.30 → 2.1.0-beta.32

package/src/runtime/project-info.ts

@@ -1,7 +1,10 @@
 import { writeFileSync } from "node:fs";
 import { resolve } from "node:path";
+import {
+  getProcessedRuntimeConfig,
+  getRuntimeDataFromEnv,
+} from "apibara/common";
 import { defineCommand, runMain } from "citty";
-import { config } from "#apibara-internal-virtual/config";
 import { availableIndexers, createIndexer } from "./internal/app";
 
 type ProjectInfo = {
@@ -31,10 +34,25 @@ const startCommand = defineCommand({
       indexers: {},
     };
 
-    for (const preset of Object.keys(config.presets ?? {})) {
+    // get all original runtime data from env
+    const { presets, runtimeConfig, userEnvRuntimeConfig } =
+      getRuntimeDataFromEnv();
+
+    for (const preset of Object.keys(presets ?? {})) {
+      // process runtime config for each preset
+      const processedRuntimeConfig = getProcessedRuntimeConfig({
+        preset,
+        presets,
+        runtimeConfig,
+        userEnvRuntimeConfig,
+      });
       for (const indexer of availableIndexers) {
         const { indexer: indexerInstance } =
-          createIndexer(indexer, preset) ?? {};
+          createIndexer({
+            indexerName: indexer,
+            processedRuntimeConfig,
+            preset,
+          }) ?? {};
         if (!indexerInstance) {
           continue;
         }

package/src/runtime/start.ts

@@ -1,8 +1,20 @@
 import { runWithReconnect } from "@apibara/indexer";
+import {
+  checkForUnknownArgs,
+  getProcessedRuntimeConfig,
+  getRuntimeDataFromEnv,
+} from "apibara/common";
 import { defineCommand, runMain } from "citty";
 import consola from "consola";
 import { blueBright } from "picocolors";
 import { register } from "#apibara-internal-virtual/instrumentation";
+// used when running with node .apibara/build/start.mjs as these values are made static during build time (except userEnvRuntimeConfig)
+import {
+  preset as originalPreset,
+  presets,
+  runtimeConfig,
+  userEnvRuntimeConfig,
+} from "#apibara-internal-virtual/static-config";
 import { createAuthenticatedClient, createIndexer } from "./internal/app";
 
 const startCommand = defineCommand({
@@ -18,14 +30,45 @@ const startCommand = defineCommand({
     },
     preset: {
       type: "string",
-      description: "Preset to use",
+      description: "Preset name",
+    },
+    standalone: {
+      type: "boolean",
+      default: true,
+      description:
+        "--standalone: can run the indexer just with node and without apibara cli \n\t\t\t  --no-standalone: must run the indexer with apibara cli",
     },
   },
-  async run({ args }) {
-    const { indexer, preset } = args;
+  async run({ args, cmd }) {
+    const { indexer, preset: argPreset, standalone } = args;
+    await checkForUnknownArgs(args, cmd);
+
+    let preset: string | undefined;
+    let processedRuntimeConfig: Record<string, unknown> | undefined;
+
+    if (standalone) {
+      // when user does node .apibara/build/start.mjs
+      preset = argPreset ?? originalPreset;
+      processedRuntimeConfig = getProcessedRuntimeConfig({
+        preset,
+        presets,
+        runtimeConfig,
+        userEnvRuntimeConfig,
+      });
+    } else {
+      // When user does apibara start
+      const envResult = getRuntimeDataFromEnv();
+      preset = envResult.preset;
+      processedRuntimeConfig = envResult.processedRuntimeConfig;
+    }
 
     const { indexer: indexerInstance, logger } =
-      createIndexer(indexer, preset) ?? {};
+      createIndexer({
+        indexerName: indexer,
+        processedRuntimeConfig,
+        preset,
+      }) ?? {};
+
     if (!indexerInstance) {
       consola.error(`Specified indexer "${indexer}" but it was not defined`);
       process.exit(1);
@@ -34,6 +77,7 @@ const startCommand = defineCommand({
     const client = createAuthenticatedClient(
       indexerInstance.streamConfig,
       indexerInstance.options.streamUrl,
+      indexerInstance.options.clientOptions,
     );
 
     if (register) {

package/src/types/config.ts

@@ -41,7 +41,10 @@ export interface ApibaraConfig<
   preset?: keyof T;
 }
 
-export type ApibaraDynamicConfig = Pick<ApibaraConfig, "runtimeConfig">;
+export type ApibaraDynamicConfig = Pick<
+  ApibaraConfig,
+  "runtimeConfig" | "preset" | "presets"
+>;
 
 /**
  * Config loader options

package/src/types/virtual/static-config.d.ts

@@ -0,0 +1,4 @@
+export const preset: string | undefined = undefined;
+export const presets: Record<string, unknown> = {};
+export const runtimeConfig: Record<string, unknown> = {};
+export const userEnvRuntimeConfig: Record<string, unknown> = {};

package/dist/runtime/internal/helper.d.ts

@@ -1,12 +0,0 @@
-/**
- * Get the merged runtime config from the process.env.APIBARA_RUNTIME_CONFIG, presets and defaults.
- * Priority (Highest to lowest):
- * 1. process.env.APIBARA_RUNTIME_CONFIG
- * 2. Preset
- * 3. Defaults
- */
-export declare function getProcessedRuntimeConfig({ preset, presets, runtimeConfig, }: {
-    preset?: string;
-    presets?: Record<string, unknown>;
-    runtimeConfig?: Record<string, unknown>;
-}): Record<string, unknown>;

package/dist/runtime/internal/helper.mjs

@@ -1,33 +0,0 @@
-import defu from "defu";
-export function getProcessedRuntimeConfig({
-  preset,
-  presets,
-  runtimeConfig
-}) {
-  let _runtimeConfig = { ...runtimeConfig };
-  const envRuntimeConfig = process.env.APIBARA_RUNTIME_CONFIG;
-  if (preset) {
-    if (presets === void 0) {
-      throw new Error(
-        `Specified preset "${preset}" but no presets were defined`
-      );
-    }
-    if (presets[preset] === void 0) {
-      throw new Error(`Specified preset "${preset}" but it was not defined`);
-    }
-    const presetValue = presets[preset];
-    _runtimeConfig = defu(presetValue.runtimeConfig, _runtimeConfig);
-  }
-  if (envRuntimeConfig) {
-    try {
-      const envRuntimeConfigValue = JSON.parse(envRuntimeConfig);
-      _runtimeConfig = defu(envRuntimeConfigValue, _runtimeConfig);
-    } catch (error) {
-      throw new Error(
-        "Failed to parse runtime config from process.env.APIBARA_RUNTIME_CONFIG. Please ensure it is a valid JSON string.",
-        { cause: error }
-      );
-    }
-  }
-  return _runtimeConfig;
-}

package/dist/shared/apibara.63c9a277.mjs

@@ -1,29 +0,0 @@
-import { renderUsage } from 'citty';
-import consola from 'consola';
-
-const commonArgs = {
-  dir: {
-    type: "string",
-    description: "project root directory"
-  }
-};
-const checkForUnknownArgs = async (args, cmd) => {
-  const definedArgs = [];
-  if (cmd.args) {
-    for (const [argName, argDef] of Object.entries(cmd.args)) {
-      definedArgs.push(argName);
-      if (argDef.alias) {
-        definedArgs.push(argDef.alias);
-      }
-    }
-  }
-  const providedArgs = Object.keys(args).filter((arg) => arg !== "_");
-  const wrongArgs = providedArgs.filter((arg) => !definedArgs.includes(arg));
-  if (wrongArgs.length > 0) {
-    consola.error(`Unknown arguments: ${wrongArgs.join(", ")}`);
-    consola.info(await renderUsage(cmd));
-    process.exit(1);
-  }
-};
-
-export { checkForUnknownArgs as a, commonArgs as c };

package/src/core/config/resolvers/preset.resolver.ts

@@ -1,12 +0,0 @@
-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);
-    Object.assign(options, new_options);
-  }
-}

package/src/rolldown/plugins/config.ts

@@ -1,17 +0,0 @@
-import virtual from "@rollup/plugin-virtual";
-import type { Apibara } from "apibara/types";
-import type { RolldownPluginOption } from "rolldown";
-
-export function appConfig(apibara: Apibara) {
-  return virtual({
-    "#apibara-internal-virtual/config": `
-    const serializedConfig = \`process.env.APIBARA_CONFIG\`;
-
-    if (serializedConfig === undefined || serializedConfig === "") {
-      throw new Error("APIBARA_CONFIG is not defined");
-    }
-
-    export const config = JSON.parse(serializedConfig);
-    `,
-  }) as RolldownPluginOption;
-}

package/src/runtime/internal/helper.ts

@@ -1,55 +0,0 @@
-import defu from "defu";
-
-/**
- * Get the merged runtime config from the process.env.APIBARA_RUNTIME_CONFIG, presets and defaults.
- * Priority (Highest to lowest):
- * 1. process.env.APIBARA_RUNTIME_CONFIG
- * 2. Preset
- * 3. Defaults
- */
-export function getProcessedRuntimeConfig({
-  preset,
-  presets,
-  runtimeConfig,
-}: {
-  preset?: string;
-  presets?: Record<string, unknown>;
-  runtimeConfig?: Record<string, unknown>;
-}) {
-  let _runtimeConfig: Record<string, unknown> = { ...runtimeConfig };
-  const envRuntimeConfig = process.env.APIBARA_RUNTIME_CONFIG;
-
-  if (preset) {
-    if (presets === undefined) {
-      throw new Error(
-        `Specified preset "${preset}" but no presets were defined`,
-      );
-    }
-
-    if (presets[preset] === undefined) {
-      throw new Error(`Specified preset "${preset}" but it was not defined`);
-    }
-
-    const presetValue = presets[preset] as {
-      runtimeConfig: Record<string, unknown>;
-    };
-
-    // Preset applied
-    _runtimeConfig = defu(presetValue.runtimeConfig, _runtimeConfig);
-  }
-
-  if (envRuntimeConfig) {
-    try {
-      // Environment runtime config applied
-      const envRuntimeConfigValue = JSON.parse(envRuntimeConfig);
-      _runtimeConfig = defu(envRuntimeConfigValue, _runtimeConfig);
-    } catch (error) {
-      throw new Error(
-        "Failed to parse runtime config from process.env.APIBARA_RUNTIME_CONFIG. Please ensure it is a valid JSON string.",
-        { cause: error },
-      );
-    }
-  }
-
-  return _runtimeConfig;
-}

package/src/types/virtual/config.d.ts

@@ -1,6 +0,0 @@
-import type { ApibaraConfig } from "apibara/types";
-
-export const config: Pick<
-  ApibaraConfig,
-  "runtimeConfig" | "preset" | "presets"
-> = {};