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

package/dist/types/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apibara",
-  "version": "2.1.0-beta.30",
+  "version": "2.1.0-beta.32",
   "type": "module",
   "main": "./dist/core/index.mjs",
   "exports": {
@@ -32,6 +32,10 @@
       "types": "./dist/hooks/index.d.ts",
       "import": "./dist/hooks/index.mjs"
     },
+    "./common": {
+      "types": "./dist/common/index.d.ts",
+      "import": "./dist/common/index.mjs"
+    },
     "./runtime": {
       "types": "./dist/runtime/index.d.ts",
       "import": "./dist/runtime/index.mjs"
@@ -51,6 +55,22 @@
     "./dist/runtime/*": {
       "types": "./dist/runtime/*.d.ts",
       "import": "./dist/runtime/*.mjs"
+    },
+    "./indexer": {
+      "types": "./dist/indexer/index.d.ts",
+      "import": "./dist/indexer/index.mjs"
+    },
+    "./plugins": {
+      "types": "./dist/indexer/plugins.d.ts",
+      "import": "./dist/indexer/plugins.mjs"
+    },
+    "./testing": {
+      "types": "./dist/indexer/testing.d.ts",
+      "import": "./dist/indexer/testing.mjs"
+    },
+    "./vcr": {
+      "types": "./dist/indexer/vcr.d.ts",
+      "import": "./dist/indexer/vcr.mjs"
     }
   },
   "bin": {
@@ -78,7 +98,7 @@
     "playground:add": "pnpm playground add --dir playground"
   },
   "devDependencies": {
-    "@apibara/starknet": "2.1.0-beta.30",
+    "@apibara/starknet": "2.1.0-beta.32",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.14.0",
     "@types/prompts": "^2.4.9",
@@ -89,8 +109,8 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/indexer": "2.1.0-beta.30",
-    "@apibara/protocol": "2.1.0-beta.30",
+    "@apibara/indexer": "2.1.0-beta.32",
+    "@apibara/protocol": "2.1.0-beta.32",
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-virtual": "^3.0.2",
     "c12": "^1.11.1",

package/src/cli/commands/add.ts

@@ -1,6 +1,6 @@
+import { checkForUnknownArgs } from "apibara/common";
 import { addIndexer } from "apibara/create";
 import { defineCommand } from "citty";
-import { checkForUnknownArgs } from "../common";
 
 export default defineCommand({
   meta: {

package/src/cli/commands/build.ts

@@ -1,8 +1,8 @@
+import { checkForUnknownArgs, commonArgs } from "apibara/common";
 import { build, createApibara, prepare, writeTypes } from "apibara/core";
 import { runtimeDir } from "apibara/runtime/meta";
 import { defineCommand } from "citty";
 import { join, resolve } from "pathe";
-import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {

package/src/cli/commands/dev.ts

@@ -1,4 +1,5 @@
 import { type ChildProcess, spawn } from "node:child_process";
+import { checkForUnknownArgs, commonArgs } from "apibara/common";
 import { build, createApibara, prepare, writeTypes } from "apibara/core";
 import { runtimeDir } from "apibara/runtime/meta";
 import type { Apibara } from "apibara/types";
@@ -6,11 +7,10 @@ import { defineCommand } from "citty";
 import { colors } from "consola/utils";
 import { join, resolve } from "pathe";
 import { blueBright, gray } from "../../create/colors";
-import { checkForUnknownArgs, commonArgs } from "../common";
 
 // Hot module reloading key regex
-// for only runtimeConfig.* keys
-const hmrKeyRe = /^runtimeConfig\./;
+// for only runtimeConfig.*, presets.* keys & preset key
+const hmrKeyRe = /^(runtimeConfig\.|presets\.|preset$)/;
 
 export default defineCommand({
   meta: {
@@ -79,12 +79,12 @@ export default defineCommand({
               }
 
               apibara.logger.info(
-                `Config updated:
-                  ${diff.map((entry) => `  ${entry.toString()}`).join("\n")}`,
+                `Config updated: \n${diff.map((entry) => `  ${entry.toString()}`).join("\n")}`,
               );
 
               await (diff.every((e) => hmrKeyRe.test(e.key))
-                ? apibara.updateConfig(newConfig.config || {}) // Hot reload
+                ? // in hot reload we only update the runtime values & restart indexers,no build step, apibara instance remains the same
+                  apibara.updateConfig(newConfig.config || {}) // Hot reload
                 : reload()); // Full reload
             },
           },
@@ -92,7 +92,9 @@ export default defineCommand({
         true,
       );
 
-      apibara.hooks.hookOnce("restart", reload);
+      apibara.hooks.hookOnce("restart", async () => {
+        await reload();
+      });
 
       apibara.options.entry = join(runtimeDir, "dev.mjs");
 
@@ -110,9 +112,9 @@ export default defineCommand({
 
       apibara.hooks.hook("dev:reload", async () => {
         if (childProcess) {
-          apibara.logger.info("Restarting indexers");
           await killProcess(childProcess);
           childProcess = undefined;
+          apibara.logger.info("Restarting indexers");
         } else {
           apibara.logger.info("Starting indexers");
 
@@ -130,7 +132,6 @@ export default defineCommand({
           resolve(apibara.options.outputDir || "./.apibara/build", "dev.mjs"),
           "start",
           ...(args.indexers ? ["--indexers", args.indexers] : []),
-          ...(args.preset ? ["--preset", args.preset] : []),
         ];
 
         childProcess = spawn("node", childArgs, {
@@ -140,7 +141,7 @@ export default defineCommand({
         childProcess.on("close", (code, signal) => {
           childProcess = undefined;
           console.log();
-          apibara.logger.log(
+          apibara.logger.info(
             `Indexers process exited${
               code !== null ? ` with code ${colors.red(code)}` : ""
             }`,

package/src/cli/commands/init.ts

@@ -1,6 +1,6 @@
+import { checkForUnknownArgs } from "apibara/common";
 import { initializeProject } from "apibara/create";
 import { defineCommand } from "citty";
-import { checkForUnknownArgs } from "../common";
 
 export default defineCommand({
   meta: {

package/src/cli/commands/prepare.ts

@@ -1,8 +1,7 @@
+import { checkForUnknownArgs, commonArgs } from "apibara/common";
 import { createApibara, writeTypes } from "apibara/core";
-import {} from "apibara/types";
 import { defineCommand } from "citty";
 import { resolve } from "pathe";
-import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {

package/src/cli/commands/start.ts

@@ -1,10 +1,10 @@
 import { spawn } from "node:child_process";
+import { checkForUnknownArgs, commonArgs } from "apibara/common";
 import { createApibara } from "apibara/core";
 import { defineCommand } from "citty";
 import { colors } from "consola/utils";
 import fse from "fs-extra";
 import { resolve } from "pathe";
-import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -55,6 +55,8 @@ export default defineCommand({
       "start",
       "--indexer",
       indexer,
+      // important: this is required to run the indexer with apibara cli to load runtime values correctly
+      "--no-standalone",
       ...(preset ? ["--preset", preset] : []),
     ];
 
@@ -64,7 +66,7 @@ export default defineCommand({
 
     childProcess.on("close", (code, signal) => {
       console.log();
-      apibara.logger.log(
+      apibara.logger.info(
         `Indexers process exited${
           code !== null ? ` with code ${colors.red(code)}` : ""
         }`,

package/src/cli/commands/write-project-info.ts

@@ -1,11 +1,11 @@
 import { spawn } from "node:child_process";
 import { join } from "node:path";
+import { checkForUnknownArgs, commonArgs } from "apibara/common";
 import { build, createApibara, prepare, writeTypes } from "apibara/core";
 import { runtimeDir } from "apibara/runtime/meta";
 import { defineCommand } from "citty";
 import consola from "consola";
 import { resolve } from "pathe";
-import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {

package/src/common/constants.ts

@@ -0,0 +1,6 @@
+export const ENV_INTERNAL_APIBARA_RUNTIME = "_APIBARA_RUNTIME";
+export const ENV_INTERNAL_APIBARA_PRESET = "_APIBARA_PRESET";
+export const ENV_INTERNAL_APIBARA_PRESETS = "_APIBARA_PRESETS";
+export const ENV_INTERNAL_APIBARA_PROCESSED_RUNTIME =
+  "_APIBARA_PROCESSED_RUNTIME";
+export const USER_ENV_APIBARA_RUNTIME_CONFIG = "APIBARA_RUNTIME_CONFIG";

package/src/common/helper.ts

@@ -0,0 +1,86 @@
+import defu from "defu";
+import {
+  ENV_INTERNAL_APIBARA_PRESET,
+  ENV_INTERNAL_APIBARA_PRESETS,
+  ENV_INTERNAL_APIBARA_PROCESSED_RUNTIME,
+  ENV_INTERNAL_APIBARA_RUNTIME,
+  USER_ENV_APIBARA_RUNTIME_CONFIG,
+} from "./constants";
+
+export function getRuntimeDataFromEnv() {
+  const processedRuntimeConfig: Record<string, unknown> = JSON.parse(
+    process.env[ENV_INTERNAL_APIBARA_PROCESSED_RUNTIME] ?? "{}",
+  );
+  const preset: string | undefined = process.env[ENV_INTERNAL_APIBARA_PRESET];
+  const presets: Record<string, unknown> | undefined = JSON.parse(
+    process.env[ENV_INTERNAL_APIBARA_PRESETS] ?? "{}",
+  );
+  const runtimeConfig: Record<string, unknown> | undefined = JSON.parse(
+    process.env[ENV_INTERNAL_APIBARA_RUNTIME] ?? "{}",
+  );
+  const userEnvRuntimeConfig: Record<string, unknown> | undefined = JSON.parse(
+    process.env[USER_ENV_APIBARA_RUNTIME_CONFIG] ?? "{}",
+  );
+
+  return {
+    userEnvRuntimeConfig,
+    processedRuntimeConfig,
+    preset,
+    presets,
+    runtimeConfig,
+  };
+}
+
+/**
+ * Get the merged runtime config from the user env overrided runtime config, presets and defaults.
+ * Priority (Highest to lowest):
+ * 1. User env overrided runtime config
+ * 2. Preset
+ * 3. Defaults
+ */
+export function getProcessedRuntimeConfig({
+  preset,
+  presets,
+  runtimeConfig,
+  userEnvRuntimeConfig,
+}: {
+  preset?: string;
+  presets?: Record<string, unknown>;
+  runtimeConfig?: Record<string, unknown>;
+  userEnvRuntimeConfig?: Record<string, unknown>;
+}) {
+  let _runtimeConfig: Record<string, unknown> = { ...runtimeConfig };
+
+  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 (userEnvRuntimeConfig) {
+    try {
+      // Environment runtime config applied
+      _runtimeConfig = defu(userEnvRuntimeConfig, _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/common/index.ts

@@ -0,0 +1,3 @@
+export * from "./constants";
+export * from "./helper";
+export * from "./cli";

package/src/core/apibara.ts

@@ -28,8 +28,8 @@ export async function createApibara(
     hooks: createHooks(),
     close: () => apibara.hooks.callHook("close"),
     logger: consola.withTag("apibara"),
-    async updateConfig(config: ApibaraDynamicConfig) {
-      updateApibaraConfig(apibara, config);
+    async updateConfig(newConfig: ApibaraDynamicConfig) {
+      updateApibaraConfig(apibara, newConfig);
     },
   };
 

package/src/core/build/dev.ts

@@ -102,4 +102,6 @@ const getIgnorePatterns = (apibara: Apibara) => [
   "**/node_modules/**",
   "**/dist/**",
   "**/.turbo/**",
+  // changes to apibara.config is handled by c12 itself so we dont need rolldown to handle this
+  "**/apibara.config?(.ts|.js)",
 ];

package/src/core/config/loader.ts

@@ -7,8 +7,10 @@ import { loadConfig, watchConfig } from "c12";
 import { klona } from "klona/full";
 import { ApibaraDefaults } from "./defaults";
 import { resolvePathOptions } from "./resolvers/paths.resolver";
+import { runtimeConfigResolver } from "./resolvers/runtime.resolver";
 
-const configResolvers = [resolvePathOptions] as const;
+// runtimeConfigResolver handles assigning runtime values to env
+const configResolvers = [resolvePathOptions, runtimeConfigResolver] as const;
 
 export async function loadOptions(
   configOverrides: ApibaraConfig = {},

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

@@ -0,0 +1,44 @@
+import {
+  ENV_INTERNAL_APIBARA_PRESET,
+  ENV_INTERNAL_APIBARA_PRESETS,
+  ENV_INTERNAL_APIBARA_PROCESSED_RUNTIME,
+  ENV_INTERNAL_APIBARA_RUNTIME,
+  USER_ENV_APIBARA_RUNTIME_CONFIG,
+  getProcessedRuntimeConfig,
+} from "apibara/common";
+import type { ApibaraOptions } from "apibara/types";
+
+export function runtimeConfigResolver(options: Partial<ApibaraOptions>) {
+  try {
+    const { runtimeConfig, preset, presets } = options;
+
+    if (runtimeConfig) {
+      process.env[ENV_INTERNAL_APIBARA_RUNTIME] = JSON.stringify(runtimeConfig);
+    }
+    if (preset) {
+      process.env[ENV_INTERNAL_APIBARA_PRESET] = preset;
+    }
+
+    if (presets) {
+      process.env[ENV_INTERNAL_APIBARA_PRESETS] = JSON.stringify(presets);
+    }
+
+    const userEnvRuntimeConfig = JSON.parse(
+      process.env[USER_ENV_APIBARA_RUNTIME_CONFIG] ?? "{}",
+    );
+
+    // This is final processed runtime config that will be used by the indexer and useRuntimeConfig hook
+    process.env[ENV_INTERNAL_APIBARA_PROCESSED_RUNTIME] = JSON.stringify(
+      getProcessedRuntimeConfig({
+        preset,
+        presets,
+        runtimeConfig,
+        userEnvRuntimeConfig,
+      }),
+    );
+  } catch (error) {
+    throw new Error("Failed to process & set runtime environment variables", {
+      cause: error,
+    });
+  }
+}

package/src/core/config/update.ts

@@ -1,9 +1,13 @@
 import type { Apibara, ApibaraDynamicConfig } from "apibara/types";
+import { runtimeConfigResolver } from "./resolvers/runtime.resolver";
 
 export async function updateApibaraConfig(
   apibara: Apibara,
-  _config: ApibaraDynamicConfig,
+  newConfig: ApibaraDynamicConfig,
 ) {
-  await apibara.hooks.callHook("rolldown:reload");
+  // applies new config values to env again during hot reload
+  runtimeConfigResolver(newConfig);
   apibara.logger.success("Apibara config hot reloaded!");
+  // we simply stop indexers and restart them with updated runtime values
+  await apibara.hooks.callHook("dev:reload");
 }

package/src/create/constants.ts

@@ -67,7 +67,6 @@ export const storages: StorageDataType[] = [
 export const packageVersions = {
   // Required Dependencies
   apibara: "next",
-  "@apibara/indexer": "next",
   "@apibara/protocol": "next",
   // Chain Dependencies
   "@apibara/evm": "next",

package/src/create/templates.ts

@@ -22,7 +22,6 @@ export function generatePackageJson(isTypeScript: boolean) {
       ...(isTypeScript && { typecheck: "tsc --noEmit" }),
     },
     dependencies: {
-      "@apibara/indexer": packageVersions["@apibara/indexer"],
       "@apibara/protocol": packageVersions["@apibara/protocol"],
       apibara: packageVersions.apibara,
     },
@@ -70,8 +69,8 @@ export function generateIndexer({
   chain,
   language,
 }: IndexerOptions) {
-  return `import { defineIndexer } from "@apibara/indexer";
-import { useLogger } from "@apibara/indexer/plugins";
+  return `import { defineIndexer } from "apibara/indexer";
+import { useLogger } from "apibara/plugins";
 ${storage === "postgres" ? `import { drizzleStorage } from "@apibara/plugin-drizzle";` : ""}
 ${storage === "postgres" ? `import { drizzle } from "@apibara/plugin-drizzle";` : ""}
 ${

package/src/hooks/useRuntimeConfig.ts

@@ -1,5 +1,8 @@
+import { ENV_INTERNAL_APIBARA_PROCESSED_RUNTIME } from "apibara/common";
 import type { ApibaraRuntimeConfig } from "apibara/types";
 
 export function useRuntimeConfig(): ApibaraRuntimeConfig {
-  return JSON.parse(process.env.APIBARA_RUNTIME_CONFIG_HOOK_DATA || "{}");
+  return JSON.parse(
+    process.env[ENV_INTERNAL_APIBARA_PROCESSED_RUNTIME] || "{}",
+  );
 }

package/src/indexer/index.ts

@@ -0,0 +1 @@
+export * from "@apibara/indexer";

package/src/indexer/plugins.ts

@@ -0,0 +1 @@
+export * from "@apibara/indexer/plugins";

package/src/indexer/testing.ts

@@ -0,0 +1 @@
+export * from "@apibara/indexer/testing";

package/src/indexer/vcr.ts

@@ -0,0 +1 @@
+export * from "@apibara/indexer/vcr";

package/src/rolldown/config.ts

@@ -1,6 +1,5 @@
 import { existsSync } from "node:fs";
 import { builtinModules } from "node:module";
-import replace from "@rollup/plugin-replace";
 import type { Apibara } from "apibara/types";
 import defu from "defu";
 import { join } from "pathe";
@@ -9,9 +8,9 @@ import type {
   RolldownOptions,
   RolldownPluginOption,
 } from "rolldown";
-import { appConfig } from "./plugins/config";
 import { indexers } from "./plugins/indexers";
 import { instrumentation } from "./plugins/instrumentation";
+import { staticConfig } from "./plugins/static-config";
 
 const runtimeDependencies = [
   "better-sqlite3",
@@ -79,33 +78,8 @@ export function getRolldownConfig(apibara: Apibara): RolldownOptions {
     },
   );
 
-  rolldownConfig.plugins?.push(
-    replace({
-      preventAssignment: true,
-      values: {
-        "process.env.APIBARA_CONFIG": getSerializedRuntimeConfig(apibara),
-      },
-    }) as RolldownPluginOption,
-  );
-
+  rolldownConfig.plugins?.push(staticConfig(apibara));
   rolldownConfig.plugins?.push(instrumentation(apibara));
   rolldownConfig.plugins?.push(indexers(apibara));
-  rolldownConfig.plugins?.push(appConfig(apibara));
-
   return rolldownConfig;
 }
-
-function getSerializedRuntimeConfig(apibara: Apibara) {
-  try {
-    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.",
-      { cause: error },
-    );
-  }
-}

package/src/rolldown/plugins/static-config.ts

@@ -0,0 +1,21 @@
+import virtual from "@rollup/plugin-virtual";
+import { USER_ENV_APIBARA_RUNTIME_CONFIG } from "apibara/common";
+import type { Apibara } from "apibara/types";
+import type { RolldownPluginOption } from "rolldown";
+
+export function staticConfig(apibara: Apibara) {
+  const presetString = apibara.options.preset ?? "";
+  const presetsStringified = JSON.stringify(apibara.options.presets ?? {});
+  const runtimeConfigStringified = JSON.stringify(
+    apibara.options.runtimeConfig ?? {},
+  );
+
+  return virtual({
+    "#apibara-internal-virtual/static-config": `
+    export const preset = ${presetString ? `"${presetString}"` : "undefined"};
+    export const presets = ${presetsStringified};
+    export const runtimeConfig = ${runtimeConfigStringified};
+    export const userEnvRuntimeConfig = JSON.parse(process.env.${USER_ENV_APIBARA_RUNTIME_CONFIG} ?? "{}");
+    `,
+  }) as RolldownPluginOption;
+}

package/src/runtime/dev.ts

@@ -1,4 +1,5 @@
 import { runWithReconnect } from "@apibara/indexer";
+import { getRuntimeDataFromEnv } from "apibara/common";
 import { defineCommand, runMain } from "citty";
 import { blueBright } from "picocolors";
 import {
@@ -17,13 +18,11 @@ const startCommand = defineCommand({
       type: "string",
       description: "Which indexers to run",
     },
-    preset: {
-      type: "string",
-      description: "Preset to use",
-    },
   },
   async run({ args }) {
-    const { indexers: indexersArgs, preset } = args;
+    const { indexers: indexersArgs } = args;
+
+    const { processedRuntimeConfig, preset } = getRuntimeDataFromEnv();
 
     let selectedIndexers = availableIndexers;
     if (indexersArgs) {
@@ -41,7 +40,11 @@ const startCommand = defineCommand({
     await Promise.all(
       selectedIndexers.map(async (indexer) => {
         const { indexer: indexerInstance, logger } =
-          createIndexer(indexer, preset) ?? {};
+          createIndexer({
+            indexerName: indexer,
+            processedRuntimeConfig,
+            preset,
+          }) ?? {};
         if (!indexerInstance) {
           return;
         }
@@ -49,6 +52,7 @@ const startCommand = defineCommand({
         const client = createAuthenticatedClient(
           indexerInstance.streamConfig,
           indexerInstance.options.streamUrl,
+          indexerInstance.options.clientOptions,
         );
 
         if (logger) {

package/src/runtime/internal/app.ts

@@ -15,25 +15,27 @@ import {
   createClient,
 } from "@apibara/protocol";
 import consola from "consola";
-import { config } from "#apibara-internal-virtual/config";
 import { indexers } from "#apibara-internal-virtual/indexers";
 import { logger as instrumentationLogger } from "#apibara-internal-virtual/instrumentation";
-import { getProcessedRuntimeConfig } from "./helper";
 import { createLogger } from "./logger";
 
 export const availableIndexers = indexers.map((i) => i.name);
 
-export function createIndexer(indexerName: string, preset?: string) {
-  // Get merged runtime config from preset and process.env.APIBARA_RUNTIME_CONFIG and defaults.
-  const runtimeConfig = getProcessedRuntimeConfig({
-    preset,
-    presets: config.presets,
-    runtimeConfig: config.runtimeConfig,
-  });
-
-  // Set the runtime config in the environment so that it can be used by the useRuntimeConfig hook.
-  process.env.APIBARA_RUNTIME_CONFIG_HOOK_DATA = JSON.stringify(runtimeConfig);
-
+export function createIndexer({
+  indexerName,
+  processedRuntimeConfig,
+  preset,
+}: {
+  indexerName: string;
+  /**
+   * Final processed runtime config to be used by the indexer
+   */
+  processedRuntimeConfig: Record<string, unknown>;
+  /**
+   * Preset name which was used to generate the runtime config
+   */
+  preset?: string;
+}) {
   const indexerDefinition = indexers.find((i) => i.name === indexerName);
 
   if (indexerDefinition === undefined) {
@@ -52,7 +54,7 @@ export function createIndexer(indexerName: string, preset?: string) {
 
   const definition =
     typeof indexerModule === "function"
-      ? indexerModule(runtimeConfig)
+      ? indexerModule(processedRuntimeConfig)
       : indexerModule;
 
   let reporter: ConsolaReporter = createLogger({
@@ -109,10 +111,13 @@ export function createAuthenticatedClient(
   return createClient(config, streamUrl, {
     ...options,
     defaultCallOptions: {
+      ...(options?.defaultCallOptions ?? {}),
       "*": {
         metadata: Metadata({
           Authorization: `Bearer ${dnaToken}`,
         }),
+        // metadata cant be overrided with spread as its a class so we override it fully if user provided it.
+        ...(options?.defaultCallOptions?.["*"] ?? {}),
       },
     },
   });