Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "indexer: fix reconnect on internal server errors",
"packageName": "@apibara/indexer",
"email": "jadejajaipal5@gmail.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "indexer: fix reconnect on internal server errors",
"packageName": "@apibara/protocol",
"email": "jadejajaipal5@gmail.com",
"dependentChangeType": "patch"
}
12 changes: 9 additions & 3 deletions packages/indexer/src/indexer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
type DataFinality,
type Finalize,
type Invalidate,
ServerError,
Status,
type StreamConfig,
type StreamDataOptions,
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import type { StreamConfig } from "./config";
import { StatusRequest, StatusResponse } from "./status";
import { type StreamDataRequest, StreamDataResponse } from "./stream";

export { ClientError, Status, Metadata } from "nice-grpc";
export { ClientError, ServerError, Status, Metadata } from "nice-grpc";

const DEFAULT_TIMEOUT_MS = 45_000;

Expand Down