apibara 2.1.0-beta.21 → 2.1.0-beta.23

package/dist/chunks/dev.mjs

@@ -4,7 +4,9 @@ import { runtimeDir } from 'apibara/runtime/meta';
 import { defineCommand } from 'citty';
 import { colors } from 'consola/utils';
 import { resolve, join } from 'pathe';
+import { b as blueBright, g as gray } from '../shared/apibara.730bb1e4.mjs';
 import { c as commonArgs, a as checkForUnknownArgs } from '../shared/apibara.63c9a277.mjs';
+import 'picocolors';
 import 'consola';
 
 const hmrKeyRe = /^runtimeConfig\./;
@@ -35,6 +37,9 @@ const dev = defineCommand({
     if (args["always-reindex"]) {
       process.env.APIBARA_ALWAYS_REINDEX = "true";
     }
+    const selectedIndexers = new Set(
+      args.indexers?.split(",").map((i) => i.trim()).sort() ?? []
+    );
     let apibara;
     let childProcess;
     const reload = async () => {
@@ -87,6 +92,10 @@ const dev = defineCommand({
           childProcess = void 0;
         } else {
           apibara.logger.info("Starting indexers");
+          const indexersText = apibara.indexers.map(
+            (i) => selectedIndexers.has(i.name) || selectedIndexers.size === 0 ? blueBright(i.name) : gray(i.name)
+          ).join(", ");
+          apibara.logger.info("Indexers:", indexersText);
         }
         const childArgs = [
           resolve(apibara.options.outputDir || "./.apibara/build", "dev.mjs"),

package/dist/create/index.mjs

@@ -1,24 +1,11 @@
 import path, { basename } from 'node:path';
 import consola$1, { consola } from 'consola';
 import prompts from 'prompts';
-import colors from 'picocolors';
+import { a as blue, y as yellow, c as green, r as red, d as cyan, m as magenta, e as reset } from '../shared/apibara.730bb1e4.mjs';
 import fs from 'node:fs';
 import { Project, SyntaxKind } from 'ts-morph';
 import * as prettier from 'prettier';
-
-const {
-  blue,
-  blueBright,
-  cyan,
-  gray,
-  green,
-  greenBright,
-  magenta,
-  red,
-  redBright,
-  reset,
-  yellow
-} = colors;
+import 'picocolors';
 
 const chains = [
   {
@@ -449,10 +436,9 @@ ${storage === "postgres" ? `import * as schema from "../lib/schema";` : ""}
 
 export default function (runtimeConfig${language === "typescript" ? ": ApibaraRuntimeConfig" : ""}) {
   const indexerId = "${indexerId}";
-  const { startingBlock, streamUrl${storage === "postgres" ? ", postgresConnectionString" : ""} } = runtimeConfig[indexerId];
+  const { startingBlock, streamUrl } = runtimeConfig[indexerId];
   ${storage === "postgres" ? `const db = drizzle({
     schema,
-    connectionString: postgresConnectionString,
   });` : ""}
 
   return defineIndexer(${chain === "ethereum" ? "EvmStream" : chain === "beaconchain" ? "BeaconChainStream" : chain === "starknet" ? "StarknetStream" : ""})({
@@ -546,8 +532,8 @@ async function updateApibaraConfigFile({
   );
   const runtimeConfigString = `{
   startingBlock: 0,
-  streamUrl: "${dnaUrl ?? getDnaUrl(chain, network)}"${storage === "postgres" ? `,
-  postgresConnectionString: process.env["POSTGRES_CONNECTION_STRING"] ?? "memory://${indexerId}"` : ""}}`;
+  streamUrl: "${dnaUrl ?? getDnaUrl(chain, network)}"  
+}`;
   const project = new Project();
   const sourceFile = project.addSourceFileAtPath(pathToConfig);
   const defineConfigCall = sourceFile.getFirstDescendantByKind(

package/dist/runtime/dev.mjs

@@ -1,5 +1,6 @@
 import { runWithReconnect } from "@apibara/indexer";
 import { defineCommand, runMain } from "citty";
+import { blueBright } from "picocolors";
 import {
   availableIndexers,
   createAuthenticatedClient,
@@ -35,7 +36,7 @@ const startCommand = defineCommand({
     }
     await Promise.all(
       selectedIndexers.map(async (indexer) => {
-        const indexerInstance = createIndexer(indexer, preset);
+        const { indexer: indexerInstance, logger } = createIndexer(indexer, preset) ?? {};
         if (!indexerInstance) {
           return;
         }
@@ -43,6 +44,9 @@ const startCommand = defineCommand({
           indexerInstance.streamConfig,
           indexerInstance.options.streamUrl
         );
+        if (logger) {
+          logger.info(`Indexer ${blueBright(indexer)} started`);
+        }
         await runWithReconnect(client, indexerInstance);
       })
     );

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

@@ -1,4 +1,7 @@
 import { type CreateClientOptions, type StreamConfig } from "@apibara/protocol";
 export declare const availableIndexers: any;
-export declare function createIndexer(indexerName: string, preset?: string): import("@apibara/indexer").Indexer<unknown, unknown> | undefined;
+export declare function createIndexer(indexerName: string, preset?: string): {
+    indexer: import("@apibara/indexer").Indexer<unknown, unknown>;
+    logger: any;
+} | undefined;
 export declare function createAuthenticatedClient(config: StreamConfig<unknown, unknown>, streamUrl: string, options?: CreateClientOptions): import("@apibara/protocol").GrpcClient<unknown, unknown>;

package/dist/runtime/internal/app.mjs

@@ -62,7 +62,10 @@ export function createIndexer(indexerName, preset) {
     inMemoryPersistence(),
     ...definition.plugins ?? []
   ];
-  return _createIndexer(definition);
+  return {
+    indexer: _createIndexer(definition),
+    logger: consola.create({ reporters: [reporter] })
+  };
 }
 export function createAuthenticatedClient(config2, streamUrl, options) {
   const dnaToken = process.env.DNA_TOKEN;

package/dist/runtime/start.mjs

@@ -1,6 +1,7 @@
 import { runWithReconnect } from "@apibara/indexer";
 import { defineCommand, runMain } from "citty";
 import consola from "consola";
+import { blueBright } from "picocolors";
 import { register } from "#apibara-internal-virtual/instrumentation";
 import { createAuthenticatedClient, createIndexer } from "./internal/app.mjs";
 const startCommand = defineCommand({
@@ -21,7 +22,7 @@ const startCommand = defineCommand({
   },
   async run({ args }) {
     const { indexer, preset } = args;
-    const indexerInstance = createIndexer(indexer, preset);
+    const { indexer: indexerInstance, logger } = createIndexer(indexer, preset) ?? {};
     if (!indexerInstance) {
       consola.error(`Specified indexer "${indexer}" but it was not defined`);
       process.exit(1);
@@ -35,6 +36,9 @@ const startCommand = defineCommand({
       await register();
       consola.success("Registered from instrumentation");
     }
+    if (logger) {
+      logger.info(`Indexer ${blueBright(indexer)} started`);
+    }
     await runWithReconnect(client, indexerInstance);
   }
 });

package/dist/shared/apibara.730bb1e4.mjs

@@ -0,0 +1,17 @@
+import colors from 'picocolors';
+
+const {
+  blue,
+  blueBright,
+  cyan,
+  gray,
+  green,
+  greenBright,
+  magenta,
+  red,
+  redBright,
+  reset,
+  yellow
+} = colors;
+
+export { blue as a, blueBright as b, green as c, cyan as d, reset as e, gray as g, magenta as m, red as r, yellow as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apibara",
-  "version": "2.1.0-beta.21",
+  "version": "2.1.0-beta.23",
   "type": "module",
   "main": "./dist/core/index.mjs",
   "exports": {
@@ -78,7 +78,7 @@
     "playground:add": "pnpm playground add --dir playground"
   },
   "devDependencies": {
-    "@apibara/starknet": "2.1.0-beta.21",
+    "@apibara/starknet": "2.1.0-beta.23",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.14.0",
     "@types/prompts": "^2.4.9",
@@ -89,8 +89,8 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/indexer": "2.1.0-beta.21",
-    "@apibara/protocol": "2.1.0-beta.21",
+    "@apibara/indexer": "2.1.0-beta.23",
+    "@apibara/protocol": "2.1.0-beta.23",
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-virtual": "^3.0.2",
     "c12": "^1.11.1",

package/src/cli/commands/dev.ts

@@ -5,6 +5,7 @@ import type { Apibara } from "apibara/types";
 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
@@ -42,6 +43,13 @@ export default defineCommand({
       process.env.APIBARA_ALWAYS_REINDEX = "true";
     }
 
+    const selectedIndexers = new Set(
+      args.indexers
+        ?.split(",")
+        .map((i) => i.trim())
+        .sort() ?? [],
+    );
+
     let apibara: Apibara;
     let childProcess: ChildProcess | undefined;
 
@@ -107,6 +115,15 @@ export default defineCommand({
           childProcess = undefined;
         } else {
           apibara.logger.info("Starting indexers");
+
+          const indexersText = apibara.indexers
+            .map((i) =>
+              selectedIndexers.has(i.name) || selectedIndexers.size === 0
+                ? blueBright(i.name)
+                : gray(i.name),
+            )
+            .join(", ");
+          apibara.logger.info("Indexers:", indexersText);
         }
 
         const childArgs = [

package/src/create/templates.ts

@@ -89,12 +89,11 @@ ${storage === "postgres" ? `import * as schema from "../lib/schema";` : ""}
 
 export default function (runtimeConfig${language === "typescript" ? ": ApibaraRuntimeConfig" : ""}) {
   const indexerId = "${indexerId}";
-  const { startingBlock, streamUrl${storage === "postgres" ? ", postgresConnectionString" : ""} } = runtimeConfig[indexerId];
+  const { startingBlock, streamUrl } = runtimeConfig[indexerId];
   ${
     storage === "postgres"
       ? `const db = drizzle({
     schema,
-    connectionString: postgresConnectionString,
   });`
       : ""
   }
@@ -225,12 +224,8 @@ export async function updateApibaraConfigFile({
 
   const runtimeConfigString = `{
   startingBlock: 0,
-  streamUrl: "${dnaUrl ?? getDnaUrl(chain, network)}"${
-    storage === "postgres"
-      ? `,
-  postgresConnectionString: process.env["POSTGRES_CONNECTION_STRING"] ?? "memory://${indexerId}"`
-      : ""
-  }}`;
+  streamUrl: "${dnaUrl ?? getDnaUrl(chain, network)}"  
+}`;
 
   const project = new Project();
   const sourceFile = project.addSourceFileAtPath(pathToConfig);

package/src/runtime/dev.ts

@@ -1,5 +1,6 @@
 import { runWithReconnect } from "@apibara/indexer";
 import { defineCommand, runMain } from "citty";
+import { blueBright } from "picocolors";
 import {
   availableIndexers,
   createAuthenticatedClient,
@@ -39,7 +40,8 @@ const startCommand = defineCommand({
 
     await Promise.all(
       selectedIndexers.map(async (indexer) => {
-        const indexerInstance = createIndexer(indexer, preset);
+        const { indexer: indexerInstance, logger } =
+          createIndexer(indexer, preset) ?? {};
         if (!indexerInstance) {
           return;
         }
@@ -49,6 +51,10 @@ const startCommand = defineCommand({
           indexerInstance.options.streamUrl,
         );
 
+        if (logger) {
+          logger.info(`Indexer ${blueBright(indexer)} started`);
+        }
+
         await runWithReconnect(client, indexerInstance);
       }),
     );

package/src/runtime/internal/app.ts

@@ -88,7 +88,10 @@ export function createIndexer(indexerName: string, preset?: string) {
     ...(definition.plugins ?? []),
   ];
 
-  return _createIndexer(definition);
+  return {
+    indexer: _createIndexer(definition),
+    logger: consola.create({ reporters: [reporter] }),
+  };
 }
 
 export function createAuthenticatedClient(

package/src/runtime/start.ts

@@ -1,6 +1,7 @@
 import { runWithReconnect } from "@apibara/indexer";
 import { defineCommand, runMain } from "citty";
 import consola from "consola";
+import { blueBright } from "picocolors";
 import { register } from "#apibara-internal-virtual/instrumentation";
 import { createAuthenticatedClient, createIndexer } from "./internal/app";
 
@@ -23,7 +24,8 @@ const startCommand = defineCommand({
   async run({ args }) {
     const { indexer, preset } = args;
 
-    const indexerInstance = createIndexer(indexer, preset);
+    const { indexer: indexerInstance, logger } =
+      createIndexer(indexer, preset) ?? {};
     if (!indexerInstance) {
       consola.error(`Specified indexer "${indexer}" but it was not defined`);
       process.exit(1);
@@ -40,6 +42,10 @@ const startCommand = defineCommand({
       consola.success("Registered from instrumentation");
     }
 
+    if (logger) {
+      logger.info(`Indexer ${blueBright(indexer)} started`);
+    }
+
     await runWithReconnect(client, indexerInstance);
   },
 });