Logan CusanoandClaude Opus 5.5
8af410aede
Owner-reported on live: adding a radio channel for a server + voice channel that already had one (different label, system, even bot) overwrote the existing stream and made its bot leave, because stream_id was guild:channel. - New streams get guild:channel:<12 hex> ids (leases.new_stream_id); old guild:channel docs keep working for read/stop/remove/node reports. Route validators accept both (leases.STREAM_ID_PATTERN). - start_stream: no stream_id = ADD. Same system already on in that channel is idempotent (already_on, label/mode untouched); a stopped one of that system is restarted; anything else is a new doc. stream_id = explicit restart/edit (admin Start button, reconciler), incl. moving to another bot. - preferred_token_id is strict: bot already in this server -> 409 preferred_busy naming the stream; on another node -> preferred_other_node; unusable -> preferred_unavailable. No silent swap. pool_exhausted now says one-bot-per-server and to add + invite another bot. - One-token-per-guild was already enforced inside the lease transaction; now covered by race tests. Per-guild asyncio lock serialises the already-on / server-cap check with the create (guild half of #223). - Stop by stream_id (POST /discord/guilds/{id}/stop {stream_id}); admin UI Stop/Start/Remove act on the row's stream; node picker lists every stream in a channel and adds beside other systems. - Bot: /leave stream: (autocomplete) stops one; /leave channel: with several streams asks which unless all:True; bare /leave still stops the server. /status and /join name each stream's bot. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
99 lines
3.0 KiB
TypeScript
99 lines
3.0 KiB
TypeScript
// 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_id?: string | null;
|
|
system_name: string | null;
|
|
/** The radio bot carrying it — tells apart several streams in one voice channel. */
|
|
token_name?: string | null;
|
|
mode: "persistent" | "adhoc" | null;
|
|
node_id: string | null;
|
|
node_name: string | null;
|
|
actual: { state: StreamState; error: string | null; code?: 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;
|
|
/** This node's system's stream in the channel, if any — what a pick restarts or moves. */
|
|
stream: DiscordStreamView | null;
|
|
/** Every live stream in the channel (several systems can share it, each its own bot). */
|
|
streams?: DiscordStreamView[];
|
|
}
|
|
|
|
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;
|
|
/** Permanent removal: platform admin or the org owner only (operators can stop, not remove). */
|
|
can_remove?: 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: [] };
|
|
}
|