Skip to content

feat(cli): track all three Bluesky relays in dashboard and status #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ascorbic wants to merge 1 commit into from
Closed

feat(cli): track all three Bluesky relays in dashboard and status #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
80 changes: 51 additions & 29 deletions packages/pds/src/cli/commands/dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,18 @@ interface Notification {
isRead: boolean;
}

type RelayStatus = "checking" | "synced" | "behind" | "unknown" | "error";

interface RelayState {
name: string;
url: string;
status: RelayStatus;
rev: string | null;
}

interface DashboardState {
collections: CollectionInfo[];
syncStatus: "checking" | "synced" | "behind" | "unknown" | "error";
relayRev: string | null;
relays: RelayState[];
pdsRev: string | null;
subscribers: number;
latestSeq: number | null;
Expand All @@ -280,11 +288,21 @@ interface DashboardState {
const MAX_EVENTS = 100;
const MAX_NOTIFICATIONS = 50;

const RELAY_ENDPOINTS = [
{ name: "us-west", url: "https://relay1.us-west.bsky.network" },
{ name: "us-east", url: "https://relay1.us-east.bsky.network" },
{ name: "bsky.network", url: "https://bsky.network" },
];

function createInitialState(): DashboardState {
return {
collections: [],
syncStatus: "checking",
relayRev: null,
relays: RELAY_ENDPOINTS.map((r) => ({
name: r.name,
url: r.url,
status: "checking" as RelayStatus,
rev: null,
})),
pdsRev: null,
subscribers: 0,
latestSeq: null,
Expand Down Expand Up @@ -349,24 +367,28 @@ async function fetchRelaySync(
render: () => void,
): Promise<void> {
if (!state.pdsRev) return;
try {
const res = await fetch(
`https://bsky.network/xrpc/com.atproto.sync.getLatestCommit?did=${encodeURIComponent(did)}`,
);
if (res.status === 404) {
state.syncStatus = "unknown";
} else if (res.ok) {
const data = (await res.json()) as { rev: string };
state.syncStatus = data.rev === state.pdsRev ? "synced" : "behind";
state.relayRev = data.rev;
} else {
state.syncStatus = "error";
}
render();
} catch {
state.syncStatus = "error";
render();
}
await Promise.all(
state.relays.map(async (relay) => {
try {
const res = await fetch(
`${relay.url}/xrpc/com.atproto.sync.getLatestCommit?did=${encodeURIComponent(did)}`,
);
if (res.status === 404) {
relay.status = "unknown";
relay.rev = null;
} else if (res.ok) {
const data = (await res.json()) as { rev: string };
relay.status = data.rev === state.pdsRev ? "synced" : "behind";
relay.rev = data.rev;
} else {
relay.status = "error";
}
} catch {
relay.status = "error";
}
}),
);
render();
}

async function fetchFirehoseStatus(
Expand Down Expand Up @@ -557,7 +579,6 @@ function renderDashboard(

// Column 2: Federation
const col2: string[] = [pc.dim("FEDERATION"), ""];
col2.push(pc.dim("bsky.network"));
const statusColors: Record<string, (s: string) => string> = {
synced: pc.green,
behind: pc.yellow,
Expand All @@ -572,12 +593,13 @@ function renderDashboard(
checking: pc.dim("\u25cb"),
unknown: pc.dim("\u25cb"),
};
const colorFn = statusColors[state.syncStatus] ?? pc.dim;
col2.push(
`${dotColors[state.syncStatus] ?? pc.dim("\u25cb")} ${colorFn(state.syncStatus.toUpperCase())}`,
);
if (state.relayRev) {
col2.push(pc.dim(`rev: ${state.relayRev.slice(0, 12)}`));
for (const relay of state.relays) {
const dot = dotColors[relay.status] ?? pc.dim("\u25cb");
const colorFn = statusColors[relay.status] ?? pc.dim;
const revStr = relay.rev ? pc.dim(` ${relay.rev.slice(0, 8)}`) : "";
col2.push(
`${dot} ${pc.dim(relay.name)} ${colorFn(relay.status.toUpperCase())}${revStr}`,
);
}

// Column 3: Firehose
Expand Down
4 changes: 3 additions & 1 deletion packages/pds/src/cli/commands/status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,9 @@ export const statusCommand = defineCommand({
for (const relayStatus of relayStatuses) {
const relayName = relayStatus.relay.includes("us-west")
? "us-west"
: "us-east";
: relayStatus.relay.includes("us-east")
? "us-east"
: new URL(relayStatus.relay).hostname;
const statusIcon =
relayStatus.status === "active"
? CHECK
Expand Down
1 change: 1 addition & 0 deletions packages/pds/src/cli/utils/pds-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,7 @@ export class PDSClient {
static RELAY_URLS = [
"https://relay1.us-west.bsky.network",
"https://relay1.us-east.bsky.network",
"https://bsky.network",
];

/**
Expand Down
Loading