Merge pull request 'Node page Discord picker: org's servers + voice channels, not raw IDs (#213 item 3)' (#220) from feat/213-node-join-picker into main
Build & Deploy / Build & push images (push) Successful in 4m58s
Build & Deploy / Deploy Firestore rules & indexes (push) Successful in 29s
Build & Deploy / Deploy to VM (push) Successful in 2m37s
Build & Deploy / Report a failed deploy (push) Skipped

Reviewed-on: #220
This commit was merged in pull request #220.
This commit is contained in:
2026-10-04 22:05:49 -04:00
11 changed files with 1230 additions and 104 deletions
+15
View File
@@ -101,6 +101,21 @@ export const c2api = {
),
rejectNode: (id: string) =>
request(`/nodes/${id}/reject`, { method: "POST" }),
// Node-page Discord picker (server-26#213 item 3) — org-scoped server side.
getNodeDiscordOptions: (nodeId: string) =>
request<import("@/lib/discordPicker").DiscordJoinOptions>(`/discord/nodes/${nodeId}/join-options`),
startNodeDiscordStream: (nodeId: string, body: { guild_id: string; channel_id: string; mode: "adhoc" | "persistent" }) =>
request<import("@/lib/discordPicker").DiscordStartResult>(`/discord/nodes/${nodeId}/streams`, {
method: "POST",
body: JSON.stringify(body),
}),
/** Omit streamId to stop every radio channel this node carries. */
stopNodeDiscordStreams: (nodeId: string, streamId?: string) =>
request<{ ok: boolean; stopped: string[] }>(`/discord/nodes/${nodeId}/streams/stop`, {
method: "POST",
body: JSON.stringify(streamId ? { stream_id: streamId } : {}),
}),
deleteNode: (id: string) =>
request(`/nodes/${id}`, { method: "DELETE" }),
+90
View File
@@ -0,0 +1,90 @@
// Node-page Discord picker (server-26#213 item 3, #109 item 13).
// Shapes returned by c2-core app/routers/discord_web.py. No token strings —
// the server never sends them to the browser.
export type StreamState =
| "pending"
| "connecting"
| "connected"
| "error"
| "stopping"
| "stopped"
| "node_offline"
| "paused_locally";
export interface DiscordStreamView {
stream_id: string;
guild_id: string;
channel_id: string;
guild_name: string | null;
channel_name: string | null;
system_name: string | null;
mode: "persistent" | "adhoc" | null;
node_id: string | null;
node_name: string | null;
actual: { state: StreamState; error: string | null; since?: string; at?: string } | null;
updated_at: string | null;
}
export interface DiscordInvite {
name: string;
invite_url: string;
}
export interface DiscordVoiceChannel {
channel_id: string;
name: string;
category: string | null;
stream: DiscordStreamView | null;
}
export interface DiscordGuildOption {
guild_id: string;
name: string | null;
linked: boolean;
synced: boolean;
synced_at: string | null;
voice_channels: DiscordVoiceChannel[];
streams_on: number;
bot: { ok: boolean; code: string | null; message: string | null; invite: DiscordInvite[] };
}
export interface DiscordJoinOptions {
node_id: string;
node_name: string | null;
node_online: boolean;
system_id: string | null;
system_name: string | null;
can_control: boolean;
limits: { node_max: number; node_used: number; guild_max: number };
guilds: DiscordGuildOption[];
streams: DiscordStreamView[];
}
export interface DiscordStartResult {
ok: boolean;
stream_id: string;
token_id: string | null;
delivered: boolean | null;
reused: boolean | null;
}
/** c2api's request() throws `C2 API error <status>: <body>`. Pull the
* detail + invite links back out of a JSON body when there is one. */
export function parseC2Error(err: unknown): { message: string; invite: DiscordInvite[] } {
const raw = err instanceof Error ? err.message : String(err);
const idx = raw.indexOf(": ");
if (idx >= 0) {
try {
const body = JSON.parse(raw.slice(idx + 2));
const detail = typeof body?.detail === "string" ? body.detail : null;
const invite = Array.isArray(body?.invite)
? (body.invite as DiscordInvite[]).filter((i) => i && typeof i.invite_url === "string")
: [];
if (detail) return { message: detail, invite };
} catch {
/* not JSON — fall through */
}
}
return { message: raw, invite: [] };
}