Replace monolithic catalog with generic section-based registry

.gitignore

@@ -19,16 +19,6 @@ result
 node_modules
 /.direnv
 
-# Don't leak dev stuff
-*.mp4
-*.fmp4
-*.crt
-*.key
-*.hex
-*.jwk
-*.jwt
-*.m3u8
-*.m4s
 
 # We're using bun
 package-lock.json

CLAUDE.md

@@ -116,13 +116,15 @@ match version {
 - Run `just fix` to automatically fix formating and easy things.
 - Rust tests are integrated within source files
 - Async tests that sleep should call `tokio::time::pause()` at the start to simulate time instantly
+- Use `tokio::time::sleep()` (not `advance()`) to move time forward in paused-time tests — `sleep` both advances the clock and yields to the runtime so spawned tasks can run
 
 ## Branching Strategy
 
 - **`main`**: Stable branch for patch releases. Only non-breaking fixes and additions.
 - **`dev`**: Development branch for breaking API changes. PRs with major API changes should target `dev`.
 - When ready for a new minor/major release, merge `dev` into `main`.
 - `cargo-semver-checks` enforces this on PRs to `main`.
+- When removing a public method on `dev`, mark it `#[deprecated]` first so downstream code gets warnings before the next breaking release.
 
 ## Workflow
 

cdn/input.tf

@@ -36,17 +36,25 @@ variable "webhook" {
 # instance types: https://api.linode.com/v4/linode/types
 locals {
   relays = {
-    usc = {
-      region = "us-central"    # Dallas, TX
-      type   = "g6-standard-2" # 4GB RAM, 2 vCPU, $24/mo, 4TB out
+    usw = {
+      region  = "us-west"       # Fremont, CA
+      type    = "g6-standard-2" # 4GB RAM, 2 vCPU, $24/mo, 4TB out
+      connect = ["use"]
+    }
+    use = {
+      region  = "us-east" # Newark, NJ
+      type    = "g6-standard-2"
+      connect = ["usw", "euc"]
     }
     euc = {
-      region = "eu-central" # Frankfurt, Germany
-      type   = "g6-standard-2"
+      region  = "eu-central" # Frankfurt, Germany
+      type    = "g6-standard-2"
+      connect = ["use"]
     }
     sea = {
-      region = "ap-south" # Singapore
-      type   = "g6-standard-2"
+      region  = "ap-south" # Singapore
+      type    = "g6-standard-2"
+      connect = ["use"]
     }
   }
 }

cdn/main.tf

@@ -68,6 +68,7 @@ module "relay" {
 module "pub" {
   source          = "./pub"
   domain          = var.domain
+  relay           = "use.${var.domain}"
   ssh_keys        = var.ssh_keys
   stackscript_id  = linode_stackscript.bootstrap.id
   gcp_account_key = google_service_account_key.relay.private_key

cdn/pub/demo-bbb.service.tftpl

@@ -23,7 +23,7 @@ ExecStart=/bin/bash -c '\
     -movflags cmaf+separate_moof+delay_moov+skip_trailer+frag_every_frame \
     - | \
   /var/lib/moq/pkg/bin/moq-cli publish \
-    --url "https://${domain}/demo?jwt=$(cat /var/lib/moq/demo-pub.jwt)" \
+    --url "https://${relay}/demo?jwt=$(cat /var/lib/moq/demo-pub.jwt)" \
     --name bbb \
     fmp4'
 

cdn/pub/main.tf

@@ -1,15 +1,15 @@
 # Generate systemd service files from templates
 resource "local_file" "demo_bbb_service" {
   content = templatefile("${path.module}/demo-bbb.service.tftpl", {
-    domain = var.domain
+    relay = var.relay
   })
   filename = "${path.module}/gen/demo-bbb.service"
 }
 
 # Publisher instance
 resource "linode_instance" "publisher" {
   label  = "publisher-moq"
-  region = "us-central" # Dallas, TX
+  region = "us-east" # Newark, NJ (colocated with use relay)
   type   = "g6-nanode-1"
 
   # Use Debian 12 as base, will be converted to NixOS via bootstrap

cdn/pub/variables.tf

@@ -3,6 +3,11 @@ variable "domain" {
   type        = string
 }
 
+variable "relay" {
+  description = "Relay hostname to publish to (e.g. use.example.com)"
+  type        = string
+}
+
 variable "ssh_keys" {
   description = "SSH public keys for root access"
   type        = list(string)

cdn/relay/dns.tf

@@ -32,7 +32,8 @@ resource "google_dns_record_set" "relay_global" {
 # GCP uses region codes like "us-east1", "us-west1", "europe-west3", "asia-southeast1"
 locals {
   relay_gcp_regions = {
-    usc = "us-central1"     # Dallas, TX -> closest GCP region
+    usw = "us-west1"        # Fremont, CA -> closest GCP region
+    use = "us-east1"        # Newark, NJ -> closest GCP region
     euc = "europe-west3"    # Frankfurt -> closest GCP region
     sea = "asia-southeast1" # Singapore -> closest GCP region
   }

cdn/relay/justfile

@@ -26,13 +26,14 @@ host node:
 
 # List the available nodes.
 nodes:
-	@echo "usc: Dallas, TX"
+	@echo "usw: Fremont, CA"
+	@echo "use: Newark, NJ"
 	@echo "euc: Frankfurt, Germany"
 	@echo "sea: Singapore"
 
 # Deploy moq-relay and moq-cert to all nodes
 [parallel]
-deploy-all: (deploy "usc") (deploy "euc") (deploy "sea")
+deploy-all: (deploy "usw") (deploy "use") (deploy "euc") (deploy "sea")
 
 # Deploy moq-relay and moq-cert to a specific node
 deploy node:
@@ -78,7 +79,7 @@ status node:
 	echo "=== $HOST ==="
 	ssh root@$HOST "systemctl status moq-relay --no-pager"
 
-status-all: (status "usc") (status "euc") (status "sea")
+status-all: (status "usw") (status "use") (status "euc") (status "sea")
 
 ssh node:
 	#!/usr/bin/env bash

cdn/relay/main.tf

@@ -1,9 +1,12 @@
-# Generate systemd service files from templates
+# Generate per-node systemd service files from templates
 resource "local_file" "moq_relay_service" {
+  for_each = var.relays
+
   content = templatefile("${path.module}/moq-relay.service.tftpl", {
-    domain = var.domain
+    domain  = var.domain
+    connect = each.value.connect
   })
-  filename = "${path.module}/gen/moq-relay.service"
+  filename = "${path.module}/gen/${each.key}/moq-relay.service"
 }
 
 resource "local_file" "moq_cert_service" {

cdn/relay/moq-relay.service.tftpl

@@ -20,7 +20,9 @@ ExecStart=/var/lib/moq/pkg/bin/moq-relay \
   --web-https-listen [::]:443 \
   --web-https-cert /etc/letsencrypt/live/${domain}/fullchain.pem \
   --web-https-key /etc/letsencrypt/live/${domain}/privkey.pem \
-  --cluster-root usc.${domain} \
+%{ for peer in connect ~}
+  --cluster-connect ${peer}.${domain} \
+%{ endfor ~}
   --cluster-node %H \
   --cluster-token /var/lib/moq/cluster.jwt
 

cdn/relay/variables.tf

@@ -16,8 +16,9 @@ variable "ssh_keys" {
 variable "relays" {
   description = "Map of relay node configurations"
   type = map(object({
-    region = string
-    type   = string
+    region  = string
+    type    = string
+    connect = list(string)
   }))
 }
 

dev/.gitignore

@@ -0,0 +1,9 @@
+*.mp4
+*.fmp4
+*.crt
+*.key
+*.hex
+*.jwk
+*.jwt
+*.m3u8
+*.m4s

dev/boy/src/audio.rs

@@ -4,7 +4,7 @@ use anyhow::{Context, Result};
 ///
 /// Uses ffmpeg-next for Opus encoding (same dependency as video H.264).
 pub struct AudioEncoder {
-    opus: moq_mux::import::Opus,
+    opus: moq_mux::producer::Opus,
     ffmpeg_encoder: ffmpeg_next::encoder::audio::Encoder,
     resampler: Option<ffmpeg_next::software::resampling::Context>,
     sample_buffer: Vec<i16>,
@@ -26,10 +26,10 @@ impl AudioEncoder {
         catalog: moq_mux::CatalogProducer,
         input_sample_rate: u32,
     ) -> Result<Self> {
-        let opus = moq_mux::import::Opus::new(
+        let opus = moq_mux::producer::Opus::new(
             broadcast,
             catalog,
-            moq_mux::import::OpusConfig {
+            moq_mux::producer::OpusConfig {
                 sample_rate: OPUS_SAMPLE_RATE,
                 channel_count: CHANNELS,
             },

dev/boy/src/index.ts

@@ -195,7 +195,7 @@ class GameCard {
 		const sync = new Watch.Sync({ jitter: 50 as Moq.Time.Milli });
 		this.#signals.cleanup(() => sync.close());
 
-		const videoSource = new Watch.Video.Source(sync, { broadcast });
+		const videoSource = new Watch.Video.Source({ sync, broadcast });
 		this.#signals.cleanup(() => videoSource.close());
 
 		// Set pixel budget based on expanded state.
@@ -220,7 +220,7 @@ class GameCard {
 		this.#signals.cleanup(() => videoRenderer.close());
 
 		// Set up audio — play on hover at 50% volume.
-		const audioSource = new Watch.Audio.Source(sync, { broadcast });
+		const audioSource = new Watch.Audio.Source({ sync, broadcast });
 		this.#signals.cleanup(() => audioSource.close());
 
 		const audioDecoder = new Watch.Audio.Decoder(audioSource);