@apibara/indexer 2.1.0-beta.25 → 2.1.0-beta.27

package/dist/index.cjs

@@ -108,13 +108,15 @@ async function runWithReconnect(client, indexer, options = {}) {
       return;
     } catch (error) {
       retryCount++;
-      if (error instanceof protocol.ClientError) {
+      if (error instanceof protocol.ClientError || error instanceof protocol.ServerError) {
+        const isServerError = error instanceof protocol.ServerError;
         if (error.code === protocol.Status.INTERNAL) {
           if (retryCount < maxRetries) {
             consola__default.error(
-              "Internal server error, reconnecting...",
-              error.message
+              `Internal ${isServerError ? "server" : "client"} error: ${error.message}`
             );
+            consola__default.start("Reconnecting...");
+            console.log();
             const delay = Math.random() * (retryDelay * 0.2) + retryDelay;
             await new Promise(
               (resolve) => setTimeout(resolve, Math.min(retryCount * delay, maxWait))

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ClientError, Status } from '@apibara/protocol';
+import { ClientError, ServerError, Status } from '@apibara/protocol';
 import consola from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import assert from 'node:assert';
@@ -101,13 +101,15 @@ async function runWithReconnect(client, indexer, options = {}) {
       return;
     } catch (error) {
       retryCount++;
-      if (error instanceof ClientError) {
+      if (error instanceof ClientError || error instanceof ServerError) {
+        const isServerError = error instanceof ServerError;
         if (error.code === Status.INTERNAL) {
           if (retryCount < maxRetries) {
             consola.error(
-              "Internal server error, reconnecting...",
-              error.message
+              `Internal ${isServerError ? "server" : "client"} error: ${error.message}`
             );
+            consola.start("Reconnecting...");
+            console.log();
             const delay = Math.random() * (retryDelay * 0.2) + retryDelay;
             await new Promise(
               (resolve) => setTimeout(resolve, Math.min(retryCount * delay, maxWait))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apibara/indexer",
-  "version": "2.1.0-beta.25",
+  "version": "2.1.0-beta.27",
   "type": "module",
   "files": [
     "dist",
@@ -70,7 +70,7 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/protocol": "2.1.0-beta.25",
+    "@apibara/protocol": "2.1.0-beta.27",
     "@opentelemetry/api": "^1.9.0",
     "ci-info": "^4.1.0",
     "consola": "^3.4.2",

package/src/indexer.ts

@@ -5,6 +5,7 @@ import {
   type DataFinality,
   type Finalize,
   type Invalidate,
+  ServerError,
   Status,
   type StreamConfig,
   type StreamDataOptions,
@@ -179,13 +180,18 @@ export async function runWithReconnect<TFilter, TBlock>(
 
       retryCount++;
 
-      if (error instanceof ClientError) {
+      if (error instanceof ClientError || error instanceof ServerError) {
+        const isServerError = error instanceof ServerError;
+
         if (error.code === Status.INTERNAL) {
           if (retryCount < maxRetries) {
             consola.error(
-              "Internal server error, reconnecting...",
-              error.message,
+              `Internal ${isServerError ? "server" : "client"} error: ${
+                error.message
+              }`,
             );
+            consola.start("Reconnecting...");
+            console.log();
 
             // Add jitter to the retry delay to avoid all clients retrying at the same time.
             const delay = Math.random() * (retryDelay * 0.2) + retryDelay;