@getcirrus/pds 0.11.0 → 0.12.0

package/dist/cli.js

@@ -4204,8 +4204,6 @@ const MAX_EVENTS = 100;
 function createInitialState() {
 	return {
 		collections: [],
-		syncStatus: "checking",
-		relayRev: null,
 		pdsRev: null,
 		subscribers: 0,
 		latestSeq: null,
@@ -4215,7 +4213,10 @@ function createInitialState() {
 		accountActive: false,
 		wsConnected: false,
 		statusMessage: null,
-		statusMessageTimeout: null
+		statusMessageTimeout: null,
+		handleCheck: null,
+		didCheck: null,
+		relayHostStatus: []
 	};
 }
 async function fetchRepo(client, did, state, render) {
@@ -4242,22 +4243,6 @@ async function fetchRepo(client, did, state, render) {
 		render();
 	} catch {}
 }
-async function fetchRelaySync(did, state, render) {
-	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();
-			state.syncStatus = data.rev === state.pdsRev ? "synced" : "behind";
-			state.relayRev = data.rev;
-		} else state.syncStatus = "error";
-		render();
-	} catch {
-		state.syncStatus = "error";
-		render();
-	}
-}
 async function fetchFirehoseStatus(client, state, render) {
 	try {
 		const data = await client.getFirehoseStatus();
@@ -4289,7 +4274,27 @@ async function fetchAccountStatus(client, state, render) {
 		render();
 	} catch {}
 }
-function connectFirehose(targetUrl, state, render) {
+async function fetchIdentityChecks(client, handle, did, pdsHostname, state, render) {
+	try {
+		const [handleResult, didResult] = await Promise.all([checkHandleResolutionDetailed(client, handle, did), checkDidResolution(client, did, pdsHostname)]);
+		state.handleCheck = {
+			ok: handleResult.ok,
+			methods: handleResult.methods
+		};
+		state.didCheck = {
+			ok: didResult.ok,
+			pdsEndpoint: didResult.pdsEndpoint
+		};
+		render();
+	} catch {}
+}
+async function fetchRelayHostStatus(client, pdsHostname, state, render) {
+	try {
+		state.relayHostStatus = await client.getAllRelayHostStatus(pdsHostname);
+		render();
+	} catch {}
+}
+function connectFirehose(targetUrl, state, render, onCommit) {
 	let ws = null;
 	let reconnectTimer = null;
 	let closed = false;
@@ -4313,12 +4318,15 @@ function connectFirehose(targetUrl, state, render) {
 					action: "identity",
 					path: event.handle ?? ""
 				});
-				else for (const op of event.ops) state.events.unshift({
-					time,
-					seq: event.seq,
-					action: op.action,
-					path: op.path
-				});
+				else {
+					for (const op of event.ops) state.events.unshift({
+						time,
+						seq: event.seq,
+						action: op.action,
+						path: op.path
+					});
+					onCommit?.();
+				}
 				if (state.events.length > MAX_EVENTS) state.events.length = MAX_EVENTS;
 				render();
 			};
@@ -4348,78 +4356,65 @@ function renderDashboard(state, config) {
 	const rows = process.stdout.rows || 24;
 	const lines = [];
 	const indent = "  ";
+	const accountDot = state.accountActive ? pc.green("●") + " " + pc.green("ACTIVE") : pc.yellow("○") + " " + pc.yellow("INACTIVE");
 	lines.push("");
 	lines.push(`${indent}${pc.bold("☁  CIRRUS")}  ${pc.dim("·")}  ${pc.cyan(config.hostname)}  ${pc.dim("·")}  ${pc.dim("v" + config.version)}`);
-	lines.push(`${indent}   ${pc.white("@" + config.handle)}  ${pc.dim("·")}  ${pc.dim(config.did)}`);
+	lines.push(`${indent}   ${pc.white("@" + config.handle)}  ${pc.dim("·")}  ${pc.dim(config.did)}  ${pc.dim("·")}  ${accountDot}`);
 	lines.push("");
-	const colWidth = Math.floor((cols - 6) / 3);
+	const colWidth = Math.floor((cols - 6) / 2);
 	const col1 = [pc.dim("REPOSITORY"), ""];
-	if (state.collections.length === 0) col1.push(pc.dim("Loading…"));
+	if (state.collections.length === 0) col1.push(pc.dim("No records"));
 	else for (const c of state.collections) {
 		const name = c.friendlyName.padEnd(16);
 		const count = String(c.count).padStart(5);
 		const more = c.hasMore ? "+" : " ";
 		col1.push(`${name} ${pc.bold(count)}${more}`);
 	}
-	const col2 = [pc.dim("FEDERATION"), ""];
-	col2.push(pc.dim("bsky.network"));
-	const statusColors = {
-		synced: pc.green,
-		behind: pc.yellow,
-		error: pc.red,
-		checking: pc.dim,
-		unknown: pc.dim
+	const col2 = [pc.dim("NETWORK"), ""];
+	if (state.handleCheck) {
+		const icon = state.handleCheck.ok ? pc.green("✓") : pc.red("✗");
+		const methods = state.handleCheck.methods.length > 0 ? pc.dim(` ${state.handleCheck.methods.join(" ")}`) : "";
+		col2.push(`${icon} handle${methods}`);
+	} else col2.push(pc.dim("○ handle  checking…"));
+	if (state.didCheck) {
+		const icon = state.didCheck.ok ? pc.green("✓") : pc.red("✗");
+		col2.push(`${icon} did document`);
+	} else col2.push(pc.dim("○ did doc  checking…"));
+	col2.push("");
+	const relayStatusColors = {
+		active: pc.green,
+		idle: pc.yellow,
+		offline: pc.red,
+		throttled: pc.red,
+		banned: pc.red
 	};
-	const dotColors = {
-		synced: pc.green("●"),
-		behind: pc.yellow("●"),
-		error: pc.red("●"),
-		checking: pc.dim("○"),
-		unknown: pc.dim("○")
+	const relayDotColors = {
+		active: pc.green("●"),
+		idle: pc.yellow("●"),
+		offline: pc.red("●"),
+		throttled: pc.red("●"),
+		banned: pc.red("●")
 	};
-	const colorFn = statusColors[state.syncStatus] ?? pc.dim;
-	col2.push(`${dotColors[state.syncStatus] ?? pc.dim("○")} ${colorFn(state.syncStatus.toUpperCase())}`);
-	if (state.relayRev) col2.push(pc.dim(`rev: ${state.relayRev.slice(0, 12)}`));
-	const col3 = [pc.dim("FIREHOSE"), ""];
+	if (state.relayHostStatus.length > 0) for (const relay of state.relayHostStatus) {
+		const name = relay.relay.replace("https://relay1.", "").replace(".bsky.network", "");
+		const colorFn = relayStatusColors[relay.status] ?? pc.dim;
+		const dot = relayDotColors[relay.status] ?? pc.dim("○");
+		col2.push(`${dot} ${name} ${colorFn(relay.status)}`);
+	}
+	else col2.push(pc.dim("○ relay  unknown"));
+	col2.push("");
 	const subDot = state.subscribers > 0 ? pc.green("●") : pc.dim("○");
-	col3.push(`${subDot} ${pc.bold(String(state.subscribers))} subscriber${state.subscribers !== 1 ? "s" : ""}`);
-	col3.push(pc.dim(`seq: ${state.latestSeq != null ? state.latestSeq : "—"}`));
-	if (state.subscriberDetails.length > 0) {
-		col3.push("");
-		for (const sub of state.subscriberDetails.slice(0, 5)) {
-			const ip = sub.ip ? `  ${shortenIP(sub.ip)}` : "";
-			col3.push(pc.dim(`${relativeTime(sub.connectedAt)}  cursor: ${sub.cursor}${ip}`));
-		}
+	col2.push(`${subDot} ${pc.bold(String(state.subscribers))} subscriber${state.subscribers !== 1 ? "s" : ""}  ${pc.dim("seq:")} ${state.latestSeq != null ? state.latestSeq : pc.dim("—")}`);
+	if (state.subscriberDetails.length > 0) for (const sub of state.subscriberDetails.slice(0, 3)) {
+		const ip = sub.ip ? shortenIP(sub.ip) : "";
+		col2.push(pc.dim(`  ${relativeTime(sub.connectedAt)}  cursor: ${sub.cursor}  ${ip}`));
 	}
-	const columnLines = renderColumns([
-		col1,
-		col2,
-		col3
-	], [
-		colWidth,
-		colWidth,
-		colWidth
-	]);
+	const columnLines = renderColumns([col1, col2], [colWidth, colWidth]);
 	for (const line of columnLines) lines.push(indent + line);
 	lines.push("");
 	const remaining = rows - lines.length - 3;
-	const notifHeight = Math.max(3, Math.floor(remaining * .4));
+	const notifHeight = Math.max(3, Math.floor(remaining * .35));
 	const eventsHeight = Math.max(3, remaining - notifHeight);
-	const notifSeparator = "─".repeat(Math.max(0, cols - visibleLength(indent + "NOTIFICATIONS ") - 2));
-	lines.push(`${indent}${pc.dim("NOTIFICATIONS " + notifSeparator)}`);
-	if (state.notifications.length === 0) {
-		lines.push(`${indent}${pc.dim("No notifications yet")}`);
-		for (let i = 1; i < notifHeight - 1; i++) lines.push("");
-	} else {
-		const visibleNotifs = state.notifications.slice(0, notifHeight - 1);
-		for (const n of visibleNotifs) {
-			const readDim = n.isRead ? pc.dim : (s) => s;
-			const line = `${indent}${pc.dim(n.time)}  ${n.icon}  ${readDim(n.author)} ${readDim(pc.dim(n.text))}`;
-			lines.push(truncate(line, cols));
-		}
-		for (let i = visibleNotifs.length; i < notifHeight - 1; i++) lines.push("");
-	}
-	lines.push("");
 	const wsStatusText = state.wsConnected ? "● connected" : "○ disconnected";
 	indent + "";
 	const eventsSuffix = "  " + wsStatusText + "  ";
@@ -4438,16 +4433,35 @@ function renderDashboard(state, config) {
 				delete: pc.red,
 				identity: pc.cyan
 			}[ev.action] ?? pc.dim;
-			const line = `${indent}${pc.dim(ev.time)}  ${pc.dim("#" + String(ev.seq).padStart(4))}  ${actionColor(ev.action.toUpperCase().padEnd(7))}  ${ev.path}`;
+			const line = `${indent}${pc.dim(ev.time)}  ${pc.dim("#" + String(ev.seq).padStart(4))}  ${actionColor(ev.action.toUpperCase().padEnd(8))}  ${ev.path}`;
 			lines.push(truncate(line, cols));
 		}
 		for (let i = visibleEvents.length; i < eventsHeight - 1; i++) lines.push("");
 	}
+	const notifSeparator = "─".repeat(Math.max(0, cols - visibleLength(indent + "NOTIFICATIONS ") - 2));
+	lines.push(`${indent}${pc.dim("NOTIFICATIONS " + notifSeparator)}`);
+	if (state.notifications.length === 0) {
+		lines.push(`${indent}${pc.dim("No notifications yet")}`);
+		for (let i = 1; i < notifHeight - 1; i++) lines.push("");
+	} else {
+		const visibleNotifs = state.notifications.slice(0, notifHeight - 1);
+		for (const n of visibleNotifs) {
+			const readDim = n.isRead ? pc.dim : (s) => s;
+			const line = `${indent}${pc.dim(n.time)}  ${n.icon}  ${readDim(n.author)} ${readDim(pc.dim(n.text))}`;
+			lines.push(truncate(line, cols));
+		}
+		for (let i = visibleNotifs.length; i < notifHeight - 1; i++) lines.push("");
+	}
 	lines.push("");
-	const accountStatus = state.accountActive ? pc.green("● active") : pc.yellow("○ deactivated");
-	let footer = `${indent}${pc.dim("[a]")} activate  ${pc.dim("·")}  ${pc.dim("[r]")} crawl  ${pc.dim("·")}  ${pc.dim("[e]")} emit identity  ${pc.dim("·")}  ${pc.dim("[q]")} quit`;
+	const keys = [];
+	if (!state.accountActive) keys.push(`${pc.dim("[a]")} activate`);
+	else {
+		keys.push(`${pc.dim("[r]")} crawl`);
+		keys.push(`${pc.dim("[e]")} emit identity`);
+	}
+	keys.push(`${pc.dim("[q]")} quit`);
+	let footer = `${indent}${keys.join(`  ${pc.dim("·")}  `)}`;
 	if (state.statusMessage) footer += `     ${pc.yellow(state.statusMessage)}`;
-	else footer += `     ${accountStatus}`;
 	lines.push(footer);
 	while (lines.length < rows) lines.push("");
 	const output = lines.slice(0, rows).map((l) => padRight(l, cols)).join("\n");
@@ -4490,6 +4504,7 @@ const dashboardCommand = defineCommand({
 		const authToken = config.AUTH_TOKEN;
 		const handle = config.HANDLE ?? "";
 		const did = config.DID ?? "";
+		const pdsHostname = config.PDS_HOSTNAME ?? "";
 		if (!authToken) {
 			console.error(pc.red("Error:"), "No AUTH_TOKEN found. Run 'pds init' first.");
 			process.exit(1);
@@ -4501,7 +4516,7 @@ const dashboardCommand = defineCommand({
 		}
 		const state = createInitialState();
 		const dashConfig = {
-			hostname: config.PDS_HOSTNAME ?? targetUrl,
+			hostname: pdsHostname || targetUrl,
 			handle,
 			did,
 			version: "0.10.6"
@@ -4512,9 +4527,11 @@ const dashboardCommand = defineCommand({
 		clearScreen();
 		const intervals = [];
 		let firehose = null;
+		let repoRefetchTimer = null;
 		function cleanup() {
 			for (const interval of intervals) clearInterval(interval);
 			if (firehose) firehose.close();
+			if (repoRefetchTimer) clearTimeout(repoRefetchTimer);
 			if (state.statusMessageTimeout) clearTimeout(state.statusMessageTimeout);
 			if (process.stdin.isTTY) process.stdin.setRawMode(false);
 			showCursor();
@@ -4528,20 +4545,28 @@ const dashboardCommand = defineCommand({
 			cleanup();
 			process.exit(0);
 		});
+		const scheduleRepoRefetch = () => {
+			if (repoRefetchTimer) clearTimeout(repoRefetchTimer);
+			repoRefetchTimer = setTimeout(() => {
+				fetchRepo(client, did, state, render);
+			}, 1e3);
+		};
 		render();
 		await Promise.all([
 			fetchRepo(client, did, state, render),
 			fetchFirehoseStatus(client, state, render),
 			fetchAccountStatus(client, state, render),
-			fetchNotifications(client, state, render)
+			fetchNotifications(client, state, render),
+			fetchIdentityChecks(client, handle, did, pdsHostname, state, render)
 		]);
-		await fetchRelaySync(did, state, render);
+		await fetchRelayHostStatus(client, pdsHostname, state, render);
 		intervals.push(setInterval(() => fetchRepo(client, did, state, render), 3e4));
-		intervals.push(setInterval(() => fetchRelaySync(did, state, render), 5e3));
+		intervals.push(setInterval(() => fetchRelayHostStatus(client, pdsHostname, state, render), 5e3));
 		intervals.push(setInterval(() => fetchFirehoseStatus(client, state, render), 1e4));
 		intervals.push(setInterval(() => fetchNotifications(client, state, render), 15e3));
 		intervals.push(setInterval(() => fetchAccountStatus(client, state, render), 3e4));
-		firehose = connectFirehose(targetUrl, state, render);
+		intervals.push(setInterval(() => fetchIdentityChecks(client, handle, did, pdsHostname, state, render), 15e3));
+		firehose = connectFirehose(targetUrl, state, render, scheduleRepoRefetch);
 		process.stdout.on("resize", render);
 		if (process.stdin.isTTY) {
 			process.stdin.setRawMode(true);
@@ -4559,6 +4584,7 @@ const dashboardCommand = defineCommand({
 					process.exit(0);
 				}
 				if (key === "a" || key === "A") {
+					if (state.accountActive) return;
 					if (awaitingActivateConfirm) {
 						awaitingActivateConfirm = false;
 						if (activateConfirmTimeout) clearTimeout(activateConfirmTimeout);
@@ -4566,12 +4592,7 @@ const dashboardCommand = defineCommand({
 						try {
 							await client.activateAccount();
 							state.accountActive = true;
-							const pdsHostname = config.PDS_HOSTNAME;
-							if (pdsHostname && !isDev) await client.requestCrawl(pdsHostname);
-							try {
-								await client.emitIdentity();
-							} catch {}
-							setStatusMessage(state, pc.green("✓ Activated! Crawl requested."), render, 5e3);
+							setStatusMessage(state, pc.green("✓ Account activated"), render, 5e3);
 						} catch (err) {
 							setStatusMessage(state, pc.red(`\u2717 ${err instanceof Error ? err.message : "Activation failed"}`), render, 5e3);
 						}
@@ -4587,7 +4608,7 @@ const dashboardCommand = defineCommand({
 					return;
 				}
 				if (key === "r" || key === "R") {
-					const pdsHostname = config.PDS_HOSTNAME;
+					if (!state.accountActive) return;
 					if (!pdsHostname || isDev) {
 						setStatusMessage(state, pc.yellow("No PDS hostname configured"), render);
 						return;
@@ -4597,6 +4618,7 @@ const dashboardCommand = defineCommand({
 					return;
 				}
 				if (key === "e" || key === "E") {
+					if (!state.accountActive) return;
 					setStatusMessage(state, "Emitting identity…", render, 1e4);
 					try {
 						const result = await client.emitIdentity();

package/dist/index.js

@@ -4230,7 +4230,7 @@ function renderDashboard(config) {
 
 //#endregion
 //#region package.json
-var version = "0.11.0";
+var version = "0.12.0";
 
 //#endregion
 //#region src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getcirrus/pds",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Cirrus – A single-user AT Protocol PDS on Cloudflare Workers",
   "type": "module",
   "main": "dist/index.js",