From 972043c74afdf1d4acbb26cf3875786c171ad123 Mon Sep 17 00:00:00 2001 From: Seebomega Date: Thu, 24 Sep 2026 17:37:06 +0200 Subject: [PATCH 001/102] keep all events, add cash on player api --- README.md | 12 +- docs/wardogs-api.md | 6 +- drizzle/0001_organizations.sql | 4 +- drizzle/0002_org_limits.sql | 6 +- drizzle/0003_server_allow_private.sql | 2 +- drizzle/0006_org_lists.sql | 4 +- drizzle/0007_sample_cash.sql | 2 +- drizzle/0011_default_org.sql | 2 +- drizzle/0012_org_roles.sql | 4 +- drizzle/0014_webhook_status.sql | 8 +- drizzle/0015_server_identity.sql | 4 +- drizzle/0016_live_started_at.sql | 2 +- drizzle/0017_reserved_uncapped.sql | 2 +- drizzle/0018_auth_methods.sql | 10 +- drizzle/0019_kill_feed.sql | 6 +- drizzle/0020_seed_seconds.sql | 2 +- drizzle/0021_public_features.sql | 18 +- drizzle/0023_public_kills.sql | 2 +- drizzle/0024_server_lists.sql | 2 +- drizzle/0027_ban_message.sql | 2 +- drizzle/0028_steam_friends.sql | 10 +- drizzle/0038_brainy_toxin.sql | 5 + drizzle/meta/0038_snapshot.json | 4900 +++++++++++++++++++++++ drizzle/meta/_journal.json | 7 + src/lib/server/analytics.ts | 12 +- src/lib/server/db/schema.ts | 14 +- src/lib/server/feed-core.test.ts | 18 +- src/lib/server/feed-core.ts | 52 +- src/lib/server/feed-events.ts | 6 + src/lib/server/feed.ts | 80 +- src/lib/server/leaderboards.ts | 3 +- src/lib/server/match-players.ts | 3 +- src/lib/server/matches.ts | 3 +- src/lib/server/players.ts | 19 +- src/lib/server/triggers.ts | 12 +- src/lib/types.ts | 4 + src/routes/api/ingest/events/+server.ts | 4 +- src/test/feed-ingest.test.ts | 40 +- src/test/view.test.ts | 46 + 39 files changed, 5222 insertions(+), 116 deletions(-) create mode 100644 drizzle/0038_brainy_toxin.sql create mode 100644 drizzle/meta/0038_snapshot.json diff --git a/README.md b/README.md index 5290b036..765ec8cd 100644 --- a/README.md +++ b/README.md @@ -584,15 +584,19 @@ that player alone. A dry run shows `…` for the stats and for whatever else it ### Kill feed -WARDOGS can push every kill to an HTTP endpoint: with `[WDServerFeed] Url` and `Token` set in -`ServerSettings.ini`, the game process POSTs each kill (killer, victim, weapon or vehicle, -distance, headshot and other context) a second or two after it happens. Warcon is that endpoint. +WARDOGS can push event batches to an HTTP endpoint: with `[WDServerFeed] Url` and `Token` set in +`ServerSettings.ini`, the game process POSTs kills (killer, victim, weapon or vehicle, +distance, headshot and other context) a second or two after they happen. Warcon is that endpoint. On the server's **Config** tab an org owner clicks **Configure**: Warcon mints a token, writes both keys into the config document and applies; the game reads them at its next restart (its own 24-hour one, or a manual restart). `Url` is the panel's origin alone: the game appends `/api/ingest/events` to it by itself. The card shows when the last batch arrived, so a config that did not take is visible. +Warcon stores every event in a batch with its original JSON and `eventType`, including event types +it does not yet display and incomplete kills. Existing kill rows predate raw-JSON storage. All +kill-specific views, statistics and automation explicitly use only valid `killed` events. + What the feed adds: a live kill feed on the server's Overview tab, a **Kills** tab with the whole history (filter by killer, victim, either side, weapon or vehicle, kind of kill and minimum distance, with a count, older pages and new kills arriving live; the filter lives in the URL, so a @@ -600,7 +604,7 @@ view can be shared), a **Combat** section on Analytics (kills per bucket, weapon top killers with headshot share and team kills), a Combat card on every player dossier (weapons, most-killed, nemeses, recent kills and deaths), and the team-kill trigger. Team kills are inferred: the feed carries no factions, so Warcon uses the factions it observed for both players -at that moment. Kills are history and are +at that moment. Feed events are history and are never pruned (a TimescaleDB hypertable with compression where the extension is installed). The demo server feeds itself once its feed is turned on. diff --git a/docs/wardogs-api.md b/docs/wardogs-api.md index 89028053..99f5194d 100644 --- a/docs/wardogs-api.md +++ b/docs/wardogs-api.md @@ -172,8 +172,10 @@ environment deaths, `cause` on falls, `distance` (Unreal units, centimetres) on explosions and most suicides. Tags seen: `Headshot`, `Penetration`, `Ricochet`, `WeaponMelee`, `VehicleExplosion`, `RoadKill`, `Falling` (all `Meta.Progression.Context.Player.KillContext.*`), `Suicide` and the constant `Local.Kill`/`Local.Death` (`Meta.PlayerKillFlag.Player.*`). No faction -on either side. Only `killed` was seen; other types may exist. Whether the game buffers while the -endpoint is down is not known. Warcon serves the endpoint at `POST /api/ingest/events` and writes +on either side. Only `killed` was seen; other types may exist. Warcon retains every event's +original JSON and event type, while kill views and statistics use only complete `killed` events. +Whether the game buffers while the endpoint is down is not known. Warcon serves the endpoint at +`POST /api/ingest/events` and writes `Url=` with a per-server token (README, "Kill feed"); a config written before the suffix was known (`Url=/api/feed/events`) needs Configure again, and Warcon keeps building the scoreboard's kill and cash totals as before. diff --git a/drizzle/0001_organizations.sql b/drizzle/0001_organizations.sql index 3a840ee2..3e5e6c2c 100644 --- a/drizzle/0001_organizations.sql +++ b/drizzle/0001_organizations.sql @@ -33,8 +33,8 @@ CREATE TABLE "organizations" ( CONSTRAINT "organizations_slug_unique" UNIQUE("slug") ); --> statement-breakpoint -ALTER TABLE "servers" ADD COLUMN "org_id" text;--> statement-breakpoint -ALTER TABLE "audit_log" ADD COLUMN "org_id" text;--> statement-breakpoint +ALTER TABLE "servers" ADD COLUMN IF NOT EXISTS "org_id" text;--> statement-breakpoint +ALTER TABLE "audit_log" ADD COLUMN IF NOT EXISTS "org_id" text;--> statement-breakpoint -- Every install gets a 'Default' org (so the owner can add servers straight after setup). On an -- existing install it takes every server; owners become org owners, everyone else a member. INSERT INTO "organizations" ("id", "name", "slug") diff --git a/drizzle/0002_org_limits.sql b/drizzle/0002_org_limits.sql index 99a91cda..962e22bb 100644 --- a/drizzle/0002_org_limits.sql +++ b/drizzle/0002_org_limits.sql @@ -1,3 +1,3 @@ -ALTER TABLE "organizations" ADD COLUMN "server_limit" integer;--> statement-breakpoint -ALTER TABLE "organizations" ADD COLUMN "suspended_at" timestamp with time zone;--> statement-breakpoint -ALTER TABLE "organizations" ADD COLUMN "suspended_reason" text DEFAULT '' NOT NULL; \ No newline at end of file +ALTER TABLE "organizations" ADD COLUMN IF NOT EXISTS "server_limit" integer;--> statement-breakpoint +ALTER TABLE "organizations" ADD COLUMN IF NOT EXISTS "suspended_at" timestamp with time zone;--> statement-breakpoint +ALTER TABLE "organizations" ADD COLUMN IF NOT EXISTS "suspended_reason" text DEFAULT '' NOT NULL; \ No newline at end of file diff --git a/drizzle/0003_server_allow_private.sql b/drizzle/0003_server_allow_private.sql index 2085e03e..5f2bec30 100644 --- a/drizzle/0003_server_allow_private.sql +++ b/drizzle/0003_server_allow_private.sql @@ -1 +1 @@ -ALTER TABLE "servers" ADD COLUMN "allow_private" boolean DEFAULT false NOT NULL; \ No newline at end of file +ALTER TABLE "servers" ADD COLUMN IF NOT EXISTS "allow_private" boolean DEFAULT false NOT NULL; \ No newline at end of file diff --git a/drizzle/0006_org_lists.sql b/drizzle/0006_org_lists.sql index 0fb91e92..040c6e02 100644 --- a/drizzle/0006_org_lists.sql +++ b/drizzle/0006_org_lists.sql @@ -61,8 +61,8 @@ CREATE TABLE "server_reserved" ( CONSTRAINT "server_reserved_server_id_steam_id_pk" PRIMARY KEY("server_id","steam_id") ); --> statement-breakpoint -ALTER TABLE "organizations" ADD COLUMN "members_reserved" boolean DEFAULT false NOT NULL;--> statement-breakpoint -ALTER TABLE "user" ADD COLUMN "steam_id" text;--> statement-breakpoint +ALTER TABLE "organizations" ADD COLUMN IF NOT EXISTS "members_reserved" boolean DEFAULT false NOT NULL;--> statement-breakpoint +ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "steam_id" text;--> statement-breakpoint ALTER TABLE "list_entries" ADD CONSTRAINT "list_entries_list_id_lists_id_fk" FOREIGN KEY ("list_id") REFERENCES "public"."lists"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint ALTER TABLE "lists" ADD CONSTRAINT "lists_org_id_organizations_id_fk" FOREIGN KEY ("org_id") REFERENCES "public"."organizations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint ALTER TABLE "server_list_state" ADD CONSTRAINT "server_list_state_server_id_servers_id_fk" FOREIGN KEY ("server_id") REFERENCES "public"."servers"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint diff --git a/drizzle/0007_sample_cash.sql b/drizzle/0007_sample_cash.sql index 53bca735..83cb7cee 100644 --- a/drizzle/0007_sample_cash.sql +++ b/drizzle/0007_sample_cash.sql @@ -1 +1 @@ -ALTER TABLE "samples" ADD COLUMN "cash" jsonb; \ No newline at end of file +ALTER TABLE "samples" ADD COLUMN IF NOT EXISTS "cash" jsonb; \ No newline at end of file diff --git a/drizzle/0011_default_org.sql b/drizzle/0011_default_org.sql index 225c4f7a..5083479c 100644 --- a/drizzle/0011_default_org.sql +++ b/drizzle/0011_default_org.sql @@ -1,2 +1,2 @@ -ALTER TABLE "user" ADD COLUMN "default_org_id" text;--> statement-breakpoint +ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "default_org_id" text;--> statement-breakpoint ALTER TABLE "user" ADD CONSTRAINT "user_default_org_id_organizations_id_fk" FOREIGN KEY ("default_org_id") REFERENCES "public"."organizations"("id") ON DELETE set null ON UPDATE no action; \ No newline at end of file diff --git a/drizzle/0012_org_roles.sql b/drizzle/0012_org_roles.sql index 3dadd375..caa287cb 100644 --- a/drizzle/0012_org_roles.sql +++ b/drizzle/0012_org_roles.sql @@ -26,7 +26,7 @@ SELECT gen_random_uuid()::text, o."id", r."name", r."caps"::jsonb, r."name", r." ('admin', '["server.view","chat.send","players.moderate","match.control","rotation.edit","players.notes","rotation.save","players.notes.manage","bans.manage","slots.manage","lists.edit","config.apply","automation.manage","audit.read","rcon.raw"]', 2) ) AS r("name", "caps", "ord");--> statement-breakpoint -- Grants: viewer / operator / admin -> the matching built-in of the server's org. -ALTER TABLE "server_grants" ADD COLUMN "role_id" text;--> statement-breakpoint +ALTER TABLE "server_grants" ADD COLUMN IF NOT EXISTS "role_id" text;--> statement-breakpoint UPDATE "server_grants" g SET "role_id" = r."id" FROM "servers" s, "org_roles" r WHERE s."id" = g."server_id" AND r."org_id" = s."org_id" AND r."builtin" = g."role";--> statement-breakpoint @@ -37,7 +37,7 @@ ALTER TABLE "server_grants" ADD CONSTRAINT "server_grants_role_id_org_roles_id_f CREATE INDEX "server_grants_role_idx" ON "server_grants" USING btree ("role_id");--> statement-breakpoint ALTER TABLE "server_grants" DROP COLUMN "role";--> statement-breakpoint -- Invite links: the default server role they hand out, same mapping. -ALTER TABLE "org_invites" ADD COLUMN "server_role_id" text;--> statement-breakpoint +ALTER TABLE "org_invites" ADD COLUMN IF NOT EXISTS "server_role_id" text;--> statement-breakpoint UPDATE "org_invites" i SET "server_role_id" = r."id" FROM "org_roles" r WHERE r."org_id" = i."org_id" AND r."builtin" = i."server_role";--> statement-breakpoint diff --git a/drizzle/0014_webhook_status.sql b/drizzle/0014_webhook_status.sql index e706cc15..051422a1 100644 --- a/drizzle/0014_webhook_status.sql +++ b/drizzle/0014_webhook_status.sql @@ -1,4 +1,4 @@ -ALTER TABLE "webhooks" ADD COLUMN "status_enabled" boolean DEFAULT false NOT NULL;--> statement-breakpoint -ALTER TABLE "webhooks" ADD COLUMN "status_style" text DEFAULT 'banner' NOT NULL;--> statement-breakpoint -ALTER TABLE "webhooks" ADD COLUMN "status_messages" jsonb;--> statement-breakpoint -ALTER TABLE "webhooks" ADD COLUMN "status_sent_at" timestamp with time zone; \ No newline at end of file +ALTER TABLE "webhooks" ADD COLUMN IF NOT EXISTS "status_enabled" boolean DEFAULT false NOT NULL;--> statement-breakpoint +ALTER TABLE "webhooks" ADD COLUMN IF NOT EXISTS "status_style" text DEFAULT 'banner' NOT NULL;--> statement-breakpoint +ALTER TABLE "webhooks" ADD COLUMN IF NOT EXISTS "status_messages" jsonb;--> statement-breakpoint +ALTER TABLE "webhooks" ADD COLUMN IF NOT EXISTS "status_sent_at" timestamp with time zone; \ No newline at end of file diff --git a/drizzle/0015_server_identity.sql b/drizzle/0015_server_identity.sql index e671c2f9..2b507e32 100644 --- a/drizzle/0015_server_identity.sql +++ b/drizzle/0015_server_identity.sql @@ -1,2 +1,2 @@ -ALTER TABLE "server_live" ADD COLUMN "build" text DEFAULT '' NOT NULL;--> statement-breakpoint -ALTER TABLE "server_live" ADD COLUMN "game_server_id" text DEFAULT '' NOT NULL; \ No newline at end of file +ALTER TABLE "server_live" ADD COLUMN IF NOT EXISTS "build" text DEFAULT '' NOT NULL;--> statement-breakpoint +ALTER TABLE "server_live" ADD COLUMN IF NOT EXISTS "game_server_id" text DEFAULT '' NOT NULL; \ No newline at end of file diff --git a/drizzle/0016_live_started_at.sql b/drizzle/0016_live_started_at.sql index cbe701b4..d6bbda0b 100644 --- a/drizzle/0016_live_started_at.sql +++ b/drizzle/0016_live_started_at.sql @@ -1 +1 @@ -ALTER TABLE "server_live" ADD COLUMN "started_at" timestamp with time zone; \ No newline at end of file +ALTER TABLE "server_live" ADD COLUMN IF NOT EXISTS "started_at" timestamp with time zone; \ No newline at end of file diff --git a/drizzle/0017_reserved_uncapped.sql b/drizzle/0017_reserved_uncapped.sql index 02b332ae..ab894300 100644 --- a/drizzle/0017_reserved_uncapped.sql +++ b/drizzle/0017_reserved_uncapped.sql @@ -1,4 +1,4 @@ -ALTER TABLE "server_live" ADD COLUMN "reserved_slots" integer;--> statement-breakpoint +ALTER TABLE "server_live" ADD COLUMN IF NOT EXISTS "reserved_slots" integer;--> statement-breakpoint ALTER TABLE "list_entries" DROP COLUMN "priority";--> statement-breakpoint ALTER TABLE "server_list_sync" DROP COLUMN "reserved_cap";--> statement-breakpoint ALTER TABLE "server_list_sync" DROP COLUMN "reserved_used";--> statement-breakpoint diff --git a/drizzle/0018_auth_methods.sql b/drizzle/0018_auth_methods.sql index f886e884..08e5dfa4 100644 --- a/drizzle/0018_auth_methods.sql +++ b/drizzle/0018_auth_methods.sql @@ -22,11 +22,11 @@ CREATE TABLE "two_factor" ( "locked_until" timestamp with time zone ); --> statement-breakpoint -ALTER TABLE "user" ADD COLUMN "two_factor_enabled" boolean DEFAULT false;--> statement-breakpoint -ALTER TABLE "user" ADD COLUMN "auth_complete" boolean DEFAULT false NOT NULL;--> statement-breakpoint -ALTER TABLE "user" ADD COLUMN "auth_grace_started_at" timestamp with time zone;--> statement-breakpoint -ALTER TABLE "user" ADD COLUMN "recovery_key_hash" text;--> statement-breakpoint -ALTER TABLE "user" ADD COLUMN "recovery_key_at" timestamp with time zone;--> statement-breakpoint +ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "two_factor_enabled" boolean DEFAULT false;--> statement-breakpoint +ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "auth_complete" boolean DEFAULT false NOT NULL;--> statement-breakpoint +ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "auth_grace_started_at" timestamp with time zone;--> statement-breakpoint +ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "recovery_key_hash" text;--> statement-breakpoint +ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "recovery_key_at" timestamp with time zone;--> statement-breakpoint ALTER TABLE "passkey" ADD CONSTRAINT "passkey_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint ALTER TABLE "two_factor" ADD CONSTRAINT "two_factor_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint CREATE INDEX "passkey_user_id_idx" ON "passkey" USING btree ("user_id");--> statement-breakpoint diff --git a/drizzle/0019_kill_feed.sql b/drizzle/0019_kill_feed.sql index 6ccd6037..a02e1164 100644 --- a/drizzle/0019_kill_feed.sql +++ b/drizzle/0019_kill_feed.sql @@ -21,9 +21,9 @@ CREATE TABLE "kills" ( "tags" jsonb NOT NULL ); --> statement-breakpoint -ALTER TABLE "server_live" ADD COLUMN "feed_at" timestamp with time zone;--> statement-breakpoint -ALTER TABLE "servers" ADD COLUMN "feed_token_enc" text;--> statement-breakpoint -ALTER TABLE "servers" ADD COLUMN "feed_token_hash" text;--> statement-breakpoint +ALTER TABLE "server_live" ADD COLUMN IF NOT EXISTS "feed_at" timestamp with time zone;--> statement-breakpoint +ALTER TABLE "servers" ADD COLUMN IF NOT EXISTS "feed_token_enc" text;--> statement-breakpoint +ALTER TABLE "servers" ADD COLUMN IF NOT EXISTS "feed_token_hash" text;--> statement-breakpoint CREATE INDEX "kills_event_idx" ON "kills" USING btree ("event_id");--> statement-breakpoint CREATE INDEX "kills_server_ts_idx" ON "kills" USING btree ("server_id","ts" DESC NULLS LAST);--> statement-breakpoint CREATE INDEX "kills_killer_idx" ON "kills" USING btree ("killer_steam_id","ts" DESC NULLS LAST);--> statement-breakpoint diff --git a/drizzle/0020_seed_seconds.sql b/drizzle/0020_seed_seconds.sql index ca41744d..3205f446 100644 --- a/drizzle/0020_seed_seconds.sql +++ b/drizzle/0020_seed_seconds.sql @@ -1 +1 @@ -ALTER TABLE "player_sessions" ADD COLUMN "seed_seconds" integer DEFAULT 0 NOT NULL; \ No newline at end of file +ALTER TABLE "player_sessions" ADD COLUMN IF NOT EXISTS "seed_seconds" integer DEFAULT 0 NOT NULL; \ No newline at end of file diff --git a/drizzle/0021_public_features.sql b/drizzle/0021_public_features.sql index 719095cd..9e649ed3 100644 --- a/drizzle/0021_public_features.sql +++ b/drizzle/0021_public_features.sql @@ -1,12 +1,12 @@ -ALTER TABLE "organizations" ADD COLUMN "allow_public_status" boolean DEFAULT false NOT NULL;--> statement-breakpoint -ALTER TABLE "organizations" ADD COLUMN "allow_public_leaderboards" boolean DEFAULT false NOT NULL;--> statement-breakpoint -ALTER TABLE "organizations" ADD COLUMN "discord_invite_url" text DEFAULT '' NOT NULL;--> statement-breakpoint -ALTER TABLE "servers" ADD COLUMN "public_status" boolean DEFAULT false NOT NULL;--> statement-breakpoint -ALTER TABLE "servers" ADD COLUMN "public_leaderboards" boolean DEFAULT false NOT NULL;--> statement-breakpoint -ALTER TABLE "webhooks" ADD COLUMN "status_interval_s" integer DEFAULT 60 NOT NULL;--> statement-breakpoint -ALTER TABLE "webhooks" ADD COLUMN "link_status" boolean DEFAULT true NOT NULL;--> statement-breakpoint -ALTER TABLE "webhooks" ADD COLUMN "link_leaderboard" boolean DEFAULT true NOT NULL;--> statement-breakpoint -ALTER TABLE "webhooks" ADD COLUMN "link_panel" boolean DEFAULT false NOT NULL;--> statement-breakpoint +ALTER TABLE "organizations" ADD COLUMN IF NOT EXISTS "allow_public_status" boolean DEFAULT false NOT NULL;--> statement-breakpoint +ALTER TABLE "organizations" ADD COLUMN IF NOT EXISTS "allow_public_leaderboards" boolean DEFAULT false NOT NULL;--> statement-breakpoint +ALTER TABLE "organizations" ADD COLUMN IF NOT EXISTS "discord_invite_url" text DEFAULT '' NOT NULL;--> statement-breakpoint +ALTER TABLE "servers" ADD COLUMN IF NOT EXISTS "public_status" boolean DEFAULT false NOT NULL;--> statement-breakpoint +ALTER TABLE "servers" ADD COLUMN IF NOT EXISTS "public_leaderboards" boolean DEFAULT false NOT NULL;--> statement-breakpoint +ALTER TABLE "webhooks" ADD COLUMN IF NOT EXISTS "status_interval_s" integer DEFAULT 60 NOT NULL;--> statement-breakpoint +ALTER TABLE "webhooks" ADD COLUMN IF NOT EXISTS "link_status" boolean DEFAULT true NOT NULL;--> statement-breakpoint +ALTER TABLE "webhooks" ADD COLUMN IF NOT EXISTS "link_leaderboard" boolean DEFAULT true NOT NULL;--> statement-breakpoint +ALTER TABLE "webhooks" ADD COLUMN IF NOT EXISTS "link_panel" boolean DEFAULT false NOT NULL;--> statement-breakpoint -- Cards that already exist were linking their title to the panel; keep that for them. New -- webhooks start with the panel link off (staff channels), the public links on. UPDATE "webhooks" SET "link_panel" = true WHERE "status_enabled"; diff --git a/drizzle/0023_public_kills.sql b/drizzle/0023_public_kills.sql index c4e243eb..423cf58f 100644 --- a/drizzle/0023_public_kills.sql +++ b/drizzle/0023_public_kills.sql @@ -1 +1 @@ -ALTER TABLE "servers" ADD COLUMN "public_kills" boolean DEFAULT false NOT NULL; \ No newline at end of file +ALTER TABLE "servers" ADD COLUMN IF NOT EXISTS "public_kills" boolean DEFAULT false NOT NULL; \ No newline at end of file diff --git a/drizzle/0024_server_lists.sql b/drizzle/0024_server_lists.sql index 166a3357..2b8e42b6 100644 --- a/drizzle/0024_server_lists.sql +++ b/drizzle/0024_server_lists.sql @@ -1,5 +1,5 @@ DROP INDEX "lists_org_kind_name_uidx";--> statement-breakpoint -ALTER TABLE "lists" ADD COLUMN "server_id" text;--> statement-breakpoint +ALTER TABLE "lists" ADD COLUMN IF NOT EXISTS "server_id" text;--> statement-breakpoint ALTER TABLE "lists" ADD CONSTRAINT "lists_server_id_servers_id_fk" FOREIGN KEY ("server_id") REFERENCES "public"."servers"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint CREATE UNIQUE INDEX "lists_server_kind_uidx" ON "lists" USING btree ("server_id","kind") WHERE "lists"."server_id" is not null;--> statement-breakpoint CREATE UNIQUE INDEX "lists_org_kind_name_uidx" ON "lists" USING btree ("org_id","kind","name") WHERE "lists"."server_id" is null; \ No newline at end of file diff --git a/drizzle/0027_ban_message.sql b/drizzle/0027_ban_message.sql index 7f4cbb6f..3d8e13d8 100644 --- a/drizzle/0027_ban_message.sql +++ b/drizzle/0027_ban_message.sql @@ -1 +1 @@ -ALTER TABLE "organizations" ADD COLUMN "ban_message" text DEFAULT '{reason}' NOT NULL; \ No newline at end of file +ALTER TABLE "organizations" ADD COLUMN IF NOT EXISTS "ban_message" text DEFAULT '{reason}' NOT NULL; \ No newline at end of file diff --git a/drizzle/0028_steam_friends.sql b/drizzle/0028_steam_friends.sql index 23fa8b41..272bf41e 100644 --- a/drizzle/0028_steam_friends.sql +++ b/drizzle/0028_steam_friends.sql @@ -1,5 +1,5 @@ -ALTER TABLE "steam_profiles" ADD COLUMN "friends_state" text DEFAULT 'unknown' NOT NULL;--> statement-breakpoint -ALTER TABLE "steam_profiles" ADD COLUMN "friends_total" integer DEFAULT 0 NOT NULL;--> statement-breakpoint -ALTER TABLE "steam_profiles" ADD COLUMN "friends_checked" integer DEFAULT 0 NOT NULL;--> statement-breakpoint -ALTER TABLE "steam_profiles" ADD COLUMN "banned_friends" integer DEFAULT 0 NOT NULL;--> statement-breakpoint -ALTER TABLE "steam_profiles" ADD COLUMN "friends_checked_at" timestamp with time zone; \ No newline at end of file +ALTER TABLE "steam_profiles" ADD COLUMN IF NOT EXISTS "friends_state" text DEFAULT 'unknown' NOT NULL;--> statement-breakpoint +ALTER TABLE "steam_profiles" ADD COLUMN IF NOT EXISTS "friends_total" integer DEFAULT 0 NOT NULL;--> statement-breakpoint +ALTER TABLE "steam_profiles" ADD COLUMN IF NOT EXISTS "friends_checked" integer DEFAULT 0 NOT NULL;--> statement-breakpoint +ALTER TABLE "steam_profiles" ADD COLUMN IF NOT EXISTS "banned_friends" integer DEFAULT 0 NOT NULL;--> statement-breakpoint +ALTER TABLE "steam_profiles" ADD COLUMN IF NOT EXISTS "friends_checked_at" timestamp with time zone; \ No newline at end of file diff --git a/drizzle/0038_brainy_toxin.sql b/drizzle/0038_brainy_toxin.sql new file mode 100644 index 00000000..75f87dd9 --- /dev/null +++ b/drizzle/0038_brainy_toxin.sql @@ -0,0 +1,5 @@ +ALTER TABLE "kills" ALTER COLUMN "event_time" DROP NOT NULL;--> statement-breakpoint +ALTER TABLE "kills" ALTER COLUMN "victim_steam_id" DROP NOT NULL;--> statement-breakpoint +ALTER TABLE "kills" ADD COLUMN IF NOT EXISTS "event_type" text DEFAULT 'killed' NOT NULL;--> statement-breakpoint +ALTER TABLE "kills" ADD COLUMN IF NOT EXISTS "parsed_kill" boolean DEFAULT true NOT NULL;--> statement-breakpoint +ALTER TABLE "kills" ADD COLUMN IF NOT EXISTS "raw_event" jsonb; diff --git a/drizzle/meta/0038_snapshot.json b/drizzle/meta/0038_snapshot.json new file mode 100644 index 00000000..7418586b --- /dev/null +++ b/drizzle/meta/0038_snapshot.json @@ -0,0 +1,4900 @@ +{ + "id": "15b5536b-712b-49a3-be81-ac1f84bf7bc2", + "prevId": "aa0ab5ba-afc5-4f57-a2f0-cd429e3c8047", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 7fe4ab18..cbbe07ae 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -267,6 +267,13 @@ "when": 1791069654398, "tag": "0037_read_and_write_indexes", "breakpoints": true + }, + { + "idx": 38, + "version": "7", + "when": 1791114595272, + "tag": "0038_brainy_toxin", + "breakpoints": true } ] } \ No newline at end of file diff --git a/src/lib/server/analytics.ts b/src/lib/server/analytics.ts index beda9cbe..4f3a3241 100644 --- a/src/lib/server/analytics.ts +++ b/src/lib/server/analytics.ts @@ -602,15 +602,15 @@ async function loadCombat( SELECT COUNT(*) AS kills, COUNT(*) FILTER (WHERE headshot) AS headshots, COUNT(*) FILTER (WHERE team_kill) AS "teamKills", COUNT(*) FILTER (WHERE suicide) AS suicides, COUNT(*) FILTER (WHERE cause LIKE 'Vehicle.%' OR cause LIKE 'Id.Vehicle.%') AS "vehicleKills" - FROM kills WHERE server_id = ${serverId} AND ts >= ${from}`); + FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${serverId} AND ts >= ${from}`); if (!feed?.configured && !num(totals?.kills)) return null; const [perBucket, causes, players, longest] = await Promise.all([ db.execute<{ b: Date; kills: string }>(sql` SELECT to_timestamp(floor(extract(epoch FROM ts) / ${bucket}) * ${bucket}) AS b, COUNT(*) AS kills - FROM kills WHERE server_id = ${serverId} AND ts >= ${from} GROUP BY b ORDER BY b`), + FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${serverId} AND ts >= ${from} GROUP BY b ORDER BY b`), db.execute<{ cause: string; kills: string; headshots: string }>(sql` SELECT cause, COUNT(*) AS kills, COUNT(*) FILTER (WHERE headshot) AS headshots - FROM kills WHERE server_id = ${serverId} AND ts >= ${from} AND cause IS NOT NULL AND NOT suicide + FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${serverId} AND ts >= ${from} AND cause IS NOT NULL AND NOT suicide GROUP BY cause ORDER BY kills DESC LIMIT 12`), db.execute<{ steamId: string; @@ -625,17 +625,17 @@ async function loadCombat( SELECT killer_steam_id AS steam_id, MAX(killer_name) AS name, COUNT(*) AS kills, COUNT(*) FILTER (WHERE headshot) AS headshots, COUNT(*) FILTER (WHERE team_kill) AS team_kills, AVG(distance_m) AS avg - FROM kills WHERE server_id = ${serverId} AND ts >= ${from} AND killer_steam_id IS NOT NULL AND NOT suicide + FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${serverId} AND ts >= ${from} AND killer_steam_id IS NOT NULL AND NOT suicide GROUP BY killer_steam_id), d AS ( SELECT victim_steam_id AS steam_id, COUNT(*) AS deaths - FROM kills WHERE server_id = ${serverId} AND ts >= ${from} GROUP BY victim_steam_id) + FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${serverId} AND ts >= ${from} GROUP BY victim_steam_id) SELECT k.steam_id AS "steamId", k.name, k.kills, COALESCE(d.deaths, 0) AS deaths, k.headshots, k.team_kills AS "teamKills", k.avg FROM k LEFT JOIN d ON d.steam_id = k.steam_id ORDER BY k.kills DESC LIMIT 25`), db.execute<{ ts: Date; killer: string; victim: string; cause: string | null; d: number }>(sql` SELECT ts, killer_name AS killer, victim_name AS victim, cause, distance_m AS d - FROM kills WHERE server_id = ${serverId} AND ts >= ${from} AND distance_m IS NOT NULL + FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${serverId} AND ts >= ${from} AND distance_m IS NOT NULL AND NOT suicide AND NOT team_kill ORDER BY distance_m DESC LIMIT 5`) ]); diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index f5333651..9f0250be 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -491,8 +491,9 @@ export const matches = pgTable( ); /** - * One row per kill the game's feed delivered (`[WDServerFeed]`, see docs/wardogs-api.md), with - * what Warcon knew at receipt: the open match and both players' factions. History: never pruned; + * One row per event the game's feed delivered (`[WDServerFeed]`, see docs/wardogs-api.md). + * The raw event and its type are kept even when it is not a usable kill; structured kill fields + * include what Warcon knew at receipt: the open match and both players' factions. Never pruned; * a TimescaleDB hypertable with compression where the extension exists (migration 0019). */ export const kills = pgTable( @@ -502,6 +503,11 @@ export const kills = pgTable( ts: ts('ts').notNull(), serverId: text('server_id').notNull(), eventId: text('event_id').notNull(), + eventType: text('event_type').notNull().default('killed'), + /** false for non-kills or incomplete killed events; old rows were all valid kills */ + parsedKill: boolean('parsed_kill').notNull().default(true), + /** the original event object; null only for historical rows written before this column */ + rawEvent: jsonb('raw_event'), /** the game's serverId: a per-boot instance id, not the join code */ instanceId: text('instance_id').notNull(), /** the game's matchId: also per boot, as observed */ @@ -509,13 +515,13 @@ export const kills = pgTable( /** matches.id open on this server at receipt */ matchRow: bigint('match_row', { mode: 'number' }), /** seconds on the match clock */ - eventTime: real('event_time').notNull(), + eventTime: real('event_time'), map: text('map').notNull(), /** null: the environment */ killerSteamId: text('killer_steam_id'), killerName: text('killer_name'), killerFaction: text('killer_faction'), - victimSteamId: text('victim_steam_id').notNull(), + victimSteamId: text('victim_steam_id'), victimName: text('victim_name').notNull(), victimFaction: text('victim_faction'), /** the raw weapon or vehicle tag, e.g. Id.Item.AK74M */ diff --git a/src/lib/server/feed-core.test.ts b/src/lib/server/feed-core.test.ts index 022934e4..9775f74e 100644 --- a/src/lib/server/feed-core.test.ts +++ b/src/lib/server/feed-core.test.ts @@ -129,12 +129,24 @@ describe('shortTags', () => { }); describe('parseBatch', () => { - test('keeps the instance id and name, counts what it skipped', () => { - const b = parseBatch(batch([killed, { type: 'match_started' }, { ...killed, eventId: 'x' }])); + test('keeps every event, including unknown types and incomplete kills', () => { + const started = { type: 'match_started', mapName: 'Kavkazi', extra: { round: 2 } }; + const incomplete = { ...killed, eventId: 'incomplete', victimSteamId: null }; + const b = parseBatch( + batch([killed, started, incomplete, { ...killed, eventId: 'x' }, 'opaque']) + ); expect(b.instanceId).toBe('e9cf2544-b21e-4b80-9f12-8ec95ff58964'); expect(b.serverName).toBe('[TLR][UK] The Last Rifles'); expect(b.kills.map((k) => k.eventId)).toEqual([killed.eventId, 'x']); - expect(b.skipped).toBe(1); + expect(b.events).toHaveLength(5); + expect(b.events[1]).toMatchObject({ eventType: 'match_started', raw: started, kill: null }); + expect(b.events[2]).toMatchObject({ eventType: 'killed', raw: incomplete, kill: null }); + expect(b.events[4]).toMatchObject({ eventType: 'unknown', raw: 'opaque', kill: null }); + expect(b.skipped).toBe(0); + expect(parseBatch(batch([killed, started])).events[1].eventId).toBe(b.events[1].eventId); + expect(parseBatch(batch([started, started])).events[0].eventId).not.toBe( + parseBatch(batch([started, started])).events[1].eventId + ); }); test('refuses what is not a batch, and batches too big to be the game', () => { diff --git a/src/lib/server/feed-core.ts b/src/lib/server/feed-core.ts index f8718ed2..e85fa5b4 100644 --- a/src/lib/server/feed-core.ts +++ b/src/lib/server/feed-core.ts @@ -1,7 +1,8 @@ -// The pure part of the kill feed: what the game POSTs to [WDServerFeed] Url (docs/wardogs-api.md) +// The pure part of the event feed: what the game POSTs to [WDServerFeed] Url (docs/wardogs-api.md) // and how one batch becomes rows. No database, so it is unit-tested with plain objects; feed.ts // adds what only the database knows (the open match, both factions) and writes. import { mapId } from '$lib/format'; +import { createHash } from 'node:crypto'; export const FEED_TOKEN_PREFIX = 'wkf_'; const FEED_TOKEN_RE = /^wkf_[A-Za-z0-9_-]{43}$/; @@ -37,11 +38,22 @@ export interface ParsedKill { export interface ParsedBatch { instanceId: string; serverName: string; + events: ParsedEvent[]; kills: ParsedKill[]; - /** events that were not kills, or kills missing what a row needs */ + /** only malformed batch envelopes are refused; individual events are retained */ skipped: number; } +export interface ParsedEvent { + eventId: string; + eventType: string; + eventTime: number | null; + matchId: string; + map: string; + raw: unknown; + kill: ParsedKill | null; +} + const STEAM_RE = /^\d{17}$/; const str = (v: unknown, max = 200): string => (typeof v === 'string' ? v.slice(0, max) : ''); const num = (v: unknown): number | null => (typeof v === 'number' && Number.isFinite(v) ? v : null); @@ -106,14 +118,34 @@ export function parseBatch(body: unknown): ParsedBatch { const events = o.events as unknown[]; if (events.length > MAX_BATCH) throw new Error(`Too many events in one batch (${events.length}).`); - const kills: ParsedKill[] = []; - let skipped = 0; - for (const e of events) { - const k = parseKill(e); - if (k) kills.push(k); - else skipped++; - } - return { instanceId: str(o.serverId, 64), serverName: str(o.serverName), kills, skipped }; + const instanceId = str(o.serverId, 64); + const parsed = events.map((raw, index): ParsedEvent => { + const e = raw && typeof raw === 'object' ? (raw as Record) : {}; + const kill = parseKill(raw); + // A malformed or future event may lack an eventId. Give it a stable id so a retried batch + // does not write it twice; the full original event is still retained. + const eventId = + str(e.eventId, 64) || + createHash('sha256') + .update(JSON.stringify([instanceId, index, raw ?? null])) + .digest('hex'); + return { + eventId, + eventType: str(e.type, 64) || 'unknown', + eventTime: num(e.eventTime), + matchId: str(e.matchId, 64), + map: str(e.mapName, 64), + raw: raw ?? null, + kill + }; + }); + return { + instanceId, + serverName: str(o.serverName), + events: parsed, + kills: parsed.flatMap((e) => (e.kill ? [e.kill] : [])), + skipped: 0 + }; } /** Same faction on both sides, both known, and not a suicide. */ diff --git a/src/lib/server/feed-events.ts b/src/lib/server/feed-events.ts index b79ead5d..0f60ed78 100644 --- a/src/lib/server/feed-events.ts +++ b/src/lib/server/feed-events.ts @@ -191,6 +191,8 @@ async function stampedMatch(env: Env, serverId: string, batch: KillView[]): Prom .where( and( eq(kills.serverId, serverId), + eq(kills.eventType, 'killed'), + eq(kills.parsedKill, true), eq(kills.eventId, batch[0].eventId), gte(kills.ts, new Date(at.getTime() - 60_000)) ) @@ -371,6 +373,8 @@ async function teamKillsThisMatch( .where( and( eq(kills.serverId, serverId), + eq(kills.eventType, 'killed'), + eq(kills.parsedKill, true), eq(kills.eventId, batch[0].eventId), gte(kills.ts, new Date(at.getTime() - 60_000)) ) @@ -386,6 +390,8 @@ async function teamKillsThisMatch( .where( and( eq(kills.serverId, serverId), + eq(kills.eventType, 'killed'), + eq(kills.parsedKill, true), inArray(kills.killerSteamId, steamIds), eq(kills.teamKill, true), stamp?.row != null ? eq(kills.matchRow, stamp.row) : isNull(kills.matchRow), diff --git a/src/lib/server/feed.ts b/src/lib/server/feed.ts index 9c2e3ca9..aac9025d 100644 --- a/src/lib/server/feed.ts +++ b/src/lib/server/feed.ts @@ -1,5 +1,5 @@ -// The kill feed on the database side: each server's feed token, which batch belongs to which -// server, and how a batch becomes rows in `kills`. Inbound data from the game process, so it runs +// The event feed on the database side: each server's feed token, which batch belongs to which +// server, and how every event becomes a row in `kills`. Inbound data from the game process, so it runs // on the web role and writes Postgres directly; the worker's lane is for requests Warcon makes. import { and, @@ -35,7 +35,7 @@ import { import type { KillView } from '$lib/types'; import { VEHICLE_TAGS, type KillFilter } from '$lib/kills'; import type { SessionUser } from './access'; -import { FEED_TOKEN_PREFIX, isTeamKill, parseBatch, type ParsedKill } from './feed-core'; +import { FEED_TOKEN_PREFIX, isTeamKill, parseBatch, type ParsedEvent } from './feed-core'; const hashToken = (token: string): string => createHash('sha256').update(token, 'utf8').digest('hex'); @@ -141,14 +141,19 @@ const feedAtWritten = new Map(); const DEDUPE_WINDOW_MS = 24 * 3600_000; export interface IngestResult { + /** all newly stored events, not only kills */ accepted: number; + acceptedKills: number; skipped: number; duplicates: number; + duplicateKills: number; /** what was written, in feed order */ kills: KillView[]; } export function killView(r: KillRow): KillView { + if (r.eventType !== 'killed' || !r.parsedKill || !r.victimSteamId || r.eventTime === null) + throw new Error('A non-kill feed event reached a kill view.'); return { eventId: r.eventId, ts: r.ts.toISOString(), @@ -183,8 +188,9 @@ export async function ingestBatch( } catch (err) { throw new ApiError(400, err instanceof Error ? err.message : 'Malformed batch.'); } - let fresh: ParsedKill[] = batch.kills; + let fresh: ParsedEvent[] = batch.events; let duplicates = 0; + let duplicateKills = 0; let written: KillView[] = []; if (fresh.length) // The table cannot hold a unique event id (a hypertable's unique indexes must include ts), @@ -215,12 +221,17 @@ export async function ingestBatch( once.add(k.eventId); return true; }); - duplicates = batch.kills.length - fresh.length; + duplicates = batch.events.length - fresh.length; + duplicateKills = batch.kills.length - fresh.filter((e) => e.kill !== null).length; if (!fresh.length) return; const steamIds = [ ...new Set( - fresh.flatMap((k) => - k.killerSteamId ? [k.killerSteamId, k.victimSteamId] : [k.victimSteamId] + fresh.flatMap(({ kill }) => + kill + ? kill.killerSteamId + ? [kill.killerSteamId, kill.victimSteamId] + : [kill.victimSteamId] + : [] ) ) ]; @@ -249,35 +260,39 @@ export async function ingestBatch( const rows = await db .insert(kills) .values( - fresh.map((k) => { - const kf = k.killerSteamId ? (faction.get(k.killerSteamId) ?? null) : null; - const vf = faction.get(k.victimSteamId) ?? null; + fresh.map((event) => { + const k = event.kill; + const kf = k?.killerSteamId ? (faction.get(k.killerSteamId) ?? null) : null; + const vf = k ? (faction.get(k.victimSteamId) ?? null) : null; return { ts: now, serverId, - eventId: k.eventId, + eventId: event.eventId, + eventType: event.eventType, + parsedKill: k !== null, + rawEvent: event.raw, instanceId: batch.instanceId, - matchId: k.matchId, + matchId: event.matchId, matchRow: match?.id ?? null, - eventTime: k.eventTime, - map: k.map, - killerSteamId: k.killerSteamId, - killerName: k.killerName, + eventTime: event.eventTime, + map: event.map, + killerSteamId: k?.killerSteamId ?? null, + killerName: k?.killerName ?? null, killerFaction: kf, - victimSteamId: k.victimSteamId, - victimName: k.victimName, + victimSteamId: k?.victimSteamId ?? null, + victimName: k?.victimName ?? '', victimFaction: vf, - cause: k.cause, - distanceM: k.distanceM, - headshot: k.headshot, - suicide: k.suicide, - teamKill: isTeamKill(k, kf, vf), - tags: k.tags + cause: k?.cause ?? null, + distanceM: k?.distanceM ?? null, + headshot: k?.headshot ?? false, + suicide: k?.suicide ?? false, + teamKill: k ? isTeamKill(k, kf, vf) : false, + tags: k?.tags ?? [] }; }) ) .returning(); - written = rows.map(killView); + written = rows.filter((r) => r.eventType === 'killed' && r.parsedKill).map(killView); }); // The liveness stamp, at most every ten seconds per server: the worker's upsert of the row // leaves this column alone, so the two never fight. @@ -289,7 +304,14 @@ export async function ingestBatch( .values({ serverId, feedAt: now }) .onConflictDoUpdate({ target: serverLive.serverId, set: { feedAt: now } }); } - return { accepted: fresh.length, skipped: batch.skipped, duplicates, kills: written }; + return { + accepted: fresh.length, + acceptedKills: written.length, + skipped: batch.skipped, + duplicates, + duplicateKills, + kills: written + }; } const STEAM_RE = /^\d{17}$/; @@ -319,7 +341,11 @@ function killWhere( f: KillFilter, match: KillsOfMatch | null = null ): SQL { - const conds: (SQL | undefined)[] = [eq(kills.serverId, serverId)]; + const conds: (SQL | undefined)[] = [ + eq(kills.serverId, serverId), + eq(kills.eventType, 'killed'), + eq(kills.parsedKill, true) + ]; if (match) { conds.push(eq(kills.matchRow, match.matchRow), gte(kills.ts, match.from)); if (match.to) conds.push(lte(kills.ts, match.to)); diff --git a/src/lib/server/leaderboards.ts b/src/lib/server/leaderboards.ts index 8f3c6810..4165df74 100644 --- a/src/lib/server/leaderboards.ts +++ b/src/lib/server/leaderboards.ts @@ -120,7 +120,8 @@ export async function riskPerformanceFor( SELECT killer_steam_id AS "steamId", COUNT(*) FILTER (WHERE NOT suicide) AS "feedKills", COUNT(*) FILTER (WHERE headshot AND NOT suicide) AS headshots - FROM kills WHERE server_id IN ${serverIds} AND killer_steam_id IN ${steamIds} + FROM kills WHERE event_type = 'killed' AND parsed_kill + AND server_id IN ${serverIds} AND killer_steam_id IN ${steamIds} GROUP BY killer_steam_id`), env.db.execute<{ steamId: string; diff --git a/src/lib/server/match-players.ts b/src/lib/server/match-players.ts index c7f228f4..910d0552 100644 --- a/src/lib/server/match-players.ts +++ b/src/lib/server/match-players.ts @@ -287,7 +287,8 @@ export async function enrichMatchPlayers( SELECT killer_steam_id AS "killerSteamId", victim_steam_id AS "victimSteamId", headshot, suicide, team_kill AS "teamKill", cause, distance_m AS "distanceM" FROM kills - WHERE server_id = ${serverId} AND ts >= ${new Date(startedAt.getTime() - 120_000)} + WHERE event_type = 'killed' AND parsed_kill + AND server_id = ${serverId} AND ts >= ${new Date(startedAt.getTime() - 120_000)} AND match_row = ${matchId}::bigint ORDER BY event_time, ts`); const record = feedRecord(rows as FeedKill[]); diff --git a/src/lib/server/matches.ts b/src/lib/server/matches.ts index 808b86e3..0b391872 100644 --- a/src/lib/server/matches.ts +++ b/src/lib/server/matches.ts @@ -146,7 +146,8 @@ export async function loadMatch( liveFactions(env, serverId), env.db.execute<{ n: string }>(sql` SELECT COUNT(*) AS n FROM kills - WHERE server_id = ${serverId} AND ts >= ${span.from} AND ts <= ${span.to} + WHERE event_type = 'killed' AND parsed_kill + AND server_id = ${serverId} AND ts >= ${span.from} AND ts <= ${span.to} AND match_row = ${matchId}::bigint`) ]); const lines: MatchLine[] = rows.map((r) => ({ diff --git a/src/lib/server/players.ts b/src/lib/server/players.ts index a10bd5bb..f3956b1c 100644 --- a/src/lib/server/players.ts +++ b/src/lib/server/players.ts @@ -231,11 +231,13 @@ export async function dossier( const [summary] = await db.execute<{ sessions: string; minutes: string | null; + cash: string | null; firstSeen: Date | null; lastSeen: Date | null; }>(sql` SELECT COUNT(*) AS sessions, SUM(EXTRACT(EPOCH FROM (COALESCE(left_at, now()) - joined_at))) / 60 AS minutes, + SUM(cash) AS cash, MIN(joined_at) AS "firstSeen", MAX(last_seen) AS "lastSeen" FROM player_sessions WHERE steam_id = ${steamId} AND server_id IN ${ids.length ? ids : ['']}`); const perServer = ids.length @@ -243,10 +245,12 @@ export async function dossier( serverId: string; sessions: string; minutes: string; + cash: string; lastSeen: Date; }>(sql` SELECT server_id AS "serverId", COUNT(*) AS sessions, SUM(EXTRACT(EPOCH FROM (COALESCE(left_at, now()) - joined_at))) / 60 AS minutes, + SUM(cash) AS cash, MAX(last_seen) AS "lastSeen" FROM player_sessions WHERE steam_id = ${steamId} AND server_id IN ${ids} GROUP BY server_id ORDER BY "lastSeen" DESC`) @@ -367,6 +371,7 @@ export async function dossier( minutes: Math.round(num(summary?.minutes)), kills: recordedAll.kills, deaths: recordedAll.deaths, + cash: num(summary?.cash), firstSeen: iso(summary?.firstSeen ? new Date(summary.firstSeen) : null), lastSeen: iso(summary?.lastSeen ? new Date(summary.lastSeen) : null) }, @@ -377,6 +382,7 @@ export async function dossier( minutes: Math.round(num(r.minutes)), kills: num(recordedOn.get(r.serverId)?.kills), deaths: num(recordedOn.get(r.serverId)?.deaths), + cash: num(r.cash), lastSeen: new Date(r.lastSeen).toISOString() })), recent: recent.map((s) => ({ @@ -555,6 +561,8 @@ async function playerCombat( .where( and( inArray(kills.serverId, serverIds), + eq(kills.eventType, 'killed'), + eq(kills.parsedKill, true), or(eq(kills.killerSteamId, steamId), eq(kills.victimSteamId, steamId)) ) ) @@ -604,21 +612,24 @@ export async function combatSummary( COUNT(*) FILTER (WHERE victim_steam_id = ${steamId} AND suicide) AS suicides, AVG(distance_m) FILTER (WHERE killer_steam_id = ${steamId} AND NOT suicide) AS avg, MAX(distance_m) FILTER (WHERE killer_steam_id = ${steamId} AND NOT suicide) AS longest - FROM kills WHERE server_id IN ${serverIds} + FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id IN ${serverIds} AND (killer_steam_id = ${steamId} OR victim_steam_id = ${steamId})`); if (!num(feed?.n) && !num(t?.kills) && !num(t?.deaths)) return null; const [causes, victims, nemeses] = await Promise.all([ db.execute<{ cause: string; kills: string }>(sql` SELECT cause, COUNT(*) AS kills FROM kills - WHERE server_id IN ${serverIds} AND killer_steam_id = ${steamId} AND NOT suicide AND cause IS NOT NULL + WHERE event_type = 'killed' AND parsed_kill AND server_id IN ${serverIds} + AND killer_steam_id = ${steamId} AND NOT suicide AND cause IS NOT NULL GROUP BY cause ORDER BY kills DESC LIMIT 8`), db.execute<{ steamId: string; name: string; kills: string }>(sql` SELECT victim_steam_id AS "steamId", MAX(victim_name) AS name, COUNT(*) AS kills FROM kills - WHERE server_id IN ${serverIds} AND killer_steam_id = ${steamId} AND NOT suicide + WHERE event_type = 'killed' AND parsed_kill AND server_id IN ${serverIds} + AND killer_steam_id = ${steamId} AND NOT suicide GROUP BY victim_steam_id ORDER BY kills DESC LIMIT 5`), db.execute<{ steamId: string; name: string; deaths: string }>(sql` SELECT killer_steam_id AS "steamId", MAX(killer_name) AS name, COUNT(*) AS deaths FROM kills - WHERE server_id IN ${serverIds} AND victim_steam_id = ${steamId} AND killer_steam_id IS NOT NULL AND NOT suicide + WHERE event_type = 'killed' AND parsed_kill AND server_id IN ${serverIds} + AND victim_steam_id = ${steamId} AND killer_steam_id IS NOT NULL AND NOT suicide GROUP BY killer_steam_id ORDER BY deaths DESC LIMIT 5`) ]); return { diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index 0b80eb6c..3bb7d0e3 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -1974,14 +1974,16 @@ export async function dryRun( k.victim_name AS "victimName", k.map, k.cause, CASE WHEN ${counts(sql`k.cause`)} THEN (SELECT COUNT(*) FROM kills k2 - WHERE k2.server_id = k.server_id AND k2.killer_steam_id = k.killer_steam_id + WHERE k2.event_type = 'killed' AND k2.parsed_kill + AND k2.server_id = k.server_id AND k2.killer_steam_id = k.killer_steam_id AND k2.team_kill AND ${counts(sql`k2.cause`)} AND k2.ts <= k.ts AND k2.match_row IS NOT DISTINCT FROM k.match_row AND k2.ts >= COALESCE((SELECT m.started_at - interval '2 minutes' FROM matches m WHERE m.id = k.match_row AND m.server_id = k.server_id), k.ts - interval '1 hour')) END AS n FROM kills k - WHERE k.server_id = ${server.id} AND k.team_kill AND k.killer_steam_id IS NOT NULL + WHERE k.event_type = 'killed' AND k.parsed_kill + AND k.server_id = ${server.id} AND k.team_kill AND k.killer_steam_id IS NOT NULL AND k.ts >= ${from} ORDER BY k.ts ASC LIMIT ${REPLAY_ROWS_MAX}`); let counted = 0; @@ -2039,7 +2041,8 @@ export async function dryRun( SELECT ts, event_time AS "eventTime", killer_steam_id AS "steamId", killer_name AS name, cause, headshot, suicide FROM kills - WHERE server_id = ${server.id} AND ts >= ${from} + WHERE event_type = 'killed' AND parsed_kill + AND server_id = ${server.id} AND ts >= ${from} ORDER BY ts ASC LIMIT ${KILL_RATE_REPLAY_MAX}`); // The kills of one ingest batch share its receipt time: each batch is spaced out by the match // clock as the live rule does it, then the counted ones replayed. @@ -2114,7 +2117,8 @@ export async function dryRun( SELECT ts, killer_steam_id AS "steamId", killer_name AS name, cause, distance_m AS "distanceM", match_row AS "matchRow" FROM kills - WHERE server_id = ${server.id} AND ts >= ${since} + WHERE event_type = 'killed' AND parsed_kill + AND server_id = ${server.id} AND ts >= ${since} AND killer_steam_id IS NOT NULL AND NOT suicide ${far} AND lower(cause) IN (SELECT jsonb_array_elements_text(${JSON.stringify(c.causes.map((x) => x.toLowerCase()))}::text::jsonb)) ORDER BY ts ASC, event_time ASC LIMIT ${KILL_RATE_REPLAY_MAX}`); diff --git a/src/lib/types.ts b/src/lib/types.ts index 69a9ac4f..872b0eee 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -444,6 +444,8 @@ export interface DossierView { minutes: number; kills: number; deaths: number; + /** total cash earned across the visible servers */ + cash: number; firstSeen: string | null; lastSeen: string | null; }; @@ -456,6 +458,8 @@ export interface DossierView { minutes: number; kills: number; deaths: number; + /** total cash earned on this server */ + cash: number; lastSeen: string; }[]; recent: DossierSession[]; diff --git a/src/routes/api/ingest/events/+server.ts b/src/routes/api/ingest/events/+server.ts index 9dcd1348..606c48ea 100644 --- a/src/routes/api/ingest/events/+server.ts +++ b/src/routes/api/ingest/events/+server.ts @@ -36,9 +36,9 @@ export const POST = route(async (event) => { } const r = await ingestBatch(env, serverId, body); feedPosts.inc({ outcome: 'accepted' }); - feedKills.inc({ result: 'accepted' }, r.accepted); + feedKills.inc({ result: 'accepted' }, r.acceptedKills); feedKills.inc({ result: 'skipped' }, r.skipped); - feedKills.inc({ result: 'duplicate' }, r.duplicates); + feedKills.inc({ result: 'duplicate' }, r.duplicateKills); // Browsers watching the server see them at once; the worker's kill rules get their turn. if (r.kills.length) gateway().killsIngested(env, serverId, r.kills); return apiJson({ ok: true, accepted: r.accepted, skipped: r.skipped, duplicates: r.duplicates }); diff --git a/src/test/feed-ingest.test.ts b/src/test/feed-ingest.test.ts index 0042cbf7..fc6901c0 100644 --- a/src/test/feed-ingest.test.ts +++ b/src/test/feed-ingest.test.ts @@ -5,7 +5,8 @@ import { randomUUID } from 'node:crypto'; import { and, eq } from 'drizzle-orm'; import type { Env } from '$lib/server/env'; import { kills } from '$lib/server/db/schema'; -import { ingestBatch } from '$lib/server/feed'; +import { countKills, ingestBatch, recentKills } from '$lib/server/feed'; +import { EMPTY_FILTER } from '$lib/kills'; import { hasTestDb, testEnv } from './db'; import { seedWorld } from './world'; @@ -63,4 +64,41 @@ describe.skipIf(!hasTestDb)('kill feed ingest', () => { ]); expect([a.accepted, b.accepted]).toEqual([1, 1]); }); + + test('stores every event but exposes only complete kills to kill consumers', async () => { + const w = await seedWorld(env); + const killId = randomUUID(); + const startedId = randomUUID(); + const incompleteId = randomUUID(); + const started = { + eventId: startedId, + type: 'match_started', + mapName: 'Kavkazi', + extra: { round: 2 } + }; + const incomplete = { eventId: incompleteId, type: 'killed', eventTime: 102 }; + const body = { + ...batchOf([killId]), + events: [...batchOf([killId]).events, started, incomplete] + }; + const result = await ingestBatch(env, w.server.id, body); + expect(result).toMatchObject({ accepted: 3, acceptedKills: 1, skipped: 0, duplicates: 0 }); + expect(result.kills.map((k) => k.eventId)).toEqual([killId]); + const rows = await env.db.select().from(kills).where(eq(kills.serverId, w.server.id)); + expect(rows.find((r) => r.eventId === startedId)).toMatchObject({ + eventType: 'match_started', + parsedKill: false, + rawEvent: started, + victimSteamId: null + }); + expect(rows.find((r) => r.eventId === incompleteId)).toMatchObject({ + eventType: 'killed', + parsedKill: false, + rawEvent: incomplete + }); + expect(await countKills(env, w.server.id, EMPTY_FILTER)).toBe(1); + expect( + (await recentKills(env, w.server.id, null, 10, EMPTY_FILTER)).map((k) => k.eventId) + ).toEqual([killId]); + }); }); diff --git a/src/test/view.test.ts b/src/test/view.test.ts index 206fb413..5d573c0e 100644 --- a/src/test/view.test.ts +++ b/src/test/view.test.ts @@ -175,6 +175,52 @@ describe.skipIf(!hasTestDb)('what View shows', () => { expect(JSON.stringify(slots)).not.toContain('org-wide ban reason'); }); + test('the player endpoint exposes total cash only across servers the reader can view', async () => { + const joinedAt = new Date(Date.now() - 120_000); + const lastSeen = new Date(Date.now() - 60_000); + await env.db.insert(playerSessions).values([ + { + serverId: w.server.id, + steamId: PLAYER, + name: 'someone', + joinedAt, + lastSeen, + leftAt: lastSeen, + cash: 1_234 + }, + { + serverId: w.otherServer.id, + steamId: PLAYER, + name: 'someone', + joinedAt, + lastSeen, + leftAt: lastSeen, + cash: 5_678 + }, + { + serverId: w.otherOrgServer.id, + steamId: PLAYER, + name: 'someone', + joinedAt, + lastSeen, + leftAt: lastSeen, + cash: 90_000 + } + ]); + + const viewer = (await get('viewer', 'api/servers/[id]/players/[steamId]')).dossier; + expect(viewer.summary.cash).toBe(1_234); + expect( + viewer.perServer.map((s: { serverId: string; cash: number }) => [s.serverId, s.cash]) + ).toEqual([[w.server.id, 1_234]]); + + const owner = (await get('owner', 'api/servers/[id]/players/[steamId]')).dossier; + expect(owner.summary.cash).toBe(6_912); + expect( + owner.perServer.map((s: { cash: number }) => s.cash).sort((a: number, b: number) => a - b) + ).toEqual([1_234, 5_678]); + }); + test('the risk score counts bans and recorded games only on servers the reader can open', async () => { const t = new Date(Date.now() - 3600_000); await env.db.insert(playerSessions).values({ From 9d8f3f8455b80278e47a84deaf96d84fc6f6fd0a Mon Sep 17 00:00:00 2001 From: Seebomega Date: Thu, 24 Sep 2026 21:35:51 +0200 Subject: [PATCH 002/102] add new seed time calculation --- drizzle/0039_seed_progress_backfill.sql | 58 ++++++++++++ drizzle/meta/_journal.json | 9 +- src/lib/server/lists.ts | 68 ++++++++------ src/lib/server/outbox.ts | 24 +++-- src/lib/server/players.ts | 76 +++++++++++++++- src/lib/server/trigger-rules.ts | 3 + src/lib/server/triggers.test.ts | 5 ++ src/lib/server/triggers.ts | 88 ++++++++++++------- src/lib/types.ts | 4 + .../(app)/server/[id]/automation/+page.svelte | 14 ++- .../[id]/players/[steamId]/+page.svelte | 7 +- src/test/view.test.ts | 37 +++++++- 12 files changed, 319 insertions(+), 74 deletions(-) create mode 100644 drizzle/0039_seed_progress_backfill.sql diff --git a/drizzle/0039_seed_progress_backfill.sql b/drizzle/0039_seed_progress_backfill.sql new file mode 100644 index 00000000..fd9e17ff --- /dev/null +++ b/drizzle/0039_seed_progress_backfill.sql @@ -0,0 +1,58 @@ +-- The persistent seed-reward balance was introduced after seed_seconds had already been recorded. +-- Seed each enabled rule from the last three days without crediting a player twice when that +-- rule's destination list already gave them a reserved slot today. `observed` is the server's +-- all-time counter, not only the backfill window: the next worker observation can then add only +-- genuinely new seed time. Existing live progress wins if this is applied after the new worker +-- has already written state. +WITH totals AS ( + SELECT t.id AS trigger_id, t.server_id, t.org_id, t.config, ps.steam_id, + SUM(ps.seed_seconds)::bigint AS observed, + COALESCE(SUM(ps.seed_seconds) FILTER ( + WHERE ps.last_seen >= CURRENT_TIMESTAMP - INTERVAL '3 days' + ), 0)::bigint AS recent + FROM triggers t + JOIN player_sessions ps ON ps.server_id = t.server_id + WHERE t.kind = 'seed_reward' AND t.enabled AND ps.seed_seconds > 0 + GROUP BY t.id, t.server_id, t.org_id, t.config, ps.steam_id +), balances AS ( + SELECT x.trigger_id, x.steam_id, x.observed, + CASE WHEN EXISTS ( + SELECT 1 + FROM list_entries e + JOIN lists l ON l.id = e.list_id + WHERE l.kind = 'reserve' AND e.steam_id = x.steam_id + AND e.added_at >= CURRENT_DATE + AND e.added_at < CURRENT_DATE + INTERVAL '1 day' + AND ( + (x.config->>'scope' = 'server' AND l.server_id = x.server_id) + OR + (COALESCE(x.config->>'scope', 'org') <> 'server' + AND l.org_id = x.org_id AND l.server_id IS NULL) + ) + ) THEN 0 ELSE x.recent END AS balance + FROM totals x +), packed AS ( + SELECT trigger_id, + jsonb_object_agg( + steam_id, + jsonb_build_object( + 'observed', observed, + 'balance', balance, + 'seenAt', FLOOR(EXTRACT(EPOCH FROM CURRENT_TIMESTAMP) * 1000)::bigint + ) ORDER BY steam_id + ) AS players + FROM balances + GROUP BY trigger_id +) +UPDATE triggers t + SET state = jsonb_set( + CASE WHEN jsonb_typeof(t.state) = 'object' THEN t.state ELSE '{}'::jsonb END, + '{players}', + p.players || CASE + WHEN jsonb_typeof(t.state->'players') = 'object' THEN t.state->'players' + ELSE '{}'::jsonb + END, + true + ) + FROM packed p + WHERE t.id = p.trigger_id;--> statement-breakpoint diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index cbbe07ae..b4446ead 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -274,6 +274,13 @@ "when": 1791114595272, "tag": "0038_brainy_toxin", "breakpoints": true + }, + { + "idx": 39, + "version": "7", + "when": 1790278202475, + "tag": "0039_seed_progress_backfill", + "breakpoints": true } ] -} \ No newline at end of file +} diff --git a/src/lib/server/lists.ts b/src/lib/server/lists.ts index 0891c9b9..3a0d4b62 100644 --- a/src/lib/server/lists.ts +++ b/src/lib/server/lists.ts @@ -436,13 +436,14 @@ interface NewEntry { addedByName: string; } -/** Inserts an active entry; `added` is false when the player is already on the list. */ +/** Inserts an active entry; optionally soft-removes an active duplicate before inserting. */ async function insertEntry( env: Env, list: ListRow, - entry: NewEntry -): Promise<{ id: string; added: boolean }> { - return env.db.transaction((tx) => insertInto(tx, list, entry)); + entry: NewEntry, + opts: { replaceExisting?: boolean } = {} +): Promise<{ id: string; added: boolean; replaced: boolean; lengthened: boolean }> { + return env.db.transaction((tx) => insertInto(tx, list, entry, opts)); } /** How much longer an entry must make an existing one last to lengthen it. */ @@ -457,8 +458,8 @@ async function insertInto( tx: Tx, list: ListRow, entry: NewEntry, - lengthen = false -): Promise<{ id: string; added: boolean; lengthened: boolean }> { + opts: { lengthen?: boolean; replaceExisting?: boolean } = {} +): Promise<{ id: string; added: boolean; replaced: boolean; lengthened: boolean }> { const id = newId(); // Serialise adds to one list so two writers cannot race past the duplicate check; the // partial unique index on (list_id, steam_id) where removed_at is null is the backstop. @@ -475,43 +476,56 @@ async function insertInto( ) .limit(1); // Lengthening decides from the entry's expiry: an edit of it by hand is seen, or waits. - const [dup] = lengthen ? await found.for('update') : await found; + const [dup] = opts.lengthen || opts.replaceExisting ? await found.for('update') : await found; if (dup) { - // Longer by an hour at least: the same ban given again a moment later is not a longer one. - const longer = - dup.expiresAt !== null && - (entry.expiresAt === null || - entry.expiresAt.getTime() - dup.expiresAt.getTime() >= LENGTHEN_MIN_MS); - if (!lengthen || !longer) return { id: dup.id, added: false, lengthened: false }; - await tx - .update(listEntries) - .set({ expiresAt: entry.expiresAt }) - .where(eq(listEntries.id, dup.id)); - await touch(tx, list.id); - return { id: dup.id, added: false, lengthened: true }; + if (opts.replaceExisting) { + await tx + .update(listEntries) + .set({ + removedAt: new Date(), + removedBy: null, + removedByName: entry.addedByName, + removal: 'manual' + }) + .where(eq(listEntries.id, dup.id)); + } else { + // Longer by an hour at least: the same ban given again a moment later is not a longer one. + const longer = + dup.expiresAt !== null && + (entry.expiresAt === null || + entry.expiresAt.getTime() - dup.expiresAt.getTime() >= LENGTHEN_MIN_MS); + if (!opts.lengthen || !longer) + return { id: dup.id, added: false, replaced: false, lengthened: false }; + await tx + .update(listEntries) + .set({ expiresAt: entry.expiresAt }) + .where(eq(listEntries.id, dup.id)); + await touch(tx, list.id); + return { id: dup.id, added: false, replaced: false, lengthened: true }; + } } await tx.insert(listEntries).values({ id, listId: list.id, ...entry }); await touch(tx, list.id); - return { id, added: true, lengthened: false }; + return { id, added: true, replaced: !!dup, lengthened: false }; } /** * An entry a rule adds (the Seeding reward, a rule's ban) to an org list or a server's own: no * request, no signed-in actor; the caller records the outcome. `added` is false when the player - * already holds an active entry on that list; with `lengthen` such an entry that would end sooner - * is made to last as long (`lengthened`). With `tx` it is written in that transaction (the - * worker's owned one), else in one of its own. + * already holds an active entry on that list; `replaceExisting` replaces it, while `lengthen` + * keeps its attribution and reason but extends a shorter expiry. With `tx` it is written in that + * transaction (the worker's owned one), else in one of its own. */ export async function grantEntry( env: Env, list: ListRow, entry: { steamId: string; reason: string; expiresAt: Date | null; addedByName: string }, - opts: { tx?: Tx; lengthen?: boolean } = {} -): Promise<{ id: string; added: boolean; lengthened: boolean }> { + opts: { tx?: Tx; lengthen?: boolean; replaceExisting?: boolean } = {} +): Promise<{ id: string; added: boolean; replaced: boolean; lengthened: boolean }> { const row = { ...entry, addedBy: null }; return opts.tx - ? insertInto(opts.tx, list, row, opts.lengthen) - : env.db.transaction((tx) => insertInto(tx, list, row, opts.lengthen)); + ? insertInto(opts.tx, list, row, opts) + : env.db.transaction((tx) => insertInto(tx, list, row, opts)); } export async function addEntry( diff --git a/src/lib/server/outbox.ts b/src/lib/server/outbox.ts index 88d39a85..d8b5da43 100644 --- a/src/lib/server/outbox.ts +++ b/src/lib/server/outbox.ts @@ -573,6 +573,7 @@ async function deliverSeedReward(env: Env, row: OutboxRow): Promise { slotDays: number; /** missing on rows from before the rule had a scope: those went org-wide */ scope?: 'server' | 'org'; + replaceExisting?: boolean; }; stats.inFlight++; try { @@ -586,12 +587,21 @@ async function deliverSeedReward(env: Env, row: OutboxRow): Promise { ? await serverListOf(env, server, 'reserve') : await listOf(env, org.id, 'reserve'); const expiresAt = new Date(Date.now() + p.slotDays * 86400_000); - const { id: entryId, added } = await grantEntry(env, list, { - steamId: p.steamId, - reason: p.reason, - expiresAt, - addedByName: `trigger: ${row.triggerName}` - }); + const { + id: entryId, + added, + replaced + } = await grantEntry( + env, + list, + { + steamId: p.steamId, + reason: p.reason, + expiresAt, + addedByName: `trigger: ${row.triggerName}` + }, + { replaceExisting: !!p.replaceExisting } + ); // The next sync puts the slot on the server; remember it now so the rule does not grant // it again before the next snapshot. m?.reserved.add(p.steamId); @@ -633,7 +643,7 @@ async function deliverSeedReward(env: Env, row: OutboxRow): Promise { env, row, 'delivered', - `Reserved a slot for ${p.name} until ${expiresAt.toISOString().slice(0, 10)}.` + `${replaced ? 'Replaced the reserved slot' : 'Reserved a slot'} for ${p.name} until ${expiresAt.toISOString().slice(0, 10)}.` ); } catch (err) { if (err instanceof LostOwnership) return; // the lease sweep marks it unknown diff --git a/src/lib/server/players.ts b/src/lib/server/players.ts index f3956b1c..86777e90 100644 --- a/src/lib/server/players.ts +++ b/src/lib/server/players.ts @@ -14,10 +14,20 @@ import { type SessionUser } from './access'; import { orgListMembership } from './lists'; -import { kills, playerMarks, playerNotes, playerSessions, serverBans, servers } from './db/schema'; +import { + kills, + playerMarks, + playerNotes, + playerSessions, + serverBans, + servers, + triggers +} from './db/schema'; import { getProfiles, isSteamId, steamEnabled, type SteamProfileRow } from './steam'; import { accountAgeDays, assessRisk, namesResemble, type Risk, type RiskPerformance } from './risk'; import { riskPerformanceFor } from './leaderboards'; +import { seedBalanceSeconds } from './seed-progress'; +import type { SeedRewardConfig } from './trigger-rules'; import type { DossierView, PlayerCombat, @@ -240,6 +250,40 @@ export async function dossier( SUM(cash) AS cash, MIN(joined_at) AS "firstSeen", MAX(last_seen) AS "lastSeen" FROM player_sessions WHERE steam_id = ${steamId} AND server_id IN ${ids.length ? ids : ['']}`); + const [longestAlive] = ids.length + ? await db.execute<{ seconds: string | null }>(sql` + WITH tracked AS ( + SELECT ps.id, ps.server_id, ps.joined_at, + COALESCE(ps.left_at, ps.last_seen) AS ended_at + FROM player_sessions ps + JOIN servers s ON s.id = ps.server_id + WHERE ps.steam_id = ${steamId} AND ps.server_id IN ${ids} + AND COALESCE(ps.left_at, ps.last_seen) > ps.joined_at + AND (s.feed_token_hash IS NOT NULL OR EXISTS ( + SELECT 1 FROM kills k + WHERE k.server_id = ps.server_id AND k.event_type = 'killed' + AND k.parsed_kill AND k.victim_steam_id = ${steamId} + AND k.ts BETWEEN ps.joined_at AND COALESCE(ps.left_at, ps.last_seen) + )) + ), boundaries AS ( + SELECT id, joined_at AS at FROM tracked + UNION + SELECT id, ended_at AS at FROM tracked + UNION + SELECT t.id, k.ts AS at FROM tracked t JOIN kills k + ON k.server_id = t.server_id AND k.ts BETWEEN t.joined_at AND t.ended_at + WHERE k.event_type = 'killed' AND k.parsed_kill AND k.victim_steam_id = ${steamId} + UNION + SELECT t.id, m.started_at AS at FROM tracked t JOIN matches m + ON m.server_id = t.server_id AND m.started_at > t.joined_at + AND m.started_at < t.ended_at + ), intervals AS ( + SELECT at - LAG(at) OVER (PARTITION BY id ORDER BY at) AS alive_for + FROM boundaries + ) + SELECT MAX(EXTRACT(EPOCH FROM alive_for)) AS seconds + FROM intervals WHERE alive_for IS NOT NULL`) + : []; const perServer = ids.length ? await db.execute<{ serverId: string; @@ -296,7 +340,8 @@ export async function dossier( listsRole, allOrgServers, combat, - performance + performance, + seedRows ] = await Promise.all([ getProfiles(env, [steamId], { refresh: !!opts.refreshSteam, @@ -326,8 +371,22 @@ export async function dossier( listsRoleFor(env, user, server.orgId), orgServers(env, server.orgId), playerCombat(env, ids, nameOf, steamId), - riskPerformanceFor(env, ids, [steamId]) + riskPerformanceFor(env, ids, [steamId]), + db + .select({ config: triggers.config, state: triggers.state }) + .from(triggers) + .where( + and( + eq(triggers.serverId, server.id), + eq(triggers.kind, 'seed_reward'), + eq(triggers.enabled, true) + ) + ) + .limit(1) ]); + const seedRow = seedRows[0]; + const seedConfig = seedRow?.config as Partial | undefined; + const requiredSeedMinutes = num(seedConfig?.minutes); const l = local.get(steamId); const admin = access.caps.has('players.notes.manage'); // What staff wrote about the player is for those who may write it; an org list entry (its @@ -372,6 +431,17 @@ export async function dossier( kills: recordedAll.kills, deaths: recordedAll.deaths, cash: num(summary?.cash), + longestAliveSeconds: + longestAlive?.seconds === null || longestAlive?.seconds === undefined + ? null + : Math.round(num(longestAlive.seconds)), + seedReward: + seedRow && requiredSeedMinutes > 0 + ? { + minutes: Math.floor(seedBalanceSeconds(seedRow.state, steamId) / 60), + requiredMinutes: requiredSeedMinutes + } + : null, firstSeen: iso(summary?.firstSeen ? new Date(summary.firstSeen) : null), lastSeen: iso(summary?.lastSeen ? new Date(summary.lastSeen) : null) }, diff --git a/src/lib/server/trigger-rules.ts b/src/lib/server/trigger-rules.ts index 211dd4a3..13a61385 100644 --- a/src/lib/server/trigger-rules.ts +++ b/src/lib/server/trigger-rules.ts @@ -169,6 +169,8 @@ export type SeedScope = 'server' | 'org'; */ export interface SeedRewardConfig { scope?: SeedScope; + /** replace an active entry in the selected reserved-slot list instead of skipping the reward */ + replaceExisting: boolean; lowAt: number; /** count seed time only once the server has filled with the player still on */ untilFull: boolean; @@ -368,6 +370,7 @@ export function validateConfig(kind: TriggerKind, raw: unknown): TriggerConfig { throw new ApiError(400, 'Filled must be more players than the seeding threshold.'); return { scope: c.scope === 'server' ? 'server' : 'org', + replaceExisting: !!c.replaceExisting, lowAt, untilFull: c.untilFull === undefined ? true : !!c.untilFull, fullAt, diff --git a/src/lib/server/triggers.test.ts b/src/lib/server/triggers.test.ts index 3b3028d0..41990852 100644 --- a/src/lib/server/triggers.test.ts +++ b/src/lib/server/triggers.test.ts @@ -147,6 +147,7 @@ describe('validateConfig', () => { }); expect(validateConfig('seed_reward', { minutes: '45' })).toEqual({ scope: 'org', + replaceExisting: false, lowAt: 20, untilFull: true, fullAt: null, @@ -166,6 +167,7 @@ describe('validateConfig', () => { }) ).toEqual({ scope: 'org', + replaceExisting: false, lowAt: 1, untilFull: false, fullAt: null, @@ -185,6 +187,9 @@ describe('validateConfig', () => { expect(validateConfig('seed_reward', { minutes: 60, scope: 'everywhere' })).toMatchObject({ scope: 'org' }); + expect(validateConfig('seed_reward', { minutes: 60, replaceExisting: true })).toMatchObject({ + replaceExisting: true + }); }); }); diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index 3bb7d0e3..362865c1 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -163,6 +163,7 @@ import { type PlayerStats, type StatsBy } from './message-vars'; +import { seedProgress } from './seed-progress'; export * from './trigger-rules'; @@ -1497,9 +1498,8 @@ function evalMatchBroadcast( } // A seeding rule adds up seed time once a minute per server while the server is low, not per -// observation: the open sessions from memory, the closed ones in the window from the database. -// Above the threshold nobody is earning, so nothing is checked; the fleet's busy servers cost -// nothing here. +// observation. Historical session totals stay intact; the trigger state keeps each player's +// unspent reward balance and resets that balance when it queues a grant. const SEED_CHECK_MS = 60_000; const seedState = new Map(); @@ -1528,44 +1528,67 @@ async function evalSeedReward( : cfg.untilFull ? full && !state.full : state.low; - seedState.set(row.id, { checkedAt: due ? now : state.checkedAt, low, full }); + state.checkedAt = due ? now : state.checkedAt; + state.low = low; + state.full = full; + seedState.set(row.id, state); if (!due) return; - const candidates = ctx.players.filter((p) => !ctx.reserved.has(p.steamId)); - if (!candidates.length) return; const from = new Date(now - cfg.windowDays * 86400_000); + const progress = seedProgress(row.state); + for (const [steamId, p] of Object.entries(progress.players)) + if (p.seenAt < from.getTime()) delete progress.players[steamId]; + if (!ctx.players.length) { + row.state = progress; + out.updates.push({ id: row.id, state: progress }); + return; + } const closed = await env.db - .select({ steamId: playerSessions.steamId, seconds: sql`SUM(seed_seconds)::int` }) + .select({ + steamId: playerSessions.steamId, + windowSeconds: sql`COALESCE(SUM(${playerSessions.seedSeconds}) FILTER (WHERE ${playerSessions.lastSeen} >= ${from}), 0)::int`, + totalSeconds: sql`COALESCE(SUM(${playerSessions.seedSeconds}), 0)::bigint` + }) .from(playerSessions) .where( and( eq(playerSessions.serverId, ctx.server.id), inArray( playerSessions.steamId, - candidates.map((p) => p.steamId) + ctx.players.map((p) => p.steamId) ), - isNotNull(playerSessions.leftAt), - gte(playerSessions.leftAt, from), - gte(playerSessions.lastSeen, from) + isNotNull(playerSessions.leftAt) ) ) .groupBy(playerSessions.steamId); - const earlier = new Map(closed.map((r) => [r.steamId, r.seconds])); + const history = new Map(closed.map((r) => [r.steamId, r])); // The whisper names this date; the entry's own expiry is set when the grant is delivered. const expiresAt = new Date(now + cfg.slotDays * 86400_000); - const earned = candidates - .map((p) => ({ - p, - seconds: (earlier.get(p.steamId) ?? 0) + Math.floor((ctx.seedMs.get(p.steamId) ?? 0) / 1000) - })) - .filter((e) => e.seconds >= cfg.minutes * 60); + const rewards: { p: Player; balance: number }[] = []; + for (const p of ctx.players) { + const openSeconds = Math.floor((ctx.seedMs.get(p.steamId) ?? 0) / 1000); + const historyRow = history.get(p.steamId); + const total = Number(historyRow?.totalSeconds ?? 0) + openSeconds; + const previous = progress.players[p.steamId]; + const balance = previous + ? previous.balance + Math.max(0, total - previous.observed) + : Number(historyRow?.windowSeconds ?? 0) + openSeconds; + const qualified = balance >= cfg.minutes * 60; + const eligible = !ctx.reserved.has(p.steamId) || cfg.replaceExisting; + progress.players[p.steamId] = { + observed: total, + balance: qualified && eligible ? 0 : balance, + seenAt: now + }; + if (qualified && eligible) rewards.push({ p, balance }); + } const stats = await statsFor( read, - cfg.message ? earned.map((e) => ({ steamId: e.p.steamId, text: cfg.message })) : [] + cfg.message ? rewards.map((e) => ({ steamId: e.p.steamId, text: cfg.message })) : [] ); let n = 0; let last = ''; - for (const { p, seconds } of earned) { - const minutes = Math.floor(seconds / 60); + for (const { p, balance } of rewards) { + const minutes = Math.floor(balance / 60); const reason = `Seeded ${ctx.server.name}: ${minutes} min with ${cfg.lowAt} or fewer on`; out.intents.push({ trigger: row, @@ -1575,7 +1598,8 @@ async function evalSeedReward( name: p.name, reason, slotDays: cfg.slotDays, - scope: cfg.scope === 'server' ? 'server' : 'org' + scope: cfg.scope === 'server' ? 'server' : 'org', + replaceExisting: cfg.replaceExisting }, target: p.steamId, okMessage: `Reserved a slot for ${p.name}.`, @@ -1608,12 +1632,13 @@ async function evalSeedReward( n++; last = p.name; } - if (n) - out.updates.push({ - id: row.id, - lastFiredAt: ctx.ts, - lastResult: `Reserving a slot for ${n === 1 ? last : `${n} players`}` - }); + row.state = progress; + out.updates.push({ + id: row.id, + state: progress, + lastFiredAt: n ? ctx.ts : undefined, + lastResult: n ? `Reserving a slot for ${n === 1 ? last : `${n} players`}` : undefined + }); } /** @@ -2304,14 +2329,14 @@ export async function dryRun( .sort((a, b) => a[1].crossedAt! - b[1].crossedAt!); let held = 0; for (const [steamId, t] of crossed) { - if (reserved.has(steamId)) { + if (reserved.has(steamId) && !c.replaceExisting) { held++; continue; } const at = new Date(t.crossedAt!); push( at, - `reserve ${names.get(steamId)} (${steamId}) ${c.scope === 'server' ? 'here' : 'across the organisation'} until ${dateOf(new Date(at.getTime() + c.slotDays * 86400_000))}: ${Math.floor(t.seconds / 60)} min with ${c.lowAt} or fewer on` + `${reserved.has(steamId) ? 'replace reservation for' : 'reserve'} ${names.get(steamId)} (${steamId}) ${c.scope === 'server' ? 'here' : 'across the organisation'} until ${dateOf(new Date(at.getTime() + c.slotDays * 86400_000))}: ${Math.floor(t.seconds / 60)} min with ${c.lowAt} or fewer on` ); } const lowMinutes = Math.round(stretches.reduce((n, l) => n + (l.to - l.from), 0) / 60_000); @@ -2321,6 +2346,9 @@ export async function dryRun( result.notes.push( `Replayed over the last 24 hours only; the live rule adds up seed time over ${c.windowDays} day${c.windowDays === 1 ? '' : 's'}, so it can also fire for players this replay does not show.` ); + result.notes.push( + 'The replay shows raw seed time and cannot subtract time already consumed by a live reward; live progress resets whenever a reward is queued.' + ); return result; } if (kind === 'name_filter') { diff --git a/src/lib/types.ts b/src/lib/types.ts index 872b0eee..c8707df9 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -446,6 +446,10 @@ export interface DossierView { deaths: number; /** total cash earned across the visible servers */ cash: number; + /** longest interval between recorded life boundaries on feed-tracked sessions */ + longestAliveSeconds: number | null; + /** unspent progress for this server's active seeding reward */ + seedReward: { minutes: number; requiredMinutes: number } | null; firstSeen: string | null; lastSeen: string | null; }; diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 62e231b8..089c8576 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -434,6 +434,7 @@ windowDays: number; slotDays: number; slotScope: 'server' | 'org'; + replaceExisting: boolean; characters: 'off' | 'latin' | 'ascii'; extraScripts: string[]; allowSymbols: boolean; @@ -614,6 +615,7 @@ minutes: n('minutes', 60), windowDays: n('windowDays', 7), slotDays: n('slotDays', 7), + replaceExisting: b('replaceExisting', false), // a rule saved before the scope existed hands out org-wide slots; a new one, this server's slotScope: c.scope === 'server' ? 'server' : t ? 'org' : canSlotHere ? 'server' : 'org', characters: c.characters === 'ascii' || c.characters === 'off' ? c.characters : 'latin', @@ -802,6 +804,7 @@ windowDays: Number(f.windowDays), slotDays: Number(f.slotDays), scope: f.slotScope, + replaceExisting: f.replaceExisting, message: f.message }; } @@ -1005,7 +1008,7 @@ case 'afk_protection': return `kill everyone every ${c.everyMinutes} min while fewer than ${c.stopAt} are on and no side has scored · then off until the server empties or restarts${c.message ? ' · with a broadcast' : ''}${c.doneMessage ? ' · thanks at the start' : ''}`; case 'seed_reward': - return `${c.minutes} min with ${c.lowAt} or fewer on${c.untilFull === false ? '' : `, staying until ${typeof c.fullAt === 'number' ? `${c.fullAt}+ on` : 'it fills'}`}, within ${c.windowDays} day${c.windowDays === 1 ? '' : 's'} · slot ${c.scope === 'server' ? 'here' : 'on every server'} for ${c.slotDays} day${c.slotDays === 1 ? '' : 's'}${c.message ? ' · with a whisper' : ''}`; + return `${c.minutes} min with ${c.lowAt} or fewer on${c.untilFull === false ? '' : `, staying until ${typeof c.fullAt === 'number' ? `${c.fullAt}+ on` : 'it fills'}`}, within ${c.windowDays} day${c.windowDays === 1 ? '' : 's'} · slot ${c.scope === 'server' ? 'here' : 'on every server'} for ${c.slotDays} day${c.slotDays === 1 ? '' : 's'}${c.replaceExisting ? ' · replaces an existing slot' : ''}${c.message ? ' · with a whisper' : ''}`; } } @@ -2349,6 +2352,10 @@ on every server in the organisation +
Whisper on the grant, blank for none @@ -2361,7 +2368,10 @@ passes. A slot on this server only goes on this server's own reserved-slot list; one on every server goes on the organisation's, which this server applies at once and the others at their next sync. Either lapses on its own and can be earned again. Players who - already hold a reserved slot here are skipped. + already hold a reserved slot here are skipped unless replacement is enabled; replacement + removes the active entry in the selected list and grants a fresh one. Seed time below + the reward threshold carries into later games; granting the reward resets that player's + reward counter without erasing their historical seeding statistics.

{/if} diff --git a/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte b/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte index e5fa694c..887d262b 100644 --- a/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte +++ b/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte @@ -2,7 +2,8 @@ import { invalidateAll } from '$app/navigation'; import { api, errorMessage, rconPost } from '$lib/api'; import { MAX_CHAT } from '$lib/chat'; - import { fmtNum, fmtTime } from '$lib/format'; + import { fmtCash } from '$lib/cash'; + import { fmtDuration, fmtNum, fmtTime } from '$lib/format'; import { causeLabel } from '$lib/causes'; import { can } from '$lib/capabilities'; import { toast } from '$lib/toast.svelte'; @@ -196,8 +197,8 @@ -
- {#each [['Sessions', fmtNum(d.summary.sessions), 'A session is one stay on a server, from joining to leaving.'], ['Playtime', d.summary.sessions ? minutes(d.summary.minutes) : '—', ''], ['Kills', fmtNum(d.summary.kills), SCOREBOARD_NOTE], ['Deaths', fmtNum(d.summary.deaths), SCOREBOARD_NOTE], ['K/D', kd(d.summary.kills, d.summary.deaths), SCOREBOARD_NOTE], ['First seen', d.summary.firstSeen ? fmtTime(d.summary.firstSeen) : '—', '']] as [label, value, note] (label)} +
+ {#each [['Sessions', fmtNum(d.summary.sessions), 'A session is one stay on a server, from joining to leaving.'], ['Playtime', d.summary.sessions ? minutes(d.summary.minutes) : '—', ''], ['Seed progress', d.summary.seedReward ? `${fmtNum(d.summary.seedReward.minutes)} / ${fmtNum(d.summary.seedReward.requiredMinutes)} min` : '—', 'Unspent seeding time toward this server’s next reward. It resets when the reward is granted.'], ['Cash earned', fmtCash(d.summary.cash), 'Total cash earned across the servers visible to you.'], ['Kills', fmtNum(d.summary.kills), SCOREBOARD_NOTE], ['Deaths', fmtNum(d.summary.deaths), SCOREBOARD_NOTE], ['Longest alive', fmtDuration(d.summary.longestAliveSeconds), 'Longest recorded interval between joining, a death, a match start, and departure. Available for sessions tracked by the event feed.'], ['K/D', kd(d.summary.kills, d.summary.deaths), SCOREBOARD_NOTE], ['First seen', d.summary.firstSeen ? fmtTime(d.summary.firstSeen) : '—', '']] as [label, value, note] (label)}
{label}
{value}
diff --git a/src/test/view.test.ts b/src/test/view.test.ts index 5d573c0e..31cc06de 100644 --- a/src/test/view.test.ts +++ b/src/test/view.test.ts @@ -6,15 +6,18 @@ import { join } from 'node:path'; import type { Env } from '$lib/server/env'; import { listOf } from '$lib/server/lists'; import { + kills, listEntries, matches, matchPlayers, playerMarks, playerNotes, playerSessions, - serverBans + serverBans, + triggers } from '$lib/server/db/schema'; import { newId } from '$lib/server/http'; +import { validateConfig } from '$lib/server/trigger-rules'; import { hasTestDb, testEnv } from './db'; import { callApi, callLoad, stubGateway } from './call'; import { seedWorld, type PrincipalName, type World } from './world'; @@ -207,9 +210,41 @@ describe.skipIf(!hasTestDb)('what View shows', () => { cash: 90_000 } ]); + await env.db.insert(kills).values({ + ts: new Date(joinedAt.getTime() + 45_000), + serverId: w.server.id, + eventId: newId(), + instanceId: 'test-instance', + matchId: 'test-match', + eventTime: 45, + map: 'Test', + killerSteamId: '76561198000000043', + killerName: 'killer', + victimSteamId: PLAYER, + victimName: 'someone', + cause: 'Id.Item.AK74M', + distanceM: 10, + tags: [] + }); + await env.db.insert(triggers).values({ + id: newId(), + serverId: w.server.id, + orgId: w.org.id, + kind: 'seed_reward', + name: 'Seed reward', + enabled: true, + config: validateConfig('seed_reward', { minutes: 60 }), + state: { + players: { + [PLAYER]: { observed: 2_100, balance: 2_100, seenAt: Date.now() } + } + } + }); const viewer = (await get('viewer', 'api/servers/[id]/players/[steamId]')).dossier; expect(viewer.summary.cash).toBe(1_234); + expect(viewer.summary.longestAliveSeconds).toBe(45); + expect(viewer.summary.seedReward).toEqual({ minutes: 35, requiredMinutes: 60 }); expect( viewer.perServer.map((s: { serverId: string; cash: number }) => [s.serverId, s.cash]) ).toEqual([[w.server.id, 1_234]]); From 10a9f0bbce527e30e819b2efbedbcd5f43ea6b39 Mon Sep 17 00:00:00 2001 From: Seebomega Date: Fri, 25 Sep 2026 11:27:15 +0200 Subject: [PATCH 003/102] add seed avoid collision with paid reserved slot --- src/lib/server/feed.ts | 54 ++++- src/lib/server/lists.ts | 64 +++++- src/lib/server/outbox.ts | 13 +- src/lib/server/seed-progress.ts | 41 ++++ src/lib/server/trigger-rules.ts | 15 ++ src/lib/server/triggers.test.ts | 12 + src/lib/server/triggers.ts | 36 ++- src/lib/types.ts | 14 ++ src/routes/(app)/server/[id]/+layout.svelte | 1 + .../(app)/server/[id]/automation/+page.svelte | 26 ++- .../(app)/server/[id]/events/+page.svelte | 173 +++++++++++++++ src/routes/api/servers/[id]/events/+server.ts | 31 +++ src/test/api-matrix.test.ts | 1 + src/test/feed-ingest.test.ts | 26 ++- src/test/seed-reward.test.ts | 207 ++++++++++++++++++ 15 files changed, 693 insertions(+), 21 deletions(-) create mode 100644 src/lib/server/seed-progress.ts create mode 100644 src/routes/(app)/server/[id]/events/+page.svelte create mode 100644 src/routes/api/servers/[id]/events/+server.ts create mode 100644 src/test/seed-reward.test.ts diff --git a/src/lib/server/feed.ts b/src/lib/server/feed.ts index aac9025d..71d9474f 100644 --- a/src/lib/server/feed.ts +++ b/src/lib/server/feed.ts @@ -32,7 +32,7 @@ import { type KillRow, type ServerRow } from './db/schema'; -import type { KillView } from '$lib/types'; +import type { FeedEventView, KillView } from '$lib/types'; import { VEHICLE_TAGS, type KillFilter } from '$lib/kills'; import type { SessionUser } from './access'; import { FEED_TOKEN_PREFIX, isTeamKill, parseBatch, type ParsedEvent } from './feed-core'; @@ -172,6 +172,20 @@ export function killView(r: KillRow): KillView { }; } +export function feedEventView(r: KillRow): FeedEventView { + return { + eventId: r.eventId, + ts: r.ts.toISOString(), + eventType: r.eventType, + parsedKill: r.parsedKill, + instanceId: r.instanceId, + matchId: r.matchId, + eventTime: r.eventTime, + map: r.map, + rawEvent: r.rawEvent + }; +} + /** * Writes one batch: parse, drop what is already stored, add the open match and both factions * from the sessions the worker keeps, insert. `now` is the receipt time. @@ -429,3 +443,41 @@ export async function countKills( .where(killWhere(serverId, null, filter, match)); return row?.n ?? 0; } + +export interface EventsBefore { + ts: Date; + eventId: string; +} + +const eventWhere = (serverId: string, before: EventsBefore | null, eventType: string): SQL => + and( + eq(kills.serverId, serverId), + eventType ? eq(kills.eventType, eventType) : undefined, + before ? sql`(${kills.ts}, ${kills.eventId}) < (${before.ts}, ${before.eventId})` : undefined + )!; + +/** Every feed event, including unknown types and incomplete kills, newest first. */ +export async function recentFeedEvents( + env: Env, + serverId: string, + before: EventsBefore | null, + limit: number, + eventType = '' +): Promise { + const rows = await env.db + .select() + .from(kills) + .where(eventWhere(serverId, before, eventType)) + .orderBy(desc(kills.ts), desc(kills.eventId)) + .limit(limit); + return rows.map(feedEventView); +} + +/** How many stored feed events match the optional exact event type. */ +export async function countFeedEvents(env: Env, serverId: string, eventType = ''): Promise { + const [row] = await env.db + .select({ n: count() }) + .from(kills) + .where(eventWhere(serverId, null, eventType)); + return row?.n ?? 0; +} diff --git a/src/lib/server/lists.ts b/src/lib/server/lists.ts index 3a0d4b62..6bb21bd5 100644 --- a/src/lib/server/lists.ts +++ b/src/lib/server/lists.ts @@ -36,6 +36,7 @@ import { type ListRow } from './db/schema'; import { DEFAULT_BAN_MESSAGE } from '$lib/ban-message'; +import { noteContainsProtectedWord } from './trigger-rules'; import { requireSteamId } from './steam'; import { desiredFor, memberSlots, summaryOf } from './lists-sync'; import { latestNames } from './sessions'; @@ -441,8 +442,14 @@ async function insertEntry( env: Env, list: ListRow, entry: NewEntry, - opts: { replaceExisting?: boolean } = {} -): Promise<{ id: string; added: boolean; replaced: boolean; lengthened: boolean }> { + opts: { replaceExisting?: boolean; protectedNoteWord?: string } = {} +): Promise<{ + id: string; + added: boolean; + replaced: boolean; + lengthened: boolean; + protected: boolean; +}> { return env.db.transaction((tx) => insertInto(tx, list, entry, opts)); } @@ -458,14 +465,20 @@ async function insertInto( tx: Tx, list: ListRow, entry: NewEntry, - opts: { lengthen?: boolean; replaceExisting?: boolean } = {} -): Promise<{ id: string; added: boolean; replaced: boolean; lengthened: boolean }> { + opts: { lengthen?: boolean; replaceExisting?: boolean; protectedNoteWord?: string } = {} +): Promise<{ + id: string; + added: boolean; + replaced: boolean; + lengthened: boolean; + protected: boolean; +}> { const id = newId(); // Serialise adds to one list so two writers cannot race past the duplicate check; the // partial unique index on (list_id, steam_id) where removed_at is null is the backstop. await tx.execute(sql`SELECT 1 FROM ${lists} WHERE ${lists.id} = ${list.id} FOR UPDATE`); const found = tx - .select({ id: listEntries.id, expiresAt: listEntries.expiresAt }) + .select({ id: listEntries.id, expiresAt: listEntries.expiresAt, reason: listEntries.reason }) .from(listEntries) .where( and( @@ -478,6 +491,14 @@ async function insertInto( // Lengthening decides from the entry's expiry: an edit of it by hand is seen, or waits. const [dup] = opts.lengthen || opts.replaceExisting ? await found.for('update') : await found; if (dup) { + if (opts.replaceExisting && noteContainsProtectedWord(dup.reason, opts.protectedNoteWord ?? '')) + return { + id: dup.id, + added: false, + replaced: false, + lengthened: false, + protected: true + }; if (opts.replaceExisting) { await tx .update(listEntries) @@ -495,18 +516,30 @@ async function insertInto( (entry.expiresAt === null || entry.expiresAt.getTime() - dup.expiresAt.getTime() >= LENGTHEN_MIN_MS); if (!opts.lengthen || !longer) - return { id: dup.id, added: false, replaced: false, lengthened: false }; + return { + id: dup.id, + added: false, + replaced: false, + lengthened: false, + protected: false + }; await tx .update(listEntries) .set({ expiresAt: entry.expiresAt }) .where(eq(listEntries.id, dup.id)); await touch(tx, list.id); - return { id: dup.id, added: false, replaced: false, lengthened: true }; + return { + id: dup.id, + added: false, + replaced: false, + lengthened: true, + protected: false + }; } } await tx.insert(listEntries).values({ id, listId: list.id, ...entry }); await touch(tx, list.id); - return { id, added: true, replaced: !!dup, lengthened: false }; + return { id, added: true, replaced: !!dup, lengthened: false, protected: false }; } /** @@ -520,8 +553,19 @@ export async function grantEntry( env: Env, list: ListRow, entry: { steamId: string; reason: string; expiresAt: Date | null; addedByName: string }, - opts: { tx?: Tx; lengthen?: boolean; replaceExisting?: boolean } = {} -): Promise<{ id: string; added: boolean; replaced: boolean; lengthened: boolean }> { + opts: { + tx?: Tx; + lengthen?: boolean; + replaceExisting?: boolean; + protectedNoteWord?: string; + } = {} +): Promise<{ + id: string; + added: boolean; + replaced: boolean; + lengthened: boolean; + protected: boolean; +}> { const row = { ...entry, addedBy: null }; return opts.tx ? insertInto(opts.tx, list, row, opts) diff --git a/src/lib/server/outbox.ts b/src/lib/server/outbox.ts index d8b5da43..f1e8b227 100644 --- a/src/lib/server/outbox.ts +++ b/src/lib/server/outbox.ts @@ -574,6 +574,7 @@ async function deliverSeedReward(env: Env, row: OutboxRow): Promise { /** missing on rows from before the rule had a scope: those went org-wide */ scope?: 'server' | 'org'; replaceExisting?: boolean; + protectedNoteWord?: string; }; stats.inFlight++; try { @@ -590,7 +591,8 @@ async function deliverSeedReward(env: Env, row: OutboxRow): Promise { const { id: entryId, added, - replaced + replaced, + protected: protectedEntry } = await grantEntry( env, list, @@ -600,7 +602,10 @@ async function deliverSeedReward(env: Env, row: OutboxRow): Promise { expiresAt, addedByName: `trigger: ${row.triggerName}` }, - { replaceExisting: !!p.replaceExisting } + { + replaceExisting: !!p.replaceExisting, + protectedNoteWord: p.protectedNoteWord + } ); // The next sync puts the slot on the server; remember it now so the rule does not grant // it again before the next snapshot. @@ -610,7 +615,9 @@ async function deliverSeedReward(env: Env, row: OutboxRow): Promise { env, row, 'skipped', - `${p.steamId} already has a reserved slot ${here ? `on ${server.name}` : `in ${org.name}`}.` + protectedEntry + ? `${p.steamId}'s existing reserved slot was kept because its note contains the protected word “${p.protectedNoteWord}”.` + : `${p.steamId} already has a reserved slot ${here ? `on ${server.name}` : `in ${org.name}`}.` ); if (m) { m.syncAt = 0; diff --git a/src/lib/server/seed-progress.ts b/src/lib/server/seed-progress.ts new file mode 100644 index 00000000..3273040c --- /dev/null +++ b/src/lib/server/seed-progress.ts @@ -0,0 +1,41 @@ +export interface SeedProgressEntry { + /** all-time seed seconds seen when this balance was last updated */ + observed: number; + /** unspent seed seconds toward the next reward */ + balance: number; + seenAt: number; +} + +export interface SeedProgressState { + players: Record; +} + +/** Reads persisted seeding reward progress defensively; old and malformed trigger state is empty. */ +export function seedProgress(raw: unknown): SeedProgressState { + const input = + raw && typeof raw === 'object' && (raw as { players?: unknown }).players + ? ((raw as { players: unknown }).players as Record) + : {}; + const players: Record = {}; + for (const [steamId, value] of Object.entries(input)) { + if (!value || typeof value !== 'object') continue; + const v = value as Record; + if ( + typeof v.observed === 'number' && + Number.isFinite(v.observed) && + typeof v.balance === 'number' && + Number.isFinite(v.balance) && + typeof v.seenAt === 'number' && + Number.isFinite(v.seenAt) + ) + players[steamId] = { + observed: Math.max(0, Math.floor(v.observed)), + balance: Math.max(0, Math.floor(v.balance)), + seenAt: v.seenAt + }; + } + return { players }; +} + +export const seedBalanceSeconds = (raw: unknown, steamId: string): number => + seedProgress(raw).players[steamId]?.balance ?? 0; diff --git a/src/lib/server/trigger-rules.ts b/src/lib/server/trigger-rules.ts index 13a61385..e9f3c183 100644 --- a/src/lib/server/trigger-rules.ts +++ b/src/lib/server/trigger-rules.ts @@ -171,6 +171,8 @@ export interface SeedRewardConfig { scope?: SeedScope; /** replace an active entry in the selected reserved-slot list instead of skipping the reward */ replaceExisting: boolean; + /** keep an existing entry when its note contains this word; blank protects nothing */ + protectedNoteWord: string; lowAt: number; /** count seed time only once the server has filled with the player still on */ untilFull: boolean; @@ -181,6 +183,18 @@ export interface SeedRewardConfig { slotDays: number; message: string; } + +/** Case-insensitive whole-word/marker match, so `paid` does not accidentally match `unpaid`. */ +export function noteContainsProtectedWord(note: string, word: string): boolean { + const needle = word.trim(); + if (!needle) return false; + const escaped = needle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + const chars = Array.from(needle); + const wordChar = /[\p{L}\p{N}_]/u; + const left = wordChar.test(chars[0] ?? '') ? '(^|[^\\p{L}\\p{N}_])' : ''; + const right = wordChar.test(chars.at(-1) ?? '') ? '(?=$|[^\\p{L}\\p{N}_])' : ''; + return new RegExp(`${left}${escaped}${right}`, 'iu').test(note); +} /** * Announces a match ending and the next one starting. A match ends when the map changes or the * faction scores fall back (a faction reached the cap, or an admin ended the round); the live @@ -371,6 +385,7 @@ export function validateConfig(kind: TriggerKind, raw: unknown): TriggerConfig { return { scope: c.scope === 'server' ? 'server' : 'org', replaceExisting: !!c.replaceExisting, + protectedNoteWord: str(c.protectedNoteWord, 50), lowAt, untilFull: c.untilFull === undefined ? true : !!c.untilFull, fullAt, diff --git a/src/lib/server/triggers.test.ts b/src/lib/server/triggers.test.ts index 41990852..93d3f243 100644 --- a/src/lib/server/triggers.test.ts +++ b/src/lib/server/triggers.test.ts @@ -10,6 +10,7 @@ import { matchBoundary, matchBroadcastMessages, matchReplay, + noteContainsProtectedWord, pingKickStep, riskKickVerdict, seedRule, @@ -148,6 +149,7 @@ describe('validateConfig', () => { expect(validateConfig('seed_reward', { minutes: '45' })).toEqual({ scope: 'org', replaceExisting: false, + protectedNoteWord: '', lowAt: 20, untilFull: true, fullAt: null, @@ -168,6 +170,7 @@ describe('validateConfig', () => { ).toEqual({ scope: 'org', replaceExisting: false, + protectedNoteWord: '', lowAt: 1, untilFull: false, fullAt: null, @@ -190,6 +193,15 @@ describe('validateConfig', () => { expect(validateConfig('seed_reward', { minutes: 60, replaceExisting: true })).toMatchObject({ replaceExisting: true }); + expect( + validateConfig('seed_reward', { minutes: 60, protectedNoteWord: ' paid ' }) + ).toMatchObject({ protectedNoteWord: 'paid' }); + }); + test('seed reward note protection matches a whole word without case sensitivity', () => { + expect(noteContainsProtectedWord('Annual PAID membership', 'paid')).toBe(true); + expect(noteContainsProtectedWord('paid-member', 'PAID')).toBe(true); + expect(noteContainsProtectedWord('currently unpaid', 'paid')).toBe(false); + expect(noteContainsProtectedWord('Annual membership', '')).toBe(false); }); }); diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index 362865c1..c7df727d 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -42,6 +42,8 @@ import { writeAudit } from './audit'; import { emit } from './events'; import { kills, + listEntries, + lists, outbox, playerSessions, samples, @@ -87,6 +89,7 @@ import { type HeldMatchEnd, type MatchLineVars, matchReplay, + noteContainsProtectedWord, seedReplay, type MatchBroadcastConfig, type MatchEnd, @@ -1542,6 +1545,29 @@ async function evalSeedReward( out.updates.push({ id: row.id, state: progress }); return; } + const protectedPlayers = new Set(); + if (cfg.replaceExisting && cfg.protectedNoteWord) { + const protectedRows = await env.db + .select({ steamId: listEntries.steamId, reason: listEntries.reason }) + .from(listEntries) + .innerJoin(lists, eq(lists.id, listEntries.listId)) + .where( + and( + eq(lists.kind, 'reserve'), + isNull(listEntries.removedAt), + inArray( + listEntries.steamId, + ctx.players.map((p) => p.steamId) + ), + cfg.scope === 'server' + ? eq(lists.serverId, ctx.server.id) + : and(eq(lists.orgId, ctx.server.orgId), isNull(lists.serverId)) + ) + ); + for (const entry of protectedRows) + if (noteContainsProtectedWord(entry.reason, cfg.protectedNoteWord)) + protectedPlayers.add(entry.steamId); + } const closed = await env.db .select({ steamId: playerSessions.steamId, @@ -1573,7 +1599,8 @@ async function evalSeedReward( ? previous.balance + Math.max(0, total - previous.observed) : Number(historyRow?.windowSeconds ?? 0) + openSeconds; const qualified = balance >= cfg.minutes * 60; - const eligible = !ctx.reserved.has(p.steamId) || cfg.replaceExisting; + const eligible = + !protectedPlayers.has(p.steamId) && (!ctx.reserved.has(p.steamId) || cfg.replaceExisting); progress.players[p.steamId] = { observed: total, balance: qualified && eligible ? 0 : balance, @@ -1599,7 +1626,8 @@ async function evalSeedReward( reason, slotDays: cfg.slotDays, scope: cfg.scope === 'server' ? 'server' : 'org', - replaceExisting: cfg.replaceExisting + replaceExisting: cfg.replaceExisting, + protectedNoteWord: cfg.protectedNoteWord }, target: p.steamId, okMessage: `Reserved a slot for ${p.name}.`, @@ -2349,6 +2377,10 @@ export async function dryRun( result.notes.push( 'The replay shows raw seed time and cannot subtract time already consumed by a live reward; live progress resets whenever a reward is queued.' ); + if (c.replaceExisting && c.protectedNoteWord) + result.notes.push( + `The replay cannot read reserved-slot notes; live delivery keeps entries whose note contains “${c.protectedNoteWord}”.` + ); return result; } if (kind === 'name_filter') { diff --git a/src/lib/types.ts b/src/lib/types.ts index c8707df9..51ce7787 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -171,6 +171,20 @@ export interface KillView { teamKill: boolean; tags: string[]; } +/** One raw event accepted by the game feed, whether or not it was a complete kill. */ +export interface FeedEventView { + eventId: string; + /** when Warcon received it */ + ts: string; + eventType: string; + parsedKill: boolean; + instanceId: string; + matchId: string; + /** seconds on the match clock, when supplied */ + eventTime: number | null; + map: string; + rawEvent: unknown; +} /** One trigger action and what became of it. */ export interface OutboxView { id: number; diff --git a/src/routes/(app)/server/[id]/+layout.svelte b/src/routes/(app)/server/[id]/+layout.svelte index 28b781e7..31df5052 100644 --- a/src/routes/(app)/server/[id]/+layout.svelte +++ b/src/routes/(app)/server/[id]/+layout.svelte @@ -18,6 +18,7 @@ ['', 'Overview'], ['/players', 'Players'], ['/kills', 'Kills'], + ['/events', 'Events'], ['/matches', 'Matches'], ['/bans', 'Bans'], ['/slots', 'Reserved slots'], diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 089c8576..e35a7e65 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -435,6 +435,7 @@ slotDays: number; slotScope: 'server' | 'org'; replaceExisting: boolean; + protectedNoteWord: string; characters: 'off' | 'latin' | 'ascii'; extraScripts: string[]; allowSymbols: boolean; @@ -616,6 +617,7 @@ windowDays: n('windowDays', 7), slotDays: n('slotDays', 7), replaceExisting: b('replaceExisting', false), + protectedNoteWord: s('protectedNoteWord', ''), // a rule saved before the scope existed hands out org-wide slots; a new one, this server's slotScope: c.scope === 'server' ? 'server' : t ? 'org' : canSlotHere ? 'server' : 'org', characters: c.characters === 'ascii' || c.characters === 'off' ? c.characters : 'latin', @@ -805,6 +807,7 @@ slotDays: Number(f.slotDays), scope: f.slotScope, replaceExisting: f.replaceExisting, + protectedNoteWord: f.protectedNoteWord, message: f.message }; } @@ -1008,7 +1011,7 @@ case 'afk_protection': return `kill everyone every ${c.everyMinutes} min while fewer than ${c.stopAt} are on and no side has scored · then off until the server empties or restarts${c.message ? ' · with a broadcast' : ''}${c.doneMessage ? ' · thanks at the start' : ''}`; case 'seed_reward': - return `${c.minutes} min with ${c.lowAt} or fewer on${c.untilFull === false ? '' : `, staying until ${typeof c.fullAt === 'number' ? `${c.fullAt}+ on` : 'it fills'}`}, within ${c.windowDays} day${c.windowDays === 1 ? '' : 's'} · slot ${c.scope === 'server' ? 'here' : 'on every server'} for ${c.slotDays} day${c.slotDays === 1 ? '' : 's'}${c.replaceExisting ? ' · replaces an existing slot' : ''}${c.message ? ' · with a whisper' : ''}`; + return `${c.minutes} min with ${c.lowAt} or fewer on${c.untilFull === false ? '' : `, staying until ${typeof c.fullAt === 'number' ? `${c.fullAt}+ on` : 'it fills'}`}, within ${c.windowDays} day${c.windowDays === 1 ? '' : 's'} · slot ${c.scope === 'server' ? 'here' : 'on every server'} for ${c.slotDays} day${c.slotDays === 1 ? '' : 's'}${c.replaceExisting ? ` · replaces an existing slot${c.protectedNoteWord ? ` except notes containing “${c.protectedNoteWord}”` : ''}` : ''}${c.message ? ' · with a whisper' : ''}`; } } @@ -2356,6 +2359,20 @@ Replace an existing reserved slot with the newly earned one + {#if f.replaceExisting} + + {/if}
Whisper on the grant, blank for none @@ -2369,9 +2386,10 @@ every server goes on the organisation's, which this server applies at once and the others at their next sync. Either lapses on its own and can be earned again. Players who already hold a reserved slot here are skipped unless replacement is enabled; replacement - removes the active entry in the selected list and grants a fresh one. Seed time below - the reward threshold carries into later games; granting the reward resets that player's - reward counter without erasing their historical seeding statistics. + removes the active entry in the selected list and grants a fresh one, unless its note + contains the configured protected word. Seed time below the reward threshold carries + into later games; granting the reward resets that player's reward counter without + erasing their historical seeding statistics.

{/if} diff --git a/src/routes/(app)/server/[id]/events/+page.svelte b/src/routes/(app)/server/[id]/events/+page.svelte new file mode 100644 index 00000000..6ac011d9 --- /dev/null +++ b/src/routes/(app)/server/[id]/events/+page.svelte @@ -0,0 +1,173 @@ + + +
+
+ + + {#if eventType}{/if} +
+
+ + {#if total === null}{loading ? 'Counting…' : ''}{:else}{fmtNum(total)} + {total === 1 ? 'event' : 'events'}{eventType ? ' match' : ''}{/if} + + newest first · refresh to fetch newly ingested events +
+
+ + + + + + {#each events as event (`${event.ts}:${event.eventId}`)} + + + + + + + + {:else} + + + + {/each} + +
WhenTypeMatchMapRaw event
+ {fmtTime(event.ts)} + + + {#if event.eventType === 'killed' && !event.parsedKill} + incomplete + {/if} + +
{event.eventTime === null ? '—' : `${Math.round(event.eventTime)} s`}
+ {#if event.matchId}
+ {event.matchId} +
{/if} + 		{event.map || '—'} +
+ + View JSON + {event.eventId} + + 
{payload(
+										event
+									)}
+
+
+ {#if loading}Loading…{:else if configured === false}This server has no event feed yet. + An org owner turns it on under Config.{:else if eventType}No events have this type.{:else}No events received yet. They + appear here after the game posts them.{/if} +
+
+ {#if more} + + {/if} +

+ Every event accepted by the ingest route, including unknown types and incomplete kill events. + The original JSON is retained and shown without interpretation. +

+
diff --git a/src/routes/api/servers/[id]/events/+server.ts b/src/routes/api/servers/[id]/events/+server.ts new file mode 100644 index 00000000..ee252beb --- /dev/null +++ b/src/routes/api/servers/[id]/events/+server.ts @@ -0,0 +1,31 @@ +// Every event accepted by the game feed, newest first. Unlike /kills this includes unknown event +// types and incomplete killed events, with the original JSON exactly as it was received. +import { getEnv } from '$lib/server/env'; +import { requireServerCap } from '$lib/server/access'; +import { countFeedEvents, feedSetup, recentFeedEvents } from '$lib/server/feed'; +import { ApiError, apiJson, int, param, route, str } from '$lib/server/http'; + +export const GET = route(async (event) => { + const env = getEnv(); + const { server } = await requireServerCap(env, event.locals, param(event, 'id'), 'server.view'); + const raw = event.url.searchParams.get('before'); + const ts = raw ? new Date(raw) : null; + if (ts && Number.isNaN(ts.getTime())) throw new ApiError(400, 'before must be an ISO timestamp.'); + const beforeId = str(event.url.searchParams.get('beforeId'), 64); + if (ts && !beforeId) throw new ApiError(400, 'beforeId is required with before.'); + const before = ts ? { ts, eventId: beforeId } : null; + const eventType = str(event.url.searchParams.get('type'), 64); + const limit = int(event.url.searchParams.get('limit'), 50, 1, 200); + const [setup, events, total] = await Promise.all([ + feedSetup(env, server, false), + recentFeedEvents(env, server.id, before, limit, eventType), + event.url.searchParams.get('count') === '1' ? countFeedEvents(env, server.id, eventType) : null + ]); + return apiJson({ + ok: true, + configured: setup.configured, + feedAt: setup.feedAt, + events, + total + }); +}); diff --git a/src/test/api-matrix.test.ts b/src/test/api-matrix.test.ts index 49bc8d0e..154b71d4 100644 --- a/src/test/api-matrix.test.ts +++ b/src/test/api-matrix.test.ts @@ -123,6 +123,7 @@ const MATRIX: Record = { 'GET api/servers/[id]/analytics/periods': 'cap:server.view', 'GET api/servers/[id]/cash': 'cap:server.view', 'GET api/servers/[id]/feed': 'cap:server.view', + 'GET api/servers/[id]/events': 'cap:server.view', 'GET api/servers/[id]/kills': 'cap:server.view', 'GET api/servers/[id]/leaderboard': 'cap:server.view', 'GET api/servers/[id]/leaderboard/export': 'cap:server.view', diff --git a/src/test/feed-ingest.test.ts b/src/test/feed-ingest.test.ts index fc6901c0..d4f6428f 100644 --- a/src/test/feed-ingest.test.ts +++ b/src/test/feed-ingest.test.ts @@ -5,7 +5,13 @@ import { randomUUID } from 'node:crypto'; import { and, eq } from 'drizzle-orm'; import type { Env } from '$lib/server/env'; import { kills } from '$lib/server/db/schema'; -import { countKills, ingestBatch, recentKills } from '$lib/server/feed'; +import { + countFeedEvents, + countKills, + ingestBatch, + recentFeedEvents, + recentKills +} from '$lib/server/feed'; import { EMPTY_FILTER } from '$lib/kills'; import { hasTestDb, testEnv } from './db'; import { seedWorld } from './world'; @@ -100,5 +106,23 @@ describe.skipIf(!hasTestDb)('kill feed ingest', () => { expect( (await recentKills(env, w.server.id, null, 10, EMPTY_FILTER)).map((k) => k.eventId) ).toEqual([killId]); + expect(await countFeedEvents(env, w.server.id)).toBe(3); + expect(await countFeedEvents(env, w.server.id, 'killed')).toBe(2); + const first = await recentFeedEvents(env, w.server.id, null, 2); + expect(first).toHaveLength(2); + const older = await recentFeedEvents( + env, + w.server.id, + { ts: new Date(first[1].ts), eventId: first[1].eventId }, + 2 + ); + expect(new Set([...first, ...older].map((e) => e.eventId))).toEqual( + new Set([killId, startedId, incompleteId]) + ); + expect((await recentFeedEvents(env, w.server.id, null, 10, 'match_started'))[0]).toMatchObject({ + eventId: startedId, + eventType: 'match_started', + rawEvent: started + }); }); }); diff --git a/src/test/seed-reward.test.ts b/src/test/seed-reward.test.ts new file mode 100644 index 00000000..a13ee73b --- /dev/null +++ b/src/test/seed-reward.test.ts @@ -0,0 +1,207 @@ +import { beforeAll, describe, expect, test } from 'bun:test'; +import { asc, eq } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { listEntries, triggers } from '$lib/server/db/schema'; +import { ensureOrgLists, grantEntry, listOf } from '$lib/server/lists'; +import { evaluateTriggers, type TickContext } from '$lib/server/triggers'; +import { validateConfig } from '$lib/server/trigger-rules'; +import { newId } from '$lib/server/http'; +import { hasTestDb, testEnv } from './db'; +import { seedWorld } from './world'; + +const STEAM = '76561198000000042'; + +describe.skipIf(!hasTestDb)('seeding reward replacement', () => { + let env: Env; + + beforeAll(async () => { + env = await testEnv(); + }); + + test('soft-removes the active entry and grants a fresh slot', async () => { + const w = await seedWorld(env); + await ensureOrgLists(env.db, w.org.id); + const list = await listOf(env, w.org.id, 'reserve'); + const old = await grantEntry(env, list, { + steamId: STEAM, + reason: 'old reward', + expiresAt: new Date('2026-10-01T00:00:00Z'), + addedByName: 'admin' + }); + const fresh = await grantEntry( + env, + list, + { + steamId: STEAM, + reason: 'new seed reward', + expiresAt: new Date('2026-10-08T00:00:00Z'), + addedByName: 'trigger: Seeders' + }, + { replaceExisting: true } + ); + + expect(fresh).toMatchObject({ added: true, replaced: true }); + const rows = await env.db + .select() + .from(listEntries) + .where(eq(listEntries.listId, list.id)) + .orderBy(asc(listEntries.addedAt), asc(listEntries.id)); + expect(rows).toHaveLength(2); + expect(rows.find((r) => r.id === old.id)).toMatchObject({ + removedByName: 'trigger: Seeders', + removal: 'manual' + }); + expect(rows.find((r) => r.id === fresh.id)).toMatchObject({ + reason: 'new seed reward', + removedAt: null + }); + }); + + test('keeps an existing slot whose note contains the protected word', async () => { + const w = await seedWorld(env); + await ensureOrgLists(env.db, w.org.id); + const list = await listOf(env, w.org.id, 'reserve'); + const old = await grantEntry(env, list, { + steamId: STEAM, + reason: 'Annual PAID membership', + expiresAt: new Date('2026-10-01T00:00:00Z'), + addedByName: 'admin' + }); + const attempted = await grantEntry( + env, + list, + { + steamId: STEAM, + reason: 'new seed reward', + expiresAt: new Date('2026-10-08T00:00:00Z'), + addedByName: 'trigger: Seeders' + }, + { replaceExisting: true, protectedNoteWord: 'paid' } + ); + + expect(attempted).toMatchObject({ + id: old.id, + added: false, + replaced: false, + protected: true + }); + const rows = await env.db.select().from(listEntries).where(eq(listEntries.listId, list.id)); + expect(rows).toHaveLength(1); + expect(rows[0]).toMatchObject({ + id: old.id, + reason: 'Annual PAID membership', + removedAt: null + }); + }); + + test('does not queue or consume a reward when the existing note is protected', async () => { + const w = await seedWorld(env); + await ensureOrgLists(env.db, w.org.id); + const list = await listOf(env, w.org.id, 'reserve'); + await grantEntry(env, list, { + steamId: STEAM, + reason: 'Paid supporter', + expiresAt: new Date('2026-10-01T00:00:00Z'), + addedByName: 'admin' + }); + const config = validateConfig('seed_reward', { + minutes: 60, + lowAt: 1, + untilFull: true, + fullAt: 2, + scope: 'org', + replaceExisting: true, + protectedNoteWord: 'paid' + }); + const [row] = await env.db + .insert(triggers) + .values({ + id: newId(), + serverId: w.server.id, + orgId: w.org.id, + kind: 'seed_reward', + name: 'Seeders', + enabled: true, + config + }) + .returning(); + const player = { steamId: STEAM, name: 'Seeder' }; + const filler = { steamId: '76561198000000043', name: 'Filler' }; + const at = Date.now(); + const context = (players: (typeof player)[], seedMinutes: number, now: number): TickContext => + ({ + server: { id: w.server.id, orgId: w.org.id, name: 'One' }, + status: { maxPlayers: 100, serverName: 'One', playerCount: players.length }, + players, + reserved: new Set([STEAM]), + reservedLoaded: true, + seedMs: new Map([[STEAM, seedMinutes * 60_000]]), + ts: new Date(now) + }) as TickContext; + + await evaluateTriggers(env, context([player], 0, at), [row]); + const filled = await evaluateTriggers(env, context([player, filler], 60, at + 60_000), [row]); + expect(filled.intents.filter((i) => i.action === 'seed_reward')).toHaveLength(0); + expect( + (row.state as { players: Record }).players[STEAM].balance + ).toBe(3600); + }); + + test('carries partial seed time across game starts and resets it after a reward', async () => { + const w = await seedWorld(env); + const config = validateConfig('seed_reward', { + minutes: 60, + lowAt: 1, + untilFull: true, + fullAt: 2, + scope: 'server', + replaceExisting: true + }); + const [row] = await env.db + .insert(triggers) + .values({ + id: newId(), + serverId: w.server.id, + orgId: w.org.id, + kind: 'seed_reward', + name: 'Seeders', + enabled: true, + config + }) + .returning(); + const player = { steamId: STEAM, name: 'Seeder' }; + const filler = { steamId: '76561198000000043', name: 'Filler' }; + const at = Date.now(); + const context = (players: (typeof player)[], seedMinutes: number, now: number): TickContext => + ({ + server: { id: w.server.id, orgId: w.org.id, name: 'One' }, + status: { maxPlayers: 100, serverName: 'One', playerCount: players.length }, + players, + reserved: new Set([STEAM]), + reservedLoaded: true, + seedMs: new Map([[STEAM, seedMinutes * 60_000]]), + ts: new Date(now) + }) as TickContext; + + await evaluateTriggers(env, context([player], 0, at), [row]); + const firstStart = await evaluateTriggers(env, context([player, filler], 30, at + 60_000), [ + row + ]); + expect(firstStart.intents.filter((i) => i.action === 'seed_reward')).toHaveLength(0); + + await evaluateTriggers(env, context([player], 30, at + 120_000), [row]); + const secondStart = await evaluateTriggers(env, context([player, filler], 60, at + 180_000), [ + row + ]); + expect(secondStart.intents.filter((i) => i.action === 'seed_reward')).toHaveLength(1); + expect( + (row.state as { players: Record }).players[STEAM].balance + ).toBe(0); + + await evaluateTriggers(env, context([player], 60, at + 240_000), [row]); + const noNewTime = await evaluateTriggers(env, context([player, filler], 60, at + 300_000), [ + row + ]); + expect(noNewTime.intents.filter((i) => i.action === 'seed_reward')).toHaveLength(0); + }); +}); From ebafdc5035e8b144d02049212ef08dd67dd5b12b Mon Sep 17 00:00:00 2001 From: FaKitZ Date: Mon, 5 Oct 2026 13:44:11 +0200 Subject: [PATCH 004/102] Longest kills by cause: GET /api/servers/:id/kills/longest The Analytics card lists the five longest kills over the range, of any cause, and nothing else could ask for more. A page that wants a weapon's record, a class of weapons' records, or every shot but the mines had no route: on a busy server the five are AT mines at six kilometres (a mine's distance is from whoever laid it), and the kills route pages newest first, so the longest M4 kill meant walking the whole history. The new route answers with the card's rows over the card's ranges, narrowed by `cause` (keep these tags) and/or `exclude` (leave these out). Both match whole and in any case, as the kills route's filter does, take repeated or comma-separated values and are capped at 64 tags; `limit` is 1-25. The card's query now goes through the same function, so the two cannot drift. Tested against Postgres: order, range bounds, cause and exclude in any case, and the cap on limit. The route has its line in the API matrix. Co-Authored-By: Claude Opus 5.5 --- README.md | 1 + src/lib/kills.test.ts | 23 +++++ src/lib/kills.ts | 12 +++ src/lib/server/analytics.ts | 51 +++++++--- .../api/servers/[id]/kills/longest/+server.ts | 21 ++++ src/test/api-matrix.test.ts | 1 + src/test/longest-kills.test.ts | 95 +++++++++++++++++++ 7 files changed, 192 insertions(+), 12 deletions(-) create mode 100644 src/routes/api/servers/[id]/kills/longest/+server.ts create mode 100644 src/test/longest-kills.test.ts diff --git a/README.md b/README.md index 765ec8cd..639370ca 100644 --- a/README.md +++ b/README.md @@ -1448,6 +1448,7 @@ GET|POST /api/servers/:id/rcon/:action (GET for reads with query params, POST GET /api/servers/:id/analytics?range=24h|7d|30d includes `combat` from the kill feed when the server has one GET /api/servers/:id/analytics/periods?range=7d&tz=Europe/Berlin players, new players and session lengths per hour (24h) or per day in that zone GET /api/servers/:id/kills?before=&beforeTime=&limit=50&count=1&match= the stored kill feed, newest first; `count=1` adds the total, `match` narrows it to one match; `kills` frames on /api/live/events carry new ones +GET /api/servers/:id/kills/longest?range=24h|7d|30d&cause=,&exclude=&limit=5 the longest kills by distance, as on the Analytics card; `cause` keeps those tags, `exclude` leaves them out (whole, any case), up to 64 each; limit 1-25 GET /api/servers/:id/matches?page=1 match history, newest first, fifty a page GET /api/servers/:id/matches/:matchId a match that ended: lines, score timeline, awards POST /api/servers/:id/stats/purge {name} deletes the server's kills, matches and match rows (org owners; the name must be the server's; sessions stay) &killer=&victim=&player=&cause=&kind=&minM= filters: a SteamID exactly, else part of a name; the raw cause tag; kind headshot|teamKill|suicide|vehicle|environment; metres at least diff --git a/src/lib/kills.test.ts b/src/lib/kills.test.ts index ad08816c..9ba2da7a 100644 --- a/src/lib/kills.test.ts +++ b/src/lib/kills.test.ts @@ -4,6 +4,8 @@ import { isEmptyFilter, killFilterParams, killMatches, + MAX_CAUSE_TAGS, + parseCauseTags, parseKillFilter, type KillFilter } from './kills'; @@ -108,3 +110,24 @@ describe('killMatches', () => { expect(killMatches(both, kill({ headshot: true, distanceM: 10 }))).toBe(false); }); }); + +describe('parseCauseTags', () => { + test('repeated and comma-separated values make one list', () => { + expect(parseCauseTags(['Id.Item.M4', 'Id.Item.AK74M,Id.Item.WEPN_029'])).toEqual([ + 'Id.Item.M4', + 'Id.Item.AK74M', + 'Id.Item.WEPN_029' + ]); + }); + + test('blanks and repeats are dropped, each tag trimmed', () => { + expect(parseCauseTags([' Id.Item.M4 ,,', 'Id.Item.M4', ''])).toEqual(['Id.Item.M4']); + expect(parseCauseTags([])).toEqual([]); + }); + + test('the list is capped, and so is each tag', () => { + const many = Array.from({ length: MAX_CAUSE_TAGS + 10 }, (_, i) => `Id.Item.T${i}`); + expect(parseCauseTags([many.join(',')])).toHaveLength(MAX_CAUSE_TAGS); + expect(parseCauseTags(['x'.repeat(500)])[0]).toHaveLength(200); + }); +}); diff --git a/src/lib/kills.ts b/src/lib/kills.ts index ecbbeaf3..b4ed50f6 100644 --- a/src/lib/kills.ts +++ b/src/lib/kills.ts @@ -43,6 +43,18 @@ export const VEHICLE_TAGS = ['VehicleExplosion', 'RoadKill']; const text = (v: string | null, max = 100): string => (v ?? '').trim().slice(0, max); +/** At most this many cause tags in one list, so a query string cannot ask for an unbounded IN. */ +export const MAX_CAUSE_TAGS = 64; + +/** + * Cause tags from repeated and/or comma-separated query values (`cause=a&cause=b`, `cause=a,b`): + * trimmed, each cut as the cause filter cuts it, blanks and repeats dropped, at most MAX_CAUSE_TAGS. + */ +export function parseCauseTags(values: string[]): string[] { + const tags = values.flatMap((v) => v.split(',')).map((v) => text(v, 200)); + return [...new Set(tags.filter(Boolean))].slice(0, MAX_CAUSE_TAGS); +} + /** The filter a query string carries; anything unknown or malformed is simply not a filter. */ export function parseKillFilter(params: URLSearchParams): KillFilter { const kind = params.get('kind') ?? ''; diff --git a/src/lib/server/analytics.ts b/src/lib/server/analytics.ts index 4f3a3241..0dc1109b 100644 --- a/src/lib/server/analytics.ts +++ b/src/lib/server/analytics.ts @@ -25,6 +25,8 @@ const BUCKET_S: Record = { '24h': 300, '7d': 1800, '30d': 7200 }; const ROLLED_BEYOND_MS = 14 * 86400_000; export const parseRange = (v: string | null): Range => (v === '7d' || v === '30d' ? v : '24h'); +/** Where a range starts, counted back from now. */ +export const rangeFrom = (range: Range, now = Date.now()): Date => new Date(now - RANGE_MS[range]); export type PeriodUnit = 'hour' | 'day'; /** The periods a range is cut into for the per-period charts: hours over a day, days beyond. */ @@ -633,11 +635,7 @@ async function loadCombat( SELECT k.steam_id AS "steamId", k.name, k.kills, COALESCE(d.deaths, 0) AS deaths, k.headshots, k.team_kills AS "teamKills", k.avg FROM k LEFT JOIN d ON d.steam_id = k.steam_id ORDER BY k.kills DESC LIMIT 25`), - db.execute<{ ts: Date; killer: string; victim: string; cause: string | null; d: number }>(sql` - SELECT ts, killer_name AS killer, victim_name AS victim, cause, distance_m AS d - FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${serverId} AND ts >= ${from} AND distance_m IS NOT NULL - AND NOT suicide AND NOT team_kill - ORDER BY distance_m DESC LIMIT 5`) + longestKills(env, serverId, from) ]); return { kills: num(totals?.kills), @@ -660,16 +658,45 @@ async function loadCombat( teamKills: num(r.teamKills), avgDistanceM: r.avg === null ? null : Math.round(num(r.avg)) })), - longest: longest.map((r) => ({ - ts: isoOf(r.ts), - killer: r.killer, - victim: r.victim, - cause: r.cause, - distanceM: Math.round(num(r.d)) - })) + longest }; } +/** + * The longest kills since `from`, by distance, suicides and team kills left out. `causes` keeps + * only those tags and `exclude` leaves those out, each matching whole and in any case as the kills + * route's filter does (the game writes `ID.Item.` for some items and `Id.Item.` for others). + */ +export async function longestKills( + env: Env, + serverId: string, + from: Date, + opts: { causes?: string[]; exclude?: string[]; limit?: number } = {} +): Promise { + const keep = (opts.causes ?? []).map((c) => c.toLowerCase()); + const drop = (opts.exclude ?? []).map((c) => c.toLowerCase()); + const rows = await env.db.execute<{ + ts: Date; + killer: string; + victim: string; + cause: string | null; + d: number; + }>(sql` + SELECT ts, killer_name AS killer, victim_name AS victim, cause, distance_m AS d + FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${serverId} AND ts >= ${from} AND distance_m IS NOT NULL + AND NOT suicide AND NOT team_kill + ${keep.length ? sql`AND lower(cause) IN ${keep}` : sql``} + ${drop.length ? sql`AND (cause IS NULL OR lower(cause) NOT IN ${drop})` : sql``} + ORDER BY distance_m DESC LIMIT ${opts.limit ?? 5}`); + return rows.map((r) => ({ + ts: isoOf(r.ts), + killer: r.killer, + victim: r.victim, + cause: r.cause, + distanceM: Math.round(num(r.d)) + })); +} + /** * Cash per faction averaged into `bucket`-second buckets. Samples store cash as a JSON array, so * the rows are unnested in SQL and pivoted back here; buckets with no reachable sample are diff --git a/src/routes/api/servers/[id]/kills/longest/+server.ts b/src/routes/api/servers/[id]/kills/longest/+server.ts new file mode 100644 index 00000000..132ea28e --- /dev/null +++ b/src/routes/api/servers/[id]/kills/longest/+server.ts @@ -0,0 +1,21 @@ +// The longest kills over a range, by distance, as the Analytics card lists them, narrowed to some +// cause tags or with some left out: a weapon's record, a class of weapons, or every shot but the +// mines (whose distance is from whoever laid them, kilometres away). +// ?range=24h|7d|30d&cause=[,...]&exclude=[,...]&limit=1..25 +import { getEnv } from '$lib/server/env'; +import { apiJson, int, param, route } from '$lib/server/http'; +import { requireServerCap } from '$lib/server/access'; +import { longestKills, parseRange, rangeFrom } from '$lib/server/analytics'; +import { parseCauseTags } from '$lib/kills'; + +export const GET = route(async (event) => { + const env = getEnv(); + const { server } = await requireServerCap(env, event.locals, param(event, 'id'), 'server.view'); + const q = event.url.searchParams; + const kills = await longestKills(env, server.id, rangeFrom(parseRange(q.get('range'))), { + causes: parseCauseTags(q.getAll('cause')), + exclude: parseCauseTags(q.getAll('exclude')), + limit: int(q.get('limit'), 5, 1, 25) + }); + return apiJson({ ok: true, kills }); +}); diff --git a/src/test/api-matrix.test.ts b/src/test/api-matrix.test.ts index 154b71d4..39c58a9f 100644 --- a/src/test/api-matrix.test.ts +++ b/src/test/api-matrix.test.ts @@ -125,6 +125,7 @@ const MATRIX: Record = { 'GET api/servers/[id]/feed': 'cap:server.view', 'GET api/servers/[id]/events': 'cap:server.view', 'GET api/servers/[id]/kills': 'cap:server.view', + 'GET api/servers/[id]/kills/longest': 'cap:server.view', 'GET api/servers/[id]/leaderboard': 'cap:server.view', 'GET api/servers/[id]/leaderboard/export': 'cap:server.view', 'GET api/servers/[id]/matches': 'cap:server.view', diff --git a/src/test/longest-kills.test.ts b/src/test/longest-kills.test.ts new file mode 100644 index 00000000..517e5550 --- /dev/null +++ b/src/test/longest-kills.test.ts @@ -0,0 +1,95 @@ +// The longest-kills route: by distance over the range, suicides and team kills left out as on the +// Analytics card, narrowed by `cause` or with `exclude` left out, both whole and in any case. +import { beforeAll, describe, expect, test } from 'bun:test'; +import type { Env } from '$lib/server/env'; +import { kills } from '$lib/server/db/schema'; +import type { LongestKill } from '$lib/server/analytics'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, type World } from './world'; +import { GET as longestRoute } from '../routes/api/servers/[id]/kills/longest/+server'; + +const A = '76561198000000093'; +const B = '76561198000000094'; +const DAY = 86_400_000; + +/** [eventId, cause, metres, age in ms, extra columns] */ +const ROWS: [string, string | null, number | null, number, Record?][] = [ + ['mine', 'ID.Item.ATMine', 6000, 60_000], + ['sv98', 'Id.Item.SV98', 900, 60_000], + ['ak', 'Id.Item.AK74M', 400, 60_000], + ['m4a', 'Id.Item.M4', 300, 60_000], + ['m4b', 'Id.Item.M4', 250, 60_000], + ['twodays', 'Id.Item.MK22', 700, 2 * DAY], + ['old', 'Id.Item.SV98', 5000, 40 * DAY], + ['tk', 'Id.Item.SV98', 2000, 60_000, { teamKill: true }], + ['self', 'Id.Item.SV98', 3000, 60_000, { suicide: true }], + ['nodist', 'Id.Item.SV98', null, 60_000] +]; + +describe.skipIf(!hasTestDb)('the longest-kills route', () => { + let env: Env; + let w: World; + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + await env.db.insert(kills).values( + ROWS.map(([eventId, cause, distanceM, age, extra], i) => ({ + ts: new Date(Date.now() - age), + serverId: w.server.id, + eventId: `lk-${eventId}`, + instanceId: 'i', + matchId: 'g', + eventTime: i, + map: 'Kavkazi', + killerSteamId: A, + killerName: 'Ghostpepper', + killerFaction: 'Valkyra', + victimSteamId: B, + victimName: 'T0XIC_AVENGER', + victimFaction: 'Lonestar', + cause, + distanceM, + tags: [], + ...extra + })) + ); + }); + + const metres = async (query: string) => { + const r = await callApi(longestRoute, w.users.viewer, { params: { id: w.server.id }, query }); + expect(r.status).toBe(200); + return (r.body as { kills: LongestKill[] }).kills.map((k) => k.distanceM); + }; + + test('longest first over the range, without suicides, team kills or kills with no distance', async () => { + expect(await metres('range=30d')).toEqual([6000, 900, 700, 400, 300]); + expect(await metres('range=30d&limit=25')).toEqual([6000, 900, 700, 400, 300, 250]); + }); + + test('the range bounds it: two days ago is in 7d, not in 24h', async () => { + expect(await metres('range=7d&limit=25')).toContain(700); + expect(await metres('range=24h&limit=25')).not.toContain(700); + }); + + test('cause keeps those tags, whole and in any case, repeated or comma-separated', async () => { + expect(await metres('range=30d&cause=Id.Item.M4')).toEqual([300, 250]); + expect(await metres('range=30d&cause=id.item.m4,Id.Item.AK74M')).toEqual([400, 300, 250]); + expect(await metres('range=30d&cause=Id.Item.M4&cause=ID.ITEM.SV98')).toEqual([900, 300, 250]); + expect(await metres('range=30d&cause=Id.Item.M')).toEqual([]); + }); + + test('exclude leaves tags out: every shot but the mines', async () => { + expect(await metres('range=30d&exclude=Id.Item.ATMine')).toEqual([900, 700, 400, 300, 250]); + expect( + await metres('range=30d&cause=Id.Item.M4,Id.Item.ATMine&exclude=id.item.atmine') + ).toEqual([300, 250]); + }); + + test('limit is bounded', async () => { + expect(await metres('range=30d&limit=2')).toHaveLength(2); + expect(await metres('range=30d&limit=0')).toHaveLength(1); + }); +}); From 0f4290c2bca9f7277e8e9d5f10c43733949e8245 Mon Sep 17 00:00:00 2001 From: FaKitZ Date: Mon, 5 Oct 2026 13:48:23 +0200 Subject: [PATCH 005/102] Longest kills: maxM drops the impossible distances The feed carries the odd distance no shot can have. Over the last 30 days on a busy server: a Deagle at 4,042 m, a Bushmaster M17S at 2,290 m, an SVD at 1,807 m and an M500 shotgun at 1,455 m, while the real sniper records sit just under a kilometre (AMR 50 998 m, SV98 993 m). Asked for a class or a weapon, the route put those glitches on top of every list, and a client cannot filter them out of a top five it never sees past. `maxM` drops kills beyond it, as `minM` bounds the kills route from below; missing, malformed or not positive, it is no bound. A client after plausible long shots can now ask for firearms within 1,200 m and get the real records. Co-Authored-By: Claude Opus 5.5 --- README.md | 2 +- src/lib/server/analytics.ts | 5 ++++- src/routes/api/servers/[id]/kills/longest/+server.ts | 7 +++++-- src/test/longest-kills.test.ts | 8 ++++++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 639370ca..8027d27e 100644 --- a/README.md +++ b/README.md @@ -1448,7 +1448,7 @@ GET|POST /api/servers/:id/rcon/:action (GET for reads with query params, POST GET /api/servers/:id/analytics?range=24h|7d|30d includes `combat` from the kill feed when the server has one GET /api/servers/:id/analytics/periods?range=7d&tz=Europe/Berlin players, new players and session lengths per hour (24h) or per day in that zone GET /api/servers/:id/kills?before=&beforeTime=&limit=50&count=1&match= the stored kill feed, newest first; `count=1` adds the total, `match` narrows it to one match; `kills` frames on /api/live/events carry new ones -GET /api/servers/:id/kills/longest?range=24h|7d|30d&cause=,&exclude=&limit=5 the longest kills by distance, as on the Analytics card; `cause` keeps those tags, `exclude` leaves them out (whole, any case), up to 64 each; limit 1-25 +GET /api/servers/:id/kills/longest?range=24h|7d|30d&cause=,&exclude=&maxM=1200&limit=5 the longest kills by distance, as on the Analytics card; `cause` keeps those tags, `exclude` leaves them out (whole, any case), up to 64 each; `maxM` drops kills beyond it (the feed carries the odd impossible distance); limit 1-25 GET /api/servers/:id/matches?page=1 match history, newest first, fifty a page GET /api/servers/:id/matches/:matchId a match that ended: lines, score timeline, awards POST /api/servers/:id/stats/purge {name} deletes the server's kills, matches and match rows (org owners; the name must be the server's; sessions stay) &killer=&victim=&player=&cause=&kind=&minM= filters: a SteamID exactly, else part of a name; the raw cause tag; kind headshot|teamKill|suicide|vehicle|environment; metres at least diff --git a/src/lib/server/analytics.ts b/src/lib/server/analytics.ts index 0dc1109b..6056411b 100644 --- a/src/lib/server/analytics.ts +++ b/src/lib/server/analytics.ts @@ -666,12 +666,14 @@ async function loadCombat( * The longest kills since `from`, by distance, suicides and team kills left out. `causes` keeps * only those tags and `exclude` leaves those out, each matching whole and in any case as the kills * route's filter does (the game writes `ID.Item.` for some items and `Id.Item.` for others). + * `maxM` drops kills beyond it: the feed carries the odd impossible distance (a pistol at 4 km), + * which would otherwise sit on top of every list. */ export async function longestKills( env: Env, serverId: string, from: Date, - opts: { causes?: string[]; exclude?: string[]; limit?: number } = {} + opts: { causes?: string[]; exclude?: string[]; maxM?: number | null; limit?: number } = {} ): Promise { const keep = (opts.causes ?? []).map((c) => c.toLowerCase()); const drop = (opts.exclude ?? []).map((c) => c.toLowerCase()); @@ -687,6 +689,7 @@ export async function longestKills( AND NOT suicide AND NOT team_kill ${keep.length ? sql`AND lower(cause) IN ${keep}` : sql``} ${drop.length ? sql`AND (cause IS NULL OR lower(cause) NOT IN ${drop})` : sql``} + ${opts.maxM != null ? sql`AND distance_m <= ${opts.maxM}` : sql``} ORDER BY distance_m DESC LIMIT ${opts.limit ?? 5}`); return rows.map((r) => ({ ts: isoOf(r.ts), diff --git a/src/routes/api/servers/[id]/kills/longest/+server.ts b/src/routes/api/servers/[id]/kills/longest/+server.ts index 132ea28e..687bede9 100644 --- a/src/routes/api/servers/[id]/kills/longest/+server.ts +++ b/src/routes/api/servers/[id]/kills/longest/+server.ts @@ -1,7 +1,8 @@ // The longest kills over a range, by distance, as the Analytics card lists them, narrowed to some // cause tags or with some left out: a weapon's record, a class of weapons, or every shot but the -// mines (whose distance is from whoever laid them, kilometres away). -// ?range=24h|7d|30d&cause=[,...]&exclude=[,...]&limit=1..25 +// mines (whose distance is from whoever laid them, kilometres away). `maxM` drops what lies beyond +// it, as `minM` does below on the kills route: the feed carries the odd impossible distance. +// ?range=24h|7d|30d&cause=[,...]&exclude=[,...]&maxM=&limit=1..25 import { getEnv } from '$lib/server/env'; import { apiJson, int, param, route } from '$lib/server/http'; import { requireServerCap } from '$lib/server/access'; @@ -12,9 +13,11 @@ export const GET = route(async (event) => { const env = getEnv(); const { server } = await requireServerCap(env, event.locals, param(event, 'id'), 'server.view'); const q = event.url.searchParams; + const max = Number(q.get('maxM')); const kills = await longestKills(env, server.id, rangeFrom(parseRange(q.get('range'))), { causes: parseCauseTags(q.getAll('cause')), exclude: parseCauseTags(q.getAll('exclude')), + maxM: q.get('maxM') && Number.isFinite(max) && max > 0 ? Math.round(max) : null, limit: int(q.get('limit'), 5, 1, 25) }); return apiJson({ ok: true, kills }); diff --git a/src/test/longest-kills.test.ts b/src/test/longest-kills.test.ts index 517e5550..6552f478 100644 --- a/src/test/longest-kills.test.ts +++ b/src/test/longest-kills.test.ts @@ -88,6 +88,14 @@ describe.skipIf(!hasTestDb)('the longest-kills route', () => { ).toEqual([300, 250]); }); + test('maxM drops what lies beyond it, and a malformed one is no bound', async () => { + expect(await metres('range=30d&maxM=1200')).toEqual([900, 700, 400, 300, 250]); + expect(await metres('range=30d&maxM=400&limit=25')).toEqual([400, 300, 250]); + expect(await metres('range=30d&maxM=1200&cause=Id.Item.ATMine')).toEqual([]); + expect(await metres('range=30d&maxM=nope')).toEqual([6000, 900, 700, 400, 300]); + expect(await metres('range=30d&maxM=-5')).toEqual([6000, 900, 700, 400, 300]); + }); + test('limit is bounded', async () => { expect(await metres('range=30d&limit=2')).toHaveLength(2); expect(await metres('range=30d&limit=0')).toHaveLength(1); From 363a75592bff44edcf1403a19f82a61c00061cad Mon Sep 17 00:00:00 2001 From: FaKitZ Date: Mon, 5 Oct 2026 13:57:39 +0200 Subject: [PATCH 006/102] Longest kills carry the killer's SteamID A page linking each record to the shooter's profile had only the name to go on, and names are neither unique nor stable. Looking them up meant walking the player directory, which on a cold cache took a site 35 s for one panel. Each longest kill now carries `killerSteamId` from the kills row, on the new route and on the Analytics card alike. Both already sit behind server.view, which reads SteamIDs on the kills route, so nothing new is exposed. Co-Authored-By: Claude Opus 5.5 --- README.md | 2 +- src/lib/server/analytics.ts | 7 ++++++- src/test/longest-kills.test.ts | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8027d27e..6befe082 100644 --- a/README.md +++ b/README.md @@ -1448,7 +1448,7 @@ GET|POST /api/servers/:id/rcon/:action (GET for reads with query params, POST GET /api/servers/:id/analytics?range=24h|7d|30d includes `combat` from the kill feed when the server has one GET /api/servers/:id/analytics/periods?range=7d&tz=Europe/Berlin players, new players and session lengths per hour (24h) or per day in that zone GET /api/servers/:id/kills?before=&beforeTime=&limit=50&count=1&match= the stored kill feed, newest first; `count=1` adds the total, `match` narrows it to one match; `kills` frames on /api/live/events carry new ones -GET /api/servers/:id/kills/longest?range=24h|7d|30d&cause=,&exclude=&maxM=1200&limit=5 the longest kills by distance, as on the Analytics card; `cause` keeps those tags, `exclude` leaves them out (whole, any case), up to 64 each; `maxM` drops kills beyond it (the feed carries the odd impossible distance); limit 1-25 +GET /api/servers/:id/kills/longest?range=24h|7d|30d&cause=,&exclude=&maxM=1200&limit=5 the longest kills by distance, as on the Analytics card; `cause` keeps those tags, `exclude` leaves them out (whole, any case), up to 64 each; `maxM` drops kills beyond it (the feed carries the odd impossible distance); limit 1-25; each kill carries `killerSteamId` GET /api/servers/:id/matches?page=1 match history, newest first, fifty a page GET /api/servers/:id/matches/:matchId a match that ended: lines, score timeline, awards POST /api/servers/:id/stats/purge {name} deletes the server's kills, matches and match rows (org owners; the name must be the server's; sessions stay) &killer=&victim=&player=&cause=&kind=&minM= filters: a SteamID exactly, else part of a name; the raw cause tag; kind headshot|teamKill|suicide|vehicle|environment; metres at least diff --git a/src/lib/server/analytics.ts b/src/lib/server/analytics.ts index 6056411b..12d16c56 100644 --- a/src/lib/server/analytics.ts +++ b/src/lib/server/analytics.ts @@ -131,6 +131,8 @@ export interface CombatPlayer { export interface LongestKill { ts: string; killer: string; + /** so a page can link the shooter without looking a name up (names are not unique) */ + killerSteamId: string | null; victim: string; cause: string | null; distanceM: number; @@ -680,11 +682,13 @@ export async function longestKills( const rows = await env.db.execute<{ ts: Date; killer: string; + killerSteamId: string | null; victim: string; cause: string | null; d: number; }>(sql` - SELECT ts, killer_name AS killer, victim_name AS victim, cause, distance_m AS d + SELECT ts, killer_name AS killer, killer_steam_id AS "killerSteamId", victim_name AS victim, cause, + distance_m AS d FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${serverId} AND ts >= ${from} AND distance_m IS NOT NULL AND NOT suicide AND NOT team_kill ${keep.length ? sql`AND lower(cause) IN ${keep}` : sql``} @@ -694,6 +698,7 @@ export async function longestKills( return rows.map((r) => ({ ts: isoOf(r.ts), killer: r.killer, + killerSteamId: r.killerSteamId, victim: r.victim, cause: r.cause, distanceM: Math.round(num(r.d)) diff --git a/src/test/longest-kills.test.ts b/src/test/longest-kills.test.ts index 6552f478..9f7881b0 100644 --- a/src/test/longest-kills.test.ts +++ b/src/test/longest-kills.test.ts @@ -96,6 +96,23 @@ describe.skipIf(!hasTestDb)('the longest-kills route', () => { expect(await metres('range=30d&maxM=-5')).toEqual([6000, 900, 700, 400, 300]); }); + test('each kill names its shooter by SteamID, not only by name', async () => { + const r = await callApi(longestRoute, w.users.viewer, { + params: { id: w.server.id }, + query: 'range=30d&limit=1' + }); + expect((r.body as { kills: LongestKill[] }).kills).toEqual([ + { + ts: expect.any(String), + killer: 'Ghostpepper', + killerSteamId: A, + victim: 'T0XIC_AVENGER', + cause: 'ID.Item.ATMine', + distanceM: 6000 + } + ]); + }); + test('limit is bounded', async () => { expect(await metres('range=30d&limit=2')).toHaveLength(2); expect(await metres('range=30d&limit=0')).toHaveLength(1); From 8d8b0b47a594450f4909647be7b88e3364a82ce9 Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 17:28:12 +0100 Subject: [PATCH 007/102] Team balance: a player who switches onto the bigger side is put back every time. Put-backs count on their own, and only until the player is seen on the side they were put back on, so the three-in-ten-minutes limit no longer leaves a player who keeps going back on the bigger side after the third move (at a match start about half of the players moved went straight back within one respawn, and with three moves each the sides were left uneven); a put-back the game does not carry out is still asked three times at most, and every other move keeps its own limit of three. A move made outside the panel (the game's console, another balancer) is put back like a switch, so the README says to run no other balancer beside it --- README.md | 30 +++++++-------- src/lib/server/two-teams.test.ts | 31 +++++++++++++++ src/lib/server/two-teams.ts | 38 ++++++++++++++----- .../(app)/server/[id]/automation/+page.svelte | 14 +++++-- src/test/team-balance.test.ts | 11 ++++++ 5 files changed, 95 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 6befe082..61602b59 100644 --- a/README.md +++ b/README.md @@ -533,21 +533,21 @@ ban list_ (on every server), and for the Seeding reward _Reserved slots_ or _Org its row). A custom role or API key with _Automation_ alone can read the rules and delete them. -| Trigger | Does | -| ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Welcome whisper | Whispers a message to each joiner (optionally only on their first visit), which can tell them their all-time stats, on the server or across the organisation (see [Placeholders](#placeholders)). | -| Scheduled broadcast | Rotates through a list of messages every N minutes while at least M players are on, and optionally only until a ceiling, so a fill-the-server message stops once it has. | -| Empty-server map reset | After the server has been empty for N minutes on a different map or mode, sets the chosen map as next and ends the match (or requests it directly when there is no rotation). | -| Kick on connect risk | Kicks players who match rules: VAC ban or game ban (optionally only within the last N days), Steam account younger than N days (optionally private profiles too), banned on another server in the org, or on the watchlist; or whose advisory risk score is at or above a set number from 1 to 100 (medium starts at 20, high at 50; the players table badges 20 and up). Joiners and players reconnecting are judged at once, and everyone on is judged again every minute (a player whose kick did not land, every five). Nobody is judged until the server's reserved slots have been read. Reserved-slot players can be spared. | -| Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | -| High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | -| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | -| Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | -| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | -| Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move-then-kill, so the player respawns on their new side. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player asked to move three times in ten minutes is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | -| Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | -| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier history, the leaderboard's Seed time column and the dry run show it. | -| AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | +| Trigger | Does | +| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Welcome whisper | Whispers a message to each joiner (optionally only on their first visit), which can tell them their all-time stats, on the server or across the organisation (see [Placeholders](#placeholders)). | +| Scheduled broadcast | Rotates through a list of messages every N minutes while at least M players are on, and optionally only until a ceiling, so a fill-the-server message stops once it has. | +| Empty-server map reset | After the server has been empty for N minutes on a different map or mode, sets the chosen map as next and ends the match (or requests it directly when there is no rotation). | +| Kick on connect risk | Kicks players who match rules: VAC ban or game ban (optionally only within the last N days), Steam account younger than N days (optionally private profiles too), banned on another server in the org, or on the watchlist; or whose advisory risk score is at or above a set number from 1 to 100 (medium starts at 20, high at 50; the players table badges 20 and up). Joiners and players reconnecting are judged at once, and everyone on is judged again every minute (a player whose kick did not land, every five). Nobody is judged until the server's reserved slots have been read. Reserved-slot players can be spared. | +| Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | +| High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | +| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | +| Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | +| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | +| Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move-then-kill, so the player respawns on their new side. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | +| Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | +| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier history, the leaderboard's Seed time column and the dry run show it. | +| AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | **Dry run** replays the last 24 hours of the server's own history (joins, player counts, empty stretches, cached Steam data) against a rule and lists what it would have done, so you can tune a diff --git a/src/lib/server/two-teams.test.ts b/src/lib/server/two-teams.test.ts index 965f04b6..bd0881ca 100644 --- a/src/lib/server/two-teams.test.ts +++ b/src/lib/server/two-teams.test.ts @@ -270,6 +270,37 @@ describe('twoTeamsStep balancing', () => { expect(helper.state.sides.get('v0')?.side).toBe(M); }); + test('a player who keeps switching onto the bigger side is put back every time', () => { + const players = [...side('v', 7, V), ...side('m', 5, M)]; + const onV = players.map((x) => (x.steamId === 'm0' ? { ...x, faction: V } : x)); + let state = seeded(players); + for (let i = 0; i < 2 * TWO_TEAMS_MAX_ASKS; i++) { + // onto Valkyra again, eight against four + const r = bal(state, onV, (2 * i + 1) * 2000); + expect(r.moves.map((m) => [m.steamId, m.to, m.why])).toEqual([['m0', M, 'back']]); + expect(r.stopped).toEqual([]); + // and the put-back lands + state = bal(r.state, players, (2 * i + 2) * 2000).state; + } + }); + + test('a put-back the game does not carry out is asked three times in ten minutes at most', () => { + const players = [...side('v', 7, V), ...side('m', 5, M)]; + const onV = players.map((x) => (x.steamId === 'm0' ? { ...x, faction: V } : x)); + let state = seeded(players); + const whys: string[] = []; + const stopped: string[] = []; + // still on Valkyra at every look, each a retry's wait after the one before + for (let i = 0; i < 2 * TWO_TEAMS_MAX_ASKS; i++) { + const r = bal(state, onV, 2000 + i * (TWO_TEAMS_RETRY_MS + 1000)); + state = r.state; + whys.push(...r.moves.map((m) => m.why)); + stopped.push(...r.stopped.map((s) => s.steamId)); + } + expect(whys).toEqual(Array(TWO_TEAMS_MAX_ASKS).fill('back')); + expect(stopped).toEqual(['m0']); + }); + test('a player who leaves and rejoins on the bigger side is still put back, until forgotten', () => { const players = [...side('v', 7, V), ...side('m', 5, M)]; const others = players.filter((x) => x.steamId !== 'm0'); diff --git a/src/lib/server/two-teams.ts b/src/lib/server/two-teams.ts index 0d211dd3..a08c3fb1 100644 --- a/src/lib/server/two-teams.ts +++ b/src/lib/server/two-teams.ts @@ -29,7 +29,10 @@ export const TWO_TEAMS_MOVES_PER_SECOND = 3; export const TWO_TEAMS_MAX_MOVES_PER_LOOK = 6; /** * A player asked to move this many times within TWO_TEAMS_ASK_WINDOW_MS is left where they are - * until the window passes: something keeps putting them back, and every move kills them. + * until the window passes: something keeps putting them back, and every move kills them. Put-backs + * count on their own, and only until the player is seen on the side they were put back on, so a + * player who keeps switching onto the bigger side is put back every time, and a put-back that does + * not take is asked this many times. */ export const TWO_TEAMS_MAX_ASKS = 3; export const TWO_TEAMS_ASK_WINDOW_MS = 10 * 60_000; @@ -139,8 +142,13 @@ export interface TwoTeamsState { moving: Map; /** placed players already told where they went, when there is a whisper: SteamID -> last seen */ told: Map; - /** when each player was asked to move within TWO_TEAMS_ASK_WINDOW_MS, oldest first */ + /** when each player was asked to move within TWO_TEAMS_ASK_WINDOW_MS, oldest first; put-backs aside */ asked: Map; + /** + * balancing: when each player was put back within TWO_TEAMS_ASK_WINDOW_MS since they were last + * seen on the side they were placed on, oldest first + */ + backs: Map; /** players left where they are for being asked too often (said once, in `stopped`) */ capped: Set; /** @@ -162,6 +170,7 @@ export const emptyTwoTeamsState = (): TwoTeamsState => ({ moving: new Map(), told: new Map(), asked: new Map(), + backs: new Map(), capped: new Set(), sides: new Map(), seeded: false, @@ -249,6 +258,7 @@ export function twoTeamsStep( moving: new Map(previous.moving), told: new Map(previous.told), asked: new Map(previous.asked), + backs: new Map(previous.backs), capped: new Set(previous.capped), sides: new Map(previous.sides), seeded: previous.seeded, @@ -308,6 +318,8 @@ export function twoTeamsStep( ? p.faction : (known?.side ?? null); state.sides.set(p.steamId, { side, seen: now }); + // Where they were placed: the put-backs before this took, so they count no longer. + if (side !== null && side === p.faction) state.backs.delete(p.steamId); } // No whisper on a match end's look: a move of the match that ended may land on it, and the new // match may move the player again at once. @@ -317,13 +329,18 @@ export function twoTeamsStep( if (landed || state.told.has(p.steamId)) state.told.set(p.steamId, now); } for (const [id, m] of state.moving) if (now - m.at >= TWO_TEAMS_RETRY_MS) state.moving.delete(id); - for (const [id, times] of state.asked) { - const recent = times.filter((t) => now - t < TWO_TEAMS_ASK_WINDOW_MS); - if (recent.length) state.asked.set(id, recent); - else state.asked.delete(id); - } + for (const counted of [state.asked, state.backs]) + for (const [id, times] of counted) { + const recent = times.filter((t) => now - t < TWO_TEAMS_ASK_WINDOW_MS); + if (recent.length) counted.set(id, recent); + else counted.delete(id); + } for (const id of state.capped) - if ((state.asked.get(id)?.length ?? 0) < TWO_TEAMS_MAX_ASKS) state.capped.delete(id); + if ( + (state.asked.get(id)?.length ?? 0) < TWO_TEAMS_MAX_ASKS && + (state.backs.get(id)?.length ?? 0) < TWO_TEAMS_MAX_ASKS + ) + state.capped.delete(id); if (open.length < 2) return { state, moves, whispers, stopped }; @@ -394,7 +411,8 @@ export function twoTeamsStep( to: string, why: TwoTeamsReason ) => { - const times = state.asked.get(p.steamId) ?? []; + const counted = why === 'back' ? state.backs : state.asked; + const times = counted.get(p.steamId) ?? []; if (times.length >= TWO_TEAMS_MAX_ASKS) { if (!state.capped.has(p.steamId)) { state.capped.add(p.steamId); @@ -412,7 +430,7 @@ export function twoTeamsStep( if (isOpen(p.faction)) mates.set(p.faction, (mates.get(p.faction) ?? 1) - 1); mates.set(to, (mates.get(to) ?? 0) + 1); } - state.asked.set(p.steamId, [...times, now]); + counted.set(p.steamId, [...times, now]); if (watch) { // Nothing is sent: take them as placed where they would have gone. state.would.set(p.steamId, { from: p.faction!, to, seen: now }); diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index e35a7e65..0f7c9704 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -1909,10 +1909,16 @@ >

Moves go out a few at a time as the player list refreshes; each kills the player so they - respawn on the new side. A player asked to move three times in ten minutes is left where - they are until the ten minutes pass.{f.balance - ? '' - : ' Players are never moved between the open sides.'} One rule per server. + respawn on the new side. + {#if f.balance} + A player who switches onto the bigger side is put back every time. A player asked to + move three times in ten minutes for any other reason, or put back three times without + it taking, is left where they are until the ten minutes pass. + {:else} + A player asked to move three times in ten minutes is left where they are until the ten + minutes pass. Players are never moved between the open sides. + {/if} + One rule per server.

{:else if f.kind === 'team_kill'}
diff --git a/src/test/team-balance.test.ts b/src/test/team-balance.test.ts index 7be74e86..e13919c9 100644 --- a/src/test/team-balance.test.ts +++ b/src/test/team-balance.test.ts @@ -178,6 +178,17 @@ describe.skipIf(!hasTestDb)('Team balance against the panel', () => { expect(await look(r, teams(V))).toEqual([MOVED]); }); + test('a player who keeps switching onto the bigger side is put back at every switch', async () => { + const r = rule(); + expect(await look(r, teams())).toEqual([]); + for (let i = 0; i < 5; i++) { + // onto Valkyra, 8 v 4: put back + expect(await look(r, teams(V))).toEqual([MOVED]); + // and seen back on Manticore, where the move put them + expect(await look(r, teams())).toEqual([]); + } + }); + test('a move from the Players tab or the API is kept; one the game refused is not', async () => { const r = rule(); expect(await look(r, teams())).toEqual([]); From c1bb128b8827b25db2319f0654dbefa86b0b3d82 Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 17:28:32 +0100 Subject: [PATCH 008/102] Team balance: with clan tags kept together, a new match is evened up in the order that splits the fewest clans: players whose clan is mostly on the other side first (the move takes them to it), then those with no clanmates beside them, then the rest, fewest clanmates beside them first, instead of a random order that split clans the numbers did not need to split (on a full server a start's moves came from tagged and untagged players alike, and the tagged ones were the likelier to go straight back); among players at the same cost the order stays random --- README.md | 30 ++++++++-------- src/lib/server/two-teams.test.ts | 35 +++++++++++++++++++ src/lib/server/two-teams.ts | 17 +++++++-- .../(app)/server/[id]/automation/+page.svelte | 4 ++- 4 files changed, 67 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 61602b59..eeda74d7 100644 --- a/README.md +++ b/README.md @@ -533,21 +533,21 @@ ban list_ (on every server), and for the Seeding reward _Reserved slots_ or _Org its row). A custom role or API key with _Automation_ alone can read the rules and delete them. -| Trigger | Does | -| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Welcome whisper | Whispers a message to each joiner (optionally only on their first visit), which can tell them their all-time stats, on the server or across the organisation (see [Placeholders](#placeholders)). | -| Scheduled broadcast | Rotates through a list of messages every N minutes while at least M players are on, and optionally only until a ceiling, so a fill-the-server message stops once it has. | -| Empty-server map reset | After the server has been empty for N minutes on a different map or mode, sets the chosen map as next and ends the match (or requests it directly when there is no rotation). | -| Kick on connect risk | Kicks players who match rules: VAC ban or game ban (optionally only within the last N days), Steam account younger than N days (optionally private profiles too), banned on another server in the org, or on the watchlist; or whose advisory risk score is at or above a set number from 1 to 100 (medium starts at 20, high at 50; the players table badges 20 and up). Joiners and players reconnecting are judged at once, and everyone on is judged again every minute (a player whose kick did not land, every five). Nobody is judged until the server's reserved slots have been read. Reserved-slot players can be spared. | -| Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | -| High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | -| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | -| Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | -| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | -| Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move-then-kill, so the player respawns on their new side. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | -| Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | -| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier history, the leaderboard's Seed time column and the dry run show it. | -| AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | +| Trigger | Does | +| ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Welcome whisper | Whispers a message to each joiner (optionally only on their first visit), which can tell them their all-time stats, on the server or across the organisation (see [Placeholders](#placeholders)). | +| Scheduled broadcast | Rotates through a list of messages every N minutes while at least M players are on, and optionally only until a ceiling, so a fill-the-server message stops once it has. | +| Empty-server map reset | After the server has been empty for N minutes on a different map or mode, sets the chosen map as next and ends the match (or requests it directly when there is no rotation). | +| Kick on connect risk | Kicks players who match rules: VAC ban or game ban (optionally only within the last N days), Steam account younger than N days (optionally private profiles too), banned on another server in the org, or on the watchlist; or whose advisory risk score is at or above a set number from 1 to 100 (medium starts at 20, high at 50; the players table badges 20 and up). Joiners and players reconnecting are judged at once, and everyone on is judged again every minute (a player whose kick did not land, every five). Nobody is judged until the server's reserved slots have been read. Reserved-slot players can be spared. | +| Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | +| High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | +| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | +| Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | +| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | +| Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap; when a new match is evened up, players whose clan is mostly on the other side move first, then those with the fewest clanmates beside them), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move-then-kill, so the player respawns on their new side. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | +| Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | +| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier history, the leaderboard's Seed time column and the dry run show it. | +| AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | **Dry run** replays the last 24 hours of the server's own history (joins, player counts, empty stretches, cached Steam data) against a rule and lists what it would have done, so you can tune a diff --git a/src/lib/server/two-teams.test.ts b/src/lib/server/two-teams.test.ts index bd0881ca..454f6fb5 100644 --- a/src/lib/server/two-teams.test.ts +++ b/src/lib/server/two-teams.test.ts @@ -449,6 +449,41 @@ describe('twoTeamsStep balancing', () => { ); }); + test('with clan tags kept together, a new match moves players with no clanmates beside them first', () => { + const withClans = { ...B, clans: true }; + // the clan first in the list, where list order would take the moves from it + const players = [ + ...Array.from({ length: 6 }, (_, i) => named(`t${i}`, `[ABC] Mate${i}`, M)), + ...side('m', 6, M), + ...side('v', 2, V) + ]; + const r = bal(seeded(players, withClans), players, 1000, { newMatch: true }, withClans); + expect(r.moves.map((m) => [m.steamId, m.to])).toEqual([ + ['m0', V], + ['m1', V], + ['m2', V], + ['m3', V] + ]); + }); + + test('a new match moves first the clan members whose clan is on the side they are short of', () => { + const withClans = { ...B, clans: true }; + // 10 v 6, two of the clan on the bigger side, five on the smaller + const players = [ + ...side('m', 8, M), + named('a0', '[ABC] One', M), + named('a1', '[ABC] Two', M), + ...Array.from({ length: 5 }, (_, i) => named(`b${i}`, `[ABC] Mate${i}`, V)), + p('v0', V) + ]; + const r = bal(seeded(players, withClans), players, 1000, { newMatch: true }, withClans); + // joining their clan evens the sides: nobody else moves + expect(r.moves.map((m) => [m.steamId, m.to])).toEqual([ + ['a0', V], + ['a1', V] + ]); + }); + test('clanmates arriving on opposite sides are put together with one move', () => { const withClans = { ...B, clans: true }; const players = [...side('v', 4, V), ...side('m', 4, M)]; diff --git a/src/lib/server/two-teams.ts b/src/lib/server/two-teams.ts index a08c3fb1..a3608edd 100644 --- a/src/lib/server/two-teams.ts +++ b/src/lib/server/two-teams.ts @@ -462,12 +462,23 @@ export function twoTeamsStep( // Arrivals, and everyone after a match ends: kept where they are while the sides stay within the // gap (or with their clan), else placed on the lighter side. Right after a match end, not while a // quarter or more have yet to pick a side. In no set order: the game's list order would make the - // same players the ones moved at every match start. + // same players the ones moved at every match start. With clan tags kept together, players go in + // order of what a move would cost their clan: those whose clan is mostly on another side first + // (a move takes them to it), then those with no clanmates beside them, then the rest, fewest + // clanmates beside them first, so evening a match up splits as few clans as it can. if ((state.holdPending || now < state.holdUntil) && unpicked.length * 4 >= players.length) return { state, moves, whispers, stopped }; + const splits = (p: { name: string; faction: string | null }) => { + const tag = cfg.clans && isOpen(p.faction) ? clanTag(p.name) : null; + if (!tag) return 0; + const sides = clans.get(tag); + const beside = (sides?.get(p.faction!) ?? 1) - 1; + const clanSide = clanSideOf(p); + return beside - (clanSide !== null && clanSide !== p.faction ? (sides?.get(clanSide) ?? 0) : 0); + }; const shuffled = players - .map((p) => ({ p, k: random() })) - .sort((a, b) => a.k - b.k) + .map((p) => ({ p, cost: splits(p), k: random() })) + .sort((a, b) => a.cost - b.cost || a.k - b.k) .map((x) => x.p); for (const p of shuffled) { if (waiting(p) || !isOpen(p.faction) || (state.sides.get(p.steamId)?.side ?? null) !== null) diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 0f7c9704..08620a8c 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -1836,7 +1836,9 @@

Nobody playing is moved mid-match. An arrival who would put their side past the gap goes to the lighter side, a player who switches onto the bigger side is put back, - and a new match is evened up. + and a new match is evened up{f.clans + ? ', keeping clans together where the numbers allow' + : ''}.

{/if}
From 9526a19790282d1786d470181717b2485a1255c9 Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 18:04:27 +0100 Subject: [PATCH 009/102] Team balance: the rule's moves go out without the kill the Players tab's Move adds (the move action takes kill: false), so a player the rule places or puts back is no longer killed for it. Whether the game needs the kill to respawn a moved player on the new side is not settled: every kill after a move on a busy server found someone alive, which a move that respawns at once and a kill route that answers OK either way would both give. A move that does not take is still asked three times at most, so the audit shows quickly if moves stop landing --- README.md | 96 +++++++++---------- src/lib/server/actions.test.ts | 11 +++ src/lib/server/actions.ts | 4 +- src/lib/server/outbox.ts | 10 +- src/lib/server/triggers.ts | 2 + src/lib/server/two-teams.ts | 8 +- .../(app)/server/[id]/automation/+page.svelte | 6 +- src/test/two-teams-delivery.test.ts | 91 +++--------------- src/test/two-teams-discord.test.ts | 3 +- 9 files changed, 88 insertions(+), 143 deletions(-) diff --git a/README.md b/README.md index eeda74d7..aab6356a 100644 --- a/README.md +++ b/README.md @@ -533,21 +533,21 @@ ban list_ (on every server), and for the Seeding reward _Reserved slots_ or _Org its row). A custom role or API key with _Automation_ alone can read the rules and delete them. -| Trigger | Does | -| ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Welcome whisper | Whispers a message to each joiner (optionally only on their first visit), which can tell them their all-time stats, on the server or across the organisation (see [Placeholders](#placeholders)). | -| Scheduled broadcast | Rotates through a list of messages every N minutes while at least M players are on, and optionally only until a ceiling, so a fill-the-server message stops once it has. | -| Empty-server map reset | After the server has been empty for N minutes on a different map or mode, sets the chosen map as next and ends the match (or requests it directly when there is no rotation). | -| Kick on connect risk | Kicks players who match rules: VAC ban or game ban (optionally only within the last N days), Steam account younger than N days (optionally private profiles too), banned on another server in the org, or on the watchlist; or whose advisory risk score is at or above a set number from 1 to 100 (medium starts at 20, high at 50; the players table badges 20 and up). Joiners and players reconnecting are judged at once, and everyone on is judged again every minute (a player whose kick did not land, every five). Nobody is judged until the server's reserved slots have been read. Reserved-slot players can be spared. | -| Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | -| High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | -| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | -| Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | -| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | -| Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap; when a new match is evened up, players whose clan is mostly on the other side move first, then those with the fewest clanmates beside them), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move-then-kill, so the player respawns on their new side. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | -| Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | -| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier history, the leaderboard's Seed time column and the dry run show it. | -| AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | +| Trigger | Does | +| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Welcome whisper | Whispers a message to each joiner (optionally only on their first visit), which can tell them their all-time stats, on the server or across the organisation (see [Placeholders](#placeholders)). | +| Scheduled broadcast | Rotates through a list of messages every N minutes while at least M players are on, and optionally only until a ceiling, so a fill-the-server message stops once it has. | +| Empty-server map reset | After the server has been empty for N minutes on a different map or mode, sets the chosen map as next and ends the match (or requests it directly when there is no rotation). | +| Kick on connect risk | Kicks players who match rules: VAC ban or game ban (optionally only within the last N days), Steam account younger than N days (optionally private profiles too), banned on another server in the org, or on the watchlist; or whose advisory risk score is at or above a set number from 1 to 100 (medium starts at 20, high at 50; the players table badges 20 and up). Joiners and players reconnecting are judged at once, and everyone on is judged again every minute (a player whose kick did not land, every five). Nobody is judged until the server's reserved slots have been read. Reserved-slot players can be spared. | +| Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | +| High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | +| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | +| Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | +| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | +| Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap; when a new match is evened up, players whose clan is mostly on the other side move first, then those with the fewest clanmates beside them), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move, sent without the kill the Players tab's Move adds. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | +| Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | +| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier history, the leaderboard's Seed time column and the dry run show it. | +| AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | **Dry run** replays the last 24 hours of the server's own history (joins, player counts, empty stretches, cached Steam data) against a rule and lists what it would have done, so you can tune a @@ -1049,39 +1049,39 @@ game's (a 401 or a 5xx from it becomes a 502), and `error` carries the game's `c } ``` -| Action | Needs | Parameters | -| ----------------------------------- | ----------------- | --------------------------------------------------------------------------------------- | -| `status`, `players`, `rotation` | View | none | -| `bans` | View | none (the game's own ban list; see [Bans and reserved slots](#bans-and-reserved-slots)) | -| `reserved` | View | `document=1` also reads the config document's list | -| `serverId` | View | none (the join code) | -| `health`, `capabilities`, `sponsor` | View | none | -| `maps`, `lightings`, `catalog` | View | none | -| `experiences` | View | `map` (optional: the experiences that map offers) | -| `alternators` | View | `map` | -| `broadcast` | Chat | `message` | -| `whisper` | Chat | `steamId`, `message` | -| `whisperMany` | Chat | `message`, and either `faction` or `steamIds` (a list, up to 200) | -| `kick` | Kick | `steamId`, `reason` (optional) | -| `kill` | Kill | `steamId` | -| `changeTeam` | Move | `steamId`, `faction`; the player is killed so they respawn on that side | -| `endMatch`, `restartMatch` | Match control | none | -| `changeMap`, `setNextMap` | Match control | `map`, and optionally `experiences` (a list), `lighting`, `zoneAlternator` | -| `setWeather` | Match control | `lighting` | -| `rotationAdd` | Live rotation | as `changeMap` | -| `rotationRemove` | Live rotation | `index` | -| `rotationMove` | Live rotation | `index`, `direction` (`up` or `down`) | -| `rotationReorder` | Live rotation | `from`, `to` | -| `ban` | Bans | `steamId`, `reason` (optional) | -| `unban` | Bans | `steamId` | -| `reservedAdd`, `reservedRemove` | Reserved slots | `steamId` | -| `rotationSave` | Save rotation | none | -| `rotationSettings` | Save rotation | `rotationEnabled`, `rotationMode` (`ordered` or `random`) | -| `settings` | Config & settings | `scoreTick` (1 to 600), `rotationEnabled`, `rotationMode` | -| `config` | Config & settings | none (the config document, credentials as `(hidden)`) | -| `configValidate`, `configApply` | Config & settings | `text`; apply also `revision`, `force`, `fullApply` | -| `serverLog` | Audit trail | `limit` (1 to 500, default 50) | -| `raw` | Raw RCON | `method`, `path` (a `/v1` route), `body` | +| Action | Needs | Parameters | +| ----------------------------------- | ----------------- | ------------------------------------------------------------------------------------------------------------------ | +| `status`, `players`, `rotation` | View | none | +| `bans` | View | none (the game's own ban list; see [Bans and reserved slots](#bans-and-reserved-slots)) | +| `reserved` | View | `document=1` also reads the config document's list | +| `serverId` | View | none (the join code) | +| `health`, `capabilities`, `sponsor` | View | none | +| `maps`, `lightings`, `catalog` | View | none | +| `experiences` | View | `map` (optional: the experiences that map offers) | +| `alternators` | View | `map` | +| `broadcast` | Chat | `message` | +| `whisper` | Chat | `steamId`, `message` | +| `whisperMany` | Chat | `message`, and either `faction` or `steamIds` (a list, up to 200) | +| `kick` | Kick | `steamId`, `reason` (optional) | +| `kill` | Kill | `steamId` | +| `changeTeam` | Move | `steamId`, `faction`; the player is killed so they respawn on that side, unless `kill` is `false` (the move alone) | +| `endMatch`, `restartMatch` | Match control | none | +| `changeMap`, `setNextMap` | Match control | `map`, and optionally `experiences` (a list), `lighting`, `zoneAlternator` | +| `setWeather` | Match control | `lighting` | +| `rotationAdd` | Live rotation | as `changeMap` | +| `rotationRemove` | Live rotation | `index` | +| `rotationMove` | Live rotation | `index`, `direction` (`up` or `down`) | +| `rotationReorder` | Live rotation | `from`, `to` | +| `ban` | Bans | `steamId`, `reason` (optional) | +| `unban` | Bans | `steamId` | +| `reservedAdd`, `reservedRemove` | Reserved slots | `steamId` | +| `rotationSave` | Save rotation | none | +| `rotationSettings` | Save rotation | `rotationEnabled`, `rotationMode` (`ordered` or `random`) | +| `settings` | Config & settings | `scoreTick` (1 to 600), `rotationEnabled`, `rotationMode` | +| `config` | Config & settings | none (the config document, credentials as `(hidden)`) | +| `configValidate`, `configApply` | Config & settings | `text`; apply also `revision`, `force`, `fullApply` | +| `serverLog` | Audit trail | `limit` (1 to 500, default 50) | +| `raw` | Raw RCON | `method`, `path` (a `/v1` route), `body` | `message` is cut at 256 characters, the most the game takes in a whisper or broadcast, and `reason` at 200; rotation indexes count from 0. A SteamID goes as a string: as a JSON number it diff --git a/src/lib/server/actions.test.ts b/src/lib/server/actions.test.ts index 29992596..3984f4d9 100644 --- a/src/lib/server/actions.test.ts +++ b/src/lib/server/actions.test.ts @@ -35,6 +35,17 @@ test('changeTeam moves the faction then kills the player', async () => { expect(r.message).toContain('respawn'); }); +test('changeTeam with kill: false sends the move alone', async () => { + const { client, calls } = fakeClient(false); + const r: any = await ACTIONS.changeTeam.run(client, { + steamId: '76561198000000001', + faction: 'Valkyra', + kill: false + }); + expect(calls).toEqual(['PATCH /v1/players/76561198000000001']); + expect(r.message).toBe('Moved to Valkyra.'); +}); + test('changeTeam tolerates a failed kill', async () => { const { client, calls } = fakeClient(true); const r: any = await ACTIONS.changeTeam.run(client, { diff --git a/src/lib/server/actions.ts b/src/lib/server/actions.ts index c4e64e27..ef701745 100644 --- a/src/lib/server/actions.ts +++ b/src/lib/server/actions.ts @@ -661,7 +661,8 @@ export const ACTIONS: Record = { // As the official console does it: move the faction, then kill the player so they respawn on the // new side. A failed kill is not an error; the move already happened. A kill refused for sending // too fast says so, and carries the wait the game asked for (`retryAfterMs`) so a caller can - // hold off the server; it is not sent again, since the move is done. + // hold off the server; it is not sent again, since the move is done. `kill: false` sends the move + // alone (the Team balance rule's moves). changeTeam: { cap: 'players.move', mutating: true, @@ -673,6 +674,7 @@ export const ACTIONS: Record = { } const id = steamId(p.steamId); const moved = await c.json('PATCH', `/v1/players/${id}`, { faction }); + if (p.kill === false) return { ...moved, message: `Moved to ${faction}.` }; let respawned = true; let retryAfterMs = 0; try { diff --git a/src/lib/server/outbox.ts b/src/lib/server/outbox.ts index f1e8b227..3528e614 100644 --- a/src/lib/server/outbox.ts +++ b/src/lib/server/outbox.ts @@ -316,7 +316,7 @@ function skipReason(row: OutboxRow, m: ReturnType): string | nu return 'The match started before this was sent.'; } // A Team balance move for a player already off the side it was decided from: the move before it - // landed, or they changed side themselves. Moving (and killing) someone twice is not harmless. + // landed, or they changed side themselves. Moving someone twice is not harmless. if (row.triggerKind === 'two_teams' && row.action === 'changeTeam') { const from = (row.params as { from?: string } | null)?.from; const p = m.players.find((q) => q.steamId === row.steamId); @@ -464,7 +464,7 @@ async function release(env: Env, row: OutboxRow): Promise { /** * Sends one row and records what happened. 'held': the server is held and this row was not sent; * 'refused': the game refused this row, or a later step of it, for sending too fast (a refused row - * is failed; a move whose kill was refused is delivered) and the server is now held. Either way + * is failed; a rule kill whose whisper was refused is delivered) and the server is now held. Either way * the chain puts the rest back. */ async function deliverOne(env: Env, row: OutboxRow): Promise<'held' | 'refused' | void> { @@ -521,8 +521,8 @@ async function deliverOne(env: Env, row: OutboxRow): Promise<'held' | 'refused' ((row.action === RULE_KILL || !OWN_WORDS.has(row.action)) && messageOf(result)) || row.okMessage ); - // Done, but a later step was refused for sending too fast (changeTeam's kill, a rule kill's - // whisper): hold the rest. + // Done, but a later step was refused for sending too fast (a rule kill's whisper): hold the + // rest. const wait = retryAfterOf(result); if (wait) { held.set(row.serverId, Math.max(held.get(row.serverId) ?? 0, Date.now() + wait)); @@ -756,7 +756,7 @@ async function deliverPanelBan(env: Env, row: OutboxRow): Promise { } } -/** The wait an action's answer asks for (changeTeam's refused kill), or 0. */ +/** The wait an action's answer asks for (a later step refused for sending too fast), or 0. */ const retryAfterOf = (r: unknown): number => r && typeof r === 'object' && typeof (r as { retryAfterMs?: unknown }).retryAfterMs === 'number' ? (r as { retryAfterMs: number }).retryAfterMs diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index c7df727d..ba2d86e7 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -1240,6 +1240,8 @@ async function evalTwoTeams( params: { steamId: m.steamId, faction: m.to, + // the move alone: whether the game needs the kill to respawn them is not settled + kill: false, from: m.from, rule: config, mem: kept.id, diff --git a/src/lib/server/two-teams.ts b/src/lib/server/two-teams.ts index a3608edd..2f7a1282 100644 --- a/src/lib/server/two-teams.ts +++ b/src/lib/server/two-teams.ts @@ -17,9 +17,9 @@ export const TWO_TEAMS_RETRY_MS = 30_000; /** A placed player is told once; the note is forgotten after this long away, so a return next day is told again. */ export const TWO_TEAMS_FORGET_MS = 2 * 3600_000; /** - * Moves asked for per second of the player-list cadence. Each move is two game requests (move, - * then kill), so a full server's sort at a match start goes out over half a minute instead of at - * once, under the listener's limit on requests from one address. + * Moves asked for per second of the player-list cadence, so a full server's sort at a match start + * goes out over half a minute instead of at once, under the listener's limit on requests from one + * address. */ export const TWO_TEAMS_MOVES_PER_SECOND = 3; /** @@ -29,7 +29,7 @@ export const TWO_TEAMS_MOVES_PER_SECOND = 3; export const TWO_TEAMS_MAX_MOVES_PER_LOOK = 6; /** * A player asked to move this many times within TWO_TEAMS_ASK_WINDOW_MS is left where they are - * until the window passes: something keeps putting them back, and every move kills them. Put-backs + * until the window passes: something keeps putting them back. Put-backs * count on their own, and only until the player is seen on the side they were put back on, so a * player who keeps switching onto the bigger side is put back every time, and a put-back that does * not take is asked this many times. diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 08620a8c..dea3191b 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -1858,8 +1858,7 @@ {#each FACTIONS as x (x)}{/each}

- Everyone on it is moved to the smaller other side (or their clan's, within the gap) - and respawns there. + Everyone on it is moved to the smaller other side (or their clan's, within the gap).

@@ -1910,8 +1909,7 @@ move nobody

- Moves go out a few at a time as the player list refreshes; each kills the player so they - respawn on the new side. + Moves go out a few at a time as the player list refreshes, without killing the player. {#if f.balance} A player who switches onto the bigger side is put back every time. A player asked to move three times in ten minutes for any other reason, or put back three times without diff --git a/src/test/two-teams-delivery.test.ts b/src/test/two-teams-delivery.test.ts index 75474cd7..fa24c2b0 100644 --- a/src/test/two-teams-delivery.test.ts +++ b/src/test/two-teams-delivery.test.ts @@ -1,5 +1,5 @@ // Two-team mode at delivery: a second move for a player never goes out on the player list the first -// was checked against (moving, and killing, someone twice is not harmless), and a rule that changes +// was checked against (moving someone twice is not harmless), and a rule that changes // drops the moves it queued under its old settings, including ones that reach the outbox after it. import { afterAll, beforeAll, beforeEach, describe, expect, spyOn, test } from 'bun:test'; import { join } from 'node:path'; @@ -18,7 +18,7 @@ import { } from '$lib/server/triggers'; import type { TriggerRow } from '$lib/server/db/schema'; import { twoTeamsSettingsKey, validateTwoTeams } from '$lib/server/two-teams'; -import { GameError, WardogsClient } from '$lib/server/rcon'; +import { WardogsClient } from '$lib/server/rcon'; import type { Player } from '$lib/types'; import { subscribe } from '$lib/server/events'; import { hasTestDb, testEnv } from './db'; @@ -49,10 +49,6 @@ describe.skipIf(!hasTestDb)('Two-team mode at delivery', () => { let spy: ReturnType; let renewing: ReturnType; const requests: string[] = []; - /** when each request reached the stand-in game */ - const times: number[] = []; - /** players whose kill the stand-in game refuses for sending too fast */ - const refuseKillOf = new Set(); /** the server's Two-team rule, closing Lonestar, whose moves these rows are */ let ruleId: string; @@ -81,17 +77,6 @@ describe.skipIf(!hasTestDb)('Two-team mode at delivery', () => { ({ json: async (method: string, path: string) => { requests.push(`${method} ${path}`); - times.push(Date.now()); - const killOf = /^\/v1\/players\/(\d+)\/kill$/.exec(path)?.[1]; - if (method === 'POST' && killOf && refuseKillOf.has(killOf)) { - const err = new GameError( - 429, - 'The game server is rate limiting this panel (Request rate exceeded); retry in 2 s.', - 'rate_limited' - ); - err.retryAfterMs = 2000; - throw err; - } return { ok: true }; } }) as unknown as WardogsClient @@ -117,7 +102,7 @@ describe.skipIf(!hasTestDb)('Two-team mode at delivery', () => { triggerName: 'Two teams', triggerKind: 'two_teams', action: 'changeTeam', - params: { steamId, faction: 'Valkyra', from: 'Lonestar', rule: DECIDED }, + params: { steamId, faction: 'Valkyra', kill: false, from: 'Lonestar', rule: DECIDED }, target: steamId, steamId, okMessage: 'Moved.', @@ -159,12 +144,7 @@ describe.skipIf(!hasTestDb)('Two-team mode at delivery', () => { 'pending', 'pending' ]); - expect(requests).toEqual([ - `PATCH /v1/players/${X}`, - `POST /v1/players/${X}/kill`, - `PATCH /v1/players/${Y}`, - `POST /v1/players/${Y}/kill` - ]); + expect(requests).toEqual([`PATCH /v1/players/${X}`, `PATCH /v1/players/${Y}`]); // The next list: X landed, Y did not. m.players = [on(X, 'Valkyra'), on(Y, 'Lonestar')]; m.playersAt = Date.now(); @@ -172,9 +152,9 @@ describe.skipIf(!hasTestDb)('Two-team mode at delivery', () => { const rows = await rowsOf(ids); expect(rows.slice(2).map((r) => [r.state, r.outcome])).toEqual([ ['skipped', 'Already off Lonestar.'], - ['delivered', 'Moved to Valkyra and killed, so they respawn on the new side.'] + ['delivered', 'Moved to Valkyra.'] ]); - expect(requests.slice(4)).toEqual([`PATCH /v1/players/${Y}`, `POST /v1/players/${Y}/kill`]); + expect(requests.slice(2)).toEqual([`PATCH /v1/players/${Y}`]); await stopDelivery(); }, 30_000); @@ -257,14 +237,10 @@ describe.skipIf(!hasTestDb)('Two-team mode at delivery', () => { expect((await rowsOf(ids)).map((r) => [r.state, r.outcome])).toEqual([ ['skipped', 'No longer wanted by the rule.'], // A is on Valkyra in these lists, so B goes to Manticore - ['delivered', 'Moved to Manticore and killed, so they respawn on the new side.'] - ]); - expect(requests.slice(from)).toEqual([ - `PATCH /v1/players/${A}`, - `POST /v1/players/${A}/kill`, - `PATCH /v1/players/${B}`, - `POST /v1/players/${B}/kill` + ['delivered', 'Moved to Manticore.'] ]); + // the rule's moves go out alone, without the kill + expect(requests.slice(from)).toEqual([`PATCH /v1/players/${A}`, `PATCH /v1/players/${B}`]); } finally { await stopDelivery(); forgetRuleMemory(); @@ -293,54 +269,14 @@ describe.skipIf(!hasTestDb)('Two-team mode at delivery', () => { await until(async () => (await rowsOf(ids)).every((r) => r.doneAt !== null)); expect((await rowsOf(ids)).map((r) => [r.state, r.outcome])).toEqual([ ['skipped', 'The rule was changed before this was sent.'], - ['delivered', 'Moved to Valkyra and killed, so they respawn on the new side.'] - ]); - expect(requests.slice(from)).toEqual([ - `PATCH /v1/players/${D}`, - `POST /v1/players/${D}/kill` + ['delivered', 'Moved to Valkyra.'] ]); + expect(requests.slice(from)).toEqual([`PATCH /v1/players/${D}`]); } finally { await stopDelivery(); } }, 30_000); - test('a move whose kill is refused for sending too fast says so, and holds the server', async () => { - const m = memoryOf(w.server.id)!; - m.players = [on(X, 'Lonestar'), on(Y, 'Lonestar')]; - m.playersAt = Date.now(); - refuseKillOf.add(X); - const from = requests.length; - try { - const ids = ( - await env.db - .insert(outbox) - .values([move(X), move(Y)]) - .returning({ id: outbox.id }) - ).map((r) => r.id); - startDelivery(env); - await until(async () => (await rowsOf(ids)).every((r) => r.doneAt !== null)); - const rows = await rowsOf(ids); - expect(rows.map((r) => [r.state, r.outcome])).toEqual([ - [ - 'delivered', - 'Moved to Valkyra. The game refused the kill for sending too fast, so they stay where they are until they next die.' - ], - ['delivered', 'Moved to Valkyra and killed, so they respawn on the new side.'] - ]); - expect(requests.slice(from)).toEqual([ - `PATCH /v1/players/${X}`, - `POST /v1/players/${X}/kill`, - `PATCH /v1/players/${Y}`, - `POST /v1/players/${Y}/kill` - ]); - // Y's move waited out the two seconds the game asked for. - expect(times[from + 2] - times[from + 1]).toBeGreaterThanOrEqual(1900); - } finally { - refuseKillOf.clear(); - await stopDelivery(); - } - }, 30_000); - test('changing, switching off or deleting the rule drops its queued moves; a new name does not', async () => { const api = async (route: string, input: Omit): Promise => { const [method, path] = route.split(' '); @@ -503,10 +439,7 @@ describe.skipIf(!hasTestDb)('Two-team mode at delivery', () => { await until(async () => (await rowsOf([id]))[0].doneAt !== null); const [row] = await rowsOf([id]); expect(failed).toBe(true); - expect([row.state, row.outcome]).toEqual([ - 'delivered', - 'Moved to Valkyra and killed, so they respawn on the new side.' - ]); + expect([row.state, row.outcome]).toEqual(['delivered', 'Moved to Valkyra.']); expect(row.attempts).toBeGreaterThan(1); const trail = await env.db .select({ message: auditLog.message }) diff --git a/src/test/two-teams-discord.test.ts b/src/test/two-teams-discord.test.ts index e155003f..1f50c640 100644 --- a/src/test/two-teams-discord.test.ts +++ b/src/test/two-teams-discord.test.ts @@ -53,8 +53,7 @@ describe.skipIf(!hasTestDb)('Two-team mode on Discord', () => { test('moves that land stay off Discord; one that fails, and other rules, are posted', async () => { posts.length = 0; - for (let i = 0; i < 20; i++) - await delivery('trigger.two_teams', 'ok', 'Moved to Valkyra and killed.'); + for (let i = 0; i < 20; i++) await delivery('trigger.two_teams', 'ok', 'Moved to Valkyra.'); await delivery('trigger.two_teams', 'error', 'The player is not on the server.'); await delivery('trigger.welcome', 'ok', 'Whispered.'); await new Promise((r) => setTimeout(r, 2000)); From e1fc789feb3aa248f8a1d897456439a395ad7acf Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 10:26:19 +0100 Subject: [PATCH 010/102] Boards: a page of a board is read at most once a minute for the same servers and query, and the requests that ask for it during the read wait for that read; keyed by the server ids the caller's own check settled on, so a board over servers someone was not given is never theirs; a failed read is not kept and a stats purge forgets the server's boards (leaderboard pages were 1,204 reads at about 1 s each in 6.5 hours on the hosted panel) --- README.md | 2 + src/lib/server/leaderboards.ts | 53 ++++++++-- src/lib/server/stats.ts | 3 + src/test/board-cache.test.ts | 184 +++++++++++++++++++++++++++++++++ 4 files changed, 236 insertions(+), 6 deletions(-) create mode 100644 src/test/board-cache.test.ts diff --git a/README.md b/README.md index aab6356a..2b43d2a0 100644 --- a/README.md +++ b/README.md @@ -732,6 +732,8 @@ result (win, loss, draw) is read from the match's winner and final scores agains player played; a match with no winner and nobody scoring, or one abandoned by a restart, has no result. Playtime and seed time come from player sessions; kills per hour leaves seed time out; cash is summed over sessions, each banked across its matches like kills. Names link to the dossier. +A page of a board is read at most once a minute for the same servers and settings, so a match +that just ended can take up to a minute to appear (a stats purge shows at once). **Export CSV** on the tab downloads the board as it is set (scope, range, sort, playtime floor), from the top and every page of it, up to 10,000 players: rank, SteamID, name, playtime and seed diff --git a/src/lib/server/leaderboards.ts b/src/lib/server/leaderboards.ts index 4165df74..fa756dd5 100644 --- a/src/lib/server/leaderboards.ts +++ b/src/lib/server/leaderboards.ts @@ -2,12 +2,12 @@ // of every match (match_players: the game's own kills and deaths, the feed's headshots, team // kills, suicides, vehicle kills and streaks, time on and the side played) joined to its match // for the result, and the sessions for playtime, seed time, the last name and cash. -// Nothing is precomputed. The queries ride the existing indexes: matches (server_id, -// started_at), match_players (match_id, steam_id) and (steam_id, match_id), player_sessions -// (server_id, last_seen) and (steam_id, joined_at). Only matches that have ended count, and a -// match is in a range by when it ended; the match in progress is on the live page. The result -// of a match for a player (win, loss, draw, none) is the rule in $lib/leaderboard, written out -// again in SQL below for the aggregates. +// Nothing is precomputed; a page of a board is kept for a minute (loadBoard). The queries ride +// the existing indexes: matches (server_id, started_at), match_players (match_id, steam_id) and +// (steam_id, match_id), player_sessions (server_id, last_seen) and (steam_id, joined_at). Only +// matches that have ended count, and a match is in a range by when it ended; the match in +// progress is on the live page. The result of a match for a player (win, loss, draw, none) is the +// rule in $lib/leaderboard, written out again in SQL below for the aggregates. import { sql } from 'drizzle-orm'; import type { Env } from './env'; import { servers } from './db/schema'; @@ -241,9 +241,50 @@ async function boardSlice( FROM page r`)) as BaseRow[]; } +/** + * A page of a board is the same for everyone who may see these servers, and each one is an + * aggregate over its whole range: each (servers, query) is read once a minute per web process, + * and the requests that ask for it while it is being read wait for that read. The key is the + * server ids the caller's own check settled on, so a board over servers someone was not given + * is never theirs. A minute behind is the price: a match that just ended may not be on it yet. + */ +const BOARD_TTL_MS = 60_000; +/** The most pages kept: fifty rows each, a few megabytes at most. */ +const BOARD_CACHE_MAX = 500; +const boardCache = new Map }>(); + +/** Forgets the boards kept over this server (its stats were purged), or every board. */ +export function forgetBoards(serverId?: string): void { + for (const [key, hit] of boardCache) + if (serverId === undefined || hit.ids.includes(serverId)) boardCache.delete(key); +} + export async function loadBoard(env: Env, ids: string[], q: BoardQuery): Promise { const empty: BoardView = { query: q, rows: [], total: 0, pageSize: BOARD_PAGE, hasFeed: false }; if (!ids.length) return empty; + const sorted = [...new Set(ids)].sort(); + const key = JSON.stringify([sorted, q.scope, q.range, q.sort, q.dir, q.page, q.minMinutes]); + const now = Date.now(); + const hit = boardCache.get(key); + if (hit && hit.until > now) return hit.view; + const entry = { ids: sorted, until: now + BOARD_TTL_MS, view: readBoard(env, sorted, q) }; + boardCache.delete(key); + boardCache.set(key, entry); + // A failed read is not kept: the next request reads again. + entry.view.catch(() => { + if (boardCache.get(key) === entry) boardCache.delete(key); + }); + if (boardCache.size > BOARD_CACHE_MAX) { + for (const [k, e] of boardCache) if (e.until <= now) boardCache.delete(k); + for (const k of boardCache.keys()) { + if (boardCache.size <= BOARD_CACHE_MAX) break; + boardCache.delete(k); + } + } + return entry.view; +} + +async function readBoard(env: Env, ids: string[], q: BoardQuery): Promise { const offset = (q.page - 1) * BOARD_PAGE; const [rows, hasFeed] = await Promise.all([ boardSlice(env, ids, q, BOARD_PAGE, offset), diff --git a/src/lib/server/stats.ts b/src/lib/server/stats.ts index e01cfd49..3c41b81e 100644 --- a/src/lib/server/stats.ts +++ b/src/lib/server/stats.ts @@ -8,6 +8,7 @@ import { sql } from 'drizzle-orm'; import type { Env } from './env'; import type { ServerRow, SessionUser } from './access'; import { writeAudit } from './audit'; +import { forgetBoards } from './leaderboards'; export interface PurgeCounts { kills: number; @@ -33,6 +34,8 @@ export async function purgeServerStats( const matches = await del('matches'); return { kills, matches, matchPlayers }; }); + // The boards this web process keeps for a minute would show the purged numbers until then. + forgetBoards(server.id); await writeAudit(env, req, { actor, server: { id: server.id, name: server.name }, diff --git a/src/test/board-cache.test.ts b/src/test/board-cache.test.ts new file mode 100644 index 00000000..53f44696 --- /dev/null +++ b/src/test/board-cache.test.ts @@ -0,0 +1,184 @@ +// A page of a board is kept for a minute per (servers, query): a second look inside the minute is +// not read again, requests that arrive during a read share it, a failed read is not kept, a purge +// forgets it, and nobody is handed a board over servers other than the ones their own check gave +// them (an organisation board read by its owner first, then asked for by a member given one of +// its servers, or by anyone on the public board). +import { afterEach, beforeAll, describe, expect, setSystemTime, test } from 'bun:test'; +import { eq } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { organizations, playerSessions, servers } from '$lib/server/db/schema'; +import { forgetBoards, loadBoard } from '$lib/server/leaderboards'; +import { parseBoardQuery } from '$lib/leaderboard'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, type World } from './world'; +import { GET as panelBoard } from '../routes/api/servers/[id]/leaderboard/+server'; +import { GET as publicBoard } from '../routes/api/public/servers/[id]/leaderboard/+server'; +import { POST as purge } from '../routes/api/servers/[id]/stats/purge/+server'; + +const HOUR = 3_600_000; +const HERE = '76561198000000301'; +const THERE = '76561198000000302'; +const LATER = '76561198000000303'; +const q = parseBoardQuery(new URLSearchParams('minMinutes=0')); + +describe.skipIf(!hasTestDb)('board cache', () => { + let env: Env; + let w: World; + + const played = (serverId: string, steamId: string) => + env.db.insert(playerSessions).values({ + serverId, + steamId, + name: steamId.slice(-3), + joinedAt: new Date(Date.now() - 2 * HOUR), + lastSeen: new Date(Date.now() - HOUR), + leftAt: new Date(Date.now() - HOUR) + }); + const ids = (view: { rows: { steamId: string }[] }) => view.rows.map((r) => r.steamId).sort(); + /** The env with its raw statements counted (the board's aggregate is one), or failing. */ + const counted = (fail = false) => { + const n = { execute: 0 }; + const db = new Proxy(env.db, { + get(target, prop, receiver) { + if (prop !== 'execute') return Reflect.get(target, prop, receiver); + return (...args: unknown[]) => { + n.execute++; + if (fail) return Promise.reject(new Error('down')); + return (target.execute as (...a: unknown[]) => unknown)(...args); + }; + } + }); + return { env: { ...env, db } as Env, n }; + }; + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + await played(w.server.id, HERE); + await played(w.otherServer.id, THERE); + }); + + afterEach(() => { + setSystemTime(); + forgetBoards(); + }); + + test('a second look inside the minute is the first one; after it, the board is read again', async () => { + const first = await loadBoard(env, [w.server.id], q); + expect(ids(first)).toEqual([HERE]); + await played(w.server.id, LATER); + expect(ids(await loadBoard(env, [w.server.id], q))).toEqual([HERE]); + setSystemTime(new Date(Date.now() + 61_000)); + expect(ids(await loadBoard(env, [w.server.id], q))).toEqual([HERE, LATER]); + await env.db.delete(playerSessions).where(eq(playerSessions.steamId, LATER)); + }); + + test('the requests that arrive during a read wait for it; a failed read is not kept', async () => { + const down = counted(true); + await expect(loadBoard(down.env, [w.server.id], q)).rejects.toThrow('down'); + const up = counted(); + const [a, b] = await Promise.all([ + loadBoard(up.env, [w.server.id], q), + loadBoard(up.env, [w.server.id], q) + ]); + expect(up.n.execute).toBe(1); + expect(ids(a)).toEqual([HERE]); + expect(b).toBe(a); + }); + + test('every part of the query is its own board, and so is every set of servers', async () => { + const up = counted(); + await loadBoard(up.env, [w.server.id, w.otherServer.id], q); + // the same servers in another order are the same board + await loadBoard(up.env, [w.otherServer.id, w.server.id], q); + expect(up.n.execute).toBe(1); + await loadBoard(up.env, [w.server.id], q); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, page: 2 }); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, sort: 'deaths' }); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, minMinutes: 1 }); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, range: 'all' }); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, dir: 'asc' }); + const org = await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, scope: 'org' }); + expect(up.n.execute).toBe(8); + expect(org.query.scope).toBe('org'); + }); + + test("an organisation board read by its owner is not a member's who was given one server", async () => { + const query = 'scope=org&minMinutes=0'; + const owner = await callApi(panelBoard, w.users.owner, { + params: { id: w.server.id }, + query + }); + expect(owner.status).toBe(200); + expect(ids(owner.body as { rows: { steamId: string }[] })).toEqual([HERE, THERE]); + const member = await callApi(panelBoard, w.users.elsewhere, { + params: { id: w.otherServer.id }, + query + }); + expect(member.status).toBe(200); + expect(ids(member.body as { rows: { steamId: string }[] })).toEqual([THERE]); + const key = await callApi(panelBoard, w.users.keyElsewhere, { + params: { id: w.otherServer.id }, + query + }); + expect(ids(key.body as { rows: { steamId: string }[] })).toEqual([THERE]); + // and a server the caller cannot open is still refused, board kept or not + const outsider = await callApi(panelBoard, w.users.outsider, { + params: { id: w.server.id }, + query + }); + expect(outsider.status).toBe(404); + }); + + test('the public organisation board covers only the public servers, whatever was read before', async () => { + await env.db + .update(organizations) + .set({ allowPublicLeaderboards: true }) + .where(eq(organizations.id, w.org.id)); + await env.db + .update(servers) + .set({ publicLeaderboards: true }) + .where(eq(servers.id, w.otherServer.id)); + const query = 'scope=org&minMinutes=0'; + const owner = await callApi(panelBoard, w.users.owner, { + params: { id: w.otherServer.id }, + query + }); + expect(ids(owner.body as { rows: { steamId: string }[] })).toEqual([HERE, THERE]); + const anon = await callApi(publicBoard, null, { params: { id: w.otherServer.id }, query }); + expect(anon.status).toBe(200); + expect(ids(anon.body as { rows: { steamId: string }[] })).toEqual([THERE]); + // the server whose board is not public answers nothing, kept board or not + const closed = await callApi(publicBoard, null, { params: { id: w.server.id }, query }); + expect(closed.status).toBe(404); + await env.db + .update(servers) + .set({ publicLeaderboards: false }) + .where(eq(servers.id, w.otherServer.id)); + }); + + test("a purge forgets the server's boards at once", async () => { + const [{ name }] = await env.db + .select({ name: servers.name }) + .from(servers) + .where(eq(servers.id, w.server.id)); + const before = await loadBoard(env, [w.server.id, w.otherServer.id], q); + expect(ids(before)).toEqual([HERE, THERE]); + await played(w.server.id, LATER); + const done = await callApi(purge, w.users.owner, { + method: 'POST', + params: { id: w.server.id }, + body: { name } + }); + expect(done.status).toBe(200); + // sessions stay through a purge, so the board read again has the newcomer + expect(ids(await loadBoard(env, [w.server.id, w.otherServer.id], q))).toEqual([ + HERE, + THERE, + LATER + ]); + await env.db.delete(playerSessions).where(eq(playerSessions.steamId, LATER)); + }); +}); From 159347dc4bf711033745173053776d3b4390a92d Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 10:26:19 +0100 Subject: [PATCH 011/102] Player names preload their page on tap, not on hover: a dossier or career reads the all-time boards for its ranks, so moving the cursor down a table of names started one of those per row --- src/lib/components/CombatSummary.svelte | 12 ++++++++++-- src/lib/components/LeaderboardTable.svelte | 6 +++++- src/lib/components/MatchPanel.svelte | 7 ++++++- src/routes/(app)/orgs/[id]/BanListPage.svelte | 6 ++++-- src/routes/(app)/orgs/[id]/ReservedPage.svelte | 1 + src/routes/(app)/orgs/[id]/players/+page.svelte | 1 + src/routes/(app)/server/[id]/+page.svelte | 2 ++ src/routes/(app)/server/[id]/analytics/+page.svelte | 1 + src/routes/(app)/server/[id]/automation/+page.svelte | 6 ++++-- src/routes/(app)/server/[id]/bans/+page.svelte | 1 + src/routes/(app)/server/[id]/kills/+page.svelte | 12 ++++++++---- .../(app)/server/[id]/matches/[matchId]/+page.svelte | 12 ++++++++---- src/routes/(app)/server/[id]/players/+page.svelte | 1 + .../(app)/server/[id]/players/PastPlayers.svelte | 1 + .../(app)/server/[id]/players/[steamId]/+page.svelte | 1 + src/routes/(app)/server/[id]/slots/+page.svelte | 1 + src/routes/(public)/s/[id]/+page.svelte | 1 + 17 files changed, 56 insertions(+), 16 deletions(-) diff --git a/src/lib/components/CombatSummary.svelte b/src/lib/components/CombatSummary.svelte index 16c5bcb9..90b08bc1 100644 --- a/src/lib/components/CombatSummary.svelte +++ b/src/lib/components/CombatSummary.svelte @@ -54,7 +54,11 @@ Most killed {#each combat.victims as v (v.steamId)}

- {v.name} + {v.name} {v.kills}
{:else}
Nobody yet.
{/each} @@ -63,7 +67,11 @@ Nemeses {#each combat.nemeses as n (n.steamId)}
- {n.name} + {n.name} {n.deaths}
{:else}
Nobody yet.
{/each} diff --git a/src/lib/components/LeaderboardTable.svelte b/src/lib/components/LeaderboardTable.svelte index 2ecfef0c..3ef7699a 100644 --- a/src/lib/components/LeaderboardTable.svelte +++ b/src/lib/components/LeaderboardTable.svelte @@ -156,7 +156,11 @@ {r.rank} - {r.name} + {r.name} {#if showIds}{r.steamId}{/if} {fmtMinutes(r.minutes)} diff --git a/src/lib/components/MatchPanel.svelte b/src/lib/components/MatchPanel.svelte index 4e3f6dde..b2075c63 100644 --- a/src/lib/components/MatchPanel.svelte +++ b/src/lib/components/MatchPanel.svelte @@ -130,6 +130,7 @@
{a.value}
{a.name} @@ -164,7 +165,11 @@ {#each rows as l (l.steamId)} - {l.name} + {l.name} {#if showIds}{l.steamId}{/if} diff --git a/src/routes/(app)/orgs/[id]/BanListPage.svelte b/src/routes/(app)/orgs/[id]/BanListPage.svelte index ab3efc94..eadd5dbe 100644 --- a/src/routes/(app)/orgs/[id]/BanListPage.svelte +++ b/src/routes/(app)/orgs/[id]/BanListPage.svelte @@ -171,8 +171,10 @@ {#if dossierBase} - {e.name || e.steamId}{e.name || e.steamId} {:else} {e.name || e.steamId} diff --git a/src/routes/(app)/orgs/[id]/ReservedPage.svelte b/src/routes/(app)/orgs/[id]/ReservedPage.svelte index 65000186..e131027c 100644 --- a/src/routes/(app)/orgs/[id]/ReservedPage.svelte +++ b/src/routes/(app)/orgs/[id]/ReservedPage.svelte @@ -434,6 +434,7 @@ {#if dossierBase} {p.name} diff --git a/src/routes/(app)/server/[id]/+page.svelte b/src/routes/(app)/server/[id]/+page.svelte index 4349922b..a07525bd 100644 --- a/src/routes/(app)/server/[id]/+page.svelte +++ b/src/routes/(app)/server/[id]/+page.svelte @@ -605,6 +605,7 @@ {#if k.killer} {k.killer.name} {#if k.killer.faction} {k.victim.name} {#if k.victim.faction}{p.name} {p.steamId}{d.triggerName} {actionLabel(d.action)} {#if isSteamId(d.target)}{d.target}{#if isSteamId(d.target)}{d.target}{:else}{d.target}{/if} e.stopPropagation()}>{b.steamId}{fmtTime(k.ts)} {#if k.killer} - {k.killer.name}{k.killer.name} {#if k.killer.faction}—{/if} - {k.victim.name}{k.victim.name} {#if k.victim.faction} {#if k.killer} - {k.killer.name}{k.killer.name} {#if k.killer.faction}—{/if} - {k.victim.name}{k.victim.name} {#if k.victim.faction}{p.name} diff --git a/src/routes/(app)/server/[id]/players/PastPlayers.svelte b/src/routes/(app)/server/[id]/players/PastPlayers.svelte index 24502488..2f77415e 100644 --- a/src/routes/(app)/server/[id]/players/PastPlayers.svelte +++ b/src/routes/(app)/server/[id]/players/PastPlayers.svelte @@ -168,6 +168,7 @@
{p.name} diff --git a/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte b/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte index 887d262b..d7257085 100644 --- a/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte +++ b/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte @@ -244,6 +244,7 @@ {s.serverName} diff --git a/src/routes/(app)/server/[id]/slots/+page.svelte b/src/routes/(app)/server/[id]/slots/+page.svelte index d6fd0fc2..294b68ba 100644 --- a/src/routes/(app)/server/[id]/slots/+page.svelte +++ b/src/routes/(app)/server/[id]/slots/+page.svelte @@ -471,6 +471,7 @@ />{/if} {#if p.steamId}{p.name}{:else}{p.name}{/if} From ac5c92744e45c3c4add842d0171283e2ddc1e650 Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 11:44:46 +0100 Subject: [PATCH 012/102] Player totals: each player's settled totals per server (player_totals, migration 0038), kept by triggers in the transaction of whatever writes the sessions, matches or match rows: a session closing or a match ending adds to its players' rows, any other change recounts the rows it touched, and every writer of a server's totals takes the server's totals lock before its first row (the worker when it closes sessions, writes match rows or ends a match, the purge); built by the migration under the triggers' table locks, in the writers' order. Held against the all-time reads word for word over random histories through the worker's own looks (outages, restarts, purges, hand edits), mixed statements, the worker against a purge in both orders, and the migration over existing history --- drizzle/0040_player_totals.sql | 287 ++ drizzle/meta/0040_snapshot.json | 5051 +++++++++++++++++++++++++ drizzle/meta/_journal.json | 9 +- src/lib/server/db/schema.ts | 40 + src/lib/server/leaderboards.ts | 40 + src/lib/server/observe.ts | 12 + src/lib/server/stats.ts | 4 + src/lib/server/totals.ts | 14 + src/test/player-totals-writes.test.ts | 535 +++ src/test/player-totals.test.ts | 701 ++++ src/test/totals-oracle.ts | 165 + 11 files changed, 6857 insertions(+), 1 deletion(-) create mode 100644 drizzle/0040_player_totals.sql create mode 100644 drizzle/meta/0040_snapshot.json create mode 100644 src/lib/server/totals.ts create mode 100644 src/test/player-totals-writes.test.ts create mode 100644 src/test/player-totals.test.ts create mode 100644 src/test/totals-oracle.ts diff --git a/drizzle/0040_player_totals.sql b/drizzle/0040_player_totals.sql new file mode 100644 index 00000000..903c0757 --- /dev/null +++ b/drizzle/0040_player_totals.sql @@ -0,0 +1,287 @@ +-- Migration 0040: each player's settled totals per server, for the all-time reads (the boards and their export, +-- career ranks, the placeholders' stats, the risk record): one row per (server, player) with the +-- sums of the player's closed sessions and of their lines of ended matches. Those reads take these +-- rows plus the open sessions instead of every session and line ever written. +-- +-- Kept by triggers, in the same transaction as whatever writes the sources, whoever the writer is +-- (the worker, the purge, a test, a hand repair, an older build after a rollback): +-- - the two hot transitions add, in BEFORE row triggers: a session closing (left_at set) adds +-- the session to its pair; a match ending (ended_at set) adds each of its lines to its pair; +-- - every other change recounts the pairs it touched from the sources, in AFTER triggers: a +-- closed session inserted, changed or deleted; an ended match inserted, changed or deleted; +-- lines of an ended match inserted, changed or deleted. AFTER triggers see the whole +-- statement, so a recount after an add in the same statement counts the added row once. +-- player_totals_lock(server) orders everything that writes a server's totals. The worker and the +-- purge take it before they touch a row, so they never wait for it while holding a row the other +-- needs; the trigger functions take it again (re-entrant), which guards hand edits. A hand edit of +-- sessions, matches or lines starts with SELECT player_totals_lock(''). A bulk load (a +-- backfill) disables these triggers, loads, calls player_totals_rebuild() and enables them again, +-- all in one transaction with nothing else writing; session_replication_role = replica disables +-- them too and must not be used for anything else. +-- +-- Order: the table and the functions first (no lock on a busy table); then the triggers, in the +-- order every writer takes those tables (sessions, then lines, then matches), each CREATE TRIGGER +-- holding its table against writes until the migrations commit; then the rebuild, into the table +-- before its key exists, and the key last. The rebuild sees every session closed and every match +-- ended before the locks, and nothing can close or end between it and the triggers taking over. +CREATE TABLE "player_totals" ( + "server_id" text NOT NULL, + "steam_id" text NOT NULL, + "sessions" integer DEFAULT 0 NOT NULL, + "seconds" numeric DEFAULT '0' NOT NULL, + "seed_seconds" bigint DEFAULT 0 NOT NULL, + "cash" bigint DEFAULT 0 NOT NULL, + "last_seen" timestamp with time zone, + "matches" integer DEFAULT 0 NOT NULL, + "kills" bigint DEFAULT 0 NOT NULL, + "deaths" bigint DEFAULT 0 NOT NULL, + "headshots" bigint DEFAULT 0 NOT NULL, + "team_kills" bigint DEFAULT 0 NOT NULL, + "suicides" bigint DEFAULT 0 NOT NULL, + "vehicle_kills" bigint DEFAULT 0 NOT NULL, + "kill_streak" integer DEFAULT 0 NOT NULL, + "death_streak" integer DEFAULT 0 NOT NULL, + "wins" integer DEFAULT 0 NOT NULL, + "losses" integer DEFAULT 0 NOT NULL, + "draws" integer DEFAULT 0 NOT NULL +) WITH (fillfactor = 90);--> statement-breakpoint +-- A player's result in a match: matchResult() in $lib/leaderboard, as lines() in leaderboards.ts +-- writes it out (no faction, or a faction not on a scoreboard that has one: none; then the +-- winner; then a draw if anybody scored a number; else none). +CREATE FUNCTION "match_result"(final_scores jsonb, winner text, faction text) RETURNS text +LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $$ + SELECT CASE WHEN faction IS NULL THEN NULL + WHEN jsonb_typeof(final_scores) = 'array' AND jsonb_array_length(final_scores) > 0 + AND NOT EXISTS (SELECT 1 FROM jsonb_array_elements(final_scores) e WHERE e->>'name' = faction) + THEN NULL + WHEN winner IS NOT NULL THEN CASE WHEN winner = faction THEN 'win' ELSE 'loss' END + WHEN jsonb_typeof(final_scores) = 'array' + AND (SELECT MAX(CASE WHEN jsonb_typeof(e->'score') = 'number' THEN (e->>'score')::numeric END) + FROM jsonb_array_elements(final_scores) e) > 0 THEN 'draw' + ELSE NULL END +$$;--> statement-breakpoint +-- Every writer of the totals reads its sources at READ COMMITTED: a recount from an older snapshot +-- (REPEATABLE READ, SERIALIZABLE) could put back what a purge committed meanwhile had removed. +CREATE FUNCTION "player_totals_lock"(server_id text) RETURNS void LANGUAGE plpgsql AS $$ +BEGIN + IF current_setting('transaction_isolation') <> 'read committed' THEN + RAISE EXCEPTION 'player_totals is written at READ COMMITTED only (this transaction is %)', + current_setting('transaction_isolation'); + END IF; + PERFORM pg_advisory_xact_lock(hashtextextended('totals:' || server_id, 0)); +END $$;--> statement-breakpoint +-- These players' rows on this server, worked out again from their closed sessions and their lines +-- of ended matches (joined on match and server, as lines() joins them); a row with neither goes. +CREATE FUNCTION "player_totals_recount"(sid text, pids text[]) RETURNS void LANGUAGE plpgsql AS $$ +BEGIN + PERFORM player_totals_lock(sid); + INSERT INTO player_totals AS t (server_id, steam_id, sessions, seconds, seed_seconds, cash, last_seen, + matches, kills, deaths, headshots, team_kills, suicides, vehicle_kills, + kill_streak, death_streak, wins, losses, draws) + SELECT sid, p.steam_id, s.sessions, s.seconds, s.seed_seconds, s.cash, s.last_seen, + l.matches, l.kills, l.deaths, l.headshots, l.team_kills, l.suicides, l.vehicle_kills, + l.kill_streak, l.death_streak, l.wins, l.losses, l.draws + FROM (SELECT DISTINCT unnest(pids) AS steam_id) p + CROSS JOIN LATERAL ( + SELECT COUNT(*)::int AS sessions, + COALESCE(SUM(EXTRACT(EPOCH FROM (ps.left_at - ps.joined_at))), 0) AS seconds, + COALESCE(SUM(ps.seed_seconds), 0) AS seed_seconds, COALESCE(SUM(ps.cash), 0) AS cash, + MAX(ps.last_seen) AS last_seen + FROM player_sessions ps + WHERE ps.steam_id = p.steam_id AND ps.server_id = sid AND ps.left_at IS NOT NULL) s + CROSS JOIN LATERAL ( + SELECT COUNT(*)::int AS matches, COALESCE(SUM(mp.kills), 0) AS kills, COALESCE(SUM(mp.deaths), 0) AS deaths, + COALESCE(SUM(mp.headshots), 0) AS headshots, COALESCE(SUM(mp.team_kills), 0) AS team_kills, + COALESCE(SUM(mp.suicides), 0) AS suicides, COALESCE(SUM(mp.vehicle_kills), 0) AS vehicle_kills, + COALESCE(MAX(mp.kill_streak), 0) AS kill_streak, COALESCE(MAX(mp.death_streak), 0) AS death_streak, + (COUNT(*) FILTER (WHERE x.r = 'win'))::int AS wins, + (COUNT(*) FILTER (WHERE x.r = 'loss'))::int AS losses, + (COUNT(*) FILTER (WHERE x.r = 'draw'))::int AS draws + FROM match_players mp + JOIN matches m ON m.id = mp.match_id AND m.server_id = mp.server_id + CROSS JOIN LATERAL (SELECT match_result(m.final_scores, m.winner, mp.faction) AS r) x + WHERE mp.steam_id = p.steam_id AND mp.server_id = sid AND m.ended_at IS NOT NULL) l + ON CONFLICT (server_id, steam_id) DO UPDATE SET + sessions = EXCLUDED.sessions, seconds = EXCLUDED.seconds, seed_seconds = EXCLUDED.seed_seconds, + cash = EXCLUDED.cash, last_seen = EXCLUDED.last_seen, matches = EXCLUDED.matches, kills = EXCLUDED.kills, + deaths = EXCLUDED.deaths, headshots = EXCLUDED.headshots, team_kills = EXCLUDED.team_kills, + suicides = EXCLUDED.suicides, vehicle_kills = EXCLUDED.vehicle_kills, kill_streak = EXCLUDED.kill_streak, + death_streak = EXCLUDED.death_streak, wins = EXCLUDED.wins, losses = EXCLUDED.losses, draws = EXCLUDED.draws; + DELETE FROM player_totals WHERE server_id = sid AND steam_id = ANY (pids) AND sessions = 0 AND matches = 0; +END $$;--> statement-breakpoint +-- A session closing (BEFORE, so a recount later in the same statement sees it once). +CREATE FUNCTION "player_totals_session_closed"() RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + PERFORM player_totals_lock(NEW.server_id); + INSERT INTO player_totals AS t (server_id, steam_id, sessions, seconds, seed_seconds, cash, last_seen) + VALUES (NEW.server_id, NEW.steam_id, 1, EXTRACT(EPOCH FROM (NEW.left_at - NEW.joined_at)), NEW.seed_seconds, + NEW.cash, NEW.last_seen) + ON CONFLICT (server_id, steam_id) DO UPDATE SET + sessions = t.sessions + 1, seconds = t.seconds + EXCLUDED.seconds, + seed_seconds = t.seed_seconds + EXCLUDED.seed_seconds, cash = t.cash + EXCLUDED.cash, + last_seen = GREATEST(t.last_seen, EXCLUDED.last_seen); + RETURN NEW; +END $$;--> statement-breakpoint +-- A closed session inserted, changed or deleted: its pair (and the pair it moved to) recounted. +CREATE FUNCTION "player_totals_session_changed"() RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + IF TG_OP <> 'INSERT' THEN + PERFORM player_totals_recount(OLD.server_id, ARRAY[OLD.steam_id]); + END IF; + IF TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND (NEW.server_id, NEW.steam_id) IS DISTINCT FROM (OLD.server_id, OLD.steam_id)) THEN + PERFORM player_totals_recount(NEW.server_id, ARRAY[NEW.steam_id]); + END IF; + RETURN NULL; +END $$;--> statement-breakpoint +-- A match ending: each of its lines added with its result (BEFORE, as for a close). The worker +-- writes the lines and the feed's columns before it sets ended_at, in the same transaction. +CREATE FUNCTION "player_totals_match_ended"() RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + PERFORM player_totals_lock(NEW.server_id); + INSERT INTO player_totals AS t (server_id, steam_id, matches, kills, deaths, headshots, team_kills, suicides, + vehicle_kills, kill_streak, death_streak, wins, losses, draws) + SELECT mp.server_id, mp.steam_id, 1, mp.kills, mp.deaths, mp.headshots, mp.team_kills, mp.suicides, + mp.vehicle_kills, mp.kill_streak, mp.death_streak, + CASE WHEN x.r = 'win' THEN 1 ELSE 0 END, CASE WHEN x.r = 'loss' THEN 1 ELSE 0 END, + CASE WHEN x.r = 'draw' THEN 1 ELSE 0 END + FROM match_players mp + CROSS JOIN LATERAL (SELECT match_result(NEW.final_scores, NEW.winner, mp.faction) AS r) x + WHERE mp.match_id = NEW.id AND mp.server_id = NEW.server_id + ON CONFLICT (server_id, steam_id) DO UPDATE SET + matches = t.matches + EXCLUDED.matches, kills = t.kills + EXCLUDED.kills, deaths = t.deaths + EXCLUDED.deaths, + headshots = t.headshots + EXCLUDED.headshots, team_kills = t.team_kills + EXCLUDED.team_kills, + suicides = t.suicides + EXCLUDED.suicides, vehicle_kills = t.vehicle_kills + EXCLUDED.vehicle_kills, + kill_streak = GREATEST(t.kill_streak, EXCLUDED.kill_streak), + death_streak = GREATEST(t.death_streak, EXCLUDED.death_streak), + wins = t.wins + EXCLUDED.wins, losses = t.losses + EXCLUDED.losses, draws = t.draws + EXCLUDED.draws; + RETURN NEW; +END $$;--> statement-breakpoint +-- An ended match inserted, changed or deleted: the pairs of its lines recounted, on its server +-- before and after. +CREATE FUNCTION "player_totals_match_changed"() RETURNS trigger LANGUAGE plpgsql AS $$ +DECLARE + pids text[]; +BEGIN + IF TG_OP <> 'INSERT' THEN + SELECT array_agg(DISTINCT steam_id) INTO pids FROM match_players WHERE match_id = OLD.id AND server_id = OLD.server_id; + IF pids IS NOT NULL THEN PERFORM player_totals_recount(OLD.server_id, pids); END IF; + END IF; + IF TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND (NEW.id, NEW.server_id) IS DISTINCT FROM (OLD.id, OLD.server_id)) THEN + SELECT array_agg(DISTINCT steam_id) INTO pids FROM match_players WHERE match_id = NEW.id AND server_id = NEW.server_id; + IF pids IS NOT NULL THEN PERFORM player_totals_recount(NEW.server_id, pids); END IF; + END IF; + RETURN NULL; +END $$;--> statement-breakpoint +-- Lines of ended matches inserted, changed or deleted (one function per event, as transition +-- tables require): every pair they touch recounted, a server at a time. The worker only writes +-- the lines of the match in progress, which these find nothing to do for. +CREATE FUNCTION "player_totals_lines_inserted"() RETURNS trigger LANGUAGE plpgsql AS $$ +DECLARE + s record; +BEGIN + FOR s IN + SELECT n.server_id, array_agg(DISTINCT n.steam_id) AS pids + FROM lines_new n JOIN matches m ON m.id = n.match_id AND m.server_id = n.server_id + WHERE m.ended_at IS NOT NULL + GROUP BY n.server_id ORDER BY n.server_id + LOOP + PERFORM player_totals_recount(s.server_id, s.pids); + END LOOP; + RETURN NULL; +END $$;--> statement-breakpoint +CREATE FUNCTION "player_totals_lines_updated"() RETURNS trigger LANGUAGE plpgsql AS $$ +DECLARE + s record; +BEGIN + FOR s IN + SELECT k.server_id, array_agg(DISTINCT k.steam_id) AS pids + FROM (SELECT match_id, server_id, steam_id FROM lines_old + UNION ALL SELECT match_id, server_id, steam_id FROM lines_new) k + JOIN matches m ON m.id = k.match_id AND m.server_id = k.server_id + WHERE m.ended_at IS NOT NULL + GROUP BY k.server_id ORDER BY k.server_id + LOOP + PERFORM player_totals_recount(s.server_id, s.pids); + END LOOP; + RETURN NULL; +END $$;--> statement-breakpoint +CREATE FUNCTION "player_totals_lines_deleted"() RETURNS trigger LANGUAGE plpgsql AS $$ +DECLARE + s record; +BEGIN + FOR s IN + SELECT o.server_id, array_agg(DISTINCT o.steam_id) AS pids + FROM lines_old o JOIN matches m ON m.id = o.match_id AND m.server_id = o.server_id + WHERE m.ended_at IS NOT NULL + GROUP BY o.server_id ORDER BY o.server_id + LOOP + PERFORM player_totals_recount(s.server_id, s.pids); + END LOOP; + RETURN NULL; +END $$;--> statement-breakpoint +-- Every row worked out again from the sources: what the migration fills the table with, and what a +-- bulk load ends with (see the top of this file). One insert of both aggregates joined; each match's +-- result worked out once per side that played it rather than once per line (Postgres runs the +-- SELECT of an INSERT without parallel workers, so the per-line function calls were most of it). +CREATE FUNCTION "player_totals_rebuild"() RETURNS void LANGUAGE plpgsql AS $$ +BEGIN + DELETE FROM player_totals; + INSERT INTO player_totals (server_id, steam_id, sessions, seconds, seed_seconds, cash, last_seen, + matches, kills, deaths, headshots, team_kills, suicides, vehicle_kills, + kill_streak, death_streak, wins, losses, draws) + WITH results AS ( + SELECT f.match_id, f.faction, match_result(m.final_scores, m.winner, f.faction) AS r + FROM (SELECT DISTINCT match_id, faction FROM match_players WHERE faction IS NOT NULL) f + JOIN matches m ON m.id = f.match_id + WHERE m.ended_at IS NOT NULL), + s AS ( + SELECT server_id, steam_id, COUNT(*)::int AS sessions, + SUM(EXTRACT(EPOCH FROM (left_at - joined_at))) AS seconds, + SUM(seed_seconds) AS seed_seconds, SUM(cash) AS cash, MAX(last_seen) AS last_seen + FROM player_sessions WHERE left_at IS NOT NULL + GROUP BY server_id, steam_id), + l AS ( + SELECT mp.server_id, mp.steam_id, COUNT(*)::int AS matches, SUM(mp.kills) AS kills, SUM(mp.deaths) AS deaths, + SUM(mp.headshots) AS headshots, SUM(mp.team_kills) AS team_kills, SUM(mp.suicides) AS suicides, + SUM(mp.vehicle_kills) AS vehicle_kills, MAX(mp.kill_streak) AS kill_streak, + MAX(mp.death_streak) AS death_streak, + (COUNT(*) FILTER (WHERE x.r = 'win'))::int AS wins, + (COUNT(*) FILTER (WHERE x.r = 'loss'))::int AS losses, + (COUNT(*) FILTER (WHERE x.r = 'draw'))::int AS draws + FROM match_players mp + JOIN matches m ON m.id = mp.match_id AND m.server_id = mp.server_id + LEFT JOIN results x ON x.match_id = mp.match_id AND x.faction = mp.faction + WHERE m.ended_at IS NOT NULL + GROUP BY mp.server_id, mp.steam_id) + SELECT COALESCE(s.server_id, l.server_id), COALESCE(s.steam_id, l.steam_id), + COALESCE(s.sessions, 0), COALESCE(s.seconds, 0), COALESCE(s.seed_seconds, 0), COALESCE(s.cash, 0), s.last_seen, + COALESCE(l.matches, 0), COALESCE(l.kills, 0), COALESCE(l.deaths, 0), COALESCE(l.headshots, 0), + COALESCE(l.team_kills, 0), COALESCE(l.suicides, 0), COALESCE(l.vehicle_kills, 0), + COALESCE(l.kill_streak, 0), COALESCE(l.death_streak, 0), + COALESCE(l.wins, 0), COALESCE(l.losses, 0), COALESCE(l.draws, 0) + FROM s FULL JOIN l ON l.server_id = s.server_id AND l.steam_id = s.steam_id; +END $$;--> statement-breakpoint +CREATE TRIGGER "player_totals_session_closed" BEFORE UPDATE OF "left_at" ON "player_sessions" + FOR EACH ROW WHEN (OLD.left_at IS NULL AND NEW.left_at IS NOT NULL) EXECUTE FUNCTION player_totals_session_closed();--> statement-breakpoint +CREATE TRIGGER "player_totals_session_inserted" AFTER INSERT ON "player_sessions" + FOR EACH ROW WHEN (NEW.left_at IS NOT NULL) EXECUTE FUNCTION player_totals_session_changed();--> statement-breakpoint +CREATE TRIGGER "player_totals_session_updated" AFTER UPDATE ON "player_sessions" + FOR EACH ROW WHEN (OLD.left_at IS NOT NULL) EXECUTE FUNCTION player_totals_session_changed();--> statement-breakpoint +CREATE TRIGGER "player_totals_session_deleted" AFTER DELETE ON "player_sessions" + FOR EACH ROW WHEN (OLD.left_at IS NOT NULL) EXECUTE FUNCTION player_totals_session_changed();--> statement-breakpoint +CREATE TRIGGER "player_totals_lines_inserted" AFTER INSERT ON "match_players" + REFERENCING NEW TABLE AS lines_new FOR EACH STATEMENT EXECUTE FUNCTION player_totals_lines_inserted();--> statement-breakpoint +CREATE TRIGGER "player_totals_lines_updated" AFTER UPDATE ON "match_players" + REFERENCING OLD TABLE AS lines_old NEW TABLE AS lines_new FOR EACH STATEMENT EXECUTE FUNCTION player_totals_lines_updated();--> statement-breakpoint +CREATE TRIGGER "player_totals_lines_deleted" AFTER DELETE ON "match_players" + REFERENCING OLD TABLE AS lines_old FOR EACH STATEMENT EXECUTE FUNCTION player_totals_lines_deleted();--> statement-breakpoint +CREATE TRIGGER "player_totals_match_ended" BEFORE UPDATE OF "ended_at" ON "matches" + FOR EACH ROW WHEN (OLD.ended_at IS NULL AND NEW.ended_at IS NOT NULL) EXECUTE FUNCTION player_totals_match_ended();--> statement-breakpoint +CREATE TRIGGER "player_totals_match_inserted" AFTER INSERT ON "matches" + FOR EACH ROW WHEN (NEW.ended_at IS NOT NULL) EXECUTE FUNCTION player_totals_match_changed();--> statement-breakpoint +CREATE TRIGGER "player_totals_match_updated" AFTER UPDATE ON "matches" + FOR EACH ROW WHEN (OLD.ended_at IS NOT NULL) EXECUTE FUNCTION player_totals_match_changed();--> statement-breakpoint +CREATE TRIGGER "player_totals_match_deleted" AFTER DELETE ON "matches" + FOR EACH ROW WHEN (OLD.ended_at IS NOT NULL) EXECUTE FUNCTION player_totals_match_changed();--> statement-breakpoint +SELECT player_totals_rebuild();--> statement-breakpoint +ALTER TABLE "player_totals" ADD CONSTRAINT "player_totals_server_id_steam_id_pk" PRIMARY KEY("server_id","steam_id"); diff --git a/drizzle/meta/0040_snapshot.json b/drizzle/meta/0040_snapshot.json new file mode 100644 index 00000000..a3cce110 --- /dev/null +++ b/drizzle/meta/0040_snapshot.json @@ -0,0 +1,5051 @@ +{ + "id": "7d126f2d-ff67-4eec-9b7e-4cdca360c55e", + "prevId": "15b5536b-712b-49a3-be81-ac1f84bf7bc2", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_totals": { + "name": "player_totals", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_totals_server_id_steam_id_pk": { + "name": "player_totals_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index b4446ead..1e98ee3e 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -281,6 +281,13 @@ "when": 1790278202475, "tag": "0039_seed_progress_backfill", "breakpoints": true + }, + { + "idx": 40, + "version": "7", + "when": 1791740935613, + "tag": "0040_player_totals", + "breakpoints": true } ] -} +} \ No newline at end of file diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 9f0250be..a0ef30e7 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -8,6 +8,7 @@ import { customType, index, integer, + numeric, pgTable, primaryKey, real, @@ -586,6 +587,45 @@ export const matchPlayers = pgTable( ); export type MatchPlayerRow = typeof matchPlayers.$inferSelect; +/** + * Each player's settled totals on a server, for the all-time reads (boards and their export, + * career ranks, the placeholders' stats, the risk record), which add the open sessions: the sums + * of the player's closed sessions and of their lines of ended matches, with the boards' result + * rule. A row exists while the pair has either. Kept by triggers on player_sessions, matches and + * match_players in the writer's own transaction, whoever the writer is (migration 0038 holds the + * rules); the application only reads it, and takes player_totals_lock(server) before it closes a + * session, ends a match or purges (totals.ts). + */ +export const playerTotals = pgTable( + 'player_totals', + { + serverId: text('server_id').notNull(), + steamId: text('steam_id').notNull(), + /** closed sessions */ + sessions: integer('sessions').notNull().default(0), + /** SUM(EXTRACT(EPOCH FROM left_at - joined_at)) over them, exact */ + seconds: numeric('seconds').notNull().default('0'), + seedSeconds: bigint('seed_seconds', { mode: 'number' }).notNull().default(0), + cash: bigint('cash', { mode: 'number' }).notNull().default(0), + /** MAX(last_seen) over them; null without one */ + lastSeen: ts('last_seen'), + /** lines of ended matches */ + matches: integer('matches').notNull().default(0), + kills: bigint('kills', { mode: 'number' }).notNull().default(0), + deaths: bigint('deaths', { mode: 'number' }).notNull().default(0), + headshots: bigint('headshots', { mode: 'number' }).notNull().default(0), + teamKills: bigint('team_kills', { mode: 'number' }).notNull().default(0), + suicides: bigint('suicides', { mode: 'number' }).notNull().default(0), + vehicleKills: bigint('vehicle_kills', { mode: 'number' }).notNull().default(0), + killStreak: integer('kill_streak').notNull().default(0), + deathStreak: integer('death_streak').notNull().default(0), + wins: integer('wins').notNull().default(0), + losses: integer('losses').notNull().default(0), + draws: integer('draws').notNull().default(0) + }, + (t) => [primaryKey({ columns: [t.serverId, t.steamId] })] +); + // ---- Player intelligence: org-scoped notes and watchlist, cached Steam data, ban snapshots ------ /** One row per (org, player): the watchlist flag and why. */ diff --git a/src/lib/server/leaderboards.ts b/src/lib/server/leaderboards.ts index fa756dd5..42534dc2 100644 --- a/src/lib/server/leaderboards.ts +++ b/src/lib/server/leaderboards.ts @@ -97,6 +97,46 @@ const base = (ids: string[], from: Date, steamIds: string[] | null = null) => sq COALESCE(mt.losses, 0) AS losses, COALESCE(mt.draws, 0) AS draws FROM sess FULL JOIN mt USING (steam_id))`; +/** + * `base` for all time, from the settled totals: `sess` is the pairs with a closed session plus + * the open sessions, `mt` the pairs with a line of an ended match, then the same join. The same + * rows and values as base(ids, EPOCH, steamIds): the seconds are exact numeric sums either way, + * and a player with no session at all still gets the join's zeros. Also read by the exactness + * test (src/test/player-totals.test.ts). + */ +export const totalsBase = (ids: string[], steamIds: string[] | null = null) => sql` + sess AS ( + SELECT steam_id, SUM(seconds) / 60 AS minutes, SUM(seed_seconds) / 60.0 AS seed_minutes, + MAX(last_seen) AS last_seen, SUM(cash) AS cash + FROM (SELECT steam_id, seconds, seed_seconds, cash, last_seen FROM player_totals + WHERE server_id IN ${ids} AND sessions > 0 + ${steamIds === null ? sql`` : sql`AND steam_id IN ${steamIds}`} + UNION ALL + SELECT steam_id, EXTRACT(EPOCH FROM (now() - joined_at)), seed_seconds, cash, last_seen + FROM player_sessions WHERE server_id IN ${ids} AND left_at IS NULL + ${steamIds === null ? sql`` : sql`AND steam_id IN ${steamIds}`}) s + GROUP BY steam_id), + mt AS ( + SELECT steam_id, SUM(matches) AS matches, + SUM(kills) AS kills, SUM(deaths) AS deaths, SUM(headshots) AS headshots, + SUM(team_kills) AS team_kills, SUM(suicides) AS suicides, SUM(vehicle_kills) AS vehicle_kills, + MAX(kill_streak) AS kill_streak, MAX(death_streak) AS death_streak, + SUM(wins) AS wins, SUM(losses) AS losses, SUM(draws) AS draws + FROM player_totals WHERE server_id IN ${ids} AND matches > 0 + ${steamIds === null ? sql`` : sql`AND steam_id IN ${steamIds}`} + GROUP BY steam_id), + base AS ( + SELECT steam_id, + COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.seed_minutes, 0) AS seed_minutes, + COALESCE(sess.cash, 0) AS cash, sess.last_seen, + COALESCE(mt.kills, 0) AS kills, COALESCE(mt.deaths, 0) AS deaths, + COALESCE(mt.headshots, 0) AS headshots, COALESCE(mt.team_kills, 0) AS team_kills, + COALESCE(mt.suicides, 0) AS suicides, COALESCE(mt.vehicle_kills, 0) AS vehicle_kills, + COALESCE(mt.kill_streak, 0) AS kill_streak, COALESCE(mt.death_streak, 0) AS death_streak, + COALESCE(mt.matches, 0) AS matches, COALESCE(mt.wins, 0) AS wins, + COALESCE(mt.losses, 0) AS losses, COALESCE(mt.draws, 0) AS draws + FROM sess FULL JOIN mt USING (steam_id))`; + /** All recorded games on these servers, batched for the connected-player risk badges. */ export async function riskPerformanceFor( env: Env, diff --git a/src/lib/server/observe.ts b/src/lib/server/observe.ts index 3f13f69b..2792b3ff 100644 --- a/src/lib/server/observe.ts +++ b/src/lib/server/observe.ts @@ -66,6 +66,7 @@ import { type Tallies } from './match-players'; import { isOwner, LostOwnership, withOwnedTransaction } from './leadership'; +import { lockTotals } from './totals'; import { settings } from './settings'; import { isWatched } from './interest'; import { emit } from './events'; @@ -682,6 +683,9 @@ export async function observeServer(env: Env, m: ServerMemory, kinds: ObserveKin try { if (needWrite) await withOwnedTransaction(env, async (tx) => { + // A session closing adds to the player's totals: the server's totals lock comes + // before any row is touched (totals.ts). + if (players && presenceDue && diff.left.length) await lockTotals(tx, server.id); if (players && presenceDue) await persistPresence( tx, @@ -788,6 +792,9 @@ async function observationFailed( try { await withOwnedTransaction(env, async (tx) => { if (m.failures >= OFFLINE_AFTER_FAILURES) { + // Closing the sessions adds to the totals, and the tallies go to the open match: the + // server's totals lock first (totals.ts). + await lockTotals(tx, m.server.id); // Close every open session once; a rollback below reloads the map so this retries. if (!m.presence.loaded) await loadPresence( @@ -927,6 +934,10 @@ async function reconcileMatch( prevStatusAt: number ): Promise { const serverId = m.server.id; + // Writing lines or ending a match can touch the totals: the server's totals lock before the + // match row is read, so a purge cannot come in between (totals.ts). An abandoned match, known + // only once the open row is read, takes it below. + if (ended || [...m.tallies.values()].some((t) => t.dirty)) await lockTotals(db, serverId); const [current] = await db .select({ id: matches.id, @@ -953,6 +964,7 @@ async function reconcileMatch( m.tallies = closed.carried; } else if (current && stale) { // Abandoned: no scores, no winner. What the tallies hold belongs to the map now on. + await lockTotals(db, serverId); await db.update(matches).set({ endedAt: ts }).where(eq(matches.id, current.id)); } else if (current) { const due = [...m.tallies.values()].filter((t) => t.dirty); diff --git a/src/lib/server/stats.ts b/src/lib/server/stats.ts index 3c41b81e..3287bc40 100644 --- a/src/lib/server/stats.ts +++ b/src/lib/server/stats.ts @@ -9,6 +9,7 @@ import type { Env } from './env'; import type { ServerRow, SessionUser } from './access'; import { writeAudit } from './audit'; import { forgetBoards } from './leaderboards'; +import { lockTotals } from './totals'; export interface PurgeCounts { kills: number; @@ -23,6 +24,9 @@ export async function purgeServerStats( server: ServerRow ): Promise { const counts = await env.db.transaction(async (tx) => { + // The deletes recount the server's totals (migration 0038): the totals lock first, as the + // worker takes it before it closes a session or ends a match (totals.ts). + await lockTotals(tx, server.id); const del = async (table: 'kills' | 'match_players' | 'matches') => { const [row] = await tx.execute<{ n: string }>(sql` WITH d AS (DELETE FROM ${sql.raw(table)} WHERE server_id = ${server.id} RETURNING 1) diff --git a/src/lib/server/totals.ts b/src/lib/server/totals.ts new file mode 100644 index 00000000..7eed5ed9 --- /dev/null +++ b/src/lib/server/totals.ts @@ -0,0 +1,14 @@ +// Each player's settled totals per server (player_totals) are kept by triggers in the database +// (migration 0038): a session closing or a match ending adds to them, and any other change to the +// sessions, matches or lines recounts the pairs it touched. Every trigger takes the server's +// totals lock before it reads or writes; whoever closes a session, ends a match or purges takes it +// first, before its first row, so that two of them never wait for each other while each holds +// something the other needs (a purge holding the lock and wanting the match row a match end has +// already updated, for one). +import { sql } from 'drizzle-orm'; +import type { DbOrTx } from './db'; + +/** The server's totals lock, held to the end of the transaction (re-entrant). */ +export async function lockTotals(db: DbOrTx, serverId: string): Promise { + await db.execute(sql`SELECT player_totals_lock(${serverId})`); +} diff --git a/src/test/player-totals-writes.test.ts b/src/test/player-totals-writes.test.ts new file mode 100644 index 00000000..7e772a30 --- /dev/null +++ b/src/test/player-totals-writes.test.ts @@ -0,0 +1,535 @@ +// The totals' triggers (migration 0038) under the writes the random histories do not reach: one +// statement that closes a session and edits a closed one of the same player, or ends a match and +// edits an ended one; a transaction that ends a match and then changes its lines and its winner; +// an upsert of an ended match's lines; a statement that fails after a close; a purge. Then two +// transactions on one server, the worker's (a close, a match end, an abandoned match, leavers' +// lines, the offline transition) and a purge, each holding the server's totals lock while the +// other waits for it, in both orders: no deadlock, and the totals exact after. Taking the lock +// first is what makes that so: without it, an abandoned match against a purge deadlocks. A +// transaction that is not READ COMMITTED is refused. Last, migration 0038 run over a database that +// already has history builds the totals the reads expect. +import { beforeAll, describe, expect, test } from 'bun:test'; +import { SQL } from 'bun'; +import { randomBytes } from 'node:crypto'; +import { cp, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import { eq, sql } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { connect, runMigrations, type DbOrTx } from '$lib/server/db'; +import { matches, matchPlayers, playerSessions } from '$lib/server/db/schema'; +import { writeMatchPlayers } from '$lib/server/match-players'; +import { purgeServerStats } from '$lib/server/stats'; +import { lockTotals } from '$lib/server/totals'; +import { hasTestDb, testEnv } from './db'; +import { seedWorld, type World } from './world'; +import { oracleBase, totalsRows } from './totals-oracle'; + +const P = '76561198000032001'; +const Q = '76561198000032002'; +const R = '76561198000032003'; +const HOUR = 3_600_000; +const scores = [ + { name: 'Valkyra', score: 100 }, + { name: 'Lonestar', score: 60 } +]; + +function gate() { + let open!: () => void; + const opened = new Promise((resolve) => (open = resolve)); + return { open, opened }; +} + +describe.skipIf(!hasTestDb)('player totals under every kind of write', () => { + let env: Env; + + /** The totals of these servers equal what today's reads compute, in one snapshot. */ + const exact = async (ids: string[]) => { + await env.db.transaction(async (tx) => { + expect(await totalsRows(tx, ids)).toEqual(await oracleBase(tx, ids)); + }); + }; + const t0 = Date.now() - 20 * HOUR; + const at = (h: number) => new Date(t0 + h * HOUR); + const session = async ( + serverId: string, + steamId: string, + from: number, + to: number | null, + cash = 100 + ) => + ( + await env.db + .insert(playerSessions) + .values({ + serverId, + steamId, + name: `n${steamId.slice(-2)}`, + faction: 'Valkyra', + joinedAt: at(from), + lastSeen: at(to ?? from + 0.5), + leftAt: to === null ? null : at(to), + kills: 3, + deaths: 2, + cash, + seedSeconds: 60 + }) + .returning({ id: playerSessions.id }) + )[0].id; + const match = async ( + serverId: string, + from: number, + ended: boolean, + winner: string | null = 'Valkyra' + ) => + ( + await env.db + .insert(matches) + .values({ + serverId, + startedAt: at(from), + endedAt: ended ? at(from + 1) : null, + map: 'Kavkazi', + finalScores: ended ? scores : null, + winner: ended ? winner : null + }) + .returning({ id: matches.id }) + )[0].id; + const line = ( + matchId: number, + serverId: string, + steamId: string, + faction: string | null, + kills = 4 + ) => + env.db.insert(matchPlayers).values({ + matchId, + serverId, + steamId, + name: 'l', + faction, + seconds: 600, + kills, + deaths: 2, + headshots: 1, + killStreak: kills + }); + /** Someone waits for a server's totals lock (another transaction holds it). */ + const untilWaiting = async () => { + const end = Date.now() + 10_000; + for (;;) { + const [row] = (await env.db.execute(sql` + SELECT COUNT(*)::int AS n FROM pg_locks + WHERE locktype = 'advisory' AND NOT granted + AND database = (SELECT oid FROM pg_database WHERE datname = current_database())`)) as { + n: number; + }[]; + if (row.n > 0) return; + if (Date.now() > end) throw new Error('nobody waited for the lock'); + await Bun.sleep(20); + } + }; + + beforeAll(async () => { + env = await testEnv(); + }); + + test('a statement that closes a session and edits a closed one of the same player counts each once', async () => { + const w = await seedWorld(env); + const A = w.server.id; + for (const openFirst of [false, true]) { + const steamId = openFirst ? Q : P; + const a = openFirst ? await session(A, steamId, 3, null) : await session(A, steamId, 1, 2); + const b = openFirst ? await session(A, steamId, 1, 2) : await session(A, steamId, 3, null); + const [open, closed] = openFirst ? [a, b] : [b, a]; + // left_at in the SET list: the open row's close adds (BEFORE), the closed row's edit + // recounts the pair from the statement's end state (AFTER) + await env.db.execute(sql` + UPDATE player_sessions SET left_at = CASE WHEN id = ${open} THEN last_seen ELSE left_at END, + cash = cash + 7 + WHERE id IN (${open}, ${closed})`); + await exact([A]); + } + // two closes of one pair in one statement add twice, once each + const c = await session(A, R, 4, null); + const d = await session(A, R, 5, null); + await env.db.execute( + sql`UPDATE player_sessions SET left_at = last_seen WHERE id IN (${c}, ${d})` + ); + await exact([A]); + const [row] = (await env.db.execute(sql` + SELECT sessions FROM player_totals WHERE server_id = ${A} AND steam_id = ${R}`)) as { + sessions: number; + }[]; + expect(row.sessions).toBe(2); + }); + + test('a statement that fails after a close adds nothing', async () => { + const w = await seedWorld(env); + const A = w.server.id; + const a = await session(A, P, 1, null); + const b = await session(A, P, 2, null); + await expect( + (async () => + env.db.execute(sql` + UPDATE player_sessions SET left_at = last_seen, + kills = CASE WHEN id = ${b} THEN kills / 0 ELSE kills END + WHERE id IN (${a}, ${b})`))() + ).rejects.toThrow(); + await exact([A]); + expect( + await env.db.execute(sql`SELECT 1 FROM player_totals WHERE server_id = ${A}`) + ).toHaveLength(0); + }); + + test('a match ended, then its lines and its winner changed, in one transaction; and in one statement with an ended match', async () => { + const w = await seedWorld(env); + const A = w.server.id; + await session(A, P, 0, 4); + const m = await match(A, 1, false); + await line(m, A, P, 'Valkyra'); + await line(m, A, Q, 'Lonestar'); + await env.db.transaction(async (tx) => { + await tx + .update(matches) + .set({ endedAt: at(2), finalScores: scores, winner: 'Valkyra' }) + .where(eq(matches.id, m)); + await tx.execute(sql`UPDATE match_players SET kills = kills + 5 WHERE match_id = ${m}`); + await tx.update(matches).set({ winner: 'Lonestar' }).where(eq(matches.id, m)); + }); + await exact([A]); + // one statement ending an open match and editing an ended one, both with P + const open = await match(A, 3, false); + await line(open, A, P, 'Lonestar', 9); + await env.db.execute(sql` + UPDATE matches SET ended_at = COALESCE(ended_at, ${at(4)}), final_scores = ${JSON.stringify(scores)}::jsonb, + winner = 'Lonestar' + WHERE id IN (${m}, ${open})`); + await exact([A]); + // an upsert of an ended match's lines fires both statement triggers + await writeMatchPlayers(env.db, A, m, [ + { steamId: P, name: 'p', faction: 'Valkyra', seconds: 1, kills: 1, deaths: 1, cashDelta: 0 }, + { steamId: R, name: 'r', faction: 'White', seconds: 1, kills: 2, deaths: 0, cashDelta: 0 } + ]); + await exact([A]); + // a line moved to another player, a match moved to another server, a line deleted + await env.db.execute( + sql`UPDATE match_players SET steam_id = ${R} WHERE match_id = ${open} AND steam_id = ${P}` + ); + await exact([A]); + await env.db.update(matches).set({ serverId: w.otherServer.id }).where(eq(matches.id, open)); + await exact([A]); + await exact([w.otherServer.id]); + await env.db.execute(sql`DELETE FROM match_players WHERE match_id = ${m} AND steam_id = ${Q}`); + await exact([A]); + }); + + test('a purge leaves the totals as its sources: sessions kept, lines gone, lines-only players gone', async () => { + const w = await seedWorld(env); + const A = w.server.id; + await session(A, P, 0, 3); + const m = await match(A, 1, true); + await line(m, A, P, 'Valkyra'); + await line(m, A, Q, 'Lonestar'); + await exact([A]); + await purgeServerStats(env, new Request('http://localhost/'), w.users.owner!, { + ...(await env.db.query.servers.findFirst({ where: (s, { eq }) => eq(s.id, A) }))! + }); + await exact([A]); + const rows = (await env.db.execute(sql` + SELECT steam_id, sessions, matches FROM player_totals WHERE server_id = ${A}`)) as { + steam_id: string; + sessions: number; + matches: number; + }[]; + expect(rows).toEqual([{ steam_id: P, sessions: 1, matches: 0 }]); + }); + + test('a transaction that is not READ COMMITTED is refused', async () => { + const w = await seedWorld(env); + const A = w.server.id; + const id = await session(A, P, 0, 1); + const refused = await env.db + .transaction( + async (tx) => { + await tx.update(playerSessions).set({ cash: 1 }).where(eq(playerSessions.id, id)); + }, + { isolationLevel: 'repeatable read' } + ) + .then( + () => null, + (err: { cause?: { message?: string } }) => err + ); + expect(String(refused?.cause?.message)).toMatch(/READ COMMITTED only/); + await exact([A]); + }); + + describe('the worker and a purge on one server', () => { + /** History on a server: a closed and an open session, an ended match, an open one with lines. */ + const history = async () => { + const w = await seedWorld(env); + const A = w.server.id; + await session(A, P, 0, 2); + const open = await session(A, Q, 3, null); + const ended = await match(A, 0, true); + await line(ended, A, P, 'Valkyra'); + const current = await match(A, 2, false); + await line(current, A, Q, 'Lonestar'); + return { w, A, open, current }; + }; + /** The purge's statements, the lock first, pausing after the lines when told to. */ + const purge = (A: string, pause?: Promise, paused?: () => void) => + env.db.transaction(async (tx) => { + await lockTotals(tx, A); + await tx.execute(sql`DELETE FROM kills WHERE server_id = ${A}`); + await tx.execute(sql`DELETE FROM match_players WHERE server_id = ${A}`); + paused?.(); + if (pause) await pause; + await tx.execute(sql`DELETE FROM matches WHERE server_id = ${A}`); + }); + const kinds: Record< + string, + (tx: DbOrTx, h: Awaited>) => Promise + > = { + 'a session closing': (tx, h) => + tx.execute( + sql`UPDATE player_sessions SET left_at = last_seen WHERE id = ${h.open} AND left_at IS NULL` + ), + "leavers' lines": (tx, h) => + writeMatchPlayers(tx, h.A, h.current, [ + { + steamId: Q, + name: 'q', + faction: 'Lonestar', + seconds: 9, + kills: 7, + deaths: 1, + cashDelta: 5 + } + ]), + 'a match ending': async (tx, h) => { + await writeMatchPlayers(tx, h.A, h.current, [ + { + steamId: Q, + name: 'q', + faction: 'Lonestar', + seconds: 9, + kills: 7, + deaths: 1, + cashDelta: 5 + }, + { + steamId: R, + name: 'r', + faction: 'Valkyra', + seconds: 9, + kills: 1, + deaths: 4, + cashDelta: 0 + } + ]); + await tx + .update(matches) + .set({ endedAt: new Date(), finalScores: scores, winner: 'Valkyra' }) + .where(eq(matches.id, h.current)); + }, + 'an abandoned match': (tx, h) => + tx.update(matches).set({ endedAt: new Date() }).where(eq(matches.id, h.current)), + 'the offline transition': async (tx, h) => { + await tx.execute( + sql`UPDATE player_sessions SET left_at = last_seen WHERE server_id = ${h.A} AND left_at IS NULL` + ); + await writeMatchPlayers(tx, h.A, h.current, [ + { + steamId: Q, + name: 'q', + faction: 'Lonestar', + seconds: 9, + kills: 7, + deaths: 1, + cashDelta: 5 + } + ]); + } + }; + + for (const [kind, write] of Object.entries(kinds)) { + test(`${kind}, the purge holding the lock: the worker waits, both commit, exact`, async () => { + const h = await history(); + const deleted = gate(); + const go = gate(); + const purging = purge(h.A, go.opened, deleted.open); + await deleted.opened; + const writing = env.db.transaction(async (tx) => { + await lockTotals(tx, h.A); + await write(tx, h); + }); + await untilWaiting(); + go.open(); + await Promise.all([purging, writing]); + await exact([h.A]); + }); + test(`${kind}, the worker holding the lock: the purge waits, both commit, exact`, async () => { + const h = await history(); + const written = gate(); + const go = gate(); + const writing = env.db.transaction(async (tx) => { + await lockTotals(tx, h.A); + await write(tx, h); + written.open(); + await go.opened; + }); + await written.opened; + const purging = purge(h.A); + await untilWaiting(); + go.open(); + await Promise.all([purging, writing]); + await exact([h.A]); + }); + } + + test('without the lock first, an abandoned match against a purge deadlocks', async () => { + const h = await history(); + const deleted = gate(); + const go = gate(); + const purging = purge(h.A, go.opened, deleted.open); + await deleted.opened; + // the match row is locked by the update, then its trigger waits for the purge's lock; + // the purge then wants that row + const abandoning = env.db.transaction(async (tx) => { + await tx.update(matches).set({ endedAt: new Date() }).where(eq(matches.id, h.current)); + }); + await untilWaiting(); + go.open(); + const settled = await Promise.allSettled([purging, abandoning]); + const failed = settled.filter((s) => s.status === 'rejected') as PromiseRejectedResult[]; + expect(failed).toHaveLength(1); + expect(String(failed[0].reason?.cause?.message ?? failed[0].reason)).toMatch(/deadlock/); + await exact([h.A]); + }); + }); + + test('migration 0038 over a database with history builds the totals the reads expect', async () => { + const base = process.env.TEST_DATABASE_URL!; + const name = `warcon_test_totals_${randomBytes(4).toString('hex')}`; + const admin = new SQL(base, { max: 1 }); + await admin.unsafe(`CREATE DATABASE "${name}"`); + const url = new URL(base); + url.pathname = `/${name}`; + const { client, db } = connect(url.href); + const dir = await mkdtemp(join(tmpdir(), 'warcon-0037-')); + try { + // every migration before 0038 + await cp('drizzle', dir, { recursive: true }); + await rm(join(dir, '0038_player_totals.sql')); + await rm(join(dir, 'meta', '0038_snapshot.json')); + const journal = JSON.parse(await readFile(join(dir, 'meta', '_journal.json'), 'utf8')); + journal.entries = journal.entries.filter( + (e: { tag: string }) => e.tag !== '0038_player_totals' + ); + await writeFile(join(dir, 'meta', '_journal.json'), JSON.stringify(journal)); + await runMigrations(db, dir); + // history as the worker leaves it: closed and open sessions; ended, drawn, abandoned and + // open matches with lines, one of them on the holding side; a player with lines only + const s = ( + server: string, + steamId: string, + from: number, + to: number | null, + cash: number + ) => ({ + serverId: server, + steamId, + name: `n${steamId.slice(-1)}`, + faction: 'Valkyra', + joinedAt: at(from), + lastSeen: at(to ?? from + 0.25), + leftAt: to === null ? null : at(to), + kills: 1, + deaths: 1, + cash, + seedSeconds: from * 10 + }); + await db + .insert(playerSessions) + .values([ + s('a', P, 0, 1.5, 500), + s('a', P, 2, 3.25, 700), + s('a', Q, 1, 2, 50), + s('a', Q, 4, null, 20), + s('b', P, 1, 1.75, 900), + s('b', R, 3, null, 0) + ]); + const [won, drawn, abandoned, open] = await db + .insert(matches) + .values([ + { + serverId: 'a', + startedAt: at(0), + endedAt: at(1), + map: 'Kavkazi', + finalScores: scores, + winner: 'Valkyra' + }, + { + serverId: 'a', + startedAt: at(1), + endedAt: at(2), + map: 'Europe', + finalScores: [ + { name: 'Valkyra', score: 50 }, + { name: 'Lonestar', score: 50 } + ], + winner: null + }, + { serverId: 'b', startedAt: at(1), endedAt: at(2), map: 'Detroit' }, + { serverId: 'a', startedAt: at(4), map: 'Kavkazi' } + ]) + .returning({ id: matches.id }); + const l = ( + matchId: number, + server: string, + steamId: string, + faction: string | null, + kills: number + ) => ({ + matchId: matchId, + serverId: server, + steamId, + name: 'l', + faction, + seconds: 300, + kills, + deaths: 1, + killStreak: kills + }); + await db + .insert(matchPlayers) + .values([ + l(won.id, 'a', P, 'Valkyra', 5), + l(won.id, 'a', Q, 'White', 2), + l(drawn.id, 'a', P, 'Lonestar', 3), + l(drawn.id, 'a', 'lines-only-player', 'Valkyra', 7), + l(abandoned.id, 'b', P, 'Valkyra', 4), + l(open.id, 'a', Q, 'Lonestar', 9) + ]); + // then 0038 + await runMigrations(db, 'drizzle'); + await db.transaction(async (tx) => { + for (const ids of [['a'], ['b'], ['a', 'b']]) + expect(await totalsRows(tx, ids)).toEqual(await oracleBase(tx, ids)); + }); + const [{ n }] = (await db.execute(sql`SELECT COUNT(*)::int AS n FROM player_totals`)) as { + n: number; + }[]; + // (a, P), (a, Q), (b, P) from closed sessions and lines; the lines-only player; not (b, R), + // whose only session is open + expect(n).toBe(4); + } finally { + await client.close(); + await admin.unsafe(`DROP DATABASE IF EXISTS "${name}" WITH (FORCE)`); + await admin.close(); + await rm(dir, { recursive: true, force: true }); + } + }); +}); diff --git a/src/test/player-totals.test.ts b/src/test/player-totals.test.ts new file mode 100644 index 00000000..f111a54c --- /dev/null +++ b/src/test/player-totals.test.ts @@ -0,0 +1,701 @@ +// Each player's totals per server (player_totals, kept by the triggers of migration 0038) against +// the all-time reads they replace, word for word (totals-oracle.ts). Seeded random histories run +// through the worker's own looks at a scripted game on three servers (two in one organisation, one +// in another): joins and returns, leaves past the grace, renames, side changes and the holding +// side, counters that start again mid-match, cash, scores, match ends with a winner, a draw or no +// score, abandoned matches after an outage, the offline transition and worker restarts; with +// purges and direct writes in between (closed sessions inserted, edited and deleted, lines added to +// an ended match, a winner changed, an ended match whose scores are not numbers). After every step +// the all-time base rows of each set of servers are equal column by column, read in one +// transaction (one now()); every tenth step and at the end the reads themselves are equal too +// (every board metric both ways at two floors, every player's rank, the placeholders' stats, the +// risk record), and a rebuild leaves the table as it was. +import { afterAll, beforeAll, describe, expect, setSystemTime, spyOn, test } from 'bun:test'; +import { and, eq, isNotNull, sql } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import type { OrgRow, ServerRow } from '$lib/server/access'; +import { + kills, + matches, + matchPlayers, + organizations, + playerSessions, + servers, + triggers +} from '$lib/server/db/schema'; +import { acquireOrRenew } from '$lib/server/leadership'; +import { forgetMemory, memoryFor, observeServer, type ServerMemory } from '$lib/server/observe'; +import { GameError, WardogsClient } from '$lib/server/rcon'; +import { purgeServerStats } from '$lib/server/stats'; +import { lockTotals } from '$lib/server/totals'; +import { + EXPORT_ROWS, + exportBoard, + playerStats, + rankOf, + riskPerformanceFor +} from '$lib/server/leaderboards'; +import { BOARD_METRICS, type BoardQuery } from '$lib/leaderboard'; +import { hasTestDb, testEnv } from './db'; +import { seedWorld, type World } from './world'; +import { oracleBase, oracleBoard, oracleRank, oracleRiskRecord, totalsRows } from './totals-oracle'; + +const DEFAULT_SEED = 20261004; +const SEED = Number(process.env.TOTALS_SEED ?? DEFAULT_SEED); +const STEPS = Number(process.env.TOTALS_STEPS ?? 120); +const FACTIONS = ['Valkyra', 'Lonestar', 'White', null] as const; +const MAPS = ['Kavkazi', 'Europe', 'Bakurani', 'Detroit']; +const POOL = Array.from({ length: 24 }, (_, i) => `765611980000${String(31000 + i)}`); + +/** mulberry32: the same history for the same seed. */ +function rng(seed: number) { + let a = seed >>> 0; + const next = () => { + a = (a + 0x6d2b79f5) >>> 0; + let t = a; + t = Math.imul(t ^ (t >>> 15), t | 1); + t ^= t + Math.imul(t ^ (t >>> 7), t | 61); + return ((t ^ (t >>> 14)) >>> 0) / 4294967296; + }; + return { + next, + int: (n: number) => Math.floor(next() * n), + chance: (p: number) => next() < p, + pick: (xs: readonly T[]): T => xs[Math.floor(next() * xs.length)] + }; +} + +interface OnServer { + name: string; + faction: string | null; + kills: number; + deaths: number; + cash: number; +} +interface Game { + server: ServerRow; + org: OrgRow; + m: ServerMemory; + map: string; + scores: [number, number]; + /** looks left until it answers again */ + down: number; + players: Map; +} + +describe.skipIf(!hasTestDb)('player totals against the reads they replace', () => { + let env: Env; + let w: World; + let spy: ReturnType; + let clock = Date.now() - 12 * 86_400_000; + const games = new Map(); + const r = rng(SEED); + let names = 0; + + const json = (body: unknown) => ({ + status: 200, + statusText: 'OK', + headers: { 'content-type': 'application/json' }, + text: JSON.stringify(body) + }); + const tick = async (ms: number) => { + clock += ms; + setSystemTime(new Date(clock)); + expect(await acquireOrRenew(env, 'player-totals')).toBe(true); + }; + const look = async (g: Game) => { + g.m.playersIntervalMs = 120_000; + await observeServer(env, g.m, { status: true, players: true }); + if (g.down > 0) g.down--; + }; + const restart = (g: Game) => { + forgetMemory(g.server.id); + g.m = memoryFor(g.server, g.org); + }; + const newName = (steamId: string) => `P${steamId.slice(-3)}-${++names % 7}`; + let events = 0; + + /** A few kills from the feed on the server's open match (the feed server only). */ + const feed = async (g: Game) => { + const on = [...g.players.keys()]; + if (on.length < 2 || g.down) return; + const [open] = await env.db + .select({ id: matches.id }) + .from(matches) + .where(and(eq(matches.serverId, g.server.id), sql`ended_at IS NULL`)); + if (!open) return; + const n = r.int(4); + for (let i = 0; i < n; i++) { + const killer = r.pick(on); + const victim = r.chance(0.1) ? killer : r.pick(on); + const kf = g.players.get(killer)!.faction; + const vf = g.players.get(victim)!.faction; + await env.db.insert(kills).values({ + ts: new Date(clock - r.int(4000)), + serverId: g.server.id, + eventId: `totals-${++events}`, + instanceId: 'i', + matchId: 'g', + matchRow: open.id, + eventTime: events, + map: g.map, + killerSteamId: killer, + killerName: 'k', + killerFaction: kf, + victimSteamId: victim, + victimName: 'v', + victimFaction: vf, + cause: r.pick(['Id.Item.AK74M', 'Id.Item.SVDM', 'Vehicle.Variant.Ground.Btr80']), + distanceM: r.int(400), + headshot: r.chance(0.3), + suicide: killer === victim, + teamKill: killer !== victim && !!kf && kf === vf, + tags: [] + }); + } + }; + + /** One step of play on a server: the game changes, then the worker looks at it. */ + const play = (g: Game) => { + const on = [...g.players.keys()]; + if (on.length < 14 && r.chance(0.5)) { + const id = r.pick(POOL); + if (!g.players.has(id)) + g.players.set(id, { + name: newName(id), + faction: r.pick(FACTIONS), + kills: 0, + deaths: 0, + cash: r.int(3) * 100 + }); + } + if (on.length && r.chance(0.3)) g.players.delete(r.pick(on)); + for (const [id, p] of g.players) { + if (r.chance(0.6)) p.kills += r.int(4); + if (r.chance(0.5)) p.deaths += r.int(3); + if (r.chance(0.5)) p.cash = Math.max(0, p.cash + r.int(900) - 150); + if (r.chance(0.04)) Object.assign(p, { kills: 0, deaths: 0, cash: 0 }); // a reconnect + if (r.chance(0.05)) p.name = newName(id); + if (r.chance(0.08)) p.faction = r.pick(FACTIONS); + } + if (r.chance(0.5)) g.scores[r.int(2)] += r.int(6); + if (r.chance(0.07)) { + // The match ends: the scores start again (sometimes on the next map), and so do the + // counters, a look later for some (the list can show the next match first). + if (r.chance(0.2)) g.scores[1] = g.scores[0]; + g.scores = [0, 0]; + if (r.chance(0.3)) g.map = r.pick(MAPS); + for (const p of g.players.values()) Object.assign(p, { kills: 0, deaths: 0, cash: 0 }); + } + if (r.chance(0.02)) g.down = 4; + if (g.down === 1) g.map = r.pick(MAPS.filter((m) => m !== g.map)); // back on another map + }; + + /** A write that is not the worker's: a hand repair, a backfill, a test fixture. */ + const direct = async (g: Game) => { + const at = new Date(clock - r.int(5) * 86_400_000 - r.int(3_600_000)); + switch (r.int(7)) { + case 0: { + const left = new Date(at.getTime() + 60_000 + r.int(7_200_000)); + await env.db.insert(playerSessions).values({ + serverId: g.server.id, + steamId: r.pick(POOL), + name: newName(r.pick(POOL)), + faction: 'Valkyra', + joinedAt: at, + lastSeen: left, + leftAt: left, + kills: r.int(30), + deaths: r.int(30), + cash: r.int(5000), + seedSeconds: r.int(600) + }); + return; + } + case 1: { + const [row] = await env.db + .select({ id: playerSessions.id }) + .from(playerSessions) + .where(and(eq(playerSessions.serverId, g.server.id), isNotNull(playerSessions.leftAt))) + .limit(1) + .offset(r.int(20)); + if (row) + await env.db + .update(playerSessions) + .set({ cash: r.int(9000), seedSeconds: r.int(900) }) + .where(eq(playerSessions.id, row.id)); + return; + } + case 2: { + const [row] = await env.db + .select({ id: playerSessions.id }) + .from(playerSessions) + .where(and(eq(playerSessions.serverId, g.server.id), isNotNull(playerSessions.leftAt))) + .limit(1) + .offset(r.int(20)); + if (row) await env.db.delete(playerSessions).where(eq(playerSessions.id, row.id)); + return; + } + case 3: { + const [m] = await env.db + .select({ id: matches.id }) + .from(matches) + .where(and(eq(matches.serverId, g.server.id), isNotNull(matches.endedAt))) + .limit(1) + .offset(r.int(5)); + if (m) + await env.db + .insert(matchPlayers) + .values({ + matchId: m.id, + serverId: g.server.id, + steamId: r.pick(POOL), + name: 'late', + faction: r.pick(FACTIONS), + kills: r.int(20), + deaths: r.int(20), + killStreak: r.int(6) + }) + .onConflictDoNothing(); + return; + } + case 4: { + const [m] = await env.db + .select({ id: matches.id }) + .from(matches) + .where(and(eq(matches.serverId, g.server.id), isNotNull(matches.endedAt))) + .limit(1) + .offset(r.int(5)); + if (m) + await env.db + .update(matches) + .set({ winner: r.pick(['Valkyra', 'Lonestar', null]) }) + .where(eq(matches.id, m.id)); + return; + } + case 6: { + // a session closed by hand while the worker still thinks it open (its own close then + // finds the row closed and changes nothing) + const [row] = await env.db + .select({ id: playerSessions.id }) + .from(playerSessions) + .where(and(eq(playerSessions.serverId, g.server.id), sql`left_at IS NULL`)) + .limit(1); + if (row) + await env.db.execute(sql` + UPDATE player_sessions SET left_at = last_seen, seed_seconds = seed_seconds + ${r.int(500)}, + cash = cash + ${r.int(700)} + WHERE id = ${row.id} AND left_at IS NULL`); + return; + } + case 5: { + // an ended match whose scoreboard holds a score that is not a number + const [m] = await env.db + .insert(matches) + .values({ + serverId: g.server.id, + startedAt: at, + endedAt: new Date(at.getTime() + 1_800_000), + map: 'Europe', + finalScores: [ + { name: 'Valkyra', score: 'lots' }, + { name: 'Lonestar', score: r.int(3) } + ], + winner: null + }) + .returning({ id: matches.id }); + await env.db.insert(matchPlayers).values( + [r.pick(POOL), r.pick(POOL)] + .filter((v, i, a) => a.indexOf(v) === i) + .map((steamId, i) => ({ + matchId: m.id, + serverId: g.server.id, + steamId, + name: 'odd', + faction: i ? 'Lonestar' : 'White', + kills: r.int(9), + deaths: r.int(9) + })) + ); + return; + } + } + }; + + const sets = () => { + const a = w.server.id; + const b = w.otherServer.id; + const c = w.otherOrgServer.id; + return [[a], [b], [a, b], [c], [a, b, c]]; + }; + /** The base rows of every set of servers, equal column by column. */ + const compareBase = async (step: string) => { + await env.db.transaction(async (tx) => { + for (const ids of sets()) { + const want = await oracleBase(tx, ids); + const got = await totalsRows(tx, ids); + expect({ step, ids, rows: got }).toEqual({ step, ids, rows: want }); + } + }); + }; + + /** The reads themselves: boards, ranks, placeholders' stats and the risk record. */ + const compareReads = async (step: string) => { + await env.db.transaction(async (tx) => { + const e = { ...env, db: tx } as unknown as Env; + for (const ids of sets()) { + const players = (await oracleBase(tx, ids)).map((b) => b.steam_id as string); + for (const metric of BOARD_METRICS) + for (const dir of ['desc', 'asc'] as const) + for (const minMinutes of [0, 60]) { + const q: BoardQuery = { + scope: 'server', + range: 'all', + sort: metric.key, + dir, + page: 1, + minMinutes + }; + const want = (await oracleBoard(tx, ids, q, EXPORT_ROWS, 0)).map((o, i) => ({ + rank: i + 1, + steamId: o.steamId as string, + name: ((o.name as string | null) || o.steamId) as string, + minutes: Math.round(Number(o.minutes)), + seedMinutes: Math.round(Number(o.seedMinutes)), + kills: Number(o.kills), + deaths: Number(o.deaths), + headshots: Number(o.headshots), + teamKills: Number(o.teamKills), + suicides: Number(o.suicides), + vehicleKills: Number(o.vehicleKills), + killStreak: Number(o.killStreak), + deathStreak: Number(o.deathStreak), + matches: Number(o.matches), + wins: Number(o.wins), + losses: Number(o.losses), + draws: Number(o.draws), + cash: Number(o.cash), + lastSeen: o.lastSeen ? new Date(o.lastSeen as string).toISOString() : null + })); + expect({ step, ids, q, rows: await exportBoard(e, ids, q) }).toEqual({ + step, + ids, + q, + rows: want + }); + } + for (const p of players) + expect({ step, ids, p, rank: await rankOf(e, ids, p) }).toEqual({ + step, + ids, + p, + rank: await oracleRank(tx, ids, p) + }); + const stats = await playerStats(e, ids, POOL); + const statsWant = await oracleBase(tx, ids, POOL); + expect({ step, ids, stats: Object.fromEntries(stats) }).toEqual({ + step, + ids, + stats: Object.fromEntries( + statsWant.map((b) => [ + b.steam_id, + { + kills: Number(b.kills), + deaths: Number(b.deaths), + minutes: Number(b.minutes), + seedMinutes: Number(b.seed_minutes), + matches: Number(b.matches), + wins: Number(b.wins), + losses: Number(b.losses), + draws: Number(b.draws) + } + ]) + ) + }); + // the record of matches; the kill-feed part (feedKills, headshots) is read as before + const risk = await riskPerformanceFor(e, ids, POOL); + const riskWant = new Map( + (await oracleRiskRecord(tx, ids, POOL)).map((o) => [o.steamId as string, o]) + ); + const played = (steamId: string) => { + const v = risk.get(steamId); + return v && [v.matches, v.wins, v.losses, v.draws, v.kills, v.deaths]; + }; + for (const steamId of POOL) { + const o = riskWant.get(steamId); + expect({ step, ids, steamId, played: played(steamId) }).toEqual({ + step, + ids, + steamId, + played: o + ? [o.matches, o.wins, o.losses, o.draws, o.kills, o.deaths].map(Number) + : risk.has(steamId) + ? [0, 0, 0, 0, 0, 0] + : undefined + }); + } + } + }); + }; + + const table = async () => + (await env.db.execute(sql` + SELECT t::text AS row FROM player_totals t + WHERE server_id IN ${sets()[4]} ORDER BY server_id, steam_id`)) as { row: string }[]; + + beforeAll(async () => { + env = { ...(await testEnv()), STEAM_API_KEY: '' }; + w = await seedWorld(env); + setSystemTime(new Date(clock)); + expect(await acquireOrRenew(env, 'player-totals')).toBe(true); + spy = spyOn(WardogsClient, 'forServer').mockImplementation(async (_env, server) => { + const client = new WardogsClient( + env, + { id: server.id, host: 'demo', port: 1, scheme: 'http' }, + 'demo', + `player-totals-${server.id}` + ); + const raw = client.raw.bind(client); + client.raw = async (method, path, body, headers) => { + const g = games.get(server.id); + if (!g || method !== 'GET' || (path !== '/v1/players' && path !== '/v1/status')) + return raw(method, path, body, headers); + if (g.down > 0) throw new GameError(502, 'connect ECONNREFUSED', 'unreachable'); + if (path === '/v1/players') + return json({ + players: [...g.players].map(([steamId, p]) => ({ steamId, ping: 40, ...p })), + count: g.players.size + }); + return json({ + serverName: 'Totals', + map: g.map, + experiences: [], + players: { current: g.players.size, max: 100 }, + factionScores: [ + { name: 'Valkyra', colorHex: '#D86060', score: g.scores[0] }, + { name: 'Lonestar', colorHex: '#5B95D8', score: g.scores[1] } + ], + rotation: { nowIndex: 0, nextIndex: 1 } + }); + }; + return client; + }); + // A seeding rule on one server, so the sessions the worker closes carry seed time; it asks + // for more minutes than anyone plays, so it never grants a slot. + await env.db.insert(triggers).values({ + id: `seed-${w.server.id}`, + serverId: w.server.id, + orgId: w.org.id, + kind: 'seed_reward', + name: 'Seed time', + enabled: true, + config: { + scope: 'server', + lowAt: 8, + untilFull: false, + fullAt: null, + minutes: 1_000_000, + windowDays: 30, + slotDays: 1, + message: '' + } + }); + for (const id of [w.server.id, w.otherServer.id, w.otherOrgServer.id]) { + const [server] = await env.db.select().from(servers).where(eq(servers.id, id)); + const [org] = await env.db + .select() + .from(organizations) + .where(eq(organizations.id, server.orgId)); + if (id === w.otherServer.id) { + // the feed server: its match ends fill the feed's columns from its kills + await env.db + .update(servers) + .set({ feedTokenHash: `totals-feed-${id}` }) + .where(eq(servers.id, id)); + server.feedTokenHash = `totals-feed-${id}`; + } + forgetMemory(id); + games.set(id, { + server, + org, + m: memoryFor(server, org), + map: r.pick(MAPS), + scores: [0, 0], + down: 0, + players: new Map() + }); + } + }); + + afterAll(async () => { + spy.mockRestore(); + for (const id of games.keys()) forgetMemory(id); + setSystemTime(); + await acquireOrRenew(env, 'player-totals'); + }); + + test(`${STEPS} steps of play, outages, restarts, purges and hand edits (seed ${SEED})`, async () => { + for (let step = 1; step <= STEPS; step++) { + const label = `seed ${SEED} step ${step}`; + await tick(5_000 + r.int(90_000)); + for (const g of games.values()) { + play(g); + if (r.chance(0.02)) restart(g); + await look(g); + if (g.server.id === w.otherServer.id) await feed(g); + } + if (r.chance(0.12)) await direct(r.pick([...games.values()])); + if (r.chance(0.015)) { + const g = r.pick([...games.values()]); + await purgeServerStats(env, new Request('http://localhost/test'), w.users.owner!, g.server); + } + await compareBase(label); + if (step % 10 === 0) await compareReads(label); + } + // Everyone leaves; the last sessions close and their matches stay open. + for (const g of games.values()) g.players.clear(); + await tick(70_000); + for (const g of games.values()) await look(g); + await tick(70_000); + for (const g of games.values()) await look(g); + await compareBase(`seed ${SEED} end`); + await compareReads(`seed ${SEED} end`); + const before = await table(); + await env.db.execute(sql`SELECT player_totals_rebuild()`); + expect(await table()).toEqual(before); + // The default history (the one CI runs) reaches every path the totals have: closes with seed + // time and cash, match ends with the feed's columns, hand edits. Other seeds explore. + if (SEED !== DEFAULT_SEED) return; + const [counts] = (await env.db.execute(sql` + SELECT (SELECT COUNT(*) FROM player_sessions WHERE server_id IN ${sets()[4]} AND left_at IS NOT NULL)::int AS closed, + (SELECT COUNT(*) FROM matches WHERE server_id IN ${sets()[4]} AND ended_at IS NOT NULL)::int AS ended, + (SELECT COUNT(*) FROM match_players WHERE server_id IN ${sets()[4]})::int AS lines`)) as { + closed: number; + ended: number; + lines: number; + }[]; + expect(counts.closed).toBeGreaterThan(50); + expect(counts.ended).toBeGreaterThan(10); + expect(counts.lines).toBeGreaterThan(50); + const [seeded] = (await env.db.execute(sql` + SELECT COUNT(*)::int AS n FROM player_sessions + WHERE server_id = ${w.server.id} AND left_at IS NOT NULL AND seed_seconds > 0`)) as { + n: number; + }[]; + expect(seeded.n).toBeGreaterThan(5); + const [fed] = (await env.db.execute(sql` + SELECT COUNT(*)::int AS n FROM match_players p JOIN matches m ON m.id = p.match_id + WHERE p.server_id = ${w.otherServer.id} AND m.ended_at IS NOT NULL AND p.kill_streak > 1`)) as { + n: number; + }[]; + expect(fed.n).toBeGreaterThan(5); + }, 600_000); + + /** Somebody waits for a server's totals lock. */ + const untilWaiting = async () => { + for (let i = 0; i < 500; i++) { + const [row] = (await env.db.execute(sql` + SELECT COUNT(*)::int AS n FROM pg_locks + WHERE locktype = 'advisory' AND NOT granted + AND database = (SELECT oid FROM pg_database WHERE datname = current_database())`)) as { + n: number; + }[]; + if (row.n > 0) return; + await Bun.sleep(20); + } + throw new Error('nobody waited for the totals lock'); + }; + /** A server of its own with two players on, looked at once. */ + const fresh = async () => { + const w2 = await seedWorld(env); + const [server] = await env.db.select().from(servers).where(eq(servers.id, w2.server.id)); + const [org] = await env.db.select().from(organizations).where(eq(organizations.id, w2.org.id)); + forgetMemory(server.id); + const g: Game = { + server, + org, + m: memoryFor(server, org), + map: 'Kavkazi', + scores: [3, 1], + down: 0, + players: new Map( + POOL.slice(0, 2).map((id) => [ + id, + { name: newName(id), faction: 'Valkyra', kills: 2, deaths: 1, cash: 50 } + ]) + ) + }; + games.set(server.id, g); + await tick(1_000); + await look(g); + await tick(20_000); + await look(g); + return g; + }; + /** A purge that holds the lock, deletes the lines and waits before the matches. */ + const purgeHolding = (serverId: string) => { + let deleted!: () => void; + let go!: () => void; + const ready = new Promise((resolve) => (deleted = resolve)); + const released = new Promise((resolve) => (go = resolve)); + const done = env.db.transaction(async (tx) => { + await lockTotals(tx, serverId); + await tx.execute(sql`DELETE FROM kills WHERE server_id = ${serverId}`); + await tx.execute(sql`DELETE FROM match_players WHERE server_id = ${serverId}`); + deleted(); + await released; + await tx.execute(sql`DELETE FROM matches WHERE server_id = ${serverId}`); + }); + return { ready, go, done }; + }; + const openMaps = async (serverId: string) => + ( + await env.db + .select({ map: matches.map }) + .from(matches) + .where(and(eq(matches.serverId, serverId), sql`ended_at IS NULL`)) + ).map((m) => m.map); + + test('the worker takes the totals lock before it touches a row: an abandoned match against a purge', async () => { + const g = await fresh(); + g.down = 3; + for (let i = 0; i < 3; i++) { + await tick(10_000); + await look(g); + } + g.map = 'Europe'; + const purge = purgeHolding(g.server.id); + await purge.ready; + await tick(10_000); + // back on another map: the open match is abandoned, which waits for the purge's lock + // before it locks the match row the purge is about to delete + const looking = look(g); + await untilWaiting(); + purge.go(); + await Promise.all([purge.done, looking]); + // the match stage finished (a failed one would have opened nothing) + expect(await openMaps(g.server.id)).toEqual(['Europe']); + await env.db.transaction(async (tx) => { + expect(await totalsRows(tx, [g.server.id])).toEqual(await oracleBase(tx, [g.server.id])); + }); + }); + + test('the worker takes the totals lock before it touches a row: a match end against a purge', async () => { + const g = await fresh(); + const purge = purgeHolding(g.server.id); + await purge.ready; + // the scores fall back on the same map: the match ends, which waits for the purge's lock + // before it reads the match or writes a line the purge has deleted + g.scores = [0, 0]; + for (const p of g.players.values()) Object.assign(p, { kills: 0, deaths: 0, cash: 0 }); + await tick(10_000); + const looking = look(g); + await untilWaiting(); + purge.go(); + await Promise.all([purge.done, looking]); + expect(await openMaps(g.server.id)).toEqual(['Kavkazi']); + await env.db.transaction(async (tx) => { + expect(await totalsRows(tx, [g.server.id])).toEqual(await oracleBase(tx, [g.server.id])); + }); + }); +}); diff --git a/src/test/totals-oracle.ts b/src/test/totals-oracle.ts new file mode 100644 index 00000000..5601d36f --- /dev/null +++ b/src/test/totals-oracle.ts @@ -0,0 +1,165 @@ +// The all-time reads as they were before player_totals (main at edf2aab), word for word, for the +// exactness tests to hold the totals against: each sums every session and every line of an ended +// match on the servers asked about. Frozen on purpose: if the reads' meaning changes, this file +// changes with it in the same commit, deliberately. totalsRows, at the end, is the other side. +import { sql, type SQL } from 'drizzle-orm'; +import type { DbOrTx } from '$lib/server/db'; +import { DEFAULT_FLOOR_MINUTES, type BoardMetric, type BoardQuery } from '$lib/leaderboard'; +import { totalsBase } from '$lib/server/leaderboards'; + +const EPOCH = new Date(0); + +const lines = (ids: string[], from: Date, steamId: string | string[] | null) => sql` + lines AS ( + SELECT p.steam_id, p.match_id, p.server_id, p.faction, p.seconds, p.kills, p.deaths, p.cash_delta, + p.headshots, p.team_kills, p.suicides, p.vehicle_kills, p.longest_m, p.kill_streak, p.death_streak, + m.started_at, m.ended_at, m.map, + CASE WHEN p.faction IS NULL THEN NULL + WHEN jsonb_typeof(m.final_scores) = 'array' AND jsonb_array_length(m.final_scores) > 0 + AND NOT EXISTS (SELECT 1 FROM jsonb_array_elements(m.final_scores) e WHERE e->>'name' = p.faction) + THEN NULL + WHEN m.winner IS NOT NULL THEN CASE WHEN m.winner = p.faction THEN 'win' ELSE 'loss' END + WHEN jsonb_typeof(m.final_scores) = 'array' + AND (SELECT MAX(CASE WHEN jsonb_typeof(e->'score') = 'number' THEN (e->>'score')::numeric END) + FROM jsonb_array_elements(m.final_scores) e) > 0 THEN 'draw' + ELSE NULL END AS result + FROM matches m + JOIN match_players p ON p.match_id = m.id AND p.server_id = m.server_id + WHERE m.server_id IN ${ids} AND m.ended_at IS NOT NULL AND m.ended_at >= ${from} + ${steamId === null ? sql`` : Array.isArray(steamId) ? sql`AND p.steam_id IN ${steamId}` : sql`AND p.steam_id = ${steamId}`})`; + +const base = (ids: string[], from: Date, steamIds: string[] | null = null) => sql` + sess AS ( + SELECT steam_id, + SUM(EXTRACT(EPOCH FROM (COALESCE(left_at, now()) - GREATEST(joined_at, ${from}::timestamptz)))) / 60 AS minutes, + SUM(seed_seconds) / 60.0 AS seed_minutes, MAX(last_seen) AS last_seen, + SUM(cash) AS cash + FROM player_sessions WHERE server_id IN ${ids} AND last_seen >= ${from} + AND (left_at IS NULL OR left_at >= ${from}) + ${steamIds === null ? sql`` : sql`AND steam_id IN ${steamIds}`} + GROUP BY steam_id), + ${lines(ids, from, steamIds)}, + mt AS ( + SELECT steam_id, COUNT(*) AS matches, + SUM(kills) AS kills, SUM(deaths) AS deaths, SUM(headshots) AS headshots, + SUM(team_kills) AS team_kills, SUM(suicides) AS suicides, SUM(vehicle_kills) AS vehicle_kills, + MAX(kill_streak) AS kill_streak, MAX(death_streak) AS death_streak, + COUNT(*) FILTER (WHERE result = 'win') AS wins, + COUNT(*) FILTER (WHERE result = 'loss') AS losses, + COUNT(*) FILTER (WHERE result = 'draw') AS draws + FROM lines GROUP BY steam_id), + base AS ( + SELECT steam_id, + COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.seed_minutes, 0) AS seed_minutes, + COALESCE(sess.cash, 0) AS cash, sess.last_seen, + COALESCE(mt.kills, 0) AS kills, COALESCE(mt.deaths, 0) AS deaths, + COALESCE(mt.headshots, 0) AS headshots, COALESCE(mt.team_kills, 0) AS team_kills, + COALESCE(mt.suicides, 0) AS suicides, COALESCE(mt.vehicle_kills, 0) AS vehicle_kills, + COALESCE(mt.kill_streak, 0) AS kill_streak, COALESCE(mt.death_streak, 0) AS death_streak, + COALESCE(mt.matches, 0) AS matches, COALESCE(mt.wins, 0) AS wins, + COALESCE(mt.losses, 0) AS losses, COALESCE(mt.draws, 0) AS draws + FROM sess FULL JOIN mt USING (steam_id))`; + +const METRIC_SQL: Record = { + kills: sql`kills`, + deaths: sql`deaths`, + kd: sql`CASE WHEN deaths > 0 THEN kills::float / deaths WHEN kills > 0 THEN kills::float ELSE NULL END`, + perHour: sql`CASE WHEN minutes - seed_minutes > 0 THEN kills::float / ((minutes - seed_minutes) / 60) ELSE NULL END`, + playtime: sql`minutes`, + seeded: sql`seed_minutes`, + matches: sql`matches`, + wins: sql`wins`, + winRate: sql`CASE WHEN wins + losses + draws > 0 THEN wins::float / (wins + losses + draws) ELSE NULL END`, + cash: sql`cash` +}; + +/** Every all-time base row over these servers (or these players), each column as text. */ +export async function oracleBase( + db: DbOrTx, + ids: string[], + steamIds: string[] | null = null +): Promise[]> { + if (!ids.length) return []; + return (await db.execute(sql` + WITH ${base(ids, EPOCH, steamIds)} + SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, + death_streak::text, matches::text, wins::text, losses::text, draws::text + FROM base ORDER BY steam_id`)) as Record[]; +} + +/** A slice of the all-time board as boardSlice read it, the counts as text. */ +export async function oracleBoard( + db: DbOrTx, + ids: string[], + q: BoardQuery, + limit: number, + offset: number +): Promise[]> { + const order = q.dir === 'asc' ? sql`ASC NULLS LAST` : sql`DESC NULLS LAST`; + return (await db.execute(sql` + WITH ${base(ids, EPOCH)}, + page AS ( + SELECT *, COUNT(*) OVER () AS total FROM base + WHERE minutes >= ${q.minMinutes} + ORDER BY ${METRIC_SQL[q.sort]} ${order}, kills DESC, steam_id + LIMIT ${limit} OFFSET ${offset}) + SELECT r.steam_id AS "steamId", r.minutes::text, r.seed_minutes::text AS "seedMinutes", r.cash::text, + r.last_seen AS "lastSeen", r.kills::text, r.headshots::text, r.team_kills::text AS "teamKills", + r.deaths::text, r.suicides::text, r.vehicle_kills::text AS "vehicleKills", + r.kill_streak::text AS "killStreak", r.death_streak::text AS "deathStreak", r.matches::text, + r.wins::text, r.losses::text, r.draws::text, r.total::text, + (SELECT name FROM player_sessions ps WHERE ps.steam_id = r.steam_id AND ps.server_id IN ${ids} + ORDER BY ps.joined_at DESC LIMIT 1) AS name + FROM page r`)) as Record[]; +} + +/** rankOf as it was: one more than the players above, at the default floor; null under it. */ +export async function oracleRank( + db: DbOrTx, + ids: string[], + steamId: string +): Promise { + if (!ids.length) return null; + const [row] = (await db.execute(sql` + WITH ${base(ids, EPOCH)}, + me AS (SELECT kills, minutes FROM base WHERE steam_id = ${steamId}) + SELECT (SELECT minutes >= ${DEFAULT_FLOOR_MINUTES} FROM me) AS qualifies, + (SELECT COUNT(*) FROM base, me WHERE base.minutes >= ${DEFAULT_FLOOR_MINUTES} AND base.kills > me.kills) AS above`)) as { + qualifies: boolean | null; + above: string; + }[]; + return row?.qualifies ? Number(row.above) + 1 : null; +} + +/** riskPerformanceFor's record of matches as it was (the kill-feed part never changed). */ +export async function oracleRiskRecord( + db: DbOrTx, + ids: string[], + steamIds: string[] +): Promise[]> { + if (!ids.length || !steamIds.length) return []; + return (await db.execute(sql` + WITH ${lines(ids, EPOCH, steamIds)} + SELECT steam_id AS "steamId", COUNT(*)::text AS matches, + (COUNT(*) FILTER (WHERE result = 'win'))::text AS wins, + (COUNT(*) FILTER (WHERE result = 'loss'))::text AS losses, + (COUNT(*) FILTER (WHERE result = 'draw'))::text AS draws, + SUM(kills)::text AS kills, SUM(deaths)::text AS deaths + FROM lines GROUP BY steam_id ORDER BY steam_id`)) as Record[]; +} + +/** The same rows from the totals (totalsBase), as text, to hold against oracleBase. */ +export async function totalsRows( + db: DbOrTx, + ids: string[], + steamIds: string[] | null = null +): Promise[]> { + if (!ids.length) return []; + return (await db.execute(sql` + WITH ${totalsBase(ids, steamIds)} + SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, + death_streak::text, matches::text, wins::text, losses::text, draws::text + FROM base ORDER BY steam_id`)) as Record[]; +} From ec038da464b46faab0e67327ac85025e07b9b7c9 Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 11:44:46 +0100 Subject: [PATCH 013/102] All-time reads from the player totals: the all-time board and its export, career ranks, the placeholders' stats and the risk score's record of matches read each player's totals per server plus the sessions still open, instead of every session and match row ever written (on the hosted panel the record of matches was 19% of the database's time and the ranks 6%); ranged boards and a career's list of matches read the rows as before --- src/lib/server/leaderboards.ts | 34 +++++++++---------- .../api/servers/[id]/leaderboard/+server.ts | 3 +- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/lib/server/leaderboards.ts b/src/lib/server/leaderboards.ts index 42534dc2..dca405ca 100644 --- a/src/lib/server/leaderboards.ts +++ b/src/lib/server/leaderboards.ts @@ -1,13 +1,14 @@ // Leaderboards and careers, read at page load from what the worker writes: each player's line // of every match (match_players: the game's own kills and deaths, the feed's headshots, team // kills, suicides, vehicle kills and streaks, time on and the side played) joined to its match -// for the result, and the sessions for playtime, seed time, the last name and cash. -// Nothing is precomputed; a page of a board is kept for a minute (loadBoard). The queries ride -// the existing indexes: matches (server_id, started_at), match_players (match_id, steam_id) and -// (steam_id, match_id), player_sessions (server_id, last_seen) and (steam_id, joined_at). Only -// matches that have ended count, and a match is in a range by when it ended; the match in -// progress is on the live page. The result of a match for a player (win, loss, draw, none) is the -// rule in $lib/leaderboard, written out again in SQL below for the aggregates. +// for the result, and the sessions for playtime, seed time, the last name and cash. All time is +// read from each player's settled totals per server (player_totals, kept by the database as +// sessions close and matches end, migration 0038) plus the open sessions; a range (7, 30, 90 +// days) sums the sources in it. A page of a board is kept for a minute (loadBoard). Only matches +// that have ended count, and a match is in a range by when it ended; the match in progress is on +// the live page. The result of a match for a player (win, loss, draw, none) is the rule in +// $lib/leaderboard, written out again in SQL below for the aggregates (and once more, as +// match_result(), in the migration). import { sql } from 'drizzle-orm'; import type { Env } from './env'; import { servers } from './db/schema'; @@ -172,13 +173,10 @@ export async function riskPerformanceFor( kills: string; deaths: string; }>(sql` - WITH ${lines(serverIds, EPOCH, steamIds)} - SELECT steam_id AS "steamId", COUNT(*) AS matches, - COUNT(*) FILTER (WHERE result = 'win') AS wins, - COUNT(*) FILTER (WHERE result = 'loss') AS losses, - COUNT(*) FILTER (WHERE result = 'draw') AS draws, - SUM(kills) AS kills, SUM(deaths) AS deaths - FROM lines GROUP BY steam_id`) + SELECT steam_id AS "steamId", SUM(matches) AS matches, SUM(wins) AS wins, + SUM(losses) AS losses, SUM(draws) AS draws, SUM(kills) AS kills, SUM(deaths) AS deaths + FROM player_totals WHERE server_id IN ${serverIds} AND steam_id IN ${steamIds} + GROUP BY steam_id HAVING SUM(matches) > 0`) ]); const of = (steamId: string) => { let value = result.get(steamId); @@ -263,10 +261,10 @@ async function boardSlice( limit: number, offset: number ): Promise { - const from = rangeStart(q.range) ?? EPOCH; + const from = rangeStart(q.range); const order = q.dir === 'asc' ? sql`ASC NULLS LAST` : sql`DESC NULLS LAST`; return (await env.db.execute(sql` - WITH ${base(ids, from)}, + WITH ${from ? base(ids, from) : totalsBase(ids)}, page AS ( SELECT *, COUNT(*) OVER () AS total FROM base WHERE minutes >= ${q.minMinutes} @@ -390,7 +388,7 @@ export async function playerStats( losses: string; draws: string; }>(sql` - WITH ${base(ids, EPOCH, steamIds)} + WITH ${totalsBase(ids, steamIds)} SELECT steam_id AS "steamId", minutes, seed_minutes AS "seedMinutes", kills, deaths, matches, wins, losses, draws FROM base`); @@ -424,7 +422,7 @@ export async function lastNameOf(env: Env, ids: string[], steamId: string): Prom export async function rankOf(env: Env, ids: string[], steamId: string): Promise { if (!ids.length) return null; const [row] = await env.db.execute<{ qualifies: boolean | null; above: string }>(sql` - WITH ${base(ids, EPOCH)}, + WITH ${totalsBase(ids)}, me AS (SELECT kills, minutes FROM base WHERE steam_id = ${steamId}) SELECT (SELECT minutes >= ${DEFAULT_FLOOR_MINUTES} FROM me) AS qualifies, (SELECT COUNT(*) FROM base, me WHERE base.minutes >= ${DEFAULT_FLOOR_MINUTES} AND base.kills > me.kills) AS above`); diff --git a/src/routes/api/servers/[id]/leaderboard/+server.ts b/src/routes/api/servers/[id]/leaderboard/+server.ts index 87491a8c..f40ffae7 100644 --- a/src/routes/api/servers/[id]/leaderboard/+server.ts +++ b/src/routes/api/servers/[id]/leaderboard/+server.ts @@ -1,5 +1,6 @@ // One page of the leaderboard: this server, or every server of its organisation the caller can -// see. Read at page load from kills, player_sessions and matches; nothing is precomputed. +// see, from the match lines and the sessions (all time from each player's settled totals), a +// page kept for a minute. // ?scope=server|org&range=7d|30d|90d|all&sort=&dir=asc|desc&page=1&minMinutes=60 import { getEnv } from '$lib/server/env'; import { apiJson, param, route } from '$lib/server/http'; From 93850663c37abf071c144a581782af952cda8fa6 Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 11:44:46 +0100 Subject: [PATCH 014/102] README: all-time numbers from the player totals, and how a hand repair or a bulk load keeps them right --- README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2b43d2a0..2655659c 100644 --- a/README.md +++ b/README.md @@ -733,7 +733,9 @@ player played; a match with no winner and nobody scoring, or one abandoned by a result. Playtime and seed time come from player sessions; kills per hour leaves seed time out; cash is summed over sessions, each banked across its matches like kills. Names link to the dossier. A page of a board is read at most once a minute for the same servers and settings, so a match -that just ended can take up to a minute to appear (a stats purge shows at once). +that just ended can take up to a minute to appear (a stats purge shows at once). All time is read +from each player's totals per server, which the database keeps as sessions close and matches end, +plus the sessions still open; 7, 30 and 90 days sum the match rows and sessions in the range. **Export CSV** on the tab downloads the board as it is set (scope, range, sort, playtime floor), from the top and every page of it, up to 10,000 players: rank, SteamID, name, playtime and seed @@ -746,8 +748,8 @@ Each dossier has a **Career** section: rank on the all-time kills board for this organisation, the current win or loss streak, matches with wins, losses and draws, K/D, kills per minute, headshot rate and best streak, a table per map and per faction (matches, wins, K/D), and the last ten matches with map, faction, result, time on, kills, deaths and the change in cash, -each opening its match page. Everything is read at page load from the rows the worker writes; -nothing is precomputed. +each opening its match page. Everything is read at page load; the ranks from each player's totals +per server, the matches from the player's own rows. Every server page has a **Matches** tab: the match history, newest first, with the map, when it started, how long it ran, the winner with the final scores (or "abandoned" for a match a restart @@ -1524,6 +1526,15 @@ settings) · `serverLog` (Audit trail) · `raw` (Raw RCON). - The risk score and the kick-on-connect trigger see only what this page describes. They cannot see aim, position, input or IP addresses; anything claiming to detect aimbots from the RCON API is guessing. +- Each player's totals per server (the all-time boards, career ranks, the placeholders' stats and + the risk score's record of matches) are kept by triggers in the database, in the same + transaction as whatever closes a session, ends a match or changes either afterwards, so a hand + repair of a session, a match or a match row keeps them right by itself. Start such a repair with + `SELECT player_totals_lock('');` and keep the default READ COMMITTED isolation (the + triggers refuse any other). A bulk load (a backfill of history; a `TRUNCATE` of + `player_sessions`, `matches` or `match_players`, which fires no trigger) runs in one transaction + that disables the `player_totals_*` triggers on those tables, loads, runs + `SELECT player_totals_rebuild();` and enables them again: writers wait for it, readers do not. - Audit rows are never deleted by the panel. Prune them with SQL if you need to. Deleting an account pseudonymises its rows rather than removing them (see [Accounts and personal data](#accounts-and-personal-data)). From 44dfe919385cedf0419cadddf359fabeb461271d Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 21:25:53 +0100 Subject: [PATCH 015/102] Boards: a player's name on a board and on their dossier is their newest session's, ties broken by the newer row. Two sessions that began in the same millisecond (one player joining two servers of an organisation at once) gave whichever row the query plan met first, so the same board could show either name, and the totals' exactness test could fail on it now and then --- src/lib/server/leaderboards.ts | 4 ++-- src/test/totals-oracle.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/server/leaderboards.ts b/src/lib/server/leaderboards.ts index dca405ca..36222f1e 100644 --- a/src/lib/server/leaderboards.ts +++ b/src/lib/server/leaderboards.ts @@ -275,7 +275,7 @@ async function boardSlice( r.vehicle_kills AS "vehicleKills", r.kill_streak AS "killStreak", r.death_streak AS "deathStreak", r.matches, r.wins, r.losses, r.draws, r.total, (SELECT name FROM player_sessions ps WHERE ps.steam_id = r.steam_id AND ps.server_id IN ${ids} - ORDER BY ps.joined_at DESC LIMIT 1) AS name + ORDER BY ps.joined_at DESC, ps.id DESC LIMIT 1) AS name FROM page r`)) as BaseRow[]; } @@ -411,7 +411,7 @@ export async function lastNameOf(env: Env, ids: string[], steamId: string): Prom if (!ids.length) return null; const [row] = await env.db.execute<{ name: string }>(sql` SELECT name FROM player_sessions WHERE steam_id = ${steamId} AND server_id IN ${ids} - ORDER BY joined_at DESC LIMIT 1`); + ORDER BY joined_at DESC, id DESC LIMIT 1`); return row?.name ?? null; } diff --git a/src/test/totals-oracle.ts b/src/test/totals-oracle.ts index 5601d36f..82d5c61c 100644 --- a/src/test/totals-oracle.ts +++ b/src/test/totals-oracle.ts @@ -110,7 +110,7 @@ export async function oracleBoard( r.kill_streak::text AS "killStreak", r.death_streak::text AS "deathStreak", r.matches::text, r.wins::text, r.losses::text, r.draws::text, r.total::text, (SELECT name FROM player_sessions ps WHERE ps.steam_id = r.steam_id AND ps.server_id IN ${ids} - ORDER BY ps.joined_at DESC LIMIT 1) AS name + ORDER BY ps.joined_at DESC, ps.id DESC LIMIT 1) AS name FROM page r`)) as Record[]; } From cb5da2befae84de5122b01dcbcb5ef0c2145a622 Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 21:25:53 +0100 Subject: [PATCH 016/102] Worker: a server's totals lock is taken before the lease row, not after it. A look that waited for the lock (a stats purge of that server holds it while it deletes) held the lease row FOR SHARE meanwhile, and the lease renewal updates that row, so a purge longer than the lease (15 s; a busy server's purge held it 14 to 28 s after 95 days of history on data shaped like the hosted panel's, growing with history) would have stopped the looks at every server; now it holds up its own server only. The observation takes it when it closes sessions, the match stage always (whether it ends or abandons the match or writes rows is known only once it has read the open match), the offline transition when it closes everyone. Since a look holds nothing on the lease row while it waits, the lease can change hands and come back meanwhile: a look's writes now name the period of ownership in which it read the game (worker_ownership.acquired_at, which changes whenever the lease changes hands) and are dropped, not written over what the other process wrote, when it has changed --- src/lib/server/leadership.ts | 39 ++++++- src/lib/server/observe.ts | 149 ++++++++++++++------------ src/test/player-totals-writes.test.ts | 73 ++++++++++++- 3 files changed, 188 insertions(+), 73 deletions(-) diff --git a/src/lib/server/leadership.ts b/src/lib/server/leadership.ts index f53c6868..455b3bdc 100644 --- a/src/lib/server/leadership.ts +++ b/src/lib/server/leadership.ts @@ -6,6 +6,7 @@ import { eq, sql } from 'drizzle-orm'; import type { Env } from './env'; import type { Tx } from './db'; import { workerOwnership } from './db/schema'; +import { lockTotals } from './totals'; const ROW_ID = 1; export const LEASE_MS = 15_000; @@ -23,6 +24,13 @@ export class LostOwnership extends Error { } } +/** Work prepared while this process owned the lease before: it changed hands since, and came back. */ +export class StaleOwnership extends Error { + constructor() { + super('The lease changed hands after this work was prepared; it is dropped.'); + } +} + /** Takes the lease if it is free or ours; renews it if ours. Returns whether we own it now. */ export async function acquireOrRenew(env: Env, label: string): Promise { const until = new Date(Date.now() + LEASE_MS); @@ -73,16 +81,39 @@ export async function releaseOwnership(env: Env): Promise { */ export const ownedSince = (): number => sinceHere; +/** + * Which period of ownership this is: worker_ownership.acquired_at, which changes whenever the lease + * changes hands. Work captures it when it reads the game and passes it to withOwnedTransaction. + */ +export const ownershipPeriod = (): number => since; + /** Owner, and the last renewal landed within the lease: a stalled renewal is a lost lease. */ export const isOwner = (): boolean => owner && Date.now() - lastRenewAt < LEASE_MS; export const ownershipStats = () => ({ owner, token: token.slice(0, 8), since, lastRenewAt }); -/** A transaction that aborts unless this process still holds the lease at commit time. */ -export async function withOwnedTransaction(env: Env, fn: (tx: Tx) => Promise): Promise { +/** + * A transaction that aborts unless this process still holds the lease at commit time. `totalsOf` + * takes that server's totals lock first (totals.ts), before the lease row: a transaction waiting + * for the lock (a purge of the server holds it) must not hold the row the renewal updates, or one + * slow purge would stall the lease and with it every server. Holding nothing on the lease row while + * it waits, the lease can change hands and come back meanwhile; `period` (ownershipPeriod() when the + * work read the game) refuses the work then, rather than write it over what the other process + * wrote, and leaves the lease as it is. + */ +export async function withOwnedTransaction( + env: Env, + fn: (tx: Tx) => Promise, + opts: { totalsOf?: string; period?: number } = {} +): Promise { if (!owner) throw new LostOwnership(); return env.db.transaction(async (tx) => { + if (opts.totalsOf) await lockTotals(tx, opts.totalsOf); const [row] = await tx - .select({ token: workerOwnership.token, leaseUntil: workerOwnership.leaseUntil }) + .select({ + token: workerOwnership.token, + leaseUntil: workerOwnership.leaseUntil, + acquiredAt: workerOwnership.acquiredAt + }) .from(workerOwnership) .where(eq(workerOwnership.id, ROW_ID)) .for('share'); @@ -90,6 +121,8 @@ export async function withOwnedTransaction(env: Env, fn: (tx: Tx) => Promise< owner = false; throw new LostOwnership(); } + if (opts.period !== undefined && row.acquiredAt.getTime() !== opts.period) + throw new StaleOwnership(); return fn(tx); }); } diff --git a/src/lib/server/observe.ts b/src/lib/server/observe.ts index 2792b3ff..4bf7baf3 100644 --- a/src/lib/server/observe.ts +++ b/src/lib/server/observe.ts @@ -65,8 +65,7 @@ import { writeMatchPlayers, type Tallies } from './match-players'; -import { isOwner, LostOwnership, withOwnedTransaction } from './leadership'; -import { lockTotals } from './totals'; +import { isOwner, LostOwnership, ownershipPeriod, withOwnedTransaction } from './leadership'; import { settings } from './settings'; import { isWatched } from './interest'; import { emit } from './events'; @@ -460,6 +459,8 @@ const sampleKeyOf = (m: ServerMemory) => export async function observeServer(env: Env, m: ServerMemory, kinds: ObserveKinds): Promise { const started = Date.now(); const ts = new Date(started); + // What this look reads is written only in the same period of ownership (leadership.ts). + const period = ownershipPeriod(); const server = m.server; let client: WardogsClient; let status: Status | null = null; @@ -471,7 +472,7 @@ export async function observeServer(env: Env, m: ServerMemory, kinds: ObserveKin if (kinds.players) players = ((await ACTIONS.players.run(client, {})) as { players: Player[] }).players; } catch (err) { - await observationFailed(env, m, ts, started, err); + await observationFailed(env, m, ts, started, period, err); observations.inc({ outcome: 'failed' }); observationSeconds.observe((Date.now() - started) / 1000); return; @@ -682,26 +683,29 @@ export async function observeServer(env: Env, m: ServerMemory, kinds: ObserveKin let saved = false; try { if (needWrite) - await withOwnedTransaction(env, async (tx) => { + await withOwnedTransaction( + env, + async (tx) => { + if (players && presenceDue) + await persistPresence( + tx, + server.id, + m.presence, + diff, + ts, + heartbeatDue, + firstVisit, + teams + ); + if (ev.intents.length) intents = await enqueueIntents(tx, server.id, ev.intents, watched); + if (ev.updates.length) await applyTriggerUpdates(tx, ev.updates); + if (liveDue) await writeLive(tx, m, ts); + if (sampleDue) await writeSample(tx, m, ts, latencyMs); + }, // A session closing adds to the player's totals: the server's totals lock comes - // before any row is touched (totals.ts). - if (players && presenceDue && diff.left.length) await lockTotals(tx, server.id); - if (players && presenceDue) - await persistPresence( - tx, - server.id, - m.presence, - diff, - ts, - heartbeatDue, - firstVisit, - teams - ); - if (ev.intents.length) intents = await enqueueIntents(tx, server.id, ev.intents, watched); - if (ev.updates.length) await applyTriggerUpdates(tx, ev.updates); - if (liveDue) await writeLive(tx, m, ts); - if (sampleDue) await writeSample(tx, m, ts, latencyMs); - }); + // before the lease row and every other row (totals.ts, leadership.ts). + { totalsOf: players && presenceDue && diff.left.length ? server.id : undefined, period } + ); if (liveDue) { m.liveKey = liveKey; m.liveWrittenAt = started; @@ -740,7 +744,12 @@ export async function observeServer(env: Env, m: ServerMemory, kinds: ObserveKin // player the lists want banned here, seen on the list: banned now, not at the sync's retry. if (look) await stage('match', m, () => - withOwnedTransaction(env, (tx) => reconcileMatch(tx, m, ts, look, matchEnd, prevStatusAt)) + // Lines written or a match ended or abandoned touch the totals, which only reading the + // open match tells: the server's totals lock always, before the lease row (totals.ts). + withOwnedTransaction(env, (tx) => reconcileMatch(tx, m, ts, look, matchEnd, prevStatusAt), { + totalsOf: m.server.id, + period + }) ); if (isOwner()) await stage('lists', m, () => keepLists(env, m, client, started, ts)); // After the lists, so a ban just placed removes the player at this look, not the next. @@ -759,6 +768,7 @@ async function observationFailed( m: ServerMemory, ts: Date, started: number, + period: number, err: unknown ): Promise { if (err instanceof GameError && err.code === 'rate_limited') { @@ -769,7 +779,7 @@ async function observationFailed( m.error = publicMessage(err, 'Rate limited.').slice(0, 300); m.observedAt = started; try { - await withOwnedTransaction(env, (tx) => writeLive(tx, m, ts)); + await withOwnedTransaction(env, (tx) => writeLive(tx, m, ts), { period }); m.liveKey = liveKeyOf(m); m.liveWrittenAt = started; } catch (e) { @@ -790,50 +800,54 @@ async function observationFailed( const sampleDue = m.failures === 1 || started - m.sampleWrittenAt >= s.sampleMs; let talliesWritten = false; try { - await withOwnedTransaction(env, async (tx) => { - if (m.failures >= OFFLINE_AFTER_FAILURES) { - // Closing the sessions adds to the totals, and the tallies go to the open match: the - // server's totals lock first (totals.ts). - await lockTotals(tx, m.server.id); - // Close every open session once; a rollback below reloads the map so this retries. - if (!m.presence.loaded) - await loadPresence( - tx, - m.server.id, - m.presence, - m.status?.scores.map((f) => f.name) - ); - if (m.presence.open.size) await closeAllSessions(tx, m.presence); - // Everyone's line of the match as it stood, to the match still open; the tallies end - // with the sessions (after the commit, so a rollback keeps them for the retry). - if (m.tallies.size) { - const [open] = await tx - .select({ id: matches.id }) - .from(matches) - .where(and(eq(matches.serverId, m.server.id), isNull(matches.endedAt))) - .orderBy(desc(matches.id)) - .limit(1); - if (open) - await writeMatchPlayers( + const offline = m.failures >= OFFLINE_AFTER_FAILURES; + await withOwnedTransaction( + env, + async (tx) => { + if (offline) { + // Close every open session once; a rollback below reloads the map so this retries. + if (!m.presence.loaded) + await loadPresence( tx, m.server.id, - open.id, - [...m.tallies.values()].map(tallyRow) + m.presence, + m.status?.scores.map((f) => f.name) ); - talliesWritten = true; + if (m.presence.open.size) await closeAllSessions(tx, m.presence); + // Everyone's line of the match as it stood, to the match still open; the tallies end + // with the sessions (after the commit, so a rollback keeps them for the retry). + if (m.tallies.size) { + const [open] = await tx + .select({ id: matches.id }) + .from(matches) + .where(and(eq(matches.serverId, m.server.id), isNull(matches.endedAt))) + .orderBy(desc(matches.id)) + .limit(1); + if (open) + await writeMatchPlayers( + tx, + m.server.id, + open.id, + [...m.tallies.values()].map(tallyRow) + ); + talliesWritten = true; + } + m.lastMatch = null; } - m.lastMatch = null; - } - if (sampleDue) - await tx.insert(samples).values({ - serverId: m.server.id, - ts, - ok: false, - latencyMs: Date.now() - started, - error: m.error - }); - if (liveDue) await writeLive(tx, m, ts); - }); + if (sampleDue) + await tx.insert(samples).values({ + serverId: m.server.id, + ts, + ok: false, + latencyMs: Date.now() - started, + error: m.error + }); + if (liveDue) await writeLive(tx, m, ts); + }, + // Closing the sessions adds to the totals, and the tallies go to the open match: the + // server's totals lock first, before the lease row (totals.ts, leadership.ts). + { totalsOf: offline ? m.server.id : undefined, period } + ); if (liveDue) { m.liveKey = liveKey; m.liveWrittenAt = started; @@ -934,10 +948,8 @@ async function reconcileMatch( prevStatusAt: number ): Promise { const serverId = m.server.id; - // Writing lines or ending a match can touch the totals: the server's totals lock before the - // match row is read, so a purge cannot come in between (totals.ts). An abandoned match, known - // only once the open row is read, takes it below. - if (ended || [...m.tallies.values()].some((t) => t.dirty)) await lockTotals(db, serverId); + // The caller holds the server's totals lock (writing lines or ending a match touches the + // totals), so a purge cannot come in between the read of the match and its writes. const [current] = await db .select({ id: matches.id, @@ -964,7 +976,6 @@ async function reconcileMatch( m.tallies = closed.carried; } else if (current && stale) { // Abandoned: no scores, no winner. What the tallies hold belongs to the map now on. - await lockTotals(db, serverId); await db.update(matches).set({ endedAt: ts }).where(eq(matches.id, current.id)); } else if (current) { const due = [...m.tallies.values()].filter((t) => t.dirty); diff --git a/src/test/player-totals-writes.test.ts b/src/test/player-totals-writes.test.ts index 7e772a30..3dfdfb3b 100644 --- a/src/test/player-totals-writes.test.ts +++ b/src/test/player-totals-writes.test.ts @@ -5,7 +5,9 @@ // transactions on one server, the worker's (a close, a match end, an abandoned match, leavers' // lines, the offline transition) and a purge, each holding the server's totals lock while the // other waits for it, in both orders: no deadlock, and the totals exact after. Taking the lock -// first is what makes that so: without it, an abandoned match against a purge deadlocks. A +// first is what makes that so: without it, an abandoned match against a purge deadlocks; and, +// taken before the lease row, a purge holding it does not hold up the lease renewal, while a write +// that waited for it as the lease changed hands and came back is dropped. A // transaction that is not READ COMMITTED is refused. Last, migration 0038 run over a database that // already has history builds the totals the reads expect. import { beforeAll, describe, expect, test } from 'bun:test'; @@ -18,6 +20,13 @@ import { eq, sql } from 'drizzle-orm'; import type { Env } from '$lib/server/env'; import { connect, runMigrations, type DbOrTx } from '$lib/server/db'; import { matches, matchPlayers, playerSessions } from '$lib/server/db/schema'; +import { + acquireOrRenew, + isOwner, + ownershipPeriod, + StaleOwnership, + withOwnedTransaction +} from '$lib/server/leadership'; import { writeMatchPlayers } from '$lib/server/match-players'; import { purgeServerStats } from '$lib/server/stats'; import { lockTotals } from '$lib/server/totals'; @@ -388,6 +397,68 @@ describe.skipIf(!hasTestDb)('player totals under every kind of write', () => { }); } + test('a purge holding the totals lock does not hold up the lease: the worker waits for the lock before the lease row', async () => { + const h = await history(); + expect(await acquireOrRenew(env, 'totals-lease')).toBe(true); + const deleted = gate(); + const go = gate(); + const purging = purge(h.A, go.opened, deleted.open); + await deleted.opened; + const writing = withOwnedTransaction(env, (tx) => tx.execute(sql`SELECT 1`), { + totalsOf: h.A + }); + // with the lease row held FOR SHARE by the waiting write, the renewal would queue + // behind it until the purge let go + let renewed: boolean | string = 'not tried'; + try { + await untilWaiting(); + renewed = await Promise.race([ + acquireOrRenew(env, 'totals-lease'), + Bun.sleep(3_000).then(() => 'stalled') + ]); + } finally { + go.open(); + await Promise.allSettled([purging, writing]); + } + expect(renewed).toBe(true); + await exact([h.A]); + }); + + test('a write that waited for the totals lock while the lease changed hands and came back is dropped, not written', async () => { + const h = await history(); + expect(await acquireOrRenew(env, 'totals-lease')).toBe(true); + const period = ownershipPeriod(); + const deleted = gate(); + const go = gate(); + const purging = purge(h.A, go.opened, deleted.open); + await deleted.opened; + let ran = false; + const writing = withOwnedTransaction( + env, + async () => { + ran = true; + }, + { totalsOf: h.A, period } + ); + let outcome: unknown = 'not settled'; + try { + await untilWaiting(); + // another process takes the lease and lets it lapse; this one takes it back + await env.db.execute(sql` + UPDATE worker_ownership SET token = 'another process', acquired_at = now(), + lease_until = now() - interval '1 second'`); + expect(await acquireOrRenew(env, 'totals-lease')).toBe(true); + expect(ownershipPeriod()).not.toBe(period); + } finally { + go.open(); + const [w] = await Promise.allSettled([writing, purging]); + outcome = w.status === 'rejected' ? w.reason : 'written'; + } + expect(ran).toBe(false); + expect(outcome).toBeInstanceOf(StaleOwnership); + expect(isOwner()).toBe(true); + }); + test('without the lock first, an abandoned match against a purge deadlocks', async () => { const h = await history(); const deleted = gate(); From 7a8a9d755832195f44df8cbdc5f4b48bcd18d151 Mon Sep 17 00:00:00 2001 From: James Causon Date: Mon, 5 Oct 2026 00:13:27 +0100 Subject: [PATCH 017/102] Match links preload their page on tap, not on hover: the Matches tab, the public matches page and a career's last ten matches loaded a match page (its samples timeline) for every link the cursor crossed; on the hosted panel the match page's timeline was 8% of the database's time in a busy evening window --- src/lib/components/CareerPanel.svelte | 6 ++++-- src/lib/components/MatchCards.svelte | 6 ++++-- src/lib/components/MatchList.svelte | 12 ++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/lib/components/CareerPanel.svelte b/src/lib/components/CareerPanel.svelte index c1f80e65..950c723d 100644 --- a/src/lib/components/CareerPanel.svelte +++ b/src/lib/components/CareerPanel.svelte @@ -128,8 +128,10 @@ {fmtTime(m.startedAt)} {#if multiServer}{m.serverName}{/if} - {#if matchHref}{m.map ? mapName(m.map) : 'Match'}{m.map ? mapName(m.map) : 'Match'}{:else}{m.map ? mapName(m.map) : '—'}{/if} {m.faction || '—'} diff --git a/src/lib/components/MatchCards.svelte b/src/lib/components/MatchCards.svelte index 880b8362..29de96be 100644 --- a/src/lib/components/MatchCards.svelte +++ b/src/lib/components/MatchCards.svelte @@ -76,8 +76,10 @@
{#each matches as m (m.id)} {#if m.endedAt} - {@render card(m)}{@render card(m)} {:else}
{@render card(m)}
diff --git a/src/lib/components/MatchList.svelte b/src/lib/components/MatchList.svelte index 206bd388..c40f0861 100644 --- a/src/lib/components/MatchList.svelte +++ b/src/lib/components/MatchList.svelte @@ -52,13 +52,17 @@ {@const r = resultLine(m)} - {#if m.endedAt}{fmtTime(m.startedAt)}{fmtTime(m.startedAt)}{:else}{fmtTime(m.startedAt)}{/if} - {#if m.endedAt}{mapName(m.map)}{mapName(m.map)}{:else}{mapName(m.map)}{/if} {fmtLength(durationOf(m, now))} From 66291dc0d072fb1be5ed2e3b2d78209c03900a94 Mon Sep 17 00:00:00 2001 From: James Causon Date: Mon, 5 Oct 2026 22:18:11 +0100 Subject: [PATCH 018/102] Kill distance watch: a kill that comes within a minute of the killer's own death is not counted, live or in the dry run. The game credits a vehicle's shell that lands after the vehicle was destroyed to the gunner's carried weapon, from wherever the gunner is by then: on the hosted feed, 294 of the 301 carried-weapon kills from 1,000 m or more in 14 days came within 35 s of the killer's own death, and a rule on M4 kills from 1,300 m banned two artillery gunners for them in one evening. The worker keeps each player's last death per server for servers with the rule on, forgotten with the counts; the dry run reads the counted killers' deaths and says how many kills it left out --- src/lib/server/feed-events.ts | 34 ++++++++- src/lib/server/kill-distance.test.ts | 89 ++++++++++++++++++++++- src/lib/server/kill-distance.ts | 67 ++++++++++++++++- src/lib/server/triggers.ts | 54 +++++++++++++- src/test/kill-distance-rule.test.ts | 105 ++++++++++++++++++++++++++- 5 files changed, 331 insertions(+), 18 deletions(-) diff --git a/src/lib/server/feed-events.ts b/src/lib/server/feed-events.ts index 0f60ed78..f9e697e9 100644 --- a/src/lib/server/feed-events.ts +++ b/src/lib/server/feed-events.ts @@ -38,10 +38,12 @@ import { countsForDistance, killDistanceSettingsKey, killDistanceStep, + killsAfterDeath, matchKey, type DistanceTrack, type DistanceTracks, - type KillDistanceConfig + type KillDistanceConfig, + type LastDeaths } from './kill-distance'; import { applyTriggerUpdates, enqueueIntents, wakeDelivery } from './outbox'; import { LostOwnership, withOwnedTransaction } from './leadership'; @@ -172,11 +174,21 @@ interface DistanceMemory { tracks: DistanceTracks; } const distanceMemory = new Map>(); +/** + * Each server's last deaths per player, so a kill just after the killer's own death is not counted + * (killsAfterDeath) when the death came in an earlier batch. Kept, and forgotten, with the counts. + */ +const lastDeaths = new Map(); /** Forgets the Kill distance counts of one server (removed from the worker), or of every server. */ export function forgetKillDistance(serverId?: string): void { - if (serverId) distanceMemory.delete(serverId); - else distanceMemory.clear(); + if (serverId) { + distanceMemory.delete(serverId); + lastDeaths.delete(serverId); + } else { + distanceMemory.clear(); + lastDeaths.clear(); + } } /** @@ -211,13 +223,26 @@ async function actOnKillDistance( let mine = distanceMemory.get(serverId); if (!rows.length) { if (mine) distanceMemory.delete(serverId); + lastDeaths.delete(serverId); return; } const live = new Set(rows.map((r) => r.id)); if (mine) for (const id of mine.keys()) if (!live.has(id)) mine.delete(id); // The kills each rule counts, in the order the game played them. Most batches have none, and - // then nothing is read. + // then nothing is read; every batch's deaths are noted all the same. const inOrder = [...batch].sort((a, b) => a.eventTime - b.eventTime); + let deaths = lastDeaths.get(serverId); + if (!deaths) lastDeaths.set(serverId, (deaths = new Map())); + const afterDeath = killsAfterDeath( + deaths, + inOrder.map((k) => ({ + eventId: k.eventId, + eventTime: k.eventTime, + killer: k.killer?.steamId, + victim: k.victim.steamId + })), + Date.parse(batch[0].ts) + ); const counted = rows .map((row) => { const cfg = row.config as KillDistanceConfig; @@ -225,6 +250,7 @@ async function actOnKillDistance( countsForDistance(cfg, { killer: k.killer?.steamId, suicide: k.suicide, + afterOwnDeath: afterDeath.has(k.eventId), cause: k.cause, distanceM: k.distanceM }) diff --git a/src/lib/server/kill-distance.test.ts b/src/lib/server/kill-distance.test.ts index bffb9edf..95a662e3 100644 --- a/src/lib/server/kill-distance.test.ts +++ b/src/lib/server/kill-distance.test.ts @@ -1,6 +1,7 @@ import { describe, expect, test } from 'bun:test'; import { ACT_AGAIN_MS, + AFTER_DEATH_S, countsForDistance, killDistanceAction, killDistanceBanScope, @@ -8,10 +9,13 @@ import { killDistanceSettingsKey, killDistanceStep, killDistanceVerdict, + killsAfterDeath, + killsAfterDeathReplay, matchKey, validateKillDistance, type DistanceTracks, - type KillDistanceConfig + type KillDistanceConfig, + type LastDeaths } from './kill-distance'; const DEFIB = 'Id.Item.Defibrillator.Standard'; @@ -29,6 +33,7 @@ const cfg = (c: Partial = {}): KillDistanceConfig => ({ const MIN = 60_000; const A = '76561198000000001'; const B = '76561198000000002'; +const C = '76561198000000003'; describe('validateKillDistance', () => { test('needs a weapon, each a kill feed tag', () => { @@ -122,7 +127,14 @@ describe('validateKillDistance', () => { describe('countsForDistance', () => { const c = cfg(); const k = (over: Partial[1]> = {}) => - countsForDistance(c, { killer: A, suicide: false, cause: DEFIB, distanceM: 4057, ...over }); + countsForDistance(c, { + killer: A, + suicide: false, + afterOwnDeath: false, + cause: DEFIB, + distanceM: 4057, + ...over + }); test('a player’s kill with a chosen weapon from the distance on, in any case', () => { expect(k()).toBe(true); expect(k({ distanceM: 100 })).toBe(true); @@ -138,12 +150,21 @@ describe('countsForDistance', () => { expect(k({ killer: null })).toBe(false); expect(k({ suicide: true })).toBe(false); }); + test('not one made just after the killer’s own death', () => { + expect(k({ afterOwnDeath: true })).toBe(false); + }); test('from 0 m every kill with a chosen weapon or vehicle, one sent without a distance too', () => { const HUMVEE_M249 = 'Id.Vehicle.WeaponExtension.WHL_05.RingTurret'; const HUMVEE = 'Vehicle.Variant.Land.Wheeled.Humvee.MachineGun'; const any = cfg({ minDistanceM: 0, causes: [HUMVEE_M249, HUMVEE] }); const at = (over: Partial[1]>) => - countsForDistance(any, { killer: A, suicide: false, cause: HUMVEE_M249, ...over } as never); + countsForDistance(any, { + killer: A, + suicide: false, + afterOwnDeath: false, + cause: HUMVEE_M249, + ...over + } as never); expect(at({ distanceM: 35 })).toBe(true); expect(at({ distanceM: 0 })).toBe(true); expect(at({ distanceM: null })).toBe(true); @@ -157,6 +178,7 @@ describe('countsForDistance', () => { countsForDistance(cfg({ minDistanceM: 1, causes: [HUMVEE] }), { killer: A, suicide: false, + afterOwnDeath: false, cause: HUMVEE, distanceM: null }) @@ -164,6 +186,67 @@ describe('countsForDistance', () => { }); }); +describe('killsAfterDeath', () => { + /** One kill of the feed: `killer` killed `victim` at `t` on the match clock. */ + let n = 0; + const kill = (killer: string | null, victim: string, t: number) => ({ + eventId: `e${++n}`, + eventTime: t, + killer, + victim + }); + test('a kill within a minute after the killer’s own death: a shell that landed after their vehicle was destroyed', () => { + const deaths: LastDeaths = new Map(); + const before = kill(A, C, 3380); + const died = kill(B, A, 3383.97); + // the same instant twice: one shell, two victims + const shell = [kill(A, B, 3388.23), kill(A, C, 3388.23)]; + const out = killsAfterDeath(deaths, [before, died, ...shell], 0); + // not the kill A made before dying, nor the one that killed A + expect([...out]).toEqual(shell.map((k) => k.eventId)); + }); + test('after the death, up to the window and not after it, on the match clock', () => { + const at = (gap: number) => { + const deaths: LastDeaths = new Map(); + const k = kill(A, B, 1000 + gap); + return killsAfterDeath(deaths, [kill(C, A, 1000), k], 0).has(k.eventId); + }; + // two who kill each other at the same instant both count + expect(at(0)).toBe(false); + expect(at(0.01)).toBe(true); + expect(at(AFTER_DEATH_S)).toBe(true); + expect(at(AFTER_DEATH_S + 0.01)).toBe(false); + }); + test('a death in an earlier batch counts; a death later on the clock is from the match before', () => { + const deaths: LastDeaths = new Map(); + killsAfterDeath(deaths, [kill(C, A, 3383.97)], 0); + const next = kill(A, B, 3388.23); + expect([...killsAfterDeath(deaths, [next], 4000)]).toEqual([next.eventId]); + // a new match: the clock started again, and A has not died in it + const first = kill(A, B, 30); + expect(killsAfterDeath(deaths, [first], 30_000).size).toBe(0); + }); + test('a death is forgotten two minutes after it came in; the environment’s kills are deaths too', () => { + const deaths: LastDeaths = new Map(); + killsAfterDeath(deaths, [kill(null, A, 100)], 0); + const soon = kill(A, B, 130); + expect( + killsAfterDeath(new Map(deaths), [soon], 2 * AFTER_DEATH_S * 1000).has(soon.eventId) + ).toBe(true); + expect(killsAfterDeath(deaths, [soon], 2 * AFTER_DEATH_S * 1000 + 1).size).toBe(0); + expect(deaths.has(A)).toBe(false); + }); + test('replayed batch by batch, as they came in', () => { + const at = (e: ReturnType, ms: number) => ({ ...e, at: ms }); + const died = kill(C, A, 500); + const shell = kill(A, B, 505); + // C killed A and lives on + const alive = kill(C, '76561198000000004', 506); + const out = killsAfterDeathReplay([at(died, 0), at(shell, 6000), at(alive, 6000)]); + expect([...out]).toEqual([shell.eventId]); + }); +}); + describe('matchKey', () => { test('the stamped match, or the hour a kill came in when none was open', () => { expect(matchKey(41, 0)).toBe('m41'); diff --git a/src/lib/server/kill-distance.ts b/src/lib/server/kill-distance.ts index 36591e4f..177bba26 100644 --- a/src/lib/server/kill-distance.ts +++ b/src/lib/server/kill-distance.ts @@ -5,7 +5,9 @@ // kill with a weapon or a vehicle it does not allow. Kills are counted per match, as the Team kill // limit counts them, rather than within minutes: the feed gives no kill a time the panel can trust // across batches (a batch the game sends again arrives late, with only the match clock), and a -// match is what the game itself numbers. No database, no game server; the live path +// match is what the game itself numbers. A kill that comes just after the killer's own death is not +// counted: the player is dead, and the game credits a vehicle's shell that lands after the vehicle +// was destroyed to the gunner's own weapon. No database, no game server; the live path // (feed-events.ts) and the dry run (triggers.ts) run the same step. import { ApiError, int, str } from './http'; import { causeTags } from './cause-tags'; @@ -91,15 +93,16 @@ function causeSet(cfg: KillDistanceConfig): Set { } /** - * A kill the rule counts: a player's, not a suicide, with one of its weapons, from at least its - * distance. From 0 m a kill the feed sends without a distance counts too: a vehicle blown up with - * its crew inside, a roadkill. + * A kill the rule counts: a player's, not a suicide, not one made just after the killer's own death + * (killsAfterDeath), with one of its weapons, from at least its distance. From 0 m a kill the feed + * sends without a distance counts too: a vehicle blown up with its crew inside, a roadkill. */ export function countsForDistance( cfg: KillDistanceConfig, k: { killer: string | null | undefined; suicide: boolean; + afterOwnDeath: boolean; cause: string | null; distanceM: number | null; } @@ -107,6 +110,7 @@ export function countsForDistance( return ( !!k.killer && !k.suicide && + !k.afterOwnDeath && (cfg.minDistanceM <= 0 || (typeof k.distanceM === 'number' && k.distanceM >= cfg.minDistanceM)) && !!k.cause && @@ -114,6 +118,61 @@ export function countsForDistance( ); } +/** + * How long after a player's own death a kill the feed credits to them is not counted, in seconds of + * the match clock. A dead player is not firing: the kill is a round or a charge already on its way, + * and its cause cannot be trusted. A vehicle's shell that lands after the vehicle was destroyed + * comes credited to the gunner's own weapon, from wherever the gunner is by then (an M4 kill from + * 2,300 m). On the hosted feed every such kill came within 35 s of the death. + */ +export const AFTER_DEATH_S = 60; +/** How long a death is kept on the panel's clock: past the window, with room for a late batch. */ +const DEATH_KEPT_MS = 2 * AFTER_DEATH_S * 1000; + +/** Each player's last death the feed told of: on the match clock (s), and when it came in (ms). */ +export type LastDeaths = Map; + +export interface FeedDeath { + eventId: string; + /** seconds on the match clock */ + eventTime: number; + killer: string | null | undefined; + victim: string; +} + +/** + * Takes in a batch of kills that came in at `at` (ms), in the order the game played them: notes + * each victim's death, and returns the kills made within AFTER_DEATH_S after the killer's own last + * death, by event id. Two players who kill each other at the same instant both count. The match + * clock starts again at a new match, so a death later on it than the kill is not the one before it. + */ +export function killsAfterDeath(deaths: LastDeaths, inOrder: FeedDeath[], at: number): Set { + for (const [steamId, d] of deaths) if (at - d.at > DEATH_KEPT_MS) deaths.delete(steamId); + const out = new Set(); + for (const k of inOrder) { + const d = k.killer ? deaths.get(k.killer) : undefined; + if (d && k.eventTime > d.clock && k.eventTime - d.clock <= AFTER_DEATH_S) out.add(k.eventId); + deaths.set(k.victim, { clock: k.eventTime, at }); + } + return out; +} + +/** + * killsAfterDeath over a window, batch by batch: `events` in the order they came in (`at`, then + * the match clock), the kills of one batch sharing their `at`. + */ +export function killsAfterDeathReplay(events: (FeedDeath & { at: number })[]): Set { + const deaths: LastDeaths = new Map(); + const out = new Set(); + for (let i = 0; i < events.length;) { + let j = i; + while (j < events.length && events[j].at === events[i].at) j++; + for (const id of killsAfterDeath(deaths, events.slice(i, j), events[i].at)) out.add(id); + i = j; + } + return out; +} + /** * Which match a kill is counted in: the match it was stamped with on arrival (feed.ts), or, for a * kill that came in while no match was open, the hour it came in. diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index ba2d86e7..02298eaa 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -118,6 +118,7 @@ import { killDistanceReplay, killDistanceSettingsKey, killDistanceVerdict, + killsAfterDeathReplay, matchKey, type DistanceKill, type KillDistanceConfig @@ -2163,26 +2164,67 @@ export async function dryRun( const far = c.minDistanceM > 0 ? sql`AND distance_m >= ${c.minDistanceM}` : sql``; const rows = await env.db.execute<{ ts: Date; + eventId: string; + eventTime: number; steamId: string; name: string | null; + victim: string; cause: string | null; distanceM: number | null; matchRow: number | null; }>(sql` - SELECT ts, killer_steam_id AS "steamId", killer_name AS name, cause, - distance_m AS "distanceM", match_row AS "matchRow" + SELECT ts, event_id AS "eventId", event_time AS "eventTime", killer_steam_id AS "steamId", + killer_name AS name, victim_steam_id AS victim, cause, distance_m AS "distanceM", + match_row AS "matchRow" FROM kills WHERE event_type = 'killed' AND parsed_kill AND server_id = ${server.id} AND ts >= ${since} AND killer_steam_id IS NOT NULL AND NOT suicide ${far} AND lower(cause) IN (SELECT jsonb_array_elements_text(${JSON.stringify(c.causes.map((x) => x.toLowerCase()))}::text::jsonb)) ORDER BY ts ASC, event_time ASC LIMIT ${KILL_RATE_REPLAY_MAX}`); + // Those killers' own deaths from a little before, so a kill just after one is left out as + // the live rule leaves it out. + const killers = new Set(); + for (const r of rows) killers.add(r.steamId); + const deaths = killers.size + ? await env.db.execute<{ ts: Date; eventId: string; eventTime: number; victim: string }>(sql` + SELECT ts, event_id AS "eventId", event_time AS "eventTime", victim_steam_id AS victim + FROM kills + WHERE server_id = ${server.id} AND ts >= ${new Date(since.getTime() - 120_000)} + AND victim_steam_id IN (SELECT jsonb_array_elements_text(${JSON.stringify([...killers])}::text::jsonb)) + ORDER BY ts ASC, event_time ASC LIMIT ${KILL_RATE_REPLAY_MAX}`) + : []; + const event = ( + ts: Date, + eventId: string, + eventTime: number, + killer: string | null, + victim: string + ) => ({ eventId, eventTime: Number(eventTime), killer, victim, at: new Date(ts).getTime() }); + const events: ReturnType[] = []; + for (const r of rows) events.push(event(r.ts, r.eventId, r.eventTime, r.steamId, r.victim)); + for (const d of deaths) events.push(event(d.ts, d.eventId, d.eventTime, null, d.victim)); + const afterDeath = killsAfterDeathReplay( + events.sort((a, b) => a.at - b.at || a.eventTime - b.eventTime) + ); const counted: DistanceKill[] = []; + let afterDeathInWindow = 0; for (const r of rows) { + const at = new Date(r.ts).getTime(); const distanceM = r.distanceM === null ? null : Number(r.distanceM); - if (!countsForDistance(c, { killer: r.steamId, suicide: false, cause: r.cause, distanceM })) + const afterOwnDeath = afterDeath.has(r.eventId); + if ( + !countsForDistance(c, { + killer: r.steamId, + suicide: false, + afterOwnDeath, + cause: r.cause, + distanceM + }) + ) { + if (afterOwnDeath && at >= from.getTime()) afterDeathInWindow++; continue; - const at = new Date(r.ts).getTime(); + } counted.push({ at, match: matchKey(r.matchRow === null ? null : Number(r.matchRow), at), @@ -2207,6 +2249,10 @@ export async function dryRun( result.notes.push( `${inWindow} kill${inWindow === 1 ? '' : 's'} with ${c.causes.length === 1 ? causeLabel(c.causes[0]) : 'the chosen weapons'} ${c.minDistanceM > 0 ? `from ${c.minDistanceM} m or more` : 'at any distance'} in the window, counted per match.` ); + if (afterDeathInWindow) + result.notes.push( + `${afterDeathInWindow} more came within a minute of the killer’s own death and ${afterDeathInWindow === 1 ? 'is' : 'are'} not counted: a vehicle’s shell that lands after the vehicle was destroyed comes credited to the gunner’s own weapon.` + ); if (rows.length >= KILL_RATE_REPLAY_MAX) result.notes.push( `Replayed the first ${KILL_RATE_REPLAY_MAX.toLocaleString('en')} such kills only.` diff --git a/src/test/kill-distance-rule.test.ts b/src/test/kill-distance-rule.test.ts index 5b778663..e501acd7 100644 --- a/src/test/kill-distance-rule.test.ts +++ b/src/test/kill-distance-rule.test.ts @@ -47,12 +47,23 @@ const SNIPER = '76561198000000803'; const VICTIM = '76561198000000804'; /** a player the server does not list */ const GONE = '76561198000000805'; +/** a gunner whose vehicle is destroyed with a shell in the air, and the enemy who destroys it */ +const GUNNER = '76561198000000806'; +const ENEMY = '76561198000000807'; +const M4 = 'Id.Item.M4'; +const ENEMY_GUN = 'Id.Vehicle.WeaponExtension.STN_05.MainBarrel'; const REASON = 'Impossible kill: Defibrillator from 4057 m.'; /** One `killed` event as the game posts it; distance in metres here, centimetres on the wire. */ const ev = ( killer: string | null, - o: { cause?: string; distanceM?: number | null; eventTime?: number; suicide?: boolean } = {} + o: { + cause?: string; + distanceM?: number | null; + eventTime?: number; + suicide?: boolean; + victim?: string; + } = {} ) => ({ eventId: newId(), type: 'killed', @@ -60,8 +71,8 @@ const ev = ( matchId: 'boot', mapName: 'Kavkazi', ...(killer ? { killerName: `p${killer.slice(-3)}`, killerSteamId: killer } : {}), - victimName: 'victim', - victimSteamId: VICTIM, + victimName: o.victim ? `p${o.victim.slice(-3)}` : 'victim', + victimSteamId: o.victim ?? VICTIM, cause: o.cause ?? DEFIB, ...(o.distanceM === null ? {} : { distance: (o.distanceM ?? 4057) * 100 }), contextTags: o.suicide ? ['Meta.Progression.Context.Player.KillContext.Suicide'] : [] @@ -272,6 +283,39 @@ describe.skipIf(!hasTestDb)('Kill distance rule, live', () => { expect(await rowsOf(id)).toHaveLength(0); }); + test('a kill just after the killer’s own death is not counted: a shell that landed after their vehicle was destroyed', async () => { + const w = await seedWorld(env); + await openMatch(w.server.id); + const id = await rule(w, w.server.id, { + causes: [M4], + minDistanceM: 1300, + count: 1, + action: 'kick' + }); + // the gunner's vehicle destroyed with them in it, then their shell landing on two players + // at once, credited to the rifle they carry + await post(w.server.id, [ + ev(ENEMY, { cause: ENEMY_GUN, distanceM: 2297, eventTime: 3383.97, victim: GUNNER }) + ]); + await post(w.server.id, [ + ev(GUNNER, { cause: M4, distanceM: 2295, eventTime: 3388.23, victim: ENEMY }), + ev(GUNNER, { cause: M4, distanceM: 2280, eventTime: 3388.23 }) + ]); + // another gunner's death and their shell in one batch + await post(w.server.id, [ + ev(ENEMY, { cause: ENEMY_GUN, distanceM: 2400, eventTime: 3390, victim: SNIPER }), + ev(SNIPER, { cause: M4, distanceM: 2410, eventTime: 3396 }) + ]); + expect(await rowsOf(id)).toHaveLength(0); + // a living player's kill from as far counts, and so does the gunner's a minute on + await post(w.server.id, [ev(CHEAT, { cause: M4, distanceM: 2300, eventTime: 3400 })]); + await post(w.server.id, [ev(GUNNER, { cause: M4, distanceM: 2300, eventTime: 3445 })]); + expect((await rowsOf(id)).map((r) => [r.steamId, r.okMessage])).toEqual([ + [CHEAT, 'Kicked p801: M4 kill from 2300 m'], + [GUNNER, 'Kicked p806: M4 kill from 2300 m'] + ]); + }); + test('a warning on a Humvee’s guns from 0 m: whispered once in the cooldown, a kill without a distance too, in the panel’s words', async () => { const w = await seedWorld(env); const [server] = await env.db.select().from(servers).where(eq(servers.id, w.server.id)); @@ -865,6 +909,61 @@ describe.skipIf(!hasTestDb)('Kill distance rule, live', () => { ); }); + test('the dry run leaves out a kill just after the killer’s own death, and says so', async () => { + const w = await seedWorld(env); + const at = Date.now() - 600_000; + const row = ( + killer: string, + victim: string, + cause: string, + distanceM: number, + eventTime: number, + receivedMs: number + ) => ({ + ts: new Date(at + receivedMs), + serverId: w.server.id, + eventId: newId(), + instanceId: 'i', + matchId: 'm', + matchRow: 9201, + eventTime, + map: 'Kavkazi', + killerSteamId: killer, + killerName: `p${killer.slice(-3)}`, + victimSteamId: victim, + victimName: `p${victim.slice(-3)}`, + cause, + distanceM, + tags: [] + }); + await env.db + .insert(kills) + .values([ + row(ENEMY, GUNNER, ENEMY_GUN, 2297, 3383.97, 0), + row(GUNNER, ENEMY, M4, 2295, 3388.23, 4000), + row(GUNNER, VICTIM, M4, 2280, 3388.23, 4000), + row(CHEAT, VICTIM, M4, 2300, 3394, 10_000), + row(GUNNER, VICTIM, M4, 2300, 3445, 62_000) + ]); + const server = { ...w.server, name: 'one' } as Parameters[1]; + const r = await dryRun(env, server, 'kill_distance', { + causes: [M4], + minDistanceM: 1300, + count: 1, + action: 'kick' + }); + expect(r.items.map((i) => i.text)).toEqual([ + `kick p801 (${CHEAT}): M4 kill from 2300 m`, + `kick p806 (${GUNNER}): M4 kill from 2300 m` + ]); + expect(r.notes).toContain( + '2 kills with M4 from 1300 m or more in the window, counted per match.' + ); + expect(r.notes).toContain( + '2 more came within a minute of the killer’s own death and are not counted: a vehicle’s shell that lands after the vehicle was destroyed comes credited to the gunner’s own weapon.' + ); + }); + test('nothing a person or a key can call runs a rule’s ban, flag or kill', async () => { const w = await seedWorld(env); const mod = await import( From ce95bc040aea5bfaefa6fd03fb390aefee0a3a9e Mon Sep 17 00:00:00 2001 From: James Causon Date: Mon, 5 Oct 2026 23:08:46 +0100 Subject: [PATCH 019/102] Kill distance watch: each kill a rule leaves out for coming just after the killer's own death is noted in the audit trail ("Not counted: M4 kill from 2295 m by ..., 4.3 s after they died"), so staff can see why the rule let it be. The note is a panel action like the flag, sends nothing to the game, is kept off Discord, and reads "not counted" in the Automation tab's list --- src/lib/server/feed-events.ts | 50 +++++++++++++--- src/lib/server/kill-distance.test.ts | 16 ++++- src/lib/server/kill-distance.ts | 40 +++++++++++-- src/lib/server/outbox.ts | 13 ++-- src/lib/server/webhook-delivery.ts | 9 ++- .../(app)/server/[id]/automation/+page.svelte | 4 +- src/test/kill-distance-rule.test.ts | 59 ++++++++++++++++--- src/test/two-teams-discord.test.ts | 33 ++++++++++- 8 files changed, 187 insertions(+), 37 deletions(-) diff --git a/src/lib/server/feed-events.ts b/src/lib/server/feed-events.ts index f9e697e9..6a2144c9 100644 --- a/src/lib/server/feed-events.ts +++ b/src/lib/server/feed-events.ts @@ -36,10 +36,12 @@ import { } from './kill-rate'; import { countsForDistance, + KILL_DISTANCE_SKIP, killDistanceSettingsKey, killDistanceStep, killsAfterDeath, matchKey, + notCountedMessage, type DistanceTrack, type DistanceTracks, type KillDistanceConfig, @@ -246,27 +248,57 @@ async function actOnKillDistance( const counted = rows .map((row) => { const cfg = row.config as KillDistanceConfig; - const hits = inOrder.filter((k) => - countsForDistance(cfg, { + const hits: KillView[] = []; + // the kills it would have counted but for the killer's own death just before + const leftOut: { k: KillView; afterS: number }[] = []; + for (const k of inOrder) { + const kill = { killer: k.killer?.steamId, suicide: k.suicide, - afterOwnDeath: afterDeath.has(k.eventId), cause: k.cause, distanceM: k.distanceM - }) - ); - return { row, cfg, hits }; + }; + const afterS = afterDeath.get(k.eventId); + if (countsForDistance(cfg, { ...kill, afterOwnDeath: afterS !== undefined })) hits.push(k); + else if (afterS !== undefined && countsForDistance(cfg, { ...kill, afterOwnDeath: false })) + leftOut.push({ k, afterS }); + } + return { row, cfg, hits, leftOut }; }) - .filter((r) => r.hits.length); + .filter((r) => r.hits.length || r.leftOut.length); if (!counted.length) return; const now = Date.now(); - const match = matchKey(await stampedMatch(env, serverId, batch), Date.parse(batch[0].ts)); + const match = counted.some((r) => r.hits.length) + ? matchKey(await stampedMatch(env, serverId, batch), Date.parse(batch[0].ts)) + : ''; if (!mine) distanceMemory.set(serverId, (mine = new Map())); const out: Evaluation = { intents: [], updates: [] }; // Acting starts the player's hold; if the action cannot be queued, neither does the hold. const acted: { track: DistanceTrack; before: number | null }[] = []; - for (const { row, cfg, hits } of counted) { + for (const { row, cfg, hits, leftOut } of counted) { const settings = killDistanceSettingsKey(cfg); + // Each left-out kill is noted in the audit trail, so staff can see why the rule let it be. + for (const { k, afterS } of leftOut) { + const steamId = k.killer!.steamId; + const name = k.killer!.name || steamId; + out.intents.push({ + trigger: row, + action: KILL_DISTANCE_SKIP, + params: { rule: settings }, + target: steamId, + okMessage: notCountedMessage(name, k.cause, k.distanceM, afterS), + detail: { + name, + cause: k.cause, + distanceM: k.distanceM, + afterDeathS: Math.round(afterS * 10) / 10, + eventId: k.eventId + }, + steamId: null, + dedupeKey: [row.id, steamId, k.eventId, 'skip'].join(':') + }); + } + if (!hits.length) continue; let entry = mine.get(row.id); if (!entry || entry.match !== match || entry.settings !== settings) { entry = { settings, match, tracks: new Map() }; diff --git a/src/lib/server/kill-distance.test.ts b/src/lib/server/kill-distance.test.ts index 95a662e3..b7857666 100644 --- a/src/lib/server/kill-distance.test.ts +++ b/src/lib/server/kill-distance.test.ts @@ -12,6 +12,7 @@ import { killsAfterDeath, killsAfterDeathReplay, matchKey, + notCountedMessage, validateKillDistance, type DistanceTracks, type KillDistanceConfig, @@ -202,8 +203,9 @@ describe('killsAfterDeath', () => { // the same instant twice: one shell, two victims const shell = [kill(A, B, 3388.23), kill(A, C, 3388.23)]; const out = killsAfterDeath(deaths, [before, died, ...shell], 0); - // not the kill A made before dying, nor the one that killed A - expect([...out]).toEqual(shell.map((k) => k.eventId)); + // not the kill A made before dying, nor the one that killed A; each with how long after + expect([...out.keys()]).toEqual(shell.map((k) => k.eventId)); + expect([...out.values()].map((s) => s.toFixed(2))).toEqual(['4.26', '4.26']); }); test('after the death, up to the window and not after it, on the match clock', () => { const at = (gap: number) => { @@ -221,7 +223,7 @@ describe('killsAfterDeath', () => { const deaths: LastDeaths = new Map(); killsAfterDeath(deaths, [kill(C, A, 3383.97)], 0); const next = kill(A, B, 3388.23); - expect([...killsAfterDeath(deaths, [next], 4000)]).toEqual([next.eventId]); + expect([...killsAfterDeath(deaths, [next], 4000).keys()]).toEqual([next.eventId]); // a new match: the clock started again, and A has not died in it const first = kill(A, B, 30); expect(killsAfterDeath(deaths, [first], 30_000).size).toBe(0); @@ -236,6 +238,14 @@ describe('killsAfterDeath', () => { expect(killsAfterDeath(deaths, [soon], 2 * AFTER_DEATH_S * 1000 + 1).size).toBe(0); expect(deaths.has(A)).toBe(false); }); + test('what the audit trail says of a kill left out', () => { + expect(notCountedMessage('Gunner', 'Id.Item.M4', 2295.25, 4.26)).toBe( + 'Not counted: M4 kill from 2295 m by Gunner, 4.3 s after they died' + ); + expect( + notCountedMessage('Gunner', 'Vehicle.Variant.Land.Wheeled.Humvee.Default', null, 12) + ).toBe('Not counted: Humvee kill by Gunner, 12.0 s after they died'); + }); test('replayed batch by batch, as they came in', () => { const at = (e: ReturnType, ms: number) => ({ ...e, at: ms }); const died = kill(C, A, 500); diff --git a/src/lib/server/kill-distance.ts b/src/lib/server/kill-distance.ts index 177bba26..afa5f3a0 100644 --- a/src/lib/server/kill-distance.ts +++ b/src/lib/server/kill-distance.ts @@ -17,6 +17,11 @@ import type { BanScope } from './rule-ban'; /** The outbox action of a Kill distance flag: a panel action, nothing is sent to the game. */ export const KILL_DISTANCE_FLAG = 'kill_distance_flag'; +/** + * The outbox action that notes a kill a rule left out because it came just after the killer's own + * death (killsAfterDeath): a panel action whose audit row is the whole delivery, kept off Discord. + */ +export const KILL_DISTANCE_SKIP = 'kill_distance_skip'; export type KillDistanceAction = 'flag' | 'warn' | 'kill' | 'kick' | 'ban'; @@ -143,20 +148,43 @@ export interface FeedDeath { /** * Takes in a batch of kills that came in at `at` (ms), in the order the game played them: notes * each victim's death, and returns the kills made within AFTER_DEATH_S after the killer's own last - * death, by event id. Two players who kill each other at the same instant both count. The match - * clock starts again at a new match, so a death later on it than the kill is not the one before it. + * death, by event id, with how many seconds after it. Two players who kill each other at the same + * instant both count. The match clock starts again at a new match, so a death later on it than the + * kill is not the one before it. */ -export function killsAfterDeath(deaths: LastDeaths, inOrder: FeedDeath[], at: number): Set { +export function killsAfterDeath( + deaths: LastDeaths, + inOrder: FeedDeath[], + at: number +): Map { for (const [steamId, d] of deaths) if (at - d.at > DEATH_KEPT_MS) deaths.delete(steamId); - const out = new Set(); + const out = new Map(); for (const k of inOrder) { const d = k.killer ? deaths.get(k.killer) : undefined; - if (d && k.eventTime > d.clock && k.eventTime - d.clock <= AFTER_DEATH_S) out.add(k.eventId); + if (d && k.eventTime > d.clock && k.eventTime - d.clock <= AFTER_DEATH_S) + out.set(k.eventId, k.eventTime - d.clock); deaths.set(k.victim, { clock: k.eventTime, at }); } return out; } +/** + * What the audit trail says of a kill a rule left out because it came just after the killer's own + * death: the kill, by whom, and how long after they died. + */ +export function notCountedMessage( + name: string, + cause: string | null, + distanceM: number | null, + afterS: number +): string { + const what = + distanceM === null + ? `${causeLabel(cause)} kill` + : `${causeLabel(cause)} kill from ${Math.round(distanceM)} m`; + return `Not counted: ${what} by ${name}, ${afterS.toFixed(1)} s after they died`; +} + /** * killsAfterDeath over a window, batch by batch: `events` in the order they came in (`at`, then * the match clock), the kills of one batch sharing their `at`. @@ -167,7 +195,7 @@ export function killsAfterDeathReplay(events: (FeedDeath & { at: number })[]): S for (let i = 0; i < events.length;) { let j = i; while (j < events.length && events[j].at === events[i].at) j++; - for (const id of killsAfterDeath(deaths, events.slice(i, j), events[i].at)) out.add(id); + for (const id of killsAfterDeath(deaths, events.slice(i, j), events[i].at).keys()) out.add(id); i = j; } return out; diff --git a/src/lib/server/outbox.ts b/src/lib/server/outbox.ts index 3528e614..84665f6a 100644 --- a/src/lib/server/outbox.ts +++ b/src/lib/server/outbox.ts @@ -32,7 +32,7 @@ import { gateway } from './gateway'; import { deliveries } from './metrics'; import { NAME_FLAG } from './name-filter'; import { KILL_RATE_FLAG } from './kill-rate'; -import { KILL_DISTANCE_FLAG } from './kill-distance'; +import { KILL_DISTANCE_FLAG, KILL_DISTANCE_SKIP } from './kill-distance'; import { writeAudit } from './audit'; import { PANEL_BAN, type PanelBanParams } from './rule-ban'; import { killAndTell, RULE_KILL, RULE_KILL_MAX_AGE_MS } from './rule-kill'; @@ -53,7 +53,8 @@ const PANEL_ACTIONS = new Set([ PANEL_BAN, NAME_FLAG, KILL_RATE_FLAG, - KILL_DISTANCE_FLAG + KILL_DISTANCE_FLAG, + KILL_DISTANCE_SKIP ]); /** The most rows one claim takes, oldest first. */ @@ -470,12 +471,14 @@ async function release(env: Env, row: OutboxRow): Promise { async function deliverOne(env: Env, row: OutboxRow): Promise<'held' | 'refused' | void> { if (row.action === 'seed_reward') return deliverSeedReward(env, row); if (row.action === PANEL_BAN) return deliverPanelBan(env, row); - // An alert-only Name filter match or a Kill rate or Kill distance flag: the audit row (and its - // Discord card) is the whole delivery. + // An alert-only Name filter match, a Kill rate or Kill distance flag, or a Kill distance rule's + // note of a kill it left out: the audit row (and, but for the note, its Discord card) is the + // whole delivery. if ( row.action === NAME_FLAG || row.action === KILL_RATE_FLAG || - row.action === KILL_DISTANCE_FLAG + row.action === KILL_DISTANCE_FLAG || + row.action === KILL_DISTANCE_SKIP ) { const holds = await stillHolds(env, row); if (holds === null) return release(env, row); diff --git a/src/lib/server/webhook-delivery.ts b/src/lib/server/webhook-delivery.ts index 66fe7daf..5975254b 100644 --- a/src/lib/server/webhook-delivery.ts +++ b/src/lib/server/webhook-delivery.ts @@ -8,6 +8,7 @@ import { decryptSecret } from './crypto'; import { playerMarks, servers, webhooks, type AuditRow, type WebhookRow } from './db/schema'; import { OWNERS_ROWS } from './audit-rows'; import { escapeMarkdown } from './webhook-status-core'; +import { KILL_DISTANCE_SKIP } from './kill-distance'; import { causeLabel } from '$lib/causes'; import type { KillView } from '$lib/types'; @@ -468,13 +469,19 @@ export async function recordResult(env: Env, id: string, result: PostResult): Pr * rule's card out of the webhook's queue. */ const QUIET_WHEN_OK = new Set(['trigger.two_teams', 'trigger.afk_protection']); +/** A delivery that only notes what a rule saw and let be: the audit trail keeps it, Discord does not. */ +const NOTES = new Set([KILL_DISTANCE_SKIP]); +const isNote = (row: AuditRow): boolean => { + const action = (row.detail as { rconAction?: unknown } | null)?.rconAction; + return typeof action === 'string' && NOTES.has(action); +}; /** Fans one audit row out to the org's webhooks that want its event class. Never throws. */ export async function notifyWebhooks(env: Env, row: AuditRow): Promise { try { const event = classify(row); if (!event) return; - if (row.outcome === 'ok' && QUIET_WHEN_OK.has(row.action)) return; + if (row.outcome === 'ok' && (QUIET_WHEN_OK.has(row.action) || isNote(row))) return; const orgId = row.orgId ?? (row.serverId ? await orgOfServer(env, row.serverId) : null); if (!orgId) return; const hooks = await enabledWebhooks(env, orgId); diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 7024c069..b65a9909 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -220,7 +220,9 @@ ? 'kill everyone' : action === 'rule_kill' ? 'kill' - : action; + : action === 'kill_distance_skip' + ? 'not counted' + : action; const label = (kind: TriggerKind) => KINDS.find((k) => k.kind === kind)?.label ?? kind; const blurb = (kind: TriggerKind) => KINDS.find((k) => k.kind === kind)?.blurb ?? ''; /** Why a kind cannot run on this server yet, or '' when it can. */ diff --git a/src/test/kill-distance-rule.test.ts b/src/test/kill-distance-rule.test.ts index e501acd7..ee9fd8e5 100644 --- a/src/test/kill-distance-rule.test.ts +++ b/src/test/kill-distance-rule.test.ts @@ -28,7 +28,7 @@ import { forgetMemory, memoryFor, observeServer } from '$lib/server/observe'; import { startDelivery, stopDelivery } from '$lib/server/outbox'; import { WardogsClient } from '$lib/server/rcon'; import { dryRun, invalidateTriggers, validateConfig } from '$lib/server/triggers'; -import { KILL_DISTANCE_FLAG } from '$lib/server/kill-distance'; +import { KILL_DISTANCE_FLAG, KILL_DISTANCE_SKIP } from '$lib/server/kill-distance'; import { PANEL_BAN } from '$lib/server/rule-ban'; import { RULE_KILL } from '$lib/server/rule-kill'; import { newId } from '$lib/server/http'; @@ -283,14 +283,14 @@ describe.skipIf(!hasTestDb)('Kill distance rule, live', () => { expect(await rowsOf(id)).toHaveLength(0); }); - test('a kill just after the killer’s own death is not counted: a shell that landed after their vehicle was destroyed', async () => { + test('a kill just after the killer’s own death is not counted, and the audit trail says so: a shell that landed after their vehicle was destroyed', async () => { const w = await seedWorld(env); await openMatch(w.server.id); const id = await rule(w, w.server.id, { causes: [M4], minDistanceM: 1300, count: 1, - action: 'kick' + action: 'flag' }); // the gunner's vehicle destroyed with them in it, then their shell landing on two players // at once, credited to the rifle they carry @@ -306,14 +306,55 @@ describe.skipIf(!hasTestDb)('Kill distance rule, live', () => { ev(ENEMY, { cause: ENEMY_GUN, distanceM: 2400, eventTime: 3390, victim: SNIPER }), ev(SNIPER, { cause: M4, distanceM: 2410, eventTime: 3396 }) ]); - expect(await rowsOf(id)).toHaveLength(0); + // nothing done to anyone; each kill left out is a note, sent nothing and asked of no one + const notes = await rowsOf(id); + expect(notes.map((r) => [r.action, r.target, r.steamId, r.okMessage])).toEqual([ + [ + KILL_DISTANCE_SKIP, + GUNNER, + null, + 'Not counted: M4 kill from 2295 m by p806, 4.3 s after they died' + ], + [ + KILL_DISTANCE_SKIP, + GUNNER, + null, + 'Not counted: M4 kill from 2280 m by p806, 4.3 s after they died' + ], + [ + KILL_DISTANCE_SKIP, + SNIPER, + null, + 'Not counted: M4 kill from 2410 m by p803, 6.0 s after they died' + ] + ]); + // written while the rule holds the settings it was decided under, like a flag + expect((notes[0].params as { rule?: string }).rule).toMatch(/^[A-Za-z0-9_-]{16}$/); + const done = await deliver(...notes.map((r) => r.id)); + expect(done.map((d) => [d.state, d.outcome])).toEqual( + notes.map((r) => ['delivered', r.okMessage]) + ); + const audited = await auditSoon(w.server.id, 'trigger.kill_distance', SNIPER); + expect(audited.map((a) => [a.outcome, a.category, a.message])).toEqual([ + ['ok', 'trigger', 'Not counted: M4 kill from 2410 m by p803, 6.0 s after they died'] + ]); + expect(audited[0].detail).toMatchObject({ + rconAction: KILL_DISTANCE_SKIP, + cause: M4, + distanceM: 2410, + afterDeathS: 6 + }); // a living player's kill from as far counts, and so does the gunner's a minute on await post(w.server.id, [ev(CHEAT, { cause: M4, distanceM: 2300, eventTime: 3400 })]); await post(w.server.id, [ev(GUNNER, { cause: M4, distanceM: 2300, eventTime: 3445 })]); - expect((await rowsOf(id)).map((r) => [r.steamId, r.okMessage])).toEqual([ - [CHEAT, 'Kicked p801: M4 kill from 2300 m'], - [GUNNER, 'Kicked p806: M4 kill from 2300 m'] + const acted = (await rowsOf(id)).filter((r) => r.action !== KILL_DISTANCE_SKIP); + expect(acted.map((r) => [r.action, r.steamId, r.okMessage])).toEqual([ + [KILL_DISTANCE_FLAG, CHEAT, 'Flagged p801: M4 kill from 2300 m'], + [KILL_DISTANCE_FLAG, GUNNER, 'Flagged p806: M4 kill from 2300 m'] ]); + // the notes and flags asked nothing of the game + expect(sent.filter(([s]) => s === w.server.id)).toEqual([]); + expect(kicked.filter(([s]) => s === w.server.id)).toEqual([]); }); test('a warning on a Humvee’s guns from 0 m: whispered once in the cooldown, a kill without a distance too, in the panel’s words', async () => { @@ -964,7 +1005,7 @@ describe.skipIf(!hasTestDb)('Kill distance rule, live', () => { ); }); - test('nothing a person or a key can call runs a rule’s ban, flag or kill', async () => { + test('nothing a person or a key can call runs a rule’s ban, flag, note or kill', async () => { const w = await seedWorld(env); const mod = await import( join( @@ -979,7 +1020,7 @@ describe.skipIf(!hasTestDb)('Kill distance rule, live', () => { '+server.ts' ) ); - for (const action of [PANEL_BAN, KILL_DISTANCE_FLAG, RULE_KILL]) { + for (const action of [PANEL_BAN, KILL_DISTANCE_FLAG, KILL_DISTANCE_SKIP, RULE_KILL]) { const r = await callApi(mod.POST, w.users.owner, { method: 'POST', params: { id: w.server.id, action }, diff --git a/src/test/two-teams-discord.test.ts b/src/test/two-teams-discord.test.ts index 1f50c640..736ceeed 100644 --- a/src/test/two-teams-discord.test.ts +++ b/src/test/two-teams-discord.test.ts @@ -1,5 +1,6 @@ // A Two-team mode sort is a hundred moves at every match start: the audit trail keeps each, and the -// org's Automation webhook hears only of the ones that fail. Other rules post as before. +// org's Automation webhook hears only of the ones that fail. A Kill distance rule's note of a kill it +// left out stays in the audit trail. Other rules post as before. import { afterAll, beforeAll, describe, expect, test } from 'bun:test'; import { and, eq } from 'drizzle-orm'; import type { Env } from '$lib/server/env'; @@ -39,7 +40,12 @@ describe.skipIf(!hasTestDb)('Two-team mode on Discord', () => { resetWebhookQueues(); }); - const delivery = (action: string, outcome: 'ok' | 'error', message: string) => + const delivery = ( + action: string, + outcome: 'ok' | 'error', + message: string, + detail?: Record + ) => writeAudit(env, null, { actorName: 'trigger: rule', server: { id: w.server.id, name: 'Server' }, @@ -48,7 +54,8 @@ describe.skipIf(!hasTestDb)('Two-team mode on Discord', () => { action, target: '76561198000000951', outcome, - message + message, + detail }); test('moves that land stay off Discord; one that fails, and other rules, are posted', async () => { @@ -79,4 +86,24 @@ describe.skipIf(!hasTestDb)('Two-team mode on Discord', () => { ); expect(titles).toEqual(['Trigger · AFK protection']); }); + + test('a Kill distance rule’s note of a kill it left out stays off Discord; its flag is posted', async () => { + posts.length = 0; + await delivery( + 'trigger.kill_distance', + 'ok', + 'Not counted: M4 kill from 2295 m by p806, 4.3 s after they died', + { + rconAction: 'kill_distance_skip' + } + ); + await delivery('trigger.kill_distance', 'ok', 'Flagged p801: M4 kill from 2300 m', { + rconAction: 'kill_distance_flag' + }); + await new Promise((r) => setTimeout(r, 2000)); + const titles = posts.flatMap((body) => + (JSON.parse(body) as { embeds: { title: string }[] }).embeds.map((e) => e.title) + ); + expect(titles).toEqual(['Trigger · kill distance watch']); + }); }); From ed7890ee0f295f70656440e7ddcbaa5a722451d9 Mon Sep 17 00:00:00 2001 From: James Causon Date: Mon, 5 Oct 2026 23:08:46 +0100 Subject: [PATCH 020/102] README: the Kill distance watch does not count a kill that comes within a minute of the killer's own death, and notes each one in the audit trail --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2655659c..5338fadd 100644 --- a/README.md +++ b/README.md @@ -533,21 +533,21 @@ ban list_ (on every server), and for the Seeding reward _Reserved slots_ or _Org its row). A custom role or API key with _Automation_ alone can read the rules and delete them. -| Trigger | Does | -| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Welcome whisper | Whispers a message to each joiner (optionally only on their first visit), which can tell them their all-time stats, on the server or across the organisation (see [Placeholders](#placeholders)). | -| Scheduled broadcast | Rotates through a list of messages every N minutes while at least M players are on, and optionally only until a ceiling, so a fill-the-server message stops once it has. | -| Empty-server map reset | After the server has been empty for N minutes on a different map or mode, sets the chosen map as next and ends the match (or requests it directly when there is no rotation). | -| Kick on connect risk | Kicks players who match rules: VAC ban or game ban (optionally only within the last N days), Steam account younger than N days (optionally private profiles too), banned on another server in the org, or on the watchlist; or whose advisory risk score is at or above a set number from 1 to 100 (medium starts at 20, high at 50; the players table badges 20 and up). Joiners and players reconnecting are judged at once, and everyone on is judged again every minute (a player whose kick did not land, every five). Nobody is judged until the server's reserved slots have been read. Reserved-slot players can be spared. | -| Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | -| High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | -| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | -| Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | -| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | -| Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap; when a new match is evened up, players whose clan is mostly on the other side move first, then those with the fewest clanmates beside them), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move, sent without the kill the Players tab's Move adds. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | -| Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | -| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier history, the leaderboard's Seed time column and the dry run show it. | -| AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | +| Trigger | Does | +| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Welcome whisper | Whispers a message to each joiner (optionally only on their first visit), which can tell them their all-time stats, on the server or across the organisation (see [Placeholders](#placeholders)). | +| Scheduled broadcast | Rotates through a list of messages every N minutes while at least M players are on, and optionally only until a ceiling, so a fill-the-server message stops once it has. | +| Empty-server map reset | After the server has been empty for N minutes on a different map or mode, sets the chosen map as next and ends the match (or requests it directly when there is no rotation). | +| Kick on connect risk | Kicks players who match rules: VAC ban or game ban (optionally only within the last N days), Steam account younger than N days (optionally private profiles too), banned on another server in the org, or on the watchlist; or whose advisory risk score is at or above a set number from 1 to 100 (medium starts at 20, high at 50; the players table badges 20 and up). Joiners and players reconnecting are judged at once, and everyone on is judged again every minute (a player whose kick did not land, every five). Nobody is judged until the server's reserved slots have been read. Reserved-slot players can be spared. | +| Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | +| High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | +| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | +| Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | +| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. A kill that comes within a minute of the killer's own death is not counted: the player is dead, so it is a round already on its way, and the game credits a vehicle's shell that lands after the vehicle was destroyed to the gunner's own weapon, from wherever the gunner is by then (an M4 kill from 2,300 m). The audit trail notes each kill left out this way, with how long after the death it came; Discord is not told. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | +| Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap; when a new match is evened up, players whose clan is mostly on the other side move first, then those with the fewest clanmates beside them), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move, sent without the kill the Players tab's Move adds. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | +| Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | +| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier history, the leaderboard's Seed time column and the dry run show it. | +| AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | **Dry run** replays the last 24 hours of the server's own history (joins, player counts, empty stretches, cached Steam data) against a rule and lists what it would have done, so you can tune a From 318ae9072f72dfe75769dc32b8cd76d469491d68 Mon Sep 17 00:00:00 2001 From: James Causon Date: Tue, 6 Oct 2026 16:08:09 +0100 Subject: [PATCH 021/102] Match page: the scoreboard is one table per side, the winner first, then the players the game never put on a side, each headed by the side's colour, result and player count, as the live page groups its roster. One sort orders every table, their columns line up on a wide screen, and on a phone a long name is cut short so the numbers stay in view. The Faction column goes; the side is the table's heading --- src/lib/components/MatchPanel.svelte | 168 ++++++++++++++++----------- src/lib/matches.test.ts | 69 ++++++++++- src/lib/matches.ts | 34 ++++++ 3 files changed, 201 insertions(+), 70 deletions(-) diff --git a/src/lib/components/MatchPanel.svelte b/src/lib/components/MatchPanel.svelte index b2075c63..e163de68 100644 --- a/src/lib/components/MatchPanel.svelte +++ b/src/lib/components/MatchPanel.svelte @@ -1,16 +1,23 @@ @@ -139,69 +145,93 @@
{/if} -
- - - - Player - Faction - Time - K - D - K/D - K/min - Cash +
+ {#if t.name} + {t.name} + {#if t.result}{t.result}{/if} + {:else} + Unassigned - {#if view.hasFeed} - HS - TK - VK - Streak - {/if} -
- - - {#each rows as l (l.steamId)} - - - - - - - - - + {/if} + {fmtNum(t.lines.length)} player{t.lines.length === 1 ? '' : 's'} + +
+
- {l.name} - {#if showIds}{l.steamId}{/if} - - ({ ...f, colorHex: f.colorHex ?? '', score: 0 }))} - /> - {#if l.result}{l.result}{/if} - {fmtLength(l.seconds)}{fmtNum(l.kills)}{fmtNum(l.deaths)}{ratio(kd(l))}{ratio(kpm(l))}{l.cashDelta > 0 ? '+' : ''}{fmtCash(l.cashDelta)}
+ + + + + + + + {#if view.hasFeed} - - - - + + + + {/if} - - {:else} - - {/each} - -
{l.headshots}{l.teamKills}{l.vehicleKills}{l.killStreak}
Nobody was recorded in this match.
-
+ + + + Player + Time + K + D + K/D + K/min + Cash + {#if view.hasFeed} + HS + TK + VK + Streak + {/if} + + + + {#each t.lines as l (l.steamId)} + + + + {l.name} + {#if showIds}{l.steamId}{/if} + + {fmtLength(l.seconds)} + {fmtNum(l.kills)} + {fmtNum(l.deaths)} + {ratio(kd(l))} + {ratio(kpm(l))} + {l.cashDelta > 0 ? '+' : ''}{fmtCash(l.cashDelta)} + {#if view.hasFeed} + {l.headshots} + {l.teamKills} + {l.vehicleKills} + {l.killStreak} + {/if} + + {/each} + + +
+ +{:else} +

Nobody was recorded in this match.

+{/each} diff --git a/src/lib/matches.test.ts b/src/lib/matches.test.ts index fcdbfc1c..83bf85e3 100644 --- a/src/lib/matches.test.ts +++ b/src/lib/matches.test.ts @@ -1,5 +1,13 @@ import { describe, expect, test } from 'bun:test'; -import { abandoned, awardsFor, durationOf, perMinute, type MatchLine } from './matches'; +import { + abandoned, + awardsFor, + durationOf, + matchTeams, + perMinute, + type MatchLine, + type MatchView +} from './matches'; const line = (steamId: string, extra: Partial = {}): MatchLine => ({ steamId, @@ -72,3 +80,62 @@ describe('a match', () => { expect(perMinute(3, 0)).toBeNull(); }); }); + +describe('the scoreboard by side', () => { + const view = ( + finalScores: { name: string; score: number }[] | null, + factions = ['Valkyra', 'Manticore', 'Lonestar'] + ): Pick => ({ + match: { + id: 1, + startedAt: '2026-10-06T10:00:00Z', + endedAt: '2026-10-06T11:00:00Z', + map: 'Ozeti', + experiences: null, + lighting: null, + peakPlayers: 6, + players: 6, + finalScores, + winner: finalScores?.length ? finalScores[0].name : null + }, + factions: factions.map((name) => ({ name, colorHex: null })) + }); + const lines = [ + line('a', { faction: 'Lonestar', result: 'loss' }), + line('b', { faction: 'Valkyra', result: 'win' }), + line('c', { faction: null, result: null }), + line('d', { faction: 'Manticore', result: 'loss' }), + line('e', { faction: 'Valkyra', result: 'win' }), + line('f', { faction: 'Lonestar', result: 'loss' }) + ]; + const shape = (teams: ReturnType) => + teams.map((t) => [t.name, t.result, t.lines.map((l) => l.steamId).join('')]); + + test('the sides by final score, each in the order it was given, then the unassigned', () => { + const scores = [ + { name: 'Lonestar', score: 55 }, + { name: 'Valkyra', score: 100 }, + { name: 'Manticore', score: 61 } + ]; + expect(shape(matchTeams(view(scores), lines))).toEqual([ + ['Valkyra', 'win', 'be'], + ['Manticore', 'loss', 'd'], + ['Lonestar', 'loss', 'af'], + [null, null, 'c'] + ]); + }); + + test('scoreboard order without scores; a side nobody ended on is left out, one off the board follows', () => { + const odd = [ + ...lines.filter((l) => l.faction !== 'Manticore'), + line('g', { faction: 'White' }) + ]; + expect(shape(matchTeams(view(null, ['Lonestar', 'Valkyra', 'Manticore']), odd))).toEqual([ + ['Lonestar', 'loss', 'af'], + ['Valkyra', 'win', 'be'], + ['White', 'win', 'g'], + [null, null, 'c'] + ]); + expect(matchTeams(view(null), [])).toEqual([]); + }); +}); diff --git a/src/lib/matches.ts b/src/lib/matches.ts index 3bb7f722..9cf8c4e4 100644 --- a/src/lib/matches.ts +++ b/src/lib/matches.ts @@ -183,6 +183,40 @@ export function awardsFor(lines: MatchLine[], durationSeconds: number): MatchAwa return out; } +/** One side's players in a match, as its scoreboard shows them; `name` null for the unassigned. */ +export interface MatchTeam { + name: string | null; + result: MatchResult; + lines: MatchLine[]; +} + +/** + * A match's players by the side they ended on: the sides by final score, highest first (in + * scoreboard order when the match has no scores), then any other side a player was on, then the + * players never on a side. Each side keeps the order of `lines`, so one sort orders every table. + */ +export function matchTeams( + view: Pick, + lines: MatchLine[] +): MatchTeam[] { + const scored = [...(view.match.finalScores ?? [])].sort((a, b) => b.score - a.score); + const order = (scored.length ? scored : view.factions).map((f) => f.name); + const sides = new Map(); + const unassigned: MatchLine[] = []; + for (const l of lines) { + if (!l.faction) unassigned.push(l); + else sides.get(l.faction)?.push(l) ?? sides.set(l.faction, [l]); + } + const known = order.filter((name) => sides.has(name)); + const others = [...sides.keys()].filter((name) => !order.includes(name)).sort(); + const teams: MatchTeam[] = [...known, ...others].map((name) => { + const of = sides.get(name)!; + return { name, result: of[0].result, lines: of }; + }); + if (unassigned.length) teams.push({ name: null, result: null, lines: unassigned }); + return teams; +} + /** "1 h 42 min", "47 min", "40 s": how long a match lasted, in its two coarsest units. */ export function fmtLength(seconds: number): string { const s = Math.max(0, Math.round(seconds)); From 034d4818e66c931d935c6673e1247139c6cd19de Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 21:25:53 +0100 Subject: [PATCH 022/102] Ranged boards from per-day totals: the 7, 30 and 90-day boards and their export read each player's totals per server per UTC day (player_days, migration 0039) for the days after the range's first, and read raw only that first, partial day, the sessions still open and, for each session that crossed the next midnight, its time up to it, instead of every session and match row in the range; still to the second (now minus 7 days), and equal to the reads they replace for any start. On the hosted panel a 30-day board was 0.5 s for the busiest server and 2 s for a 7-server org; on data shaped like it the day rows read about 3x faster for 30 days and 4.5x for 90. Kept by 0038's triggers, extended under the same lock: a session closing adds its time to each day it spans, its join to each midnight it crossed and its count, seed time and cash to the day it left; a match ending adds its rows to the day it ended; any other change recounts the player-days it touched, before and after. A closed session's last_seen must equal its left_at, as the worker closes them (the triggers refuse an edit that breaks it, the migration and the rebuild a database that holds one); a streak goes into a row with no match yet as it is, in player_totals too, whose pairs with a negative streak the migration recounts; a stats purge clears a server's totals in one pass instead of one recount per player and day (for a busy server after 95 days, 14 to 28 s down to 6 to 9 s, most of it now the delete itself). A board's name is the newest session's with ties broken by the newer row, as the dossier's now is, instead of whichever row a plan met first. Held against the reads word for word over random histories crossing midnights, hand edits that move sessions and match ends, time zones and microseconds, and both migration paths. The minute board cache counts its hits, shared reads and misses (warcon_board_reads_total) --- drizzle/0039_player_days.sql | 436 +++ drizzle/meta/0039_snapshot.json | 5216 +++++++++++++++++++++++++ drizzle/meta/_journal.json | 7 + src/lib/server/db/schema.ts | 48 +- src/lib/server/leaderboards.ts | 128 +- src/lib/server/metrics.ts | 6 + src/test/player-totals-writes.test.ts | 550 ++- src/test/player-totals.test.ts | 355 +- src/test/totals-oracle.ts | 45 +- 9 files changed, 6516 insertions(+), 275 deletions(-) create mode 100644 drizzle/0039_player_days.sql create mode 100644 drizzle/meta/0039_snapshot.json diff --git a/drizzle/0039_player_days.sql b/drizzle/0039_player_days.sql new file mode 100644 index 00000000..79d4d187 --- /dev/null +++ b/drizzle/0039_player_days.sql @@ -0,0 +1,436 @@ +-- Each player's settled totals per server per UTC day (player_days), for the ranged boards (7, 30 +-- and 90 days). rangeBase in leaderboards.ts reads a range from F as: the rows of every day after +-- F's (D1 = F's UTC day + 1); for each session that crossed D1's midnight (its joined_at is kept on +-- D1's row), its time from F, or its join, to that midnight; and, read raw, the sessions closed in +-- [F, D1's midnight), the lines of matches ended in it and the open sessions. Exact to the +-- microsecond for every F, as the all-time reads are with player_totals. +-- +-- Kept by 0038's triggers, whose functions are replaced here: no new trigger, the same lock, the +-- same READ COMMITTED rule. A session closing adds its seconds within each UTC day it spans, its +-- joined_at to each day whose midnight it crossed, and its count, seed time, cash and last sighting +-- to the day it left; a match ending adds each line to the day it ended; every other change +-- recounts the (player, day) keys it touched, before and after. A UTC day is +-- (ts AT TIME ZONE 'UTC')::date, never the connection's time zone. +-- +-- The rule the rows rest on: a closed session has last_seen = left_at. The worker closes sessions +-- so; a range counts a closed session by both, the rows place it by left_at. The session triggers +-- refuse a closed session that breaks the rule, and the rebuild refuses to start over one. +-- +-- Also here: a streak merged into a row with no match yet takes the line's own value (GREATEST +-- with the row's 0 lost a negative one), in player_totals too, whose pairs with such a line are +-- recounted once; and when a statement leaves a server with no lines at all (the purge), the line +-- columns of its rows are cleared in one pass instead of recounted key by key, which held the +-- server's lock for as long as its history (39 s for a busy server's 95 days, measured). +-- +-- Order: the table and the functions first (no busy table locked; other sessions keep running the +-- old trigger bodies until the commit). Then the three sources locked against writes in the +-- writers' order (sessions, lines, matches), so nothing closes or ends between the rebuild and the +-- new bodies: a writer queued behind the lock resumes after the commit with the new bodies and a +-- snapshot that sees the rows. Then the index on matches, after the lock: taken before it, it would +-- hold matches while the lock waits for a match end that has already written its lines. Then the +-- rebuild, into the table before its key exists, and the key last. Deploy it in its own quiet-hour +-- window, not in one migration run with 0038 (one transaction: both rebuilds under the locks). +CREATE TABLE "player_days" ( + "server_id" text NOT NULL, + "day" date NOT NULL, + "steam_id" text NOT NULL, + "seconds" numeric DEFAULT '0' NOT NULL, + "crossings" timestamp with time zone[], + "sessions" integer DEFAULT 0 NOT NULL, + "seed_seconds" bigint DEFAULT 0 NOT NULL, + "cash" bigint DEFAULT 0 NOT NULL, + "last_seen" timestamp with time zone, + "matches" integer DEFAULT 0 NOT NULL, + "kills" bigint DEFAULT 0 NOT NULL, + "deaths" bigint DEFAULT 0 NOT NULL, + "headshots" bigint DEFAULT 0 NOT NULL, + "team_kills" bigint DEFAULT 0 NOT NULL, + "suicides" bigint DEFAULT 0 NOT NULL, + "vehicle_kills" bigint DEFAULT 0 NOT NULL, + "kill_streak" integer DEFAULT 0 NOT NULL, + "death_streak" integer DEFAULT 0 NOT NULL, + "wins" integer DEFAULT 0 NOT NULL, + "losses" integer DEFAULT 0 NOT NULL, + "draws" integer DEFAULT 0 NOT NULL +) WITH (fillfactor = 90);--> statement-breakpoint +-- A closed session's parts, one per UTC day from the day it joined to the day it left: its seconds +-- within the day, and whether it crossed the day's midnight (true on every day after the first). +-- They sum to left - joined exactly. A session that left before it joined (never the worker's; a +-- hand edit) is one part on the day it left, with no crossing. +CREATE FUNCTION "session_day_parts"(joined timestamptz, "left" timestamptz) +RETURNS TABLE (day date, seconds numeric, crossing boolean) +LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $$ + SELECT d, + CASE WHEN joined < "left" + THEN EXTRACT(EPOCH FROM (LEAST("left", (d + 1)::timestamp AT TIME ZONE 'UTC') + - GREATEST(joined, d::timestamp AT TIME ZONE 'UTC'))) + ELSE EXTRACT(EPOCH FROM ("left" - joined)) END, + joined < d::timestamp AT TIME ZONE 'UTC' + FROM (SELECT (joined AT TIME ZONE 'UTC')::date AS jd, ("left" AT TIME ZONE 'UTC')::date AS ld) b, + generate_series(0, b.ld - LEAST(b.jd, b.ld)) i, + LATERAL (SELECT LEAST(b.jd, b.ld) + i AS d) x +$$;--> statement-breakpoint +-- Two crossing lists as one, in order, duplicates kept; null when both are. +CREATE FUNCTION "player_days_crossings"(a timestamptz[], b timestamptz[]) RETURNS timestamptz[] +LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $$ + SELECT array_agg(c ORDER BY c) FROM (SELECT unnest(a) UNION ALL SELECT unnest(b)) u(c) +$$;--> statement-breakpoint +CREATE FUNCTION "player_sessions_closed_rule"(left_at timestamptz, last_seen timestamptz) RETURNS void +LANGUAGE plpgsql AS $$ +BEGIN + IF left_at IS NOT NULL AND last_seen IS DISTINCT FROM left_at THEN + RAISE EXCEPTION 'a closed player session must have last_seen equal to left_at (migration 0039)'; + END IF; +END $$;--> statement-breakpoint +-- These (player, day) keys of this server worked out again from the sources: the pair's closed +-- sessions that touch the day (each split once) and its lines of matches that ended on it. A key +-- left with nothing goes. The keys come as two arrays of the same length, player and day. +CREATE FUNCTION "player_days_recount"(sid text, pids text[], days date[]) RETURNS void LANGUAGE plpgsql AS $$ +BEGIN + PERFORM player_totals_lock(sid); + INSERT INTO player_days AS t (server_id, day, steam_id, seconds, crossings, sessions, seed_seconds, cash, last_seen, + matches, kills, deaths, headshots, team_kills, suicides, vehicle_kills, + kill_streak, death_streak, wins, losses, draws) + WITH k AS (SELECT DISTINCT u.p, u.d FROM unnest(pids, days) AS u(p, d) WHERE u.d IS NOT NULL), + c AS ( + SELECT DISTINCT ps.id, ps.steam_id, ps.joined_at, ps.left_at, ps.seed_seconds, ps.cash, ps.last_seen + FROM k JOIN player_sessions ps ON ps.steam_id = k.p AND ps.server_id = sid AND ps.left_at IS NOT NULL + AND ps.left_at >= k.d::timestamp AT TIME ZONE 'UTC' + AND LEAST(ps.joined_at, ps.left_at) < (k.d + 1)::timestamp AT TIME ZONE 'UTC'), + s AS ( + SELECT c.steam_id AS p, x.day AS d, SUM(x.seconds) AS seconds, + array_agg(c.joined_at ORDER BY c.joined_at) FILTER (WHERE x.crossing) AS crossings, + (COUNT(*) FILTER (WHERE x.closes))::int AS sessions, + COALESCE(SUM(c.seed_seconds) FILTER (WHERE x.closes), 0) AS seed_seconds, + COALESCE(SUM(c.cash) FILTER (WHERE x.closes), 0) AS cash, + MAX(c.last_seen) FILTER (WHERE x.closes) AS last_seen + FROM c CROSS JOIN LATERAL ( + SELECT p.day, p.seconds, p.crossing, p.day = (c.left_at AT TIME ZONE 'UTC')::date AS closes + FROM session_day_parts(c.joined_at, c.left_at) p) x + JOIN k ON k.p = c.steam_id AND k.d = x.day + GROUP BY 1, 2), + l AS ( + SELECT k.p, k.d, COUNT(*)::int AS matches, SUM(mp.kills) AS kills, SUM(mp.deaths) AS deaths, + SUM(mp.headshots) AS headshots, SUM(mp.team_kills) AS team_kills, SUM(mp.suicides) AS suicides, + SUM(mp.vehicle_kills) AS vehicle_kills, MAX(mp.kill_streak) AS kill_streak, + MAX(mp.death_streak) AS death_streak, + (COUNT(*) FILTER (WHERE x.r = 'win'))::int AS wins, + (COUNT(*) FILTER (WHERE x.r = 'loss'))::int AS losses, + (COUNT(*) FILTER (WHERE x.r = 'draw'))::int AS draws + FROM k JOIN match_players mp ON mp.steam_id = k.p AND mp.server_id = sid + JOIN matches m ON m.id = mp.match_id AND m.server_id = mp.server_id + AND m.ended_at >= k.d::timestamp AT TIME ZONE 'UTC' AND m.ended_at < (k.d + 1)::timestamp AT TIME ZONE 'UTC' + CROSS JOIN LATERAL (SELECT match_result(m.final_scores, m.winner, mp.faction) AS r) x + GROUP BY k.p, k.d) + SELECT sid, k.d, k.p, COALESCE(s.seconds, 0), s.crossings, COALESCE(s.sessions, 0), COALESCE(s.seed_seconds, 0), + COALESCE(s.cash, 0), s.last_seen, COALESCE(l.matches, 0), COALESCE(l.kills, 0), COALESCE(l.deaths, 0), + COALESCE(l.headshots, 0), COALESCE(l.team_kills, 0), COALESCE(l.suicides, 0), COALESCE(l.vehicle_kills, 0), + COALESCE(l.kill_streak, 0), COALESCE(l.death_streak, 0), COALESCE(l.wins, 0), COALESCE(l.losses, 0), + COALESCE(l.draws, 0) + FROM k LEFT JOIN s ON s.p = k.p AND s.d = k.d LEFT JOIN l ON l.p = k.p AND l.d = k.d + ON CONFLICT (server_id, day, steam_id) DO UPDATE SET + seconds = EXCLUDED.seconds, crossings = EXCLUDED.crossings, sessions = EXCLUDED.sessions, + seed_seconds = EXCLUDED.seed_seconds, cash = EXCLUDED.cash, last_seen = EXCLUDED.last_seen, + matches = EXCLUDED.matches, kills = EXCLUDED.kills, deaths = EXCLUDED.deaths, headshots = EXCLUDED.headshots, + team_kills = EXCLUDED.team_kills, suicides = EXCLUDED.suicides, vehicle_kills = EXCLUDED.vehicle_kills, + kill_streak = EXCLUDED.kill_streak, death_streak = EXCLUDED.death_streak, wins = EXCLUDED.wins, + losses = EXCLUDED.losses, draws = EXCLUDED.draws; + DELETE FROM player_days t USING (SELECT DISTINCT u.p, u.d FROM unnest(pids, days) AS u(p, d)) k + WHERE t.server_id = sid AND t.steam_id = k.p AND t.day = k.d + AND t.sessions = 0 AND t.matches = 0 AND t.seconds = 0 AND t.crossings IS NULL; +END $$;--> statement-breakpoint +-- The day keys a closed session touches, recounted. +CREATE FUNCTION "player_days_recount_session"(sid text, pid text, joined timestamptz, "left" timestamptz) +RETURNS void LANGUAGE sql AS $$ + SELECT player_days_recount(sid, array_agg(pid), array_agg(day)) FROM session_day_parts(joined, "left") +$$;--> statement-breakpoint +-- The server has no lines left (a purge): every row's line columns are zero, cleared in one pass, +-- and rows left with nothing go. +CREATE FUNCTION "player_lines_cleared"(sid text) RETURNS void LANGUAGE plpgsql AS $$ +BEGIN + PERFORM player_totals_lock(sid); + UPDATE player_totals SET matches = 0, kills = 0, deaths = 0, headshots = 0, team_kills = 0, suicides = 0, + vehicle_kills = 0, kill_streak = 0, death_streak = 0, wins = 0, losses = 0, draws = 0 + WHERE server_id = sid AND matches > 0; + DELETE FROM player_totals WHERE server_id = sid AND sessions = 0 AND matches = 0; + UPDATE player_days SET matches = 0, kills = 0, deaths = 0, headshots = 0, team_kills = 0, suicides = 0, + vehicle_kills = 0, kill_streak = 0, death_streak = 0, wins = 0, losses = 0, draws = 0 + WHERE server_id = sid AND matches > 0; + DELETE FROM player_days + WHERE server_id = sid AND sessions = 0 AND matches = 0 AND seconds = 0 AND crossings IS NULL; +END $$;--> statement-breakpoint +-- A session closing (BEFORE, so a recount later in the same statement sees it once): its pair's +-- totals, then its part of each day, its crossings and, on the day it left, its count and sums. +CREATE OR REPLACE FUNCTION "player_totals_session_closed"() RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + PERFORM player_sessions_closed_rule(NEW.left_at, NEW.last_seen); + PERFORM player_totals_lock(NEW.server_id); + INSERT INTO player_totals AS t (server_id, steam_id, sessions, seconds, seed_seconds, cash, last_seen) + VALUES (NEW.server_id, NEW.steam_id, 1, EXTRACT(EPOCH FROM (NEW.left_at - NEW.joined_at)), NEW.seed_seconds, + NEW.cash, NEW.last_seen) + ON CONFLICT (server_id, steam_id) DO UPDATE SET + sessions = t.sessions + 1, seconds = t.seconds + EXCLUDED.seconds, + seed_seconds = t.seed_seconds + EXCLUDED.seed_seconds, cash = t.cash + EXCLUDED.cash, + last_seen = GREATEST(t.last_seen, EXCLUDED.last_seen); + INSERT INTO player_days AS t (server_id, day, steam_id, seconds, crossings, sessions, seed_seconds, cash, last_seen) + SELECT NEW.server_id, x.day, NEW.steam_id, x.seconds, CASE WHEN x.crossing THEN ARRAY[NEW.joined_at] END, + x.closes::int, CASE WHEN x.closes THEN NEW.seed_seconds ELSE 0 END, + CASE WHEN x.closes THEN NEW.cash ELSE 0 END, CASE WHEN x.closes THEN NEW.last_seen END + FROM (SELECT p.day, p.seconds, p.crossing, p.day = (NEW.left_at AT TIME ZONE 'UTC')::date AS closes + FROM session_day_parts(NEW.joined_at, NEW.left_at) p) x + ON CONFLICT (server_id, day, steam_id) DO UPDATE SET + seconds = t.seconds + EXCLUDED.seconds, crossings = player_days_crossings(t.crossings, EXCLUDED.crossings), + sessions = t.sessions + EXCLUDED.sessions, seed_seconds = t.seed_seconds + EXCLUDED.seed_seconds, + cash = t.cash + EXCLUDED.cash, last_seen = GREATEST(t.last_seen, EXCLUDED.last_seen); + RETURN NEW; +END $$;--> statement-breakpoint +-- A closed session inserted, changed or deleted: its pair (and the pair it moved to) recounted, and +-- the days it touched before and after, even when its pair stayed the same. +CREATE OR REPLACE FUNCTION "player_totals_session_changed"() RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + IF TG_OP <> 'DELETE' THEN + PERFORM player_sessions_closed_rule(NEW.left_at, NEW.last_seen); + END IF; + IF TG_OP <> 'INSERT' THEN + PERFORM player_totals_recount(OLD.server_id, ARRAY[OLD.steam_id]); + PERFORM player_days_recount_session(OLD.server_id, OLD.steam_id, OLD.joined_at, OLD.left_at); + END IF; + IF TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND (NEW.server_id, NEW.steam_id) IS DISTINCT FROM (OLD.server_id, OLD.steam_id)) THEN + PERFORM player_totals_recount(NEW.server_id, ARRAY[NEW.steam_id]); + END IF; + IF TG_OP <> 'DELETE' AND NEW.left_at IS NOT NULL THEN + PERFORM player_days_recount_session(NEW.server_id, NEW.steam_id, NEW.joined_at, NEW.left_at); + END IF; + RETURN NULL; +END $$;--> statement-breakpoint +-- A match ending: each of its lines added with its result to its pair and to the day the match +-- ended (BEFORE, as for a close). The worker writes the lines and the feed's columns before it sets +-- ended_at, in the same transaction. A streak goes into a row with no match yet as it is. +CREATE OR REPLACE FUNCTION "player_totals_match_ended"() RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + PERFORM player_totals_lock(NEW.server_id); + INSERT INTO player_totals AS t (server_id, steam_id, matches, kills, deaths, headshots, team_kills, suicides, + vehicle_kills, kill_streak, death_streak, wins, losses, draws) + SELECT mp.server_id, mp.steam_id, 1, mp.kills, mp.deaths, mp.headshots, mp.team_kills, mp.suicides, + mp.vehicle_kills, mp.kill_streak, mp.death_streak, + CASE WHEN x.r = 'win' THEN 1 ELSE 0 END, CASE WHEN x.r = 'loss' THEN 1 ELSE 0 END, + CASE WHEN x.r = 'draw' THEN 1 ELSE 0 END + FROM match_players mp + CROSS JOIN LATERAL (SELECT match_result(NEW.final_scores, NEW.winner, mp.faction) AS r) x + WHERE mp.match_id = NEW.id AND mp.server_id = NEW.server_id + ON CONFLICT (server_id, steam_id) DO UPDATE SET + matches = t.matches + EXCLUDED.matches, kills = t.kills + EXCLUDED.kills, deaths = t.deaths + EXCLUDED.deaths, + headshots = t.headshots + EXCLUDED.headshots, team_kills = t.team_kills + EXCLUDED.team_kills, + suicides = t.suicides + EXCLUDED.suicides, vehicle_kills = t.vehicle_kills + EXCLUDED.vehicle_kills, + kill_streak = CASE WHEN t.matches = 0 THEN EXCLUDED.kill_streak ELSE GREATEST(t.kill_streak, EXCLUDED.kill_streak) END, + death_streak = CASE WHEN t.matches = 0 THEN EXCLUDED.death_streak ELSE GREATEST(t.death_streak, EXCLUDED.death_streak) END, + wins = t.wins + EXCLUDED.wins, losses = t.losses + EXCLUDED.losses, draws = t.draws + EXCLUDED.draws; + INSERT INTO player_days AS t (server_id, day, steam_id, matches, kills, deaths, headshots, team_kills, suicides, + vehicle_kills, kill_streak, death_streak, wins, losses, draws) + SELECT mp.server_id, (NEW.ended_at AT TIME ZONE 'UTC')::date, mp.steam_id, 1, mp.kills, mp.deaths, mp.headshots, + mp.team_kills, mp.suicides, mp.vehicle_kills, mp.kill_streak, mp.death_streak, + CASE WHEN x.r = 'win' THEN 1 ELSE 0 END, CASE WHEN x.r = 'loss' THEN 1 ELSE 0 END, + CASE WHEN x.r = 'draw' THEN 1 ELSE 0 END + FROM match_players mp + CROSS JOIN LATERAL (SELECT match_result(NEW.final_scores, NEW.winner, mp.faction) AS r) x + WHERE mp.match_id = NEW.id AND mp.server_id = NEW.server_id + ON CONFLICT (server_id, day, steam_id) DO UPDATE SET + matches = t.matches + EXCLUDED.matches, kills = t.kills + EXCLUDED.kills, deaths = t.deaths + EXCLUDED.deaths, + headshots = t.headshots + EXCLUDED.headshots, team_kills = t.team_kills + EXCLUDED.team_kills, + suicides = t.suicides + EXCLUDED.suicides, vehicle_kills = t.vehicle_kills + EXCLUDED.vehicle_kills, + kill_streak = CASE WHEN t.matches = 0 THEN EXCLUDED.kill_streak ELSE GREATEST(t.kill_streak, EXCLUDED.kill_streak) END, + death_streak = CASE WHEN t.matches = 0 THEN EXCLUDED.death_streak ELSE GREATEST(t.death_streak, EXCLUDED.death_streak) END, + wins = t.wins + EXCLUDED.wins, losses = t.losses + EXCLUDED.losses, draws = t.draws + EXCLUDED.draws; + RETURN NEW; +END $$;--> statement-breakpoint +-- An ended match inserted, changed or deleted: the pairs of its lines recounted, on its server +-- before and after, and the days it ended on before and after (a moved end changes the day alone). +CREATE OR REPLACE FUNCTION "player_totals_match_changed"() RETURNS trigger LANGUAGE plpgsql AS $$ +DECLARE + pids text[]; +BEGIN + IF TG_OP <> 'INSERT' THEN + SELECT array_agg(DISTINCT steam_id) INTO pids FROM match_players WHERE match_id = OLD.id AND server_id = OLD.server_id; + IF pids IS NOT NULL THEN + PERFORM player_totals_recount(OLD.server_id, pids); + PERFORM player_days_recount(OLD.server_id, pids, + array_fill((OLD.ended_at AT TIME ZONE 'UTC')::date, ARRAY[cardinality(pids)])); + END IF; + END IF; + IF TG_OP <> 'DELETE' AND NEW.ended_at IS NOT NULL THEN + SELECT array_agg(DISTINCT steam_id) INTO pids FROM match_players WHERE match_id = NEW.id AND server_id = NEW.server_id; + IF pids IS NOT NULL THEN + IF TG_OP = 'INSERT' OR (NEW.id, NEW.server_id) IS DISTINCT FROM (OLD.id, OLD.server_id) THEN + PERFORM player_totals_recount(NEW.server_id, pids); + END IF; + PERFORM player_days_recount(NEW.server_id, pids, + array_fill((NEW.ended_at AT TIME ZONE 'UTC')::date, ARRAY[cardinality(pids)])); + END IF; + END IF; + RETURN NULL; +END $$;--> statement-breakpoint +-- Lines of ended matches inserted, changed or deleted (one function per event, as transition +-- tables require): every pair they touch recounted, and every (player, day the match ended) key, a +-- server at a time. The worker only writes the lines of the match in progress, which these find +-- nothing to do for. +CREATE OR REPLACE FUNCTION "player_totals_lines_inserted"() RETURNS trigger LANGUAGE plpgsql AS $$ +DECLARE + s record; +BEGIN + FOR s IN + SELECT n.server_id, array_agg(n.steam_id) AS pids, array_agg((m.ended_at AT TIME ZONE 'UTC')::date) AS days + FROM lines_new n JOIN matches m ON m.id = n.match_id AND m.server_id = n.server_id + WHERE m.ended_at IS NOT NULL + GROUP BY n.server_id ORDER BY n.server_id + LOOP + PERFORM player_totals_recount(s.server_id, s.pids); + PERFORM player_days_recount(s.server_id, s.pids, s.days); + END LOOP; + RETURN NULL; +END $$;--> statement-breakpoint +CREATE OR REPLACE FUNCTION "player_totals_lines_updated"() RETURNS trigger LANGUAGE plpgsql AS $$ +DECLARE + s record; +BEGIN + FOR s IN + SELECT k.server_id, array_agg(k.steam_id) AS pids, array_agg((m.ended_at AT TIME ZONE 'UTC')::date) AS days + FROM (SELECT match_id, server_id, steam_id FROM lines_old + UNION ALL SELECT match_id, server_id, steam_id FROM lines_new) k + JOIN matches m ON m.id = k.match_id AND m.server_id = k.server_id + WHERE m.ended_at IS NOT NULL + GROUP BY k.server_id ORDER BY k.server_id + LOOP + PERFORM player_totals_recount(s.server_id, s.pids); + PERFORM player_days_recount(s.server_id, s.pids, s.days); + END LOOP; + RETURN NULL; +END $$;--> statement-breakpoint +-- A server left with no line at all (the purge) is cleared in one pass, before any key is gathered. +CREATE OR REPLACE FUNCTION "player_totals_lines_deleted"() RETURNS trigger LANGUAGE plpgsql AS $$ +DECLARE + sid text; + s record; +BEGIN + FOR sid IN SELECT DISTINCT server_id FROM lines_old ORDER BY 1 LOOP + IF NOT EXISTS (SELECT 1 FROM match_players WHERE server_id = sid) THEN + PERFORM player_lines_cleared(sid); + ELSE + FOR s IN + SELECT array_agg(o.steam_id) AS pids, array_agg((m.ended_at AT TIME ZONE 'UTC')::date) AS days + FROM lines_old o JOIN matches m ON m.id = o.match_id AND m.server_id = o.server_id + WHERE o.server_id = sid AND m.ended_at IS NOT NULL + HAVING COUNT(*) > 0 + LOOP + PERFORM player_totals_recount(sid, s.pids); + PERFORM player_days_recount(sid, s.pids, s.days); + END LOOP; + END IF; + END LOOP; + RETURN NULL; +END $$;--> statement-breakpoint +-- Every day row worked out again from the sources: what the migration fills the table with, and +-- (through player_totals_rebuild) what a bulk load ends with. One insert of the sessions' parts +-- and the lines by day joined; each match's result worked out once per side that played it. +CREATE FUNCTION "player_days_rebuild"() RETURNS void LANGUAGE plpgsql AS $$ +BEGIN + IF EXISTS (SELECT 1 FROM player_sessions WHERE left_at IS NOT NULL AND last_seen IS DISTINCT FROM left_at) THEN + RAISE EXCEPTION 'a closed player session must have last_seen equal to left_at (migration 0039): player_days not built'; + END IF; + DELETE FROM player_days; + INSERT INTO player_days (server_id, day, steam_id, seconds, crossings, sessions, seed_seconds, cash, last_seen, + matches, kills, deaths, headshots, team_kills, suicides, vehicle_kills, + kill_streak, death_streak, wins, losses, draws) + WITH results AS ( + SELECT f.match_id, f.faction, match_result(m.final_scores, m.winner, f.faction) AS r + FROM (SELECT DISTINCT match_id, faction FROM match_players WHERE faction IS NOT NULL) f + JOIN matches m ON m.id = f.match_id + WHERE m.ended_at IS NOT NULL), + s AS ( + SELECT ps.server_id, x.day, ps.steam_id, SUM(x.seconds) AS seconds, + array_agg(ps.joined_at ORDER BY ps.joined_at) FILTER (WHERE x.crossing) AS crossings, + (COUNT(*) FILTER (WHERE x.closes))::int AS sessions, + COALESCE(SUM(ps.seed_seconds) FILTER (WHERE x.closes), 0) AS seed_seconds, + COALESCE(SUM(ps.cash) FILTER (WHERE x.closes), 0) AS cash, + MAX(ps.last_seen) FILTER (WHERE x.closes) AS last_seen + FROM player_sessions ps CROSS JOIN LATERAL ( + SELECT p.day, p.seconds, p.crossing, p.day = (ps.left_at AT TIME ZONE 'UTC')::date AS closes + FROM session_day_parts(ps.joined_at, ps.left_at) p) x + WHERE ps.left_at IS NOT NULL + GROUP BY 1, 2, 3), + l AS ( + SELECT mp.server_id, (m.ended_at AT TIME ZONE 'UTC')::date AS day, mp.steam_id, COUNT(*)::int AS matches, + SUM(mp.kills) AS kills, SUM(mp.deaths) AS deaths, SUM(mp.headshots) AS headshots, + SUM(mp.team_kills) AS team_kills, SUM(mp.suicides) AS suicides, SUM(mp.vehicle_kills) AS vehicle_kills, + MAX(mp.kill_streak) AS kill_streak, MAX(mp.death_streak) AS death_streak, + (COUNT(*) FILTER (WHERE x.r = 'win'))::int AS wins, + (COUNT(*) FILTER (WHERE x.r = 'loss'))::int AS losses, + (COUNT(*) FILTER (WHERE x.r = 'draw'))::int AS draws + FROM match_players mp + JOIN matches m ON m.id = mp.match_id AND m.server_id = mp.server_id + LEFT JOIN results x ON x.match_id = mp.match_id AND x.faction = mp.faction + WHERE m.ended_at IS NOT NULL + GROUP BY 1, 2, 3) + SELECT COALESCE(s.server_id, l.server_id), COALESCE(s.day, l.day), COALESCE(s.steam_id, l.steam_id), + COALESCE(s.seconds, 0), s.crossings, COALESCE(s.sessions, 0), COALESCE(s.seed_seconds, 0), + COALESCE(s.cash, 0), s.last_seen, COALESCE(l.matches, 0), COALESCE(l.kills, 0), COALESCE(l.deaths, 0), + COALESCE(l.headshots, 0), COALESCE(l.team_kills, 0), COALESCE(l.suicides, 0), COALESCE(l.vehicle_kills, 0), + COALESCE(l.kill_streak, 0), COALESCE(l.death_streak, 0), COALESCE(l.wins, 0), COALESCE(l.losses, 0), + COALESCE(l.draws, 0) + FROM s FULL JOIN l ON l.server_id = s.server_id AND l.day = s.day AND l.steam_id = s.steam_id; +END $$;--> statement-breakpoint +-- What a bulk load ends with (see 0038's header): the totals, then the day rows. +CREATE OR REPLACE FUNCTION "player_totals_rebuild"() RETURNS void LANGUAGE plpgsql AS $$ +BEGIN + DELETE FROM player_totals; + INSERT INTO player_totals (server_id, steam_id, sessions, seconds, seed_seconds, cash, last_seen, + matches, kills, deaths, headshots, team_kills, suicides, vehicle_kills, + kill_streak, death_streak, wins, losses, draws) + WITH results AS ( + SELECT f.match_id, f.faction, match_result(m.final_scores, m.winner, f.faction) AS r + FROM (SELECT DISTINCT match_id, faction FROM match_players WHERE faction IS NOT NULL) f + JOIN matches m ON m.id = f.match_id + WHERE m.ended_at IS NOT NULL), + s AS ( + SELECT server_id, steam_id, COUNT(*)::int AS sessions, + SUM(EXTRACT(EPOCH FROM (left_at - joined_at))) AS seconds, + SUM(seed_seconds) AS seed_seconds, SUM(cash) AS cash, MAX(last_seen) AS last_seen + FROM player_sessions WHERE left_at IS NOT NULL + GROUP BY server_id, steam_id), + l AS ( + SELECT mp.server_id, mp.steam_id, COUNT(*)::int AS matches, SUM(mp.kills) AS kills, SUM(mp.deaths) AS deaths, + SUM(mp.headshots) AS headshots, SUM(mp.team_kills) AS team_kills, SUM(mp.suicides) AS suicides, + SUM(mp.vehicle_kills) AS vehicle_kills, MAX(mp.kill_streak) AS kill_streak, + MAX(mp.death_streak) AS death_streak, + (COUNT(*) FILTER (WHERE x.r = 'win'))::int AS wins, + (COUNT(*) FILTER (WHERE x.r = 'loss'))::int AS losses, + (COUNT(*) FILTER (WHERE x.r = 'draw'))::int AS draws + FROM match_players mp + JOIN matches m ON m.id = mp.match_id AND m.server_id = mp.server_id + LEFT JOIN results x ON x.match_id = mp.match_id AND x.faction = mp.faction + WHERE m.ended_at IS NOT NULL + GROUP BY mp.server_id, mp.steam_id) + SELECT COALESCE(s.server_id, l.server_id), COALESCE(s.steam_id, l.steam_id), + COALESCE(s.sessions, 0), COALESCE(s.seconds, 0), COALESCE(s.seed_seconds, 0), COALESCE(s.cash, 0), s.last_seen, + COALESCE(l.matches, 0), COALESCE(l.kills, 0), COALESCE(l.deaths, 0), COALESCE(l.headshots, 0), + COALESCE(l.team_kills, 0), COALESCE(l.suicides, 0), COALESCE(l.vehicle_kills, 0), + COALESCE(l.kill_streak, 0), COALESCE(l.death_streak, 0), + COALESCE(l.wins, 0), COALESCE(l.losses, 0), COALESCE(l.draws, 0) + FROM s FULL JOIN l ON l.server_id = s.server_id AND l.steam_id = s.steam_id; + PERFORM player_days_rebuild(); +END $$;--> statement-breakpoint +-- A closed session that breaks the rule stops the migration here, before any lock (the rebuild +-- checks again under the locks, which nothing can change meanwhile). +DO $$ +BEGIN + IF EXISTS (SELECT 1 FROM player_sessions WHERE left_at IS NOT NULL AND last_seen IS DISTINCT FROM left_at) THEN + RAISE EXCEPTION 'a closed player session must have last_seen equal to left_at (migration 0039): player_days not built'; + END IF; +END $$;--> statement-breakpoint +LOCK TABLE "player_sessions", "match_players", "matches" IN SHARE ROW EXCLUSIVE MODE;--> statement-breakpoint +CREATE INDEX "matches_server_ended_idx" ON "matches" USING btree ("server_id","ended_at");--> statement-breakpoint +SELECT player_days_rebuild();--> statement-breakpoint +-- 0038 merged a line's streak into a pair with no match yet as GREATEST(0, streak), which kept 0 for +-- a negative one (never the worker's; a hand edit): every pair with such a line is recounted. +SELECT player_totals_recount(server_id, array_agg(DISTINCT steam_id)) + FROM match_players WHERE kill_streak < 0 OR death_streak < 0 GROUP BY server_id;--> statement-breakpoint +ALTER TABLE "player_days" ADD CONSTRAINT "player_days_server_id_day_steam_id_pk" PRIMARY KEY("server_id","day","steam_id"); diff --git a/drizzle/meta/0039_snapshot.json b/drizzle/meta/0039_snapshot.json new file mode 100644 index 00000000..677ecfc1 --- /dev/null +++ b/drizzle/meta/0039_snapshot.json @@ -0,0 +1,5216 @@ +{ + "id": "ec7fbaa8-06ec-41e4-b47f-7fbca790d9ad", + "prevId": "bb4331b4-4b41-4e79-be54-d05329950a08", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_server_ended_idx": { + "name": "matches_server_ended_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ended_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_days": { + "name": "player_days", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "day": { + "name": "day", + "type": "date", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "crossings": { + "name": "crossings", + "type": "timestamp with time zone[]", + "primaryKey": false, + "notNull": false + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_days_server_id_day_steam_id_pk": { + "name": "player_days_server_id_day_steam_id_pk", + "columns": [ + "server_id", + "day", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_totals": { + "name": "player_totals", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_totals_server_id_steam_id_pk": { + "name": "player_totals_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 1e98ee3e..caa83ccb 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -288,6 +288,13 @@ "when": 1791740935613, "tag": "0040_player_totals", "breakpoints": true + }, + { + "idx": 39, + "version": "7", + "when": 1791142161935, + "tag": "0039_player_days", + "breakpoints": true } ] } \ No newline at end of file diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index a0ef30e7..29fdd75f 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -6,6 +6,7 @@ import { bigserial, boolean, customType, + date, index, integer, numeric, @@ -487,7 +488,9 @@ export const matches = pgTable( /** the match in progress, which every status look and kill batch reads: one entry per server */ index('matches_open_idx') .on(t.serverId, t.id) - .where(sql`${t.endedAt} is null`) + .where(sql`${t.endedAt} is null`), + /** the matches that ended in a range's first, partial day (rangeBase) */ + index('matches_server_ended_idx').on(t.serverId, t.endedAt) ] ); @@ -626,6 +629,49 @@ export const playerTotals = pgTable( (t) => [primaryKey({ columns: [t.serverId, t.steamId] })] ); +/** + * Each player's settled totals on a server per UTC day, for the ranged boards (7, 30 and 90 days), + * which add the range's partial first day and the open sessions (rangeBase): the closed sessions' + * time within the day, the joined_at of each closed session that crossed the day's midnight (what + * a range starting the day before needs), and the count, seed time, cash and last sighting of the + * sessions that left on the day; the lines of the matches that ended on it, with the boards' result + * rule. A row exists while it holds any of them. Kept by the same triggers and lock as + * player_totals (migration 0039 extends 0038's); the application only reads it. + */ +export const playerDays = pgTable( + 'player_days', + { + serverId: text('server_id').notNull(), + /** the UTC date */ + day: date('day', { mode: 'string' }).notNull(), + steamId: text('steam_id').notNull(), + /** the closed sessions' seconds within the day, exact */ + seconds: numeric('seconds').notNull().default('0'), + /** joined_at of each closed session that started before the day and left on it or later, in order; null when none */ + crossings: ts('crossings').array(), + /** closed sessions that left on the day */ + sessions: integer('sessions').notNull().default(0), + seedSeconds: bigint('seed_seconds', { mode: 'number' }).notNull().default(0), + cash: bigint('cash', { mode: 'number' }).notNull().default(0), + /** MAX(last_seen) over them; null without one */ + lastSeen: ts('last_seen'), + /** lines of matches that ended on the day */ + matches: integer('matches').notNull().default(0), + kills: bigint('kills', { mode: 'number' }).notNull().default(0), + deaths: bigint('deaths', { mode: 'number' }).notNull().default(0), + headshots: bigint('headshots', { mode: 'number' }).notNull().default(0), + teamKills: bigint('team_kills', { mode: 'number' }).notNull().default(0), + suicides: bigint('suicides', { mode: 'number' }).notNull().default(0), + vehicleKills: bigint('vehicle_kills', { mode: 'number' }).notNull().default(0), + killStreak: integer('kill_streak').notNull().default(0), + deathStreak: integer('death_streak').notNull().default(0), + wins: integer('wins').notNull().default(0), + losses: integer('losses').notNull().default(0), + draws: integer('draws').notNull().default(0) + }, + (t) => [primaryKey({ columns: [t.serverId, t.day, t.steamId] })] +); + // ---- Player intelligence: org-scoped notes and watchlist, cached Steam data, ban snapshots ------ /** One row per (org, player): the watchlist flag and why. */ diff --git a/src/lib/server/leaderboards.ts b/src/lib/server/leaderboards.ts index 36222f1e..a2d36b16 100644 --- a/src/lib/server/leaderboards.ts +++ b/src/lib/server/leaderboards.ts @@ -4,7 +4,8 @@ // for the result, and the sessions for playtime, seed time, the last name and cash. All time is // read from each player's settled totals per server (player_totals, kept by the database as // sessions close and matches end, migration 0038) plus the open sessions; a range (7, 30, 90 -// days) sums the sources in it. A page of a board is kept for a minute (loadBoard). Only matches +// days) from the same totals per UTC day (player_days, migration 0039) plus its partial first day +// and the open sessions. A page of a board is kept for a minute (loadBoard). Only matches // that have ended count, and a match is in a range by when it ended; the match in progress is on // the live page. The result of a match for a player (win, loss, draw, none) is the rule in // $lib/leaderboard, written out again in SQL below for the aggregates (and once more, as @@ -12,6 +13,7 @@ import { sql } from 'drizzle-orm'; import type { Env } from './env'; import { servers } from './db/schema'; +import { boardReads } from './metrics'; import type { RiskPerformance } from './risk'; import type { PlayerStats } from './message-vars'; import { @@ -61,47 +63,72 @@ const lines = (ids: string[], from: Date, steamId: string | string[] | null) => ${steamId === null ? sql`` : Array.isArray(steamId) ? sql`AND p.steam_id IN ${steamId}` : sql`AND p.steam_id = ${steamId}`})`; /** - * Per-player totals over these servers since `from`: playtime, seed time, the last look and - * cash summed over sessions; matches, results, kills, deaths and the feed's columns from - * the match lines; joined on the SteamID, so a player seen by one source only still gets a row. - * `steamIds` narrows it to those players, with the same totals. + * Per-player totals over these servers since `from` (the 7, 30 and 90-day boards), from the day + * rows (player_days, migration 0039): every UTC day after from's (D1 on) in full; for each session + * that crossed D1's midnight (its join is kept on D1's row), its time from `from`, or from its + * join, to that midnight; and, read here, the sessions closed between `from` and that midnight, the + * open sessions seen since `from` and the lines of matches that ended in the same stretch. One pass + * over them, then the columns of the reads before player_days (base in src/test/totals-oracle.ts), + * word for word: a player's session side only when they have a session in range, the line side + * only with a line in range, else the zero the missing side had. Seconds are exact numeric sums, + * so the minutes are the same digits for any `from`. Also read by the exactness test. */ -const base = (ids: string[], from: Date, steamIds: string[] | null = null) => sql` - sess AS ( - SELECT steam_id, - SUM(EXTRACT(EPOCH FROM (COALESCE(left_at, now()) - GREATEST(joined_at, ${from}::timestamptz)))) / 60 AS minutes, - SUM(seed_seconds) / 60.0 AS seed_minutes, MAX(last_seen) AS last_seen, - SUM(cash) AS cash - FROM player_sessions WHERE server_id IN ${ids} AND last_seen >= ${from} - AND (left_at IS NULL OR left_at >= ${from}) - ${steamIds === null ? sql`` : sql`AND steam_id IN ${steamIds}`} - GROUP BY steam_id), - ${lines(ids, from, steamIds)}, - mt AS ( - SELECT steam_id, COUNT(*) AS matches, - SUM(kills) AS kills, SUM(deaths) AS deaths, SUM(headshots) AS headshots, +export const rangeBase = (ids: string[], from: Date) => sql` + edge AS ( + SELECT ${from}::timestamptz AS f, (${from}::timestamptz AT TIME ZONE 'UTC')::date + 1 AS d1, + ((${from}::timestamptz AT TIME ZONE 'UTC')::date + 1)::timestamp AT TIME ZONE 'UTC' AS m1), + parts AS ( + SELECT d.steam_id, d.sessions AS n, d.seconds AS sec, d.seed_seconds AS seed, d.cash, d.last_seen AS ls, + d.matches AS m, d.kills, d.deaths, d.headshots, d.team_kills, d.suicides, d.vehicle_kills, + d.kill_streak, d.death_streak, d.wins, d.losses, d.draws + FROM player_days d, edge WHERE d.server_id IN ${ids} AND d.day >= edge.d1 + UNION ALL + SELECT d.steam_id, 0, EXTRACT(EPOCH FROM (edge.m1 - GREATEST(j, edge.f))), 0, 0, NULL, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + FROM player_days d CROSS JOIN edge CROSS JOIN LATERAL unnest(d.crossings) j + WHERE d.server_id IN ${ids} AND d.day = edge.d1 AND d.crossings IS NOT NULL + UNION ALL + SELECT s.steam_id, 1, EXTRACT(EPOCH FROM (COALESCE(s.left_at, now()) - GREATEST(s.joined_at, edge.f))), + s.seed_seconds, s.cash, s.last_seen, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + FROM player_sessions s, edge + WHERE s.server_id IN ${ids} AND s.last_seen >= edge.f + AND (s.left_at IS NULL OR (s.left_at >= edge.f AND s.left_at < edge.m1)) + UNION ALL + SELECT p.steam_id, 0, 0, 0, 0, NULL, 1, p.kills, p.deaths, p.headshots, p.team_kills, p.suicides, + p.vehicle_kills, p.kill_streak, p.death_streak, CASE WHEN x.r = 'win' THEN 1 ELSE 0 END, + CASE WHEN x.r = 'loss' THEN 1 ELSE 0 END, CASE WHEN x.r = 'draw' THEN 1 ELSE 0 END + FROM edge, matches mt + JOIN match_players p ON p.match_id = mt.id AND p.server_id = mt.server_id + CROSS JOIN LATERAL (SELECT match_result(mt.final_scores, mt.winner, p.faction) AS r) x + WHERE mt.server_id IN ${ids} AND mt.ended_at >= edge.f AND mt.ended_at < edge.m1), + player AS ( + SELECT steam_id, SUM(n) AS n, SUM(sec) AS sec, SUM(seed) AS seed, MAX(ls) AS ls, SUM(cash) AS cash, + SUM(m) AS m, SUM(kills) AS kills, SUM(deaths) AS deaths, SUM(headshots) AS headshots, SUM(team_kills) AS team_kills, SUM(suicides) AS suicides, SUM(vehicle_kills) AS vehicle_kills, - MAX(kill_streak) AS kill_streak, MAX(death_streak) AS death_streak, - COUNT(*) FILTER (WHERE result = 'win') AS wins, - COUNT(*) FILTER (WHERE result = 'loss') AS losses, - COUNT(*) FILTER (WHERE result = 'draw') AS draws - FROM lines GROUP BY steam_id), + MAX(kill_streak) FILTER (WHERE m > 0) AS kill_streak, + MAX(death_streak) FILTER (WHERE m > 0) AS death_streak, + SUM(wins) AS wins, SUM(losses) AS losses, SUM(draws) AS draws + FROM parts GROUP BY steam_id HAVING SUM(n) > 0 OR SUM(m) > 0), base AS ( SELECT steam_id, - COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.seed_minutes, 0) AS seed_minutes, - COALESCE(sess.cash, 0) AS cash, sess.last_seen, - COALESCE(mt.kills, 0) AS kills, COALESCE(mt.deaths, 0) AS deaths, - COALESCE(mt.headshots, 0) AS headshots, COALESCE(mt.team_kills, 0) AS team_kills, - COALESCE(mt.suicides, 0) AS suicides, COALESCE(mt.vehicle_kills, 0) AS vehicle_kills, - COALESCE(mt.kill_streak, 0) AS kill_streak, COALESCE(mt.death_streak, 0) AS death_streak, - COALESCE(mt.matches, 0) AS matches, COALESCE(mt.wins, 0) AS wins, - COALESCE(mt.losses, 0) AS losses, COALESCE(mt.draws, 0) AS draws - FROM sess FULL JOIN mt USING (steam_id))`; + CASE WHEN n > 0 THEN sec / 60 ELSE 0 END AS minutes, + CASE WHEN n > 0 THEN seed / 60.0 ELSE 0 END AS seed_minutes, + CASE WHEN n > 0 THEN cash ELSE 0 END AS cash, CASE WHEN n > 0 THEN ls END AS last_seen, + CASE WHEN m > 0 THEN kills ELSE 0 END AS kills, CASE WHEN m > 0 THEN deaths ELSE 0 END AS deaths, + CASE WHEN m > 0 THEN headshots ELSE 0 END AS headshots, + CASE WHEN m > 0 THEN team_kills ELSE 0 END AS team_kills, + CASE WHEN m > 0 THEN suicides ELSE 0 END AS suicides, + CASE WHEN m > 0 THEN vehicle_kills ELSE 0 END AS vehicle_kills, + CASE WHEN m > 0 THEN kill_streak ELSE 0 END AS kill_streak, + CASE WHEN m > 0 THEN death_streak ELSE 0 END AS death_streak, + CASE WHEN m > 0 THEN m ELSE 0 END AS matches, CASE WHEN m > 0 THEN wins ELSE 0 END AS wins, + CASE WHEN m > 0 THEN losses ELSE 0 END AS losses, CASE WHEN m > 0 THEN draws ELSE 0 END AS draws + FROM player)`; /** - * `base` for all time, from the settled totals: `sess` is the pairs with a closed session plus - * the open sessions, `mt` the pairs with a line of an ended match, then the same join. The same - * rows and values as base(ids, EPOCH, steamIds): the seconds are exact numeric sums either way, + * The base rows for all time, from the settled totals: `sess` is the pairs with a closed session + * plus the open sessions, `mt` the pairs with a line of an ended match, then the join of the reads + * before player_totals. The same rows and values as they gave: the seconds are exact numeric sums, * and a player with no session at all still gets the join's zeros. Also read by the exactness * test (src/test/player-totals.test.ts). */ @@ -264,7 +291,7 @@ async function boardSlice( const from = rangeStart(q.range); const order = q.dir === 'asc' ? sql`ASC NULLS LAST` : sql`DESC NULLS LAST`; return (await env.db.execute(sql` - WITH ${from ? base(ids, from) : totalsBase(ids)}, + WITH ${from ? rangeBase(ids, from) : totalsBase(ids)}, page AS ( SELECT *, COUNT(*) OVER () AS total FROM base WHERE minutes >= ${q.minMinutes} @@ -289,7 +316,10 @@ async function boardSlice( const BOARD_TTL_MS = 60_000; /** The most pages kept: fifty rows each, a few megabytes at most. */ const BOARD_CACHE_MAX = 500; -const boardCache = new Map }>(); +const boardCache = new Map< + string, + { ids: string[]; until: number; view: Promise; read: boolean } +>(); /** Forgets the boards kept over this server (its stats were purged), or every board. */ export function forgetBoards(serverId?: string): void { @@ -304,14 +334,26 @@ export async function loadBoard(env: Env, ids: string[], q: BoardQuery): Promise const key = JSON.stringify([sorted, q.scope, q.range, q.sort, q.dir, q.page, q.minMinutes]); const now = Date.now(); const hit = boardCache.get(key); - if (hit && hit.until > now) return hit.view; - const entry = { ids: sorted, until: now + BOARD_TTL_MS, view: readBoard(env, sorted, q) }; + if (hit && hit.until > now) { + boardReads.inc({ outcome: hit.read ? 'hit' : 'shared' }); + return hit.view; + } + boardReads.inc({ outcome: 'miss' }); + const entry = { + ids: sorted, + until: now + BOARD_TTL_MS, + view: readBoard(env, sorted, q), + read: false + }; boardCache.delete(key); boardCache.set(key, entry); // A failed read is not kept: the next request reads again. - entry.view.catch(() => { - if (boardCache.get(key) === entry) boardCache.delete(key); - }); + entry.view.then( + () => (entry.read = true), + () => { + if (boardCache.get(key) === entry) boardCache.delete(key); + } + ); if (boardCache.size > BOARD_CACHE_MAX) { for (const [k, e] of boardCache) if (e.until <= now) boardCache.delete(k); for (const k of boardCache.keys()) { diff --git a/src/lib/server/metrics.ts b/src/lib/server/metrics.ts index c4810cc5..dadba9ad 100644 --- a/src/lib/server/metrics.ts +++ b/src/lib/server/metrics.ts @@ -136,6 +136,12 @@ export const feedKills = new Counter({ labelNames: ['result'] as const, registers: [registry] }); +export const boardReads = new Counter({ + name: 'warcon_board_reads_total', + help: 'Board pages asked for, by what the minute cache did: had it (hit), was reading it (shared) or read it (miss).', + labelNames: ['outcome'] as const, + registers: [registry] +}); export const rateLimited = new Counter({ name: 'warcon_rate_limited_total', help: 'Requests refused by the in-memory limiter, by the limit that fired.', diff --git a/src/test/player-totals-writes.test.ts b/src/test/player-totals-writes.test.ts index 3dfdfb3b..8329f49b 100644 --- a/src/test/player-totals-writes.test.ts +++ b/src/test/player-totals-writes.test.ts @@ -1,22 +1,25 @@ -// The totals' triggers (migration 0038) under the writes the random histories do not reach: one -// statement that closes a session and edits a closed one of the same player, or ends a match and -// edits an ended one; a transaction that ends a match and then changes its lines and its winner; -// an upsert of an ended match's lines; a statement that fails after a close; a purge. Then two -// transactions on one server, the worker's (a close, a match end, an abandoned match, leavers' -// lines, the offline transition) and a purge, each holding the server's totals lock while the -// other waits for it, in both orders: no deadlock, and the totals exact after. Taking the lock -// first is what makes that so: without it, an abandoned match against a purge deadlocks; and, -// taken before the lease row, a purge holding it does not hold up the lease renewal, while a write -// that waited for it as the lease changed hands and came back is dropped. A -// transaction that is not READ COMMITTED is refused. Last, migration 0038 run over a database that -// already has history builds the totals the reads expect. -import { beforeAll, describe, expect, test } from 'bun:test'; +// The totals' triggers (migrations 0038 and 0039) under the writes the random histories do not +// reach, each checked against the all-time reads and the ranged ones (the day rows, from every +// midnight of the history and a millisecond either side): one statement that closes a session and +// edits a closed one of the same player, or ends a match and edits an ended one; a transaction that +// ends a match and then changes its lines and its winner; an upsert of an ended match's lines; a +// statement that fails after a close; a purge; a session over two midnights closed, moved and +// deleted, and one closed exactly at a midnight; a match end moved to another day; the closed- +// session rule; a negative streak; writes and reads in other time zones, microseconds either side +// of a midnight. Then two transactions on one server, the worker's (a close, a match end, an +// abandoned match, leavers' lines, the offline transition) and a purge, each holding the server's +// totals lock while the other waits for it, in both orders: no deadlock, and the totals exact +// after. Taking the lock first is what makes that so: without it, an abandoned match against a +// purge deadlocks; and taken before the lease row, a purge holding it does not hold up the lease +// renewal. A transaction that is not READ COMMITTED is refused. Last, migrations 0038 and 0039 run +// over a database that already has history build the totals and day rows the reads expect. +import { beforeAll, describe, expect, setDefaultTimeout, test } from 'bun:test'; import { SQL } from 'bun'; import { randomBytes } from 'node:crypto'; import { cp, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'; import { tmpdir } from 'node:os'; import { join } from 'node:path'; -import { eq, sql } from 'drizzle-orm'; +import { eq, sql, type SQL as Query } from 'drizzle-orm'; import type { Env } from '$lib/server/env'; import { connect, runMigrations, type DbOrTx } from '$lib/server/db'; import { matches, matchPlayers, playerSessions } from '$lib/server/db/schema'; @@ -32,12 +35,18 @@ import { purgeServerStats } from '$lib/server/stats'; import { lockTotals } from '$lib/server/totals'; import { hasTestDb, testEnv } from './db'; import { seedWorld, type World } from './world'; -import { oracleBase, totalsRows } from './totals-oracle'; +import { oracleBase, oracleRangeBase, rangeRows, totalsRows } from './totals-oracle'; + +// Every test holds the rows against the reads from fifty-odd range starts: more than bun's 5 s on a +// loaded machine. +setDefaultTimeout(30_000); const P = '76561198000032001'; const Q = '76561198000032002'; const R = '76561198000032003'; +const S = '76561198000032004'; const HOUR = 3_600_000; +const DAY = 86_400_000; const scores = [ { name: 'Valkyra', score: 100 }, { name: 'Lonestar', score: 60 } @@ -52,14 +61,27 @@ function gate() { describe.skipIf(!hasTestDb)('player totals under every kind of write', () => { let env: Env; - /** The totals of these servers equal what today's reads compute, in one snapshot. */ + // Hour 0 is 22:00 UTC two days back: hour 2 and hour 26 are midnights. + const t0 = Math.floor(Date.now() / DAY) * DAY - 2 * DAY - 2 * HOUR; + const at = (h: number) => new Date(t0 + h * HOUR); + /** Range starts around everything these tests write: the midnights and a millisecond either side. */ + const SINCE = [-30, -1, 0, 0.5, 1, 1.5, 2, 2.5, 3, 4, 25, 26, 27, 30, 49, 50, 51, 80].flatMap( + (h) => { + const t = t0 + h * HOUR; + return [t - 1, t, t + 1].map((v) => new Date(v)); + } + ); + /** The totals and the day rows of these servers equal what today's reads compute, in one snapshot. */ const exact = async (ids: string[]) => { await env.db.transaction(async (tx) => { expect(await totalsRows(tx, ids)).toEqual(await oracleBase(tx, ids)); + for (const from of SINCE) + expect({ since: from.toISOString(), rows: await rangeRows(tx, ids, from) }).toEqual({ + since: from.toISOString(), + rows: await oracleRangeBase(tx, ids, from) + }); }); }; - const t0 = Date.now() - 20 * HOUR; - const at = (h: number) => new Date(t0 + h * HOUR); const session = async ( serverId: string, steamId: string, @@ -252,6 +274,204 @@ describe.skipIf(!hasTestDb)('player totals under every kind of write', () => { matches: number; }[]; expect(rows).toEqual([{ steam_id: P, sessions: 1, matches: 0 }]); + // the day rows too: P's two days, their session's; Q's only day held nothing but the line + const days = (await env.db.execute(sql` + SELECT steam_id, sessions, matches FROM player_days WHERE server_id = ${A} ORDER BY steam_id, day`)) as { + steam_id: string; + sessions: number; + matches: number; + }[]; + expect(days.map((d) => [d.steam_id, d.sessions, d.matches])).toEqual([ + [P, 0, 0], + [P, 1, 0] + ]); + }); + + test('a day row holding nothing (no writer leaves one; a hand insert) is nobody on a board', async () => { + const w = await seedWorld(env); + const A = w.server.id; + await session(A, P, 0, 3); + await env.db.execute(sql` + INSERT INTO player_days (server_id, day, steam_id) + VALUES (${A}, (${at(30)}::timestamptz AT TIME ZONE 'UTC')::date, ${R})`); + await exact([A]); + }); + + test('day rows: a session over two midnights closes, moves across a midnight by hand and goes; another closes at a midnight', async () => { + const w = await seedWorld(env); + const A = w.server.id; + const long = await session(A, P, 1, null); + await env.db.execute( + sql`UPDATE player_sessions SET last_seen = ${at(27.5)} WHERE id = ${long}` + ); + await env.db.execute(sql`UPDATE player_sessions SET left_at = last_seen WHERE id = ${long}`); + await exact([A]); + // an hour on the first day, the whole second, an hour and a half on the third; crossings on + // the last two, the close on the last + const days = async () => + ( + (await env.db.execute(sql` + SELECT seconds::text AS seconds, COALESCE(cardinality(crossings), 0) AS crossings, sessions + FROM player_days WHERE server_id = ${A} AND steam_id = ${P} ORDER BY day`)) as { + seconds: string; + crossings: number; + sessions: number; + }[] + ).map((d) => [Number(d.seconds), d.crossings, d.sessions]); + expect(await days()).toEqual([ + [3600, 0, 0], + [86400, 1, 0], + [5400, 1, 1] + ]); + // moved three hours back by hand: it now closes on the second day + await env.db + .update(playerSessions) + .set({ joinedAt: at(-2), leftAt: at(24.5), lastSeen: at(24.5) }) + .where(eq(playerSessions.id, long)); + await exact([A]); + expect(await days()).toEqual([ + [4 * 3600, 0, 0], + [22.5 * 3600, 1, 1] + ]); + // one closed exactly at a midnight: no time on that day, but its close and its crossing are + const edge = await session(A, Q, 1, null); + await env.db.execute( + sql`UPDATE player_sessions SET last_seen = ${at(2)}, left_at = ${at(2)} WHERE id = ${edge}` + ); + await exact([A]); + await env.db.delete(playerSessions).where(eq(playerSessions.id, long)); + await exact([A]); + expect(await days()).toEqual([]); + }); + + test('day rows: a match whose end moves to another day, a line added after, then the match reopened', async () => { + const w = await seedWorld(env); + const A = w.server.id; + await session(A, P, 0, 30); + const m = await match(A, 0.5, true); + await line(m, A, P, 'Valkyra'); + await line(m, A, Q, 'Lonestar'); + await exact([A]); + await env.db + .update(matches) + .set({ endedAt: at(2.5) }) + .where(eq(matches.id, m)); + await exact([A]); + await line(m, A, R, 'Valkyra', 6); + await exact([A]); + await env.db.update(matches).set({ endedAt: null }).where(eq(matches.id, m)); + await exact([A]); + const [{ n }] = (await env.db.execute(sql` + SELECT COUNT(*)::int AS n FROM player_days WHERE server_id = ${A} AND matches > 0`)) as { + n: number; + }[]; + expect(n).toBe(0); + }); + + test('a closed session must have last_seen equal to left_at: an edit or a close that breaks it is refused, and a rebuild over one', async () => { + const w = await seedWorld(env); + const A = w.server.id; + const closed = await session(A, P, 0, 3); + const open = await session(A, Q, 1, null); + const refused = (q: Query) => + env.db.execute(q).then( + () => 'accepted', + (err: { cause?: { message?: string } }) => String(err?.cause?.message ?? err) + ); + expect( + await refused(sql`UPDATE player_sessions SET last_seen = ${at(2)} WHERE id = ${closed}`) + ).toMatch(/last_seen equal to left_at/); + expect( + await refused(sql`UPDATE player_sessions SET left_at = ${at(2.5)} WHERE id = ${open}`) + ).toMatch(/last_seen equal to left_at/); + expect( + await refused(sql` + INSERT INTO player_sessions (server_id, steam_id, name, joined_at, last_seen, left_at) + VALUES (${A}, ${R}, 'r', ${at(0)}, ${at(1)}, ${at(2)})`) + ).toMatch(/last_seen equal to left_at/); + await exact([A]); + // a row that breaks it with the triggers off (a bulk load gone wrong) stops the rebuild + const rebuilt = await env.db + .transaction(async (tx) => { + await tx.execute( + sql`ALTER TABLE player_sessions DISABLE TRIGGER player_totals_session_updated` + ); + await tx.execute(sql`UPDATE player_sessions SET last_seen = ${at(2)} WHERE id = ${closed}`); + await tx.execute(sql`SELECT player_totals_rebuild()`); + }) + .then( + () => 'rebuilt', + (err: { cause?: { message?: string } }) => String(err?.cause?.message ?? err) + ); + expect(rebuilt).toMatch(/player_days not built/); + await exact([A]); + }); + + test('a streak goes into a row with no match yet as it is, below zero too', async () => { + const w = await seedWorld(env); + const A = w.server.id; + // the session makes P's rows first (streaks 0); the match ends on a day it covers + await session(A, P, 0, 3); + const m = await match(A, 1, false); + await env.db.insert(matchPlayers).values({ + matchId: m, + serverId: A, + steamId: P, + name: 'p', + faction: 'Valkyra', + deaths: 3, + killStreak: -1, + deathStreak: -2 + }); + await env.db + .update(matches) + .set({ endedAt: at(2), finalScores: scores, winner: 'Valkyra' }) + .where(eq(matches.id, m)); + await exact([A]); + }); + + test('day rows follow UTC, not the connection, and split microseconds either side of a midnight', async () => { + const w = await seedWorld(env); + const A = w.server.id; + const midnight = at(2).toISOString(); + await env.db.transaction(async (tx) => { + await tx.execute(sql`SET LOCAL TIME ZONE 'Pacific/Chatham'`); + // over two midnights, closed in a +13:45 session + const [{ id }] = await tx + .insert(playerSessions) + .values({ serverId: A, steamId: P, name: 'p', joinedAt: at(1), lastSeen: at(1.5) }) + .returning({ id: playerSessions.id }); + await tx.execute( + sql`UPDATE player_sessions SET last_seen = ${at(27)}, left_at = ${at(27)} WHERE id = ${id}` + ); + // a microsecond before a midnight to a microsecond after it + await tx.execute(sql` + INSERT INTO player_sessions (server_id, steam_id, name, joined_at, last_seen, left_at) + VALUES (${A}, ${Q}, 'q', ${midnight}::timestamptz - interval '1 microsecond', + ${midnight}::timestamptz + interval '1 microsecond', ${midnight}::timestamptz + interval '1 microsecond')`); + const m = await match(A, 25, false); + await line(m, A, P, 'Valkyra'); + await tx.execute(sql` + UPDATE matches SET ended_at = ${midnight}::timestamptz + interval '1 day' - interval '1 microsecond', + final_scores = ${JSON.stringify(scores)}::jsonb, winner = 'Lonestar' + WHERE id = ${m}`); + }); + // read in a -2:30 session and in UTC + await env.db.transaction(async (tx) => { + await tx.execute(sql`SET LOCAL TIME ZONE 'America/St_Johns'`); + for (const from of SINCE) + expect({ since: from.toISOString(), rows: await rangeRows(tx, [A], from) }).toEqual({ + since: from.toISOString(), + rows: await oracleRangeBase(tx, [A], from) + }); + }); + await exact([A]); + const parts = (await env.db.execute(sql` + SELECT day::text, seconds::text FROM player_days WHERE server_id = ${A} AND steam_id = ${Q} ORDER BY day`)) as { + day: string; + seconds: string; + }[]; + expect(parts.map((d) => d.seconds)).toEqual(['0.000001', '0.000001']); }); test('a transaction that is not READ COMMITTED is refused', async () => { @@ -480,127 +700,175 @@ describe.skipIf(!hasTestDb)('player totals under every kind of write', () => { }); }); - test('migration 0038 over a database with history builds the totals the reads expect', async () => { - const base = process.env.TEST_DATABASE_URL!; - const name = `warcon_test_totals_${randomBytes(4).toString('hex')}`; - const admin = new SQL(base, { max: 1 }); - await admin.unsafe(`CREATE DATABASE "${name}"`); - const url = new URL(base); - url.pathname = `/${name}`; - const { client, db } = connect(url.href); - const dir = await mkdtemp(join(tmpdir(), 'warcon-0037-')); - try { - // every migration before 0038 - await cp('drizzle', dir, { recursive: true }); - await rm(join(dir, '0038_player_totals.sql')); - await rm(join(dir, 'meta', '0038_snapshot.json')); - const journal = JSON.parse(await readFile(join(dir, 'meta', '_journal.json'), 'utf8')); - journal.entries = journal.entries.filter( - (e: { tag: string }) => e.tag !== '0038_player_totals' - ); - await writeFile(join(dir, 'meta', '_journal.json'), JSON.stringify(journal)); - await runMigrations(db, dir); - // history as the worker leaves it: closed and open sessions; ended, drawn, abandoned and - // open matches with lines, one of them on the holding side; a player with lines only - const s = ( - server: string, - steamId: string, - from: number, - to: number | null, - cash: number - ) => ({ - serverId: server, - steamId, - name: `n${steamId.slice(-1)}`, - faction: 'Valkyra', - joinedAt: at(from), - lastSeen: at(to ?? from + 0.25), - leftAt: to === null ? null : at(to), - kills: 1, - deaths: 1, - cash, - seedSeconds: from * 10 - }); - await db - .insert(playerSessions) - .values([ - s('a', P, 0, 1.5, 500), - s('a', P, 2, 3.25, 700), - s('a', Q, 1, 2, 50), - s('a', Q, 4, null, 20), - s('b', P, 1, 1.75, 900), - s('b', R, 3, null, 0) - ]); - const [won, drawn, abandoned, open] = await db - .insert(matches) - .values([ - { - serverId: 'a', - startedAt: at(0), - endedAt: at(1), - map: 'Kavkazi', - finalScores: scores, - winner: 'Valkyra' - }, - { - serverId: 'a', - startedAt: at(1), - endedAt: at(2), - map: 'Europe', - finalScores: [ - { name: 'Valkyra', score: 50 }, - { name: 'Lonestar', score: 50 } - ], - winner: null - }, - { serverId: 'b', startedAt: at(1), endedAt: at(2), map: 'Detroit' }, - { serverId: 'a', startedAt: at(4), map: 'Kavkazi' } - ]) - .returning({ id: matches.id }); - const l = ( - matchId: number, - server: string, - steamId: string, - faction: string | null, - kills: number - ) => ({ - matchId: matchId, - serverId: server, - steamId, - name: 'l', - faction, - seconds: 300, - kills, - deaths: 1, - killStreak: kills - }); - await db - .insert(matchPlayers) - .values([ - l(won.id, 'a', P, 'Valkyra', 5), - l(won.id, 'a', Q, 'White', 2), - l(drawn.id, 'a', P, 'Lonestar', 3), - l(drawn.id, 'a', 'lines-only-player', 'Valkyra', 7), - l(abandoned.id, 'b', P, 'Valkyra', 4), - l(open.id, 'a', Q, 'Lonestar', 9) - ]); - // then 0038 - await runMigrations(db, 'drizzle'); - await db.transaction(async (tx) => { - for (const ids of [['a'], ['b'], ['a', 'b']]) - expect(await totalsRows(tx, ids)).toEqual(await oracleBase(tx, ids)); - }); - const [{ n }] = (await db.execute(sql`SELECT COUNT(*)::int AS n FROM player_totals`)) as { - n: number; - }[]; - // (a, P), (a, Q), (b, P) from closed sessions and lines; the lines-only player; not (b, R), - // whose only session is open - expect(n).toBe(4); - } finally { - await client.close(); - await admin.unsafe(`DROP DATABASE IF EXISTS "${name}" WITH (FORCE)`); - await admin.close(); - await rm(dir, { recursive: true, force: true }); - } - }); + // The two ways the day rows arrive on a database with history: 0038 and 0039 in one migration + // run (Drizzle runs every pending migration in one transaction), or 0039 over 0038's totals. + for (const [label, after] of [ + [ + '0038 and 0039 in one run over a database at 0037', + ['0038_player_totals', '0039_player_days'] + ], + ['0039 over a database at 0038', ['0039_player_days']] + ] as const) + test(`migrations: ${label} build the totals and day rows the reads expect`, async () => { + const base = process.env.TEST_DATABASE_URL!; + const name = `warcon_test_totals_${randomBytes(4).toString('hex')}`; + const admin = new SQL(base, { max: 1 }); + await admin.unsafe(`CREATE DATABASE "${name}"`); + const url = new URL(base); + url.pathname = `/${name}`; + const { client, db } = connect(url.href); + const dir = await mkdtemp(join(tmpdir(), 'warcon-migrate-')); + try { + // every migration before these + await cp('drizzle', dir, { recursive: true }); + const journal = JSON.parse(await readFile(join(dir, 'meta', '_journal.json'), 'utf8')); + for (const tag of after) { + await rm(join(dir, `${tag}.sql`)); + await rm(join(dir, 'meta', `${tag.slice(0, 4)}_snapshot.json`)); + } + journal.entries = journal.entries.filter( + (e: { tag: string }) => !(after as readonly string[]).includes(e.tag) + ); + await writeFile(join(dir, 'meta', '_journal.json'), JSON.stringify(journal)); + await runMigrations(db, dir); + // history as the worker leaves it: closed and open sessions, one over two midnights, + // one closed and one opened exactly at a midnight; ended, drawn, abandoned and open + // matches with lines, one ended exactly at a midnight, one on the holding side; a + // player with lines only + const s = ( + server: string, + steamId: string, + from: number, + to: number | null, + cash: number + ) => ({ + serverId: server, + steamId, + name: `n${steamId.slice(-1)}`, + faction: 'Valkyra', + joinedAt: at(from), + lastSeen: at(to ?? from + 0.25), + leftAt: to === null ? null : at(to), + kills: 1, + deaths: 1, + cash, + seedSeconds: from * 10 + }); + await db + .insert(playerSessions) + .values([ + s('a', P, 0, 1.5, 500), + s('a', P, 2, 3.25, 700), + s('a', Q, 1, 2, 50), + s('a', Q, 4, null, 20), + s('a', R, 1, 27, 300), + s('b', P, 1, 1.75, 900), + s('b', R, 3, null, 0) + ]); + const [won, drawn, abandoned, open] = await db + .insert(matches) + .values([ + { + serverId: 'a', + startedAt: at(0), + endedAt: at(1), + map: 'Kavkazi', + finalScores: scores, + winner: 'Valkyra' + }, + { + serverId: 'a', + startedAt: at(1), + endedAt: at(2), + map: 'Europe', + finalScores: [ + { name: 'Valkyra', score: 50 }, + { name: 'Lonestar', score: 50 } + ], + winner: null + }, + { serverId: 'b', startedAt: at(1), endedAt: at(26.5), map: 'Detroit' }, + { serverId: 'a', startedAt: at(4), map: 'Kavkazi' } + ]) + .returning({ id: matches.id }); + const l = ( + matchId: number, + server: string, + steamId: string, + faction: string | null, + kills: number + ) => ({ + matchId: matchId, + serverId: server, + steamId, + name: 'l', + faction, + seconds: 300, + kills, + deaths: 1, + killStreak: kills + }); + await db + .insert(matchPlayers) + .values([ + l(won.id, 'a', P, 'Valkyra', 5), + l(won.id, 'a', Q, 'White', 2), + l(drawn.id, 'a', P, 'Lonestar', 3), + l(drawn.id, 'a', 'lines-only-player', 'Valkyra', 7), + l(abandoned.id, 'b', P, 'Valkyra', 4), + l(open.id, 'a', Q, 'Lonestar', 9) + ]); + // a negative streak merged the 0038 way where 0038 is in: a session closed first (the + // pair's row has no match yet), then a match ended with the player's line at -1 + const [late] = await db + .insert(playerSessions) + .values(s('a', S, 4.5, null, 10)) + .returning({ id: playerSessions.id }); + await db.execute( + sql`UPDATE player_sessions SET last_seen = ${at(5)}, left_at = ${at(5)} WHERE id = ${late.id}` + ); + const [negative] = await db + .insert(matches) + .values({ serverId: 'a', startedAt: at(4.6), map: 'Europe' }) + .returning({ id: matches.id }); + await db + .insert(matchPlayers) + .values({ ...l(negative.id, 'a', S, 'Valkyra', 0), killStreak: -1, deathStreak: -2 }); + await db.execute(sql` + UPDATE matches SET ended_at = ${at(5.5)}, final_scores = ${JSON.stringify(scores)}::jsonb, + winner = 'Valkyra' + WHERE id = ${negative.id}`); + // then the rest + await runMigrations(db, 'drizzle'); + await db.transaction(async (tx) => { + for (const ids of [['a'], ['b'], ['a', 'b']]) { + expect(await totalsRows(tx, ids)).toEqual(await oracleBase(tx, ids)); + for (const from of SINCE) + expect({ + ids, + since: from.toISOString(), + rows: await rangeRows(tx, ids, from) + }).toEqual({ + ids, + since: from.toISOString(), + rows: await oracleRangeBase(tx, ids, from) + }); + } + }); + const [{ n, days }] = (await db.execute(sql` + SELECT (SELECT COUNT(*) FROM player_totals)::int AS n, + (SELECT COUNT(*) FROM player_days)::int AS days`)) as { n: number; days: number }[]; + // (a, P), (a, Q), (a, R), (a, S), (b, P) from closed sessions and lines; the lines-only + // player; not (b, R), whose only session is open + expect(n).toBe(6); + // (a, P) on two days, (a, Q) on two, (a, R) on three, (a, S) on one, (b, P) on two (its + // session, then the abandoned match's line the next day), the lines-only player on one + expect(days).toBe(11); + } finally { + await client.close(); + await admin.unsafe(`DROP DATABASE IF EXISTS "${name}" WITH (FORCE)`); + await admin.close(); + await rm(dir, { recursive: true, force: true }); + } + }, 60_000); }); diff --git a/src/test/player-totals.test.ts b/src/test/player-totals.test.ts index f111a54c..1b25ea75 100644 --- a/src/test/player-totals.test.ts +++ b/src/test/player-totals.test.ts @@ -1,17 +1,23 @@ -// Each player's totals per server (player_totals, kept by the triggers of migration 0038) against -// the all-time reads they replace, word for word (totals-oracle.ts). Seeded random histories run -// through the worker's own looks at a scripted game on three servers (two in one organisation, one -// in another): joins and returns, leaves past the grace, renames, side changes and the holding -// side, counters that start again mid-match, cash, scores, match ends with a winner, a draw or no -// score, abandoned matches after an outage, the offline transition and worker restarts; with -// purges and direct writes in between (closed sessions inserted, edited and deleted, lines added to -// an ended match, a winner changed, an ended match whose scores are not numbers). After every step -// the all-time base rows of each set of servers are equal column by column, read in one -// transaction (one now()); every tenth step and at the end the reads themselves are equal too -// (every board metric both ways at two floors, every player's rank, the placeholders' stats, the -// risk record), and a rebuild leaves the table as it was. +// Each player's totals per server (player_totals, kept by the triggers of migration 0038) and per +// server per UTC day (player_days, migration 0039) against the all-time and ranged reads they +// replace, word for word (totals-oracle.ts). Seeded random histories run through the worker's own +// looks at a scripted game on three servers (two in one organisation, one in another): joins and +// returns, leaves past the grace, renames, side changes and the holding side, counters that start +// again mid-match, cash, scores, match ends with a winner, a draw or no score, abandoned matches +// after an outage, the offline transition and worker restarts; with purges and direct writes in +// between (closed sessions inserted, edited, moved and deleted, lines added to an ended match, a +// winner changed, a match's end moved, an ended match whose scores are not numbers). The clock +// starts an hour before a UTC midnight and now and then moves on by hours or days with players on, +// so sessions and matches cross midnights, some several. After every step the all-time base rows +// of each set of servers are equal column by column, and so are the rows since a spread of +// instants (the boards' own 7, 30 and 90 days back; midnights and a millisecond either side; a +// join, a leave and a match end and a millisecond either side; random ones; before and after all +// the data), all read in one transaction (one now()); every tenth step and at the end the reads +// themselves are equal too (every board metric both ways at two floors for all time, and for each +// range, every player's rank, the placeholders' stats, the risk record), and a rebuild leaves both +// tables as they were. import { afterAll, beforeAll, describe, expect, setSystemTime, spyOn, test } from 'bun:test'; -import { and, eq, isNotNull, sql } from 'drizzle-orm'; +import { and, eq, isNotNull, sql, type SQL } from 'drizzle-orm'; import type { Env } from '$lib/server/env'; import type { OrgRow, ServerRow } from '$lib/server/access'; import { @@ -35,10 +41,18 @@ import { rankOf, riskPerformanceFor } from '$lib/server/leaderboards'; -import { BOARD_METRICS, type BoardQuery } from '$lib/leaderboard'; +import { BOARD_METRICS, rangeStart, type BoardQuery } from '$lib/leaderboard'; import { hasTestDb, testEnv } from './db'; import { seedWorld, type World } from './world'; -import { oracleBase, oracleBoard, oracleRank, oracleRiskRecord, totalsRows } from './totals-oracle'; +import { + oracleBase, + oracleBoard, + oracleRangeBase, + oracleRank, + oracleRiskRecord, + rangeRows, + totalsRows +} from './totals-oracle'; const DEFAULT_SEED = 20261004; const SEED = Number(process.env.TOTALS_SEED ?? DEFAULT_SEED); @@ -46,6 +60,11 @@ const STEPS = Number(process.env.TOTALS_STEPS ?? 120); const FACTIONS = ['Valkyra', 'Lonestar', 'White', null] as const; const MAPS = ['Kavkazi', 'Europe', 'Bakurani', 'Detroit']; const POOL = Array.from({ length: 24 }, (_, i) => `765611980000${String(31000 + i)}`); +const HOUR = 3_600_000; +const DAY = 86_400_000; +/** The UTC midnight at or before t (epoch milliseconds count whole UTC days). */ +const midnight = (t: number) => Math.floor(t / DAY) * DAY; +const ms = (v: unknown) => new Date(v as string | Date).getTime(); /** mulberry32: the same history for the same seed. */ function rng(seed: number) { @@ -87,9 +106,14 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = let env: Env; let w: World; let spy: ReturnType; - let clock = Date.now() - 12 * 86_400_000; + // An hour before a UTC midnight twelve days back; the jumps never take the clock past a day ago. + const start = midnight(Date.now() - 12 * DAY) - HOUR; + const ceiling = Date.now() - DAY; + let clock = start; const games = new Map(); const r = rng(SEED); + // The range starts the comparisons take, drawn on their own so they leave the history alone. + const pick = rng(SEED ^ 0x5eed); let names = 0; const json = (body: unknown) => ({ @@ -103,6 +127,15 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = setSystemTime(new Date(clock)); expect(await acquireOrRenew(env, 'player-totals')).toBe(true); }; + /** Hours, now and then days, going by with whoever is on staying on (their sessions span it). */ + const jump = () => + Math.max( + 60_000, + Math.min( + r.chance(0.15) ? (1 + r.int(2)) * DAY + r.int(DAY) : (1 + r.int(9)) * HOUR, + ceiling - clock + ) + ); const look = async (g: Game) => { g.m.playersIntervalMs = 120_000; await observeServer(env, g.m, { status: true, players: true }); @@ -194,7 +227,7 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = /** A write that is not the worker's: a hand repair, a backfill, a test fixture. */ const direct = async (g: Game) => { const at = new Date(clock - r.int(5) * 86_400_000 - r.int(3_600_000)); - switch (r.int(7)) { + switch (r.int(10)) { case 0: { const left = new Date(at.getTime() + 60_000 + r.int(7_200_000)); await env.db.insert(playerSessions).values({ @@ -319,6 +352,62 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = ); return; } + case 7: { + // a closed session over one or two midnights, written by hand + const left = new Date(at.getTime() + 20 * HOUR + r.int(30 * HOUR)); + await env.db.insert(playerSessions).values({ + serverId: g.server.id, + steamId: r.pick(POOL), + name: newName(r.pick(POOL)), + faction: 'Lonestar', + joinedAt: at, + lastSeen: left, + leftAt: left, + kills: r.int(30), + deaths: r.int(30), + cash: r.int(5000), + seedSeconds: r.int(600) + }); + return; + } + case 8: { + // a closed session moved by hours, often across a midnight (last seen moves with it) + const [row] = await env.db + .select({ + id: playerSessions.id, + joinedAt: playerSessions.joinedAt, + leftAt: playerSessions.leftAt + }) + .from(playerSessions) + .where(and(eq(playerSessions.serverId, g.server.id), isNotNull(playerSessions.leftAt))) + .limit(1) + .offset(r.int(20)); + const by = (r.chance(0.5) ? -1 : 1) * (1 + r.int(30)) * HOUR; + if (row) { + const left = new Date(row.leftAt!.getTime() + by); + await env.db + .update(playerSessions) + .set({ joinedAt: new Date(row.joinedAt.getTime() + by), leftAt: left, lastSeen: left }) + .where(eq(playerSessions.id, row.id)); + } + return; + } + case 9: { + // an ended match's end moved by hours, often to another day + const [m] = await env.db + .select({ id: matches.id, endedAt: matches.endedAt }) + .from(matches) + .where(and(eq(matches.serverId, g.server.id), isNotNull(matches.endedAt))) + .limit(1) + .offset(r.int(5)); + const by = (r.chance(0.5) ? -1 : 1) * (1 + r.int(30)) * HOUR; + if (m) + await env.db + .update(matches) + .set({ endedAt: new Date(m.endedAt!.getTime() + by) }) + .where(eq(matches.id, m.id)); + return; + } } }; @@ -339,51 +428,105 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = }); }; + /** + * Range starts worth holding the day rows to: the boards' own; a midnight and a millisecond + * either side; a join, a leave, a match end and an open session's join, each a millisecond + * either side; random instants; before and after all the data. + */ + const instants = async (ids: string[], every: boolean): Promise => { + const span = clock - start + 2 * DAY; + const anywhere = () => start - DAY + Math.floor(pick.next() * span); + const m = midnight(anywhere()); + const out = [clock - 7 * DAY, clock - 30 * DAY, clock - 90 * DAY, start - 2 * DAY, clock + DAY]; + out.push(m - 1, m, m + 1, midnight(clock)); + for (let i = 0; i < (every ? 6 : 2); i++) out.push(anywhere()); + const one = async (q: SQL) => ((await env.db.execute(q)) as { t: unknown }[])[0]?.t; + const edges = [ + await one(sql`SELECT joined_at AS t FROM player_sessions WHERE server_id IN ${ids} + AND left_at IS NOT NULL ORDER BY id OFFSET ${pick.int(40)} LIMIT 1`), + await one(sql`SELECT left_at AS t FROM player_sessions WHERE server_id IN ${ids} + AND left_at IS NOT NULL ORDER BY id OFFSET ${pick.int(40)} LIMIT 1`), + await one(sql`SELECT ended_at AS t FROM matches WHERE server_id IN ${ids} + AND ended_at IS NOT NULL ORDER BY id OFFSET ${pick.int(20)} LIMIT 1`), + await one(sql`SELECT joined_at AS t FROM player_sessions WHERE server_id IN ${ids} + AND left_at IS NULL ORDER BY id OFFSET ${pick.int(10)} LIMIT 1`) + ]; + for (const e of edges) if (e) out.push(ms(e) - 1, ms(e), ms(e) + 1); + return out; + }; + /** The rows since each of those instants, equal column by column, in one transaction. */ + const compareRanges = async (step: string, every: boolean) => { + const plan: [string[], number[]][] = []; + for (const ids of sets()) plan.push([ids, await instants(ids, every)]); + await env.db.transaction(async (tx) => { + for (const [ids, ts] of plan) + for (const t of ts) { + const from = new Date(t); + const since = from.toISOString(); + expect({ step, ids, since, rows: await rangeRows(tx, ids, from) }).toEqual({ + step, + ids, + since, + rows: await oracleRangeBase(tx, ids, from) + }); + } + }); + }; + /** The reads themselves: boards, ranks, placeholders' stats and the risk record. */ const compareReads = async (step: string) => { await env.db.transaction(async (tx) => { const e = { ...env, db: tx } as unknown as Env; for (const ids of sets()) { const players = (await oracleBase(tx, ids)).map((b) => b.steam_id as string); + // all time: every metric both ways at both floors; each range: every metric at the + // default floor, and one more each way round + const boards: BoardQuery[] = []; + const board = ( + range: BoardQuery['range'], + sort: BoardQuery['sort'], + dir: BoardQuery['dir'], + minMinutes: number + ) => boards.push({ scope: 'server', range, sort, dir, page: 1, minMinutes }); for (const metric of BOARD_METRICS) for (const dir of ['desc', 'asc'] as const) - for (const minMinutes of [0, 60]) { - const q: BoardQuery = { - scope: 'server', - range: 'all', - sort: metric.key, - dir, - page: 1, - minMinutes - }; - const want = (await oracleBoard(tx, ids, q, EXPORT_ROWS, 0)).map((o, i) => ({ - rank: i + 1, - steamId: o.steamId as string, - name: ((o.name as string | null) || o.steamId) as string, - minutes: Math.round(Number(o.minutes)), - seedMinutes: Math.round(Number(o.seedMinutes)), - kills: Number(o.kills), - deaths: Number(o.deaths), - headshots: Number(o.headshots), - teamKills: Number(o.teamKills), - suicides: Number(o.suicides), - vehicleKills: Number(o.vehicleKills), - killStreak: Number(o.killStreak), - deathStreak: Number(o.deathStreak), - matches: Number(o.matches), - wins: Number(o.wins), - losses: Number(o.losses), - draws: Number(o.draws), - cash: Number(o.cash), - lastSeen: o.lastSeen ? new Date(o.lastSeen as string).toISOString() : null - })); - expect({ step, ids, q, rows: await exportBoard(e, ids, q) }).toEqual({ - step, - ids, - q, - rows: want - }); - } + for (const minMinutes of [0, 60]) board('all', metric.key, dir, minMinutes); + for (const range of ['7d', '30d', '90d'] as const) { + for (const metric of BOARD_METRICS) board(range, metric.key, 'desc', 60); + board(range, BOARD_METRICS[pick.int(BOARD_METRICS.length)].key, 'asc', 60); + board(range, BOARD_METRICS[pick.int(BOARD_METRICS.length)].key, 'desc', 0); + } + for (const q of boards) { + // the range starts where exportBoard's does: the clock is frozen + const from = rangeStart(q.range) ?? undefined; + const want = (await oracleBoard(tx, ids, q, EXPORT_ROWS, 0, from)).map((o, i) => ({ + rank: i + 1, + steamId: o.steamId as string, + name: ((o.name as string | null) || o.steamId) as string, + minutes: Math.round(Number(o.minutes)), + seedMinutes: Math.round(Number(o.seedMinutes)), + kills: Number(o.kills), + deaths: Number(o.deaths), + headshots: Number(o.headshots), + teamKills: Number(o.teamKills), + suicides: Number(o.suicides), + vehicleKills: Number(o.vehicleKills), + killStreak: Number(o.killStreak), + deathStreak: Number(o.deathStreak), + matches: Number(o.matches), + wins: Number(o.wins), + losses: Number(o.losses), + draws: Number(o.draws), + cash: Number(o.cash), + lastSeen: o.lastSeen ? new Date(o.lastSeen as string).toISOString() : null + })); + expect({ step, ids, q, rows: await exportBoard(e, ids, q) }).toEqual({ + step, + ids, + q, + rows: want + }); + } for (const p of players) expect({ step, ids, p, rank: await rankOf(e, ids, p) }).toEqual({ step, @@ -442,6 +585,17 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = (await env.db.execute(sql` SELECT t::text AS row FROM player_totals t WHERE server_id IN ${sets()[4]} ORDER BY server_id, steam_id`)) as { row: string }[]; + /** The day rows, each crossing list in order (the adds append, a rebuild lists them sorted). */ + const dayTable = async () => + (await env.db.execute(sql` + SELECT (d.server_id, d.day, d.steam_id, d.seconds, + (SELECT array_agg(c ORDER BY c) FROM unnest(d.crossings) c), + d.sessions, d.seed_seconds, d.cash, d.last_seen, d.matches, d.kills, d.deaths, d.headshots, + d.team_kills, d.suicides, d.vehicle_kills, d.kill_streak, d.death_streak, d.wins, + d.losses, d.draws)::text AS row + FROM player_days d WHERE server_id IN ${sets()[4]} ORDER BY server_id, day, steam_id`)) as { + row: string; + }[]; beforeAll(async () => { env = { ...(await testEnv()), STEAM_API_KEY: '' }; @@ -537,7 +691,7 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = test(`${STEPS} steps of play, outages, restarts, purges and hand edits (seed ${SEED})`, async () => { for (let step = 1; step <= STEPS; step++) { const label = `seed ${SEED} step ${step}`; - await tick(5_000 + r.int(90_000)); + await tick(r.chance(0.06) ? jump() : 5_000 + r.int(90_000)); for (const g of games.values()) { play(g); if (r.chance(0.02)) restart(g); @@ -550,6 +704,7 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = await purgeServerStats(env, new Request('http://localhost/test'), w.users.owner!, g.server); } await compareBase(label); + await compareRanges(label, step % 10 === 0); if (step % 10 === 0) await compareReads(label); } // Everyone leaves; the last sessions close and their matches stay open. @@ -559,37 +714,75 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = await tick(70_000); for (const g of games.values()) await look(g); await compareBase(`seed ${SEED} end`); + await compareRanges(`seed ${SEED} end`, true); await compareReads(`seed ${SEED} end`); const before = await table(); + const beforeDays = await dayTable(); await env.db.execute(sql`SELECT player_totals_rebuild()`); expect(await table()).toEqual(before); + expect(await dayTable()).toEqual(beforeDays); // The default history (the one CI runs) reaches every path the totals have: closes with seed - // time and cash, match ends with the feed's columns, hand edits. Other seeds explore. - if (SEED !== DEFAULT_SEED) return; - const [counts] = (await env.db.execute(sql` - SELECT (SELECT COUNT(*) FROM player_sessions WHERE server_id IN ${sets()[4]} AND left_at IS NOT NULL)::int AS closed, - (SELECT COUNT(*) FROM matches WHERE server_id IN ${sets()[4]} AND ended_at IS NOT NULL)::int AS ended, - (SELECT COUNT(*) FROM match_players WHERE server_id IN ${sets()[4]})::int AS lines`)) as { - closed: number; - ended: number; - lines: number; - }[]; - expect(counts.closed).toBeGreaterThan(50); - expect(counts.ended).toBeGreaterThan(10); - expect(counts.lines).toBeGreaterThan(50); - const [seeded] = (await env.db.execute(sql` - SELECT COUNT(*)::int AS n FROM player_sessions - WHERE server_id = ${w.server.id} AND left_at IS NOT NULL AND seed_seconds > 0`)) as { - n: number; - }[]; - expect(seeded.n).toBeGreaterThan(5); - const [fed] = (await env.db.execute(sql` - SELECT COUNT(*)::int AS n FROM match_players p JOIN matches m ON m.id = p.match_id - WHERE p.server_id = ${w.otherServer.id} AND m.ended_at IS NOT NULL AND p.kill_streak > 1`)) as { - n: number; - }[]; - expect(fed.n).toBeGreaterThan(5); - }, 600_000); + // time and cash, match ends with the feed's columns, hand edits, midnights. Other seeds explore. + if (SEED === DEFAULT_SEED) { + const [counts] = (await env.db.execute(sql` + SELECT (SELECT COUNT(*) FROM player_sessions WHERE server_id IN ${sets()[4]} AND left_at IS NOT NULL)::int AS closed, + (SELECT COUNT(*) FROM matches WHERE server_id IN ${sets()[4]} AND ended_at IS NOT NULL)::int AS ended, + (SELECT COUNT(*) FROM match_players WHERE server_id IN ${sets()[4]})::int AS lines`)) as { + closed: number; + ended: number; + lines: number; + }[]; + expect(counts.closed).toBeGreaterThan(50); + expect(counts.ended).toBeGreaterThan(10); + expect(counts.lines).toBeGreaterThan(50); + const [seeded] = (await env.db.execute(sql` + SELECT COUNT(*)::int AS n FROM player_sessions + WHERE server_id = ${w.server.id} AND left_at IS NOT NULL AND seed_seconds > 0`)) as { + n: number; + }[]; + expect(seeded.n).toBeGreaterThan(5); + const [fed] = (await env.db.execute(sql` + SELECT COUNT(*)::int AS n FROM match_players p JOIN matches m ON m.id = p.match_id + WHERE p.server_id = ${w.otherServer.id} AND m.ended_at IS NOT NULL AND p.kill_streak > 1`)) as { + n: number; + }[]; + expect(fed.n).toBeGreaterThan(5); + // and crosses midnights: closed sessions over one and over two or more, match ends on + // several days, day rows holding crossings + const [days] = (await env.db.execute(sql` + WITH s AS ( + SELECT (left_at AT TIME ZONE 'UTC')::date - (joined_at AT TIME ZONE 'UTC')::date AS spans + FROM player_sessions WHERE server_id IN ${sets()[4]} AND left_at IS NOT NULL) + SELECT (SELECT COUNT(*) FROM s WHERE spans = 1)::int AS one, + (SELECT COUNT(*) FROM s WHERE spans >= 2)::int AS several, + (SELECT COUNT(DISTINCT (ended_at AT TIME ZONE 'UTC')::date) FROM matches + WHERE server_id IN ${sets()[4]} AND ended_at IS NOT NULL)::int AS end_days, + (SELECT COUNT(*) FROM player_days WHERE server_id IN ${sets()[4]} + AND crossings IS NOT NULL)::int AS crossing_rows`)) as { + one: number; + several: number; + end_days: number; + crossing_rows: number; + }[]; + expect(days.one).toBeGreaterThan(2); + expect(days.several).toBeGreaterThan(5); + expect(days.end_days).toBeGreaterThan(2); + expect(days.crossing_rows).toBeGreaterThan(10); + } + // A purge of the server with the most history, then the same checks, and a rebuild that + // leaves the day rows as the purge did (no row emptied of its lines left behind). + await purgeServerStats( + env, + new Request('http://localhost/test'), + w.users.owner!, + games.get(w.server.id)!.server + ); + await compareBase(`seed ${SEED} after a purge`); + await compareRanges(`seed ${SEED} after a purge`, true); + const purged = await dayTable(); + await env.db.execute(sql`SELECT player_totals_rebuild()`); + expect(await dayTable()).toEqual(purged); + }, 900_000); /** Somebody waits for a server's totals lock. */ const untilWaiting = async () => { diff --git a/src/test/totals-oracle.ts b/src/test/totals-oracle.ts index 82d5c61c..90414174 100644 --- a/src/test/totals-oracle.ts +++ b/src/test/totals-oracle.ts @@ -1,11 +1,12 @@ -// The all-time reads as they were before player_totals (main at edf2aab), word for word, for the -// exactness tests to hold the totals against: each sums every session and every line of an ended -// match on the servers asked about. Frozen on purpose: if the reads' meaning changes, this file -// changes with it in the same commit, deliberately. totalsRows, at the end, is the other side. +// The all-time and ranged reads as they were before player_totals and player_days (main at +// edf2aab), word for word, for the exactness tests to hold the totals against: each sums every +// session and every line of an ended match on the servers asked about, since `from` (the epoch for +// all time). Frozen on purpose: if the reads' meaning changes, this file changes with it in the +// same commit, deliberately. totalsRows and rangeRows, at the end, are the other side. import { sql, type SQL } from 'drizzle-orm'; import type { DbOrTx } from '$lib/server/db'; import { DEFAULT_FLOOR_MINUTES, type BoardMetric, type BoardQuery } from '$lib/leaderboard'; -import { totalsBase } from '$lib/server/leaderboards'; +import { rangeBase, totalsBase } from '$lib/server/leaderboards'; const EPOCH = new Date(0); @@ -78,27 +79,38 @@ export async function oracleBase( db: DbOrTx, ids: string[], steamIds: string[] | null = null +): Promise[]> { + return oracleRangeBase(db, ids, EPOCH, steamIds); +} + +/** Every base row over these servers since `from`, each column as text. */ +export async function oracleRangeBase( + db: DbOrTx, + ids: string[], + from: Date, + steamIds: string[] | null = null ): Promise[]> { if (!ids.length) return []; return (await db.execute(sql` - WITH ${base(ids, EPOCH, steamIds)} + WITH ${base(ids, from, steamIds)} SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, death_streak::text, matches::text, wins::text, losses::text, draws::text FROM base ORDER BY steam_id`)) as Record[]; } -/** A slice of the all-time board as boardSlice read it, the counts as text. */ +/** A slice of the board since `from` (all time by default) as boardSlice read it, the counts as text. */ export async function oracleBoard( db: DbOrTx, ids: string[], q: BoardQuery, limit: number, - offset: number + offset: number, + from: Date = EPOCH ): Promise[]> { const order = q.dir === 'asc' ? sql`ASC NULLS LAST` : sql`DESC NULLS LAST`; return (await db.execute(sql` - WITH ${base(ids, EPOCH)}, + WITH ${base(ids, from)}, page AS ( SELECT *, COUNT(*) OVER () AS total FROM base WHERE minutes >= ${q.minMinutes} @@ -163,3 +175,18 @@ export async function totalsRows( death_streak::text, matches::text, wins::text, losses::text, draws::text FROM base ORDER BY steam_id`)) as Record[]; } + +/** The same rows from the day rows (rangeBase), as text, to hold against oracleRangeBase. */ +export async function rangeRows( + db: DbOrTx, + ids: string[], + from: Date +): Promise[]> { + if (!ids.length) return []; + return (await db.execute(sql` + WITH ${rangeBase(ids, from)} + SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, + death_streak::text, matches::text, wins::text, losses::text, draws::text + FROM base ORDER BY steam_id`)) as Record[]; +} From c540b00c91b858c6515214447dc1c792fc37822a Mon Sep 17 00:00:00 2001 From: James Causon Date: Sun, 4 Oct 2026 21:54:05 +0100 Subject: [PATCH 023/102] README: the ranged boards from the day totals, the closed-session rule a hand repair keeps (last_seen equal to left_at) and what to do when a database breaks it before the migration, the rebuild covering both kinds of totals, and the board cache's counter --- README.md | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5338fadd..16ef1c8c 100644 --- a/README.md +++ b/README.md @@ -252,6 +252,7 @@ scraped as job `postgres`, which is optional. | `warcon_http_requests_total{route,method,status}`, `warcon_http_request_seconds` | Every request by SvelteKit route id (web). | | `warcon_feed_posts_total{outcome}`, `warcon_feed_kills_total{result}` | Kill feed batches accepted, refused or rejected, and events accepted, skipped or duplicate. | | `warcon_rate_limited_total{scope}` | Requests the in-memory limiter refused, by the limit that fired. | +| `warcon_board_reads_total{outcome}` | Board pages from the minute cache (hit), a read in progress (shared) or read anew (miss). | | `warcon_fleet{table}` | Row counts of organizations, users, servers, org members, webhooks and triggers (web). | | `process_*`, `nodejs_*` | CPU, memory and event-loop lag of each process. | @@ -735,7 +736,9 @@ cash is summed over sessions, each banked across its matches like kills. Names l A page of a board is read at most once a minute for the same servers and settings, so a match that just ended can take up to a minute to appear (a stats purge shows at once). All time is read from each player's totals per server, which the database keeps as sessions close and matches end, -plus the sessions still open; 7, 30 and 90 days sum the match rows and sessions in the range. +plus the sessions still open; 7, 30 and 90 days from the same totals kept per UTC day, plus the +part of the range's first day and the sessions still open, so a range still starts to the second +(now minus 7 days), not at a midnight. **Export CSV** on the tab downloads the board as it is set (scope, range, sort, playtime floor), from the top and every page of it, up to 10,000 players: rank, SteamID, name, playtime and seed @@ -1527,14 +1530,21 @@ settings) · `serverLog` (Audit trail) · `raw` (Raw RCON). see aim, position, input or IP addresses; anything claiming to detect aimbots from the RCON API is guessing. - Each player's totals per server (the all-time boards, career ranks, the placeholders' stats and - the risk score's record of matches) are kept by triggers in the database, in the same - transaction as whatever closes a session, ends a match or changes either afterwards, so a hand - repair of a session, a match or a match row keeps them right by itself. Start such a repair with - `SELECT player_totals_lock('');` and keep the default READ COMMITTED isolation (the - triggers refuse any other). A bulk load (a backfill of history; a `TRUNCATE` of - `player_sessions`, `matches` or `match_players`, which fires no trigger) runs in one transaction - that disables the `player_totals_*` triggers on those tables, loads, runs - `SELECT player_totals_rebuild();` and enables them again: writers wait for it, readers do not. + the risk score's record of matches) and per server per UTC day (the 7, 30 and 90-day boards) are + kept by triggers in the database, in the same transaction as whatever closes a session, ends a + match or changes either afterwards, so a hand repair of a session, a match or a match row keeps + them right by itself. Start such a repair with `SELECT player_totals_lock('');` and + keep the default READ COMMITTED isolation (the triggers refuse any other). A closed session's + `last_seen` must equal its `left_at` (the panel closes sessions so, and the ranged boards rely on + it): the triggers refuse an edit that breaks that, so a repair that moves when a session ended + sets both, and the migration that adds the day totals stops, before it locks anything, if a + database already holds such a session: set one to the other first (for instance + `UPDATE player_sessions SET last_seen = left_at WHERE left_at <> last_seen;`, which keeps the time + the boards count playtime to) and deploy again. A bulk load (a backfill of history; a `TRUNCATE` + of `player_sessions`, `matches` or `match_players`, which fires no trigger) runs in one + transaction that disables the `player_totals_*` triggers on those tables, loads, runs + `SELECT player_totals_rebuild();` (both kinds of totals; it refuses to run over a closed session + that breaks the rule) and enables them again: writers wait for it, readers do not. - Audit rows are never deleted by the panel. Prune them with SQL if you need to. Deleting an account pseudonymises its rows rather than removing them (see [Accounts and personal data](#accounts-and-personal-data)). From cc86c98720942566489211dfce16e2ac80485475 Mon Sep 17 00:00:00 2001 From: James Causon Date: Tue, 6 Oct 2026 18:48:42 +0100 Subject: [PATCH 024/102] Seasons: a board reads one season at a time, an official WARDOGS season (Season 1 from the early-access release on 10 September 2026, Season 2 from 15 October at 16:00 UTC) or one of the organisation's own (migration 0040: a name and a start each), every season running until the next of its kind starts. Nothing is reset: a season is a window over the history kept anyway, so a finished one is read-only by nature. A board's range takes `s:` or `current`, what the organisation's boards open on: its current official season unless its owners pick their own current season, 30 days or all time (organizations.board_opens). A season still running reads like a range, to now; a finished one reads the day totals cut at its end (a session counts for its time inside the season, its seed time and cash where it left, a match by when it ended), held against a plain read of every session and line for any pair of instants, and carries its top three on kills, K/D (ten matches at least), playtime and wins. A career lists the organisation's last ten seasons from the player's own match rows, with the places won on the server's board. Owners add, rename, move and delete the organisation's seasons under /api/orgs/:id/seasons, a start only while it is still to come, each change audited; another organisation's season named by id is not found, and one not yet begun is never on a board. The migration tests build their older database by cutting the journal at the first migration they run, so a later migration is not applied ahead of them --- ...9_player_days.sql => 0041_player_days.sql} | 2 +- drizzle/0042_seasons.sql | 12 + ...{0039_snapshot.json => 0041_snapshot.json} | 28 +- drizzle/meta/0042_snapshot.json | 5329 +++++++++++++++++ drizzle/meta/_journal.json | 13 +- src/lib/leaderboard.ts | 65 +- src/lib/seasons.test.ts | 161 + src/lib/seasons.ts | 115 + src/lib/server/db/schema.ts | 22 + src/lib/server/leaderboards.ts | 368 +- src/lib/server/orgs.ts | 9 + src/lib/server/seasons.ts | 287 + .../[id]/players/[steamId]/+page.server.ts | 1 + .../s/[id]/leaderboard/+page.server.ts | 2 +- .../s/[id]/players/[steamId]/+page.server.ts | 1 + src/routes/api/orgs/[id]/+server.ts | 2 +- src/routes/api/orgs/[id]/seasons/+server.ts | 20 + .../orgs/[id]/seasons/[seasonId]/+server.ts | 27 + .../servers/[id]/leaderboard/+server.ts | 2 +- .../servers/[id]/players/[steamId]/+server.ts | 1 + .../api/servers/[id]/leaderboard/+server.ts | 7 +- .../[id]/leaderboard/export/+server.ts | 9 +- .../[id]/players/[steamId]/career/+server.ts | 1 + src/test/api-matrix.test.ts | 4 + src/test/board-cache.test.ts | 47 +- src/test/board-export.test.ts | 4 +- src/test/career.test.ts | 7 +- src/test/faction-colours.test.ts | 7 +- src/test/message-stats.test.ts | 42 +- src/test/outside-review.test.ts | 3 +- src/test/player-totals-writes.test.ts | 17 +- src/test/player-totals.test.ts | 104 +- src/test/seasons.test.ts | 415 ++ src/test/totals-oracle.ts | 94 +- 34 files changed, 7089 insertions(+), 139 deletions(-) rename drizzle/{0039_player_days.sql => 0041_player_days.sql} (99%) create mode 100644 drizzle/0042_seasons.sql rename drizzle/meta/{0039_snapshot.json => 0041_snapshot.json} (99%) create mode 100644 drizzle/meta/0042_snapshot.json create mode 100644 src/lib/seasons.test.ts create mode 100644 src/lib/seasons.ts create mode 100644 src/lib/server/seasons.ts create mode 100644 src/routes/api/orgs/[id]/seasons/+server.ts create mode 100644 src/routes/api/orgs/[id]/seasons/[seasonId]/+server.ts create mode 100644 src/test/seasons.test.ts diff --git a/drizzle/0039_player_days.sql b/drizzle/0041_player_days.sql similarity index 99% rename from drizzle/0039_player_days.sql rename to drizzle/0041_player_days.sql index 79d4d187..094da434 100644 --- a/drizzle/0039_player_days.sql +++ b/drizzle/0041_player_days.sql @@ -1,4 +1,4 @@ --- Each player's settled totals per server per UTC day (player_days), for the ranged boards (7, 30 +-- Migration 0041: each player's settled totals per server per UTC day (player_days), for the ranged boards (7, 30 -- and 90 days). rangeBase in leaderboards.ts reads a range from F as: the rows of every day after -- F's (D1 = F's UTC day + 1); for each session that crossed D1's midnight (its joined_at is kept on -- D1's row), its time from F, or its join, to that midnight; and, read raw, the sessions closed in diff --git a/drizzle/0042_seasons.sql b/drizzle/0042_seasons.sql new file mode 100644 index 00000000..e7a0b499 --- /dev/null +++ b/drizzle/0042_seasons.sql @@ -0,0 +1,12 @@ +CREATE TABLE "seasons" ( + "id" text PRIMARY KEY NOT NULL, + "org_id" text NOT NULL, + "name" text NOT NULL, + "starts_at" timestamp with time zone NOT NULL, + "created_by" text, + "created_at" timestamp with time zone DEFAULT now() NOT NULL +); +--> statement-breakpoint +ALTER TABLE "organizations" ADD COLUMN "board_opens" text DEFAULT 'official' NOT NULL;--> statement-breakpoint +ALTER TABLE "seasons" ADD CONSTRAINT "seasons_org_id_organizations_id_fk" FOREIGN KEY ("org_id") REFERENCES "public"."organizations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint +CREATE UNIQUE INDEX "seasons_org_start_uidx" ON "seasons" USING btree ("org_id","starts_at"); diff --git a/drizzle/meta/0039_snapshot.json b/drizzle/meta/0041_snapshot.json similarity index 99% rename from drizzle/meta/0039_snapshot.json rename to drizzle/meta/0041_snapshot.json index 677ecfc1..c2aa3404 100644 --- a/drizzle/meta/0039_snapshot.json +++ b/drizzle/meta/0041_snapshot.json @@ -1,6 +1,6 @@ { "id": "ec7fbaa8-06ec-41e4-b47f-7fbca790d9ad", - "prevId": "bb4331b4-4b41-4e79-be54-d05329950a08", + "prevId": "7d126f2d-ff67-4eec-9b7e-4cdca360c55e", "version": "7", "dialect": "postgresql", "tables": { @@ -867,6 +867,26 @@ "primaryKey": false, "notNull": true }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, "instance_id": { "name": "instance_id", "type": "text", @@ -889,7 +909,7 @@ "name": "event_time", "type": "real", "primaryKey": false, - "notNull": true + "notNull": false }, "map": { "name": "map", @@ -919,7 +939,7 @@ "name": "victim_steam_id", "type": "text", "primaryKey": false, - "notNull": true + "notNull": false }, "victim_name": { "name": "victim_name", @@ -5213,4 +5233,4 @@ "schemas": {}, "tables": {} } -} \ No newline at end of file +} diff --git a/drizzle/meta/0042_snapshot.json b/drizzle/meta/0042_snapshot.json new file mode 100644 index 00000000..96257ad7 --- /dev/null +++ b/drizzle/meta/0042_snapshot.json @@ -0,0 +1,5329 @@ +{ + "id": "14c498ab-6049-414d-99d3-ca88129ea718", + "prevId": "ec7fbaa8-06ec-41e4-b47f-7fbca790d9ad", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_server_ended_idx": { + "name": "matches_server_ended_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ended_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "board_opens": { + "name": "board_opens", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'official'" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_days": { + "name": "player_days", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "day": { + "name": "day", + "type": "date", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "crossings": { + "name": "crossings", + "type": "timestamp with time zone[]", + "primaryKey": false, + "notNull": false + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_days_server_id_day_steam_id_pk": { + "name": "player_days_server_id_day_steam_id_pk", + "columns": [ + "server_id", + "day", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_totals": { + "name": "player_totals", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_totals_server_id_steam_id_pk": { + "name": "player_totals_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.seasons": { + "name": "seasons", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "starts_at": { + "name": "starts_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "seasons_org_start_uidx": { + "name": "seasons_org_start_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "starts_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "seasons_org_id_organizations_id_fk": { + "name": "seasons_org_id_organizations_id_fk", + "tableFrom": "seasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index caa83ccb..09358fb3 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -290,11 +290,18 @@ "breakpoints": true }, { - "idx": 39, + "idx": 41, "version": "7", "when": 1791142161935, - "tag": "0039_player_days", + "tag": "0041_player_days", + "breakpoints": true + }, + { + "idx": 42, + "version": "7", + "when": 1791741011138, + "tag": "0042_seasons", "breakpoints": true } ] -} \ No newline at end of file +} diff --git a/src/lib/leaderboard.ts b/src/lib/leaderboard.ts index 0d12e4c8..e11f1d07 100644 --- a/src/lib/leaderboard.ts +++ b/src/lib/leaderboard.ts @@ -1,9 +1,16 @@ -// Leaderboards and careers: the vocabulary (ranges, scopes, metrics), how a board request -// travels in a query string, and the maths that turns stored counts into a result, a streak or a -// ratio. Pure and client-safe; the queries live in $lib/server/leaderboards.ts and mirror the -// result rule below in SQL where they aggregate. +// Leaderboards and careers: the vocabulary (ranges, seasons, scopes, metrics), how a board +// request travels in a query string, and the maths that turns stored counts into a result, a +// streak or a ratio. Pure and client-safe; the queries live in $lib/server/leaderboards.ts and +// mirror the result rule below in SQL where they aggregate. +import { SEASON_KEY_RE, type Season, type SeasonWinners, type WinnerCategory } from './seasons'; -export type BoardRange = '7d' | '30d' | '90d' | 'all'; +/** A rolling range, or all time. */ +export type FixedRange = '7d' | '30d' | '90d' | 'all'; +/** + * What a board covers: a fixed range, a season (`s:`), or `current`, whatever the + * organisation's boards open on (its current official season unless it chose otherwise). + */ +export type BoardRange = FixedRange | 'current' | `s:${string}`; export type BoardScope = 'server' | 'org'; export type BoardMetric = | 'kills' @@ -18,7 +25,7 @@ export type BoardMetric = | 'cash'; export type SortDir = 'asc' | 'desc'; -export const BOARD_RANGES: { key: BoardRange; label: string; ms: number | null }[] = [ +export const BOARD_RANGES: { key: FixedRange; label: string; ms: number | null }[] = [ { key: '7d', label: '7 days', ms: 7 * 86400_000 }, { key: '30d', label: '30 days', ms: 30 * 86400_000 }, { key: '90d', label: '90 days', ms: 90 * 86400_000 }, @@ -38,6 +45,9 @@ export const BOARD_METRICS: { key: BoardMetric; label: string }[] = [ ]; const METRIC_KEYS = new Set(BOARD_METRICS.map((m) => m.key)); const RANGE_KEYS = new Set(BOARD_RANGES.map((r) => r.key)); +const isBoardRange = (v: string): v is BoardRange => + v === 'current' || RANGE_KEYS.has(v) || (v.startsWith('s:') && SEASON_KEY_RE.test(v.slice(2))); +export const isFixedRange = (v: string): v is FixedRange => RANGE_KEYS.has(v); /** Ten minutes on an empty server must not top the K/D board: this much playtime, or no rank. */ export const DEFAULT_FLOOR_MINUTES = 60; @@ -62,7 +72,7 @@ export interface BoardQuery { export const DEFAULT_BOARD_QUERY: BoardQuery = { scope: 'server', - range: '30d', + range: 'current', sort: 'kills', dir: 'desc', page: 1, @@ -101,8 +111,22 @@ export interface BoardRow { lastSeen: string | null; } +/** What a board turned out to cover: the range it read and, for a season, which. */ +export interface BoardWhen { + /** the fixed range, or `s:` */ + range: FixedRange | `s:${string}`; + season: Season | null; + /** a finished season: its board no longer changes */ + finished: boolean; +} + export interface BoardView { query: BoardQuery; + when: BoardWhen; + /** the organisation's seasons that have started, for the picker, newest first */ + seasons: Season[]; + /** a finished season's top three in each category */ + winners: SeasonWinners | null; rows: BoardRow[]; /** players meeting the floor over the whole board */ total: number; @@ -127,7 +151,7 @@ export function parseBoardQuery(params: URLSearchParams, maxPage = 100_000): Boa const sort = params.get('sort') ?? ''; return { scope: params.get('scope') === 'org' ? 'org' : 'server', - range: RANGE_KEYS.has(range) ? (range as BoardRange) : DEFAULT_BOARD_QUERY.range, + range: isBoardRange(range) ? range : DEFAULT_BOARD_QUERY.range, sort: METRIC_KEYS.has(sort) ? (sort as BoardMetric) : DEFAULT_BOARD_QUERY.sort, dir: params.get('dir') === 'asc' ? 'asc' : 'desc', page: clampInt(params.get('page'), 1, 1, maxPage), @@ -147,8 +171,8 @@ export function boardQueryParams(q: BoardQuery): Record { return out; } -/** Where a range starts; null for all time. */ -export const rangeStart = (range: BoardRange, now = Date.now()): Date | null => { +/** Where a rolling range starts; null for all time. */ +export const rangeStart = (range: FixedRange, now = Date.now()): Date | null => { const ms = BOARD_RANGES.find((r) => r.key === range)?.ms ?? null; return ms === null ? null : new Date(now - ms); }; @@ -316,6 +340,27 @@ export interface CareerView { factions: CareerGroup[]; /** the last ten matches, newest first */ last: CareerMatch[]; + /** the organisation's last ten seasons that have started, newest first */ + seasons: CareerSeason[]; +} + +/** A place the player won when a season finished: first, second or third in a category. */ +export interface CareerPlace { + category: WinnerCategory; + place: number; +} + +/** The player's matches in one season, from the same lines as the rest of the career. */ +export interface CareerSeason { + season: Season; + matches: number; + wins: number; + losses: number; + draws: number; + kills: number; + deaths: number; + /** their places on this server's board when the season finished; none while it runs */ + places: CareerPlace[]; } /** Match lines grouped by map or faction (most played first): results, kills and deaths. */ diff --git a/src/lib/seasons.test.ts b/src/lib/seasons.test.ts new file mode 100644 index 00000000..40dbf022 --- /dev/null +++ b/src/lib/seasons.test.ts @@ -0,0 +1,161 @@ +import { describe, expect, test } from 'bun:test'; +import { + chainSeasons, + currentSeason, + isFinished, + isStarted, + nextSeason, + OFFICIAL_SEASONS, + seasonSpan +} from './seasons'; +import { boardQueryParams, DEFAULT_BOARD_QUERY, parseBoardQuery } from './leaderboard'; +import { resolveWindow, type OrgSeasons } from './server/seasons'; + +const SEP = '2026-09-01T00:00:00.000Z'; +const OCT = '2026-10-01T00:00:00.000Z'; +const NOV = '2026-11-01T00:00:00.000Z'; +const at = (iso: string) => Date.parse(iso); + +describe('seasons', () => { + test('the official list starts with the release and Season 2 at its launch', () => { + expect(OFFICIAL_SEASONS.slice(0, 2)).toEqual([ + { key: 'wardogs-1', name: 'Season 1', startsAt: '2026-09-10T00:00:00.000Z' }, + { key: 'wardogs-2', name: 'Season 2', startsAt: '2026-10-15T16:00:00.000Z' } + ]); + const chain = chainSeasons('official', OFFICIAL_SEASONS); + expect(chain[0].endsAt).toBe('2026-10-15T16:00:00.000Z'); + }); + + test('each season of a kind runs until the next one starts, in start order', () => { + const chain = chainSeasons('custom', [ + { key: 'c', name: 'November', startsAt: NOV }, + { key: 'a', name: 'September', startsAt: SEP }, + { key: 'b', name: 'October', startsAt: OCT } + ]); + expect(chain.map((s) => [s.key, s.startsAt, s.endsAt])).toEqual([ + ['a', SEP, OCT], + ['b', OCT, NOV], + ['c', NOV, null] + ]); + expect(chain.every((s) => s.kind === 'custom')).toBe(true); + expect(nextSeason(chain, chain[0])?.key).toBe('b'); + expect(nextSeason(chain, chain[2])).toBeNull(); + }); + + test('a season starts at its start and is over at the next one’s, to the millisecond', () => { + const [sep, oct] = chainSeasons('custom', [ + { key: 'a', name: 'September', startsAt: SEP }, + { key: 'b', name: 'October', startsAt: OCT } + ]); + expect(isStarted(sep, at(SEP) - 1)).toBe(false); + expect(isStarted(sep, at(SEP))).toBe(true); + expect(isFinished(sep, at(OCT) - 1)).toBe(false); + expect(isFinished(sep, at(OCT))).toBe(true); + expect(isFinished(oct, at(NOV) * 2)).toBe(false); + expect(currentSeason([sep, oct], 'custom', at(SEP) - 1)).toBeNull(); + expect(currentSeason([sep, oct], 'custom', at(OCT) - 1)?.key).toBe('a'); + expect(currentSeason([sep, oct], 'custom', at(OCT))?.key).toBe('b'); + expect(currentSeason([sep, oct], 'official', at(OCT))).toBeNull(); + }); + + test('says when a season runs in UTC days', () => { + const [sep, oct] = chainSeasons('custom', [ + { key: 'a', name: 'September', startsAt: SEP }, + { key: 'b', name: 'October', startsAt: OCT } + ]); + expect(seasonSpan(sep, at(SEP) - 1)).toBe('from 1 Sep 2026'); + expect(seasonSpan(sep, at(SEP) + 1)).toBe('since 1 Sep 2026'); + expect(seasonSpan(sep, at(OCT))).toBe('1 Sep – 1 Oct 2026'); + expect(seasonSpan(sep, at(OCT), true)).toBe('1 Sep – 1 Oct'); + expect(seasonSpan(oct, at(OCT), true)).toBe('since 1 Oct'); + const [dec] = chainSeasons('custom', [ + { key: 'd', name: 'Winter', startsAt: '2026-12-20T00:00:00.000Z' }, + { key: 'e', name: 'New year', startsAt: '2027-01-10T00:00:00.000Z' } + ]); + expect(seasonSpan(dec, at('2027-02-01T00:00:00.000Z'))).toBe('20 Dec 2026 – 10 Jan 2027'); + // the official Season 2 starts mid-day: its UTC day is the 15th + const s2 = chainSeasons('official', OFFICIAL_SEASONS)[1]; + expect(seasonSpan(s2, at('2026-10-20T00:00:00.000Z'))).toBe('since 15 Oct 2026'); + }); +}); + +describe('a board’s range', () => { + test('the current season by default; a season by key; nothing else', () => { + expect(DEFAULT_BOARD_QUERY.range).toBe('current'); + const range = (v: string) => parseBoardQuery(new URLSearchParams({ range: v })).range; + expect(range('s:wardogs-1')).toBe('s:wardogs-1'); + expect(range('s:Ab3-x')).toBe('s:Ab3-x'); + expect(range('7d')).toBe('7d'); + for (const bad of ['s:', 's:a b', 's:a/b', 's:../x', 'season', `s:${'x'.repeat(65)}`, 'S:x']) + expect(range(bad)).toBe('current'); + const q = { ...DEFAULT_BOARD_QUERY, range: 's:wardogs-1' as const }; + expect(boardQueryParams(q)).toEqual({ range: 's:wardogs-1' }); + expect(parseBoardQuery(new URLSearchParams(boardQueryParams(q)))).toEqual(q); + expect(boardQueryParams(DEFAULT_BOARD_QUERY)).toEqual({}); + }); +}); + +describe('resolveWindow', () => { + const official = chainSeasons('official', [ + { key: 'o1', name: 'Season 1', startsAt: '2026-09-10T00:00:00.000Z' }, + { key: 'o2', name: 'Season 2', startsAt: '2026-10-15T16:00:00.000Z' } + ]); + const custom = chainSeasons('custom', [ + { key: 'sep', name: 'September league', startsAt: SEP }, + { key: 'oct', name: 'October league', startsAt: OCT }, + { key: 'nov', name: 'November league', startsAt: NOV } + ]); + const os = (opens: OrgSeasons['opens']): OrgSeasons => ({ + seasons: [...official, ...custom], + opens + }); + const now = at('2026-10-20T12:00:00.000Z'); + + test('a fixed range is itself, to now', () => { + const w = resolveWindow('30d', os('official'), now); + expect(w).toMatchObject({ range: '30d', to: null, season: null, finished: false }); + expect(w.from?.getTime()).toBe(now - 30 * 86_400_000); + expect(resolveWindow('all', os('custom'), now)).toMatchObject({ range: 'all', from: null }); + }); + + test('a finished season reads to its end; a live one to now', () => { + expect(resolveWindow('s:o1', os('official'), now)).toEqual({ + range: 's:o1', + from: new Date('2026-09-10T00:00:00.000Z'), + to: new Date('2026-10-15T16:00:00.000Z'), + season: official[0], + finished: true + }); + expect(resolveWindow('s:oct', os('official'), now)).toMatchObject({ + range: 's:oct', + from: new Date(OCT), + to: null, + finished: false + }); + }); + + test('a season unknown or not begun is what the boards open on', () => { + for (const range of ['s:nov', 's:missing', 'current'] as const) + expect(resolveWindow(range, os('official'), now).range).toBe('s:o2'); + expect(resolveWindow('current', os('custom'), now).range).toBe('s:oct'); + expect(resolveWindow('current', os('30d'), now).range).toBe('30d'); + expect(resolveWindow('current', os('all'), now)).toMatchObject({ range: 'all', from: null }); + }); + + test('their own season when one runs, else the official one, else all time', () => { + const before = at('2026-08-01T00:00:00.000Z'); + // before any season of theirs: the official one; before that too: all time + expect(resolveWindow('current', os('custom'), at('2026-09-12T00:00:00.000Z')).range).toBe( + 's:sep' + ); + expect(resolveWindow('current', os('custom'), before)).toMatchObject({ range: 'all' }); + const theirsLater: OrgSeasons = { + seasons: [...official, ...chainSeasons('custom', [{ key: 'x', name: 'X', startsAt: NOV }])], + opens: 'custom' + }; + expect(resolveWindow('current', theirsLater, now).range).toBe('s:o2'); + expect(resolveWindow('current', { ...theirsLater, opens: 'official' }, before).range).toBe( + 'all' + ); + }); +}); diff --git a/src/lib/seasons.ts b/src/lib/seasons.ts new file mode 100644 index 00000000..8158b057 --- /dev/null +++ b/src/lib/seasons.ts @@ -0,0 +1,115 @@ +// Seasons: a name and a start, each running until the next season of its kind starts. The +// official ones are the game's own (Bulkhead's), the same for every community and listed here; +// a community's own are kept per organisation (the seasons table). A season's board is a range +// over the history that is kept anyway, so nothing is reset and a past season is read-only by +// nature. Pure and client-safe; the reads live in $lib/server/seasons.ts. + +export type SeasonKind = 'official' | 'custom'; + +export interface Season { + /** an official season's key here, a community's season's row id */ + key: string; + name: string; + kind: SeasonKind; + startsAt: string; + /** when the next season of its kind starts; null while none is set */ + endsAt: string | null; +} + +/** + * WARDOGS's seasons, from the moment each began. Season 1 is the early-access release + * (10 September 2026); Season 2 launches on 15 October 2026 at 9:00 Pacific (16:00 UTC). A season + * added here after it began still starts on its real date: the boards read the kept history. + */ +export const OFFICIAL_SEASONS: readonly { key: string; name: string; startsAt: string }[] = [ + { key: 'wardogs-1', name: 'Season 1', startsAt: '2026-09-10T00:00:00.000Z' }, + { key: 'wardogs-2', name: 'Season 2', startsAt: '2026-10-15T16:00:00.000Z' } +]; + +/** How a season is named in a board's range: `s:`. */ +export const SEASON_KEY_RE = /^[A-Za-z0-9-]{1,64}$/; + +/** Seasons of one kind in start order, each ending where the next begins. */ +export function chainSeasons( + kind: SeasonKind, + list: readonly { key: string; name: string; startsAt: string }[] +): Season[] { + const sorted = [...list].sort((a, b) => Date.parse(a.startsAt) - Date.parse(b.startsAt)); + return sorted.map((s, i) => ({ + key: s.key, + name: s.name, + kind, + startsAt: s.startsAt, + endsAt: sorted[i + 1]?.startsAt ?? null + })); +} + +export const isStarted = (s: Season, now = Date.now()): boolean => Date.parse(s.startsAt) <= now; +export const isFinished = (s: Season, now = Date.now()): boolean => + s.endsAt !== null && Date.parse(s.endsAt) <= now; + +/** The season of a kind running at `now`, or null. */ +export function currentSeason( + seasons: readonly Season[], + kind: SeasonKind, + now = Date.now() +): Season | null { + return seasons.find((s) => s.kind === kind && isStarted(s, now) && !isFinished(s, now)) ?? null; +} + +/** What an organisation's boards open on when nobody picked anything. */ +export type BoardOpens = 'official' | 'custom' | '30d' | 'all'; +export const BOARD_OPENS: readonly { key: BoardOpens; label: string }[] = [ + { key: 'official', label: 'The current official season' }, + { key: 'custom', label: 'Our current season' }, + { key: '30d', label: 'The last 30 days' }, + { key: 'all', label: 'All time' } +]; +export const isBoardOpens = (v: unknown): v is BoardOpens => BOARD_OPENS.some((o) => o.key === v); + +/** A finished season's top three in each category. */ +export interface SeasonPlace { + steamId: string; + name: string; + value: number; +} +export type WinnerCategory = 'kills' | 'kd' | 'playtime' | 'wins'; +export const WINNER_CATEGORIES: readonly { key: WinnerCategory; label: string }[] = [ + { key: 'kills', label: 'Most kills' }, + { key: 'kd', label: 'Best K/D' }, + { key: 'playtime', label: 'Most playtime' }, + { key: 'wins', label: 'Most wins' } +]; +export type SeasonWinners = Record; +/** One lucky match must not win K/D: a winner on it played at least this many in the season. */ +export const WINNER_MIN_MATCHES = 10; + +const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; + +/** + * A season's day in UTC: "15 Oct 2026", or "15 Oct" short. Spelled out here rather than by Intl, + * whose month names differ between the server and the browser ("Sep", "Sept"). + */ +export function seasonDay(iso: string, short = false): string { + const d = new Date(iso); + const day = `${d.getUTCDate()} ${MONTHS[d.getUTCMonth()]}`; + return short ? day : `${day} ${d.getUTCFullYear()}`; +} + +/** + * When a season runs, in UTC days: "since 15 Oct 2026", "10 Sep – 15 Oct 2026" (both years when + * they differ), "from 1 Nov 2026"; `short` leaves the years off ("since 15 Oct"). + */ +export function seasonSpan(s: Season, now = Date.now(), short = false): string { + const day = (iso: string) => seasonDay(iso, short); + if (!isStarted(s, now)) return `from ${day(s.startsAt)}`; + if (s.endsAt && isFinished(s, now)) { + const sameYear = s.startsAt.slice(0, 4) === s.endsAt.slice(0, 4); + return `${seasonDay(s.startsAt, short || sameYear)} – ${day(s.endsAt)}`; + } + return `since ${day(s.startsAt)}`; +} + +/** The season of the same kind that starts when this one ends, among these. */ +export const nextSeason = (seasons: readonly Season[], s: Season): Season | null => + (s.endsAt && seasons.find((x) => x.kind === s.kind && x.startsAt === s.endsAt)) || null; diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 29fdd75f..7a20f887 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -200,10 +200,32 @@ export const organizations = pgTable('organizations', { discordInviteUrl: text('discord_invite_url').notNull().default(''), /** what a banned player is shown: the reason and facts about the ban, see $lib/ban-message */ banMessage: text('ban_message').notNull().default('{reason}'), + /** what the org's boards open on: official | custom | 30d | all ($lib/seasons, BOARD_OPENS) */ + boardOpens: text('board_opens').notNull().default('official'), createdAt: ts('created_at').notNull().defaultNow(), updatedAt: ts('updated_at').notNull().defaultNow() }); +/** + * A community's own season: a name and a start, running until its next season starts + * ($lib/seasons). Nothing is stored per player: its board is a range over the kept history. Once + * one has started its start stays put, so a finished season's standings never move. + */ +export const seasons = pgTable( + 'seasons', + { + id: text('id').primaryKey(), + orgId: text('org_id') + .notNull() + .references(() => organizations.id, { onDelete: 'cascade' }), + name: text('name').notNull(), + startsAt: ts('starts_at').notNull(), + createdBy: text('created_by'), + createdAt: ts('created_at').notNull().defaultNow() + }, + (t) => [uniqueIndex('seasons_org_start_uidx').on(t.orgId, t.startsAt)] +); + /** * An org's server roles: a name and the capabilities it carries (see $lib/capabilities). Every org * starts with the three built-ins, which owners may edit but not delete; custom roles are more rows. diff --git a/src/lib/server/leaderboards.ts b/src/lib/server/leaderboards.ts index a2d36b16..58b86770 100644 --- a/src/lib/server/leaderboards.ts +++ b/src/lib/server/leaderboards.ts @@ -4,10 +4,11 @@ // for the result, and the sessions for playtime, seed time, the last name and cash. All time is // read from each player's settled totals per server (player_totals, kept by the database as // sessions close and matches end, migration 0038) plus the open sessions; a range (7, 30, 90 -// days) from the same totals per UTC day (player_days, migration 0039) plus its partial first day -// and the open sessions. A page of a board is kept for a minute (loadBoard). Only matches -// that have ended count, and a match is in a range by when it ended; the match in progress is on -// the live page. The result of a match for a player (win, loss, draw, none) is the rule in +// days) or a season still running from the same totals per UTC day (player_days, migration 0039) +// plus its partial first day and the open sessions; a finished season from the day rows too, cut +// at its end. A page of a board is kept for a minute (loadBoard). Only matches that have ended +// count, and a match is in a range or a season by when it ended; the match in progress is on the +// live page. The result of a match for a player (win, loss, draw, none) is the rule in // $lib/leaderboard, written out again in SQL below for the aggregates (and once more, as // match_result(), in the migration). import { sql } from 'drizzle-orm'; @@ -16,20 +17,29 @@ import { servers } from './db/schema'; import { boardReads } from './metrics'; import type { RiskPerformance } from './risk'; import type { PlayerStats } from './message-vars'; +import { orgSeasons, pickable, resolveWindow, type BoardWindow } from './seasons'; import { BOARD_PAGE, DEFAULT_FLOOR_MINUTES, groupCareer, - rangeStart, streak, type BoardMetric, type BoardQuery, type BoardRow, type BoardView, type CareerMatch, + type CareerPlace, + type CareerSeason, type CareerView, type MatchResult } from '$lib/leaderboard'; +import { + isFinished, + WINNER_MIN_MATCHES, + type Season, + type SeasonWinners, + type WinnerCategory +} from '$lib/seasons'; const num = (v: unknown): number => (v === null || v === undefined ? 0 : Number(v)); const iso = (v: unknown): string | null => @@ -125,6 +135,98 @@ export const rangeBase = (ids: string[], from: Date) => sql` CASE WHEN m > 0 THEN losses ELSE 0 END AS losses, CASE WHEN m > 0 THEN draws ELSE 0 END AS draws FROM player)`; +/** + * Per-player totals over these servers from `from` to `to` (a finished season), from the same day + * rows: the first day as rangeBase reads it, every UTC day after it and before to's (Dt) in full, + * and Dt read here: the sessions that left on it and those that crossed into the next day (their + * joins are kept on that day's row), each up to `to`, and the lines of matches that ended on it + * before `to`. When `to` falls on from's own day, or at its end, only the first day is read, up + * to `to`. The sessions still open count up to `to`. A session is in the season when it left in + * it or was still going at its end; its seed time and cash go where it left, as the day rows keep + * them, so one still going at `to` gives the season its time and nothing else. Last seen has no + * meaning for a finished season and is left empty. Read against oracleSeasonBase by the + * exactness test. + */ +export const seasonBase = (ids: string[], from: Date, to: Date) => sql` + edge AS ( + SELECT *, t > m1 AS late + FROM (SELECT f, t, d1, d1::timestamp AT TIME ZONE 'UTC' AS m1, dt, dt::timestamp AT TIME ZONE 'UTC' AS mt, + (dt + 1)::timestamp AT TIME ZONE 'UTC' AS mn + FROM (SELECT ${from}::timestamptz AS f, ${to}::timestamptz AS t, + (${from}::timestamptz AT TIME ZONE 'UTC')::date + 1 AS d1, + (${to}::timestamptz AT TIME ZONE 'UTC')::date AS dt) a) b), + parts AS ( + SELECT d.steam_id, d.sessions AS n, d.seconds AS sec, d.seed_seconds AS seed, d.cash, + d.matches AS m, d.kills, d.deaths, d.headshots, d.team_kills, d.suicides, d.vehicle_kills, + d.kill_streak, d.death_streak, d.wins, d.losses, d.draws + FROM player_days d, edge WHERE d.server_id IN ${ids} AND d.day >= edge.d1 AND d.day < edge.dt + UNION ALL + SELECT d.steam_id, 0, EXTRACT(EPOCH FROM (LEAST(edge.m1, edge.t) - GREATEST(j, edge.f))), 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + FROM player_days d CROSS JOIN edge CROSS JOIN LATERAL unnest(d.crossings) j + WHERE d.server_id IN ${ids} AND d.day = edge.d1 AND d.crossings IS NOT NULL AND j < edge.t + UNION ALL + SELECT s.steam_id, CASE WHEN s.left_at < edge.t THEN 1 ELSE 0 END, + EXTRACT(EPOCH FROM (LEAST(s.left_at, edge.t) - GREATEST(s.joined_at, edge.f))), + CASE WHEN s.left_at < edge.t THEN s.seed_seconds ELSE 0 END, + CASE WHEN s.left_at < edge.t THEN s.cash ELSE 0 END, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + FROM player_sessions s, edge + WHERE s.server_id IN ${ids} AND s.left_at >= edge.f AND s.left_at < edge.m1 + AND (s.left_at < edge.t OR s.joined_at < edge.t) + UNION ALL + SELECT d.steam_id, 0, EXTRACT(EPOCH FROM (edge.t - GREATEST(j, edge.mt))), 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + FROM player_days d CROSS JOIN edge CROSS JOIN LATERAL unnest(d.crossings) j + WHERE edge.late AND d.server_id IN ${ids} AND d.day = edge.dt + 1 AND d.crossings IS NOT NULL + AND j < edge.t + UNION ALL + SELECT s.steam_id, CASE WHEN s.left_at < edge.t THEN 1 ELSE 0 END, + EXTRACT(EPOCH FROM (LEAST(s.left_at, edge.t) - GREATEST(s.joined_at, edge.mt))), + CASE WHEN s.left_at < edge.t THEN s.seed_seconds ELSE 0 END, + CASE WHEN s.left_at < edge.t THEN s.cash ELSE 0 END, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + FROM player_sessions s, edge + WHERE edge.late AND s.server_id IN ${ids} AND s.left_at >= edge.mt AND s.left_at < edge.mn + AND (s.left_at < edge.t OR s.joined_at < edge.t) + UNION ALL + SELECT s.steam_id, 1, EXTRACT(EPOCH FROM (LEAST(now(), edge.t) - GREATEST(s.joined_at, edge.f))), + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + FROM player_sessions s, edge + WHERE s.server_id IN ${ids} AND s.left_at IS NULL AND s.last_seen >= edge.f + AND s.joined_at < edge.t + UNION ALL + SELECT p.steam_id, 0, 0, 0, 0, 1, p.kills, p.deaths, p.headshots, p.team_kills, p.suicides, + p.vehicle_kills, p.kill_streak, p.death_streak, CASE WHEN x.r = 'win' THEN 1 ELSE 0 END, + CASE WHEN x.r = 'loss' THEN 1 ELSE 0 END, CASE WHEN x.r = 'draw' THEN 1 ELSE 0 END + FROM edge, matches mt + JOIN match_players p ON p.match_id = mt.id AND p.server_id = mt.server_id + CROSS JOIN LATERAL (SELECT match_result(mt.final_scores, mt.winner, p.faction) AS r) x + WHERE mt.server_id IN ${ids} + AND ((mt.ended_at >= edge.f AND mt.ended_at < LEAST(edge.m1, edge.t)) + OR (edge.late AND mt.ended_at >= edge.mt AND mt.ended_at < edge.t))), + player AS ( + SELECT steam_id, SUM(n) AS n, SUM(sec) AS sec, SUM(seed) AS seed, SUM(cash) AS cash, + SUM(m) AS m, SUM(kills) AS kills, SUM(deaths) AS deaths, SUM(headshots) AS headshots, + SUM(team_kills) AS team_kills, SUM(suicides) AS suicides, SUM(vehicle_kills) AS vehicle_kills, + MAX(kill_streak) FILTER (WHERE m > 0) AS kill_streak, + MAX(death_streak) FILTER (WHERE m > 0) AS death_streak, + SUM(wins) AS wins, SUM(losses) AS losses, SUM(draws) AS draws + FROM parts GROUP BY steam_id HAVING SUM(n) > 0 OR SUM(sec) <> 0 OR SUM(m) > 0), + base AS ( + SELECT steam_id, + CASE WHEN n > 0 OR sec <> 0 THEN sec / 60 ELSE 0 END AS minutes, + CASE WHEN n > 0 OR sec <> 0 THEN seed / 60.0 ELSE 0 END AS seed_minutes, + CASE WHEN n > 0 OR sec <> 0 THEN cash ELSE 0 END AS cash, NULL::timestamptz AS last_seen, + CASE WHEN m > 0 THEN kills ELSE 0 END AS kills, CASE WHEN m > 0 THEN deaths ELSE 0 END AS deaths, + CASE WHEN m > 0 THEN headshots ELSE 0 END AS headshots, + CASE WHEN m > 0 THEN team_kills ELSE 0 END AS team_kills, + CASE WHEN m > 0 THEN suicides ELSE 0 END AS suicides, + CASE WHEN m > 0 THEN vehicle_kills ELSE 0 END AS vehicle_kills, + CASE WHEN m > 0 THEN kill_streak ELSE 0 END AS kill_streak, + CASE WHEN m > 0 THEN death_streak ELSE 0 END AS death_streak, + CASE WHEN m > 0 THEN m ELSE 0 END AS matches, CASE WHEN m > 0 THEN wins ELSE 0 END AS wins, + CASE WHEN m > 0 THEN losses ELSE 0 END AS losses, CASE WHEN m > 0 THEN draws ELSE 0 END AS draws + FROM player)`; + /** * The base rows for all time, from the settled totals: `sess` is the pairs with a closed session * plus the open sessions, `mt` the pairs with a line of an ended match, then the join of the reads @@ -273,25 +375,35 @@ async function anyFeed(env: Env, ids: string[]): Promise { return num(row?.n) > 0; } -/** One page of the board over these servers. */ /** The most rows an export writes: the top ten thousand of the board as it is set. */ export const EXPORT_ROWS = 10_000; /** - * `limit` rows of the board as `q` sets it (scope, range, sort, floor), from `offset`: the - * aggregate covers the whole range either way, then the page, or an export, takes its slice. + * The base rows of a board's window: all time from the totals, a range or a season still running + * from the day rows to now, a finished season from the day rows to its end. + */ +const windowBase = (ids: string[], win: BoardWindow) => + win.from === null + ? totalsBase(ids) + : win.to === null + ? rangeBase(ids, win.from) + : seasonBase(ids, win.from, win.to); + +/** + * `limit` rows of the board as `q` sets it (scope, sort, floor) over the window, from `offset`: + * the aggregate covers the whole window either way, then the page, or an export, takes its slice. */ async function boardSlice( env: Env, ids: string[], q: BoardQuery, + win: BoardWindow, limit: number, offset: number ): Promise { - const from = rangeStart(q.range); const order = q.dir === 'asc' ? sql`ASC NULLS LAST` : sql`DESC NULLS LAST`; return (await env.db.execute(sql` - WITH ${from ? rangeBase(ids, from) : totalsBase(ids)}, + WITH ${windowBase(ids, win)}, page AS ( SELECT *, COUNT(*) OVER () AS total FROM base WHERE minutes >= ${q.minMinutes} @@ -308,41 +420,71 @@ async function boardSlice( /** * A page of a board is the same for everyone who may see these servers, and each one is an - * aggregate over its whole range: each (servers, query) is read once a minute per web process, - * and the requests that ask for it while it is being read wait for that read. The key is the - * server ids the caller's own check settled on, so a board over servers someone was not given - * is never theirs. A minute behind is the price: a match that just ended may not be on it yet. + * aggregate over its whole window: each (servers, window, query) is read once a minute per web + * process, and the requests that ask for it while it is being read wait for that read. The key is + * the server ids the caller's own check settled on, so a board over servers someone was not given + * is never theirs, and the window the range resolved to, so a season that has just finished is + * read again as such. A minute behind is the price: a match that just ended may not be on it yet. */ const BOARD_TTL_MS = 60_000; /** The most pages kept: fifty rows each, a few megabytes at most. */ const BOARD_CACHE_MAX = 500; +/** A page as it is kept: what the board's window and query read. */ +type BoardPage = Omit; const boardCache = new Map< string, - { ids: string[]; until: number; view: Promise; read: boolean } + { ids: string[]; until: number; view: Promise; read: boolean } >(); -/** Forgets the boards kept over this server (its stats were purged), or every board. */ +/** Forgets the boards and winners kept over this server (its stats were purged), or all of them. */ export function forgetBoards(serverId?: string): void { for (const [key, hit] of boardCache) if (serverId === undefined || hit.ids.includes(serverId)) boardCache.delete(key); + for (const [key, hit] of winnersCache) + if (serverId === undefined || hit.ids.includes(serverId)) winnersCache.delete(key); } -export async function loadBoard(env: Env, ids: string[], q: BoardQuery): Promise { - const empty: BoardView = { query: q, rows: [], total: 0, pageSize: BOARD_PAGE, hasFeed: false }; - if (!ids.length) return empty; - const sorted = [...new Set(ids)].sort(); - const key = JSON.stringify([sorted, q.scope, q.range, q.sort, q.dir, q.page, q.minMinutes]); +/** + * One page of the board over these servers, which are the organisation's (`orgId`): its seasons + * name the window a season's range reads, and what its boards open on decides `current`. + */ +export async function loadBoard( + env: Env, + ids: string[], + q: BoardQuery, + orgId: string +): Promise { const now = Date.now(); + const os = await orgSeasons(env, orgId); + const win = resolveWindow(q.range, os, now); + const head = { + query: q, + when: { range: win.range, season: win.season, finished: win.finished }, + seasons: pickable(os, now) + }; + if (!ids.length) + return { ...head, rows: [], total: 0, pageSize: BOARD_PAGE, hasFeed: false, winners: null }; + const sorted = [...new Set(ids)].sort(); + const key = JSON.stringify([ + sorted, + q.scope, + win.range, + win.finished, + q.sort, + q.dir, + q.page, + q.minMinutes + ]); const hit = boardCache.get(key); if (hit && hit.until > now) { boardReads.inc({ outcome: hit.read ? 'hit' : 'shared' }); - return hit.view; + return { ...(await hit.view), ...head }; } boardReads.inc({ outcome: 'miss' }); const entry = { ids: sorted, until: now + BOARD_TTL_MS, - view: readBoard(env, sorted, q), + view: readBoard(env, sorted, q, win), read: false }; boardCache.delete(key); @@ -361,28 +503,118 @@ export async function loadBoard(env: Env, ids: string[], q: BoardQuery): Promise boardCache.delete(k); } } - return entry.view; + return { ...(await entry.view), ...head }; } -async function readBoard(env: Env, ids: string[], q: BoardQuery): Promise { +async function readBoard( + env: Env, + ids: string[], + q: BoardQuery, + win: BoardWindow +): Promise { const offset = (q.page - 1) * BOARD_PAGE; - const [rows, hasFeed] = await Promise.all([ - boardSlice(env, ids, q, BOARD_PAGE, offset), - anyFeed(env, ids) + const [rows, hasFeed, winners] = await Promise.all([ + boardSlice(env, ids, q, win, BOARD_PAGE, offset), + anyFeed(env, ids), + win.finished && win.from && win.to ? seasonWinners(env, ids, win.from, win.to) : null ]); return { - query: q, rows: rows.map((r, i) => shapeRow(r, offset + i + 1)), total: rows.length ? num(rows[0].total) : 0, pageSize: BOARD_PAGE, - hasFeed + hasFeed, + winners }; } -/** The board as `q` sets it from the top, every page of it up to EXPORT_ROWS; `q.page` is ignored. */ -export async function exportBoard(env: Env, ids: string[], q: BoardQuery): Promise { +/** + * The board as `q` sets it over the window from the top, every page of it up to EXPORT_ROWS; + * `q.page` and `q.range` are ignored (the caller resolved the range to `win`). + */ +export async function exportBoard( + env: Env, + ids: string[], + q: BoardQuery, + win: BoardWindow +): Promise { if (!ids.length) return []; - return (await boardSlice(env, ids, q, EXPORT_ROWS, 0)).map((r, i) => shapeRow(r, i + 1)); + return (await boardSlice(env, ids, q, win, EXPORT_ROWS, 0)).map((r, i) => shapeRow(r, i + 1)); +} + +/** + * A finished season's winners over these servers, from the same rows as its board (without the + * board's playtime floor), so a winner's numbers are the ones the board shows them. Kept for a + * minute, as its board is, in the season's first day (a session the worker closes late, after an + * outage, can still land in it), then for an hour: every board and career of a finished season + * asks. A purge forgets them (forgetBoards). + */ +const WINNERS_FRESH_MS = 86_400_000; +const WINNERS_TTL_MS = 3_600_000; +const WINNERS_CACHE_MAX = 2_000; +const winnersCache = new Map< + string, + { ids: string[]; until: number; value: Promise } +>(); + +function seasonWinners(env: Env, ids: string[], from: Date, to: Date): Promise { + const sorted = [...new Set(ids)].sort(); + const key = JSON.stringify([sorted, from.toISOString(), to.toISOString()]); + const now = Date.now(); + const hit = winnersCache.get(key); + if (hit && hit.until > now) return hit.value; + const ttl = now - to.getTime() < WINNERS_FRESH_MS ? BOARD_TTL_MS : WINNERS_TTL_MS; + const entry = { ids: sorted, until: now + ttl, value: readWinners(env, sorted, from, to) }; + winnersCache.delete(key); + winnersCache.set(key, entry); + entry.value.catch(() => { + if (winnersCache.get(key) === entry) winnersCache.delete(key); + }); + if (winnersCache.size > WINNERS_CACHE_MAX) { + for (const [k, e] of winnersCache) if (e.until <= now) winnersCache.delete(k); + for (const k of winnersCache.keys()) { + if (winnersCache.size <= WINNERS_CACHE_MAX) break; + winnersCache.delete(k); + } + } + return entry.value; +} + +/** + * The top three in each category: most kills (fewer deaths first on a tie), the best K/D among + * players with at least WINNER_MIN_MATCHES matches (more kills first), most playtime, most wins + * (fewer matches first); each with the name the board shows. + */ +async function readWinners(env: Env, ids: string[], from: Date, to: Date): Promise { + interface Place extends Record { + cat: WinnerCategory; + steamId: string; + value: number; + name: string | null; + } + const rows = (await env.db.execute(sql` + WITH ${seasonBase(ids, from, to)}, + top AS ( + SELECT 'kills' AS cat, steam_id, kills::float AS value, + ROW_NUMBER() OVER (ORDER BY kills DESC, deaths, steam_id) AS place + FROM base WHERE kills > 0 + UNION ALL + SELECT 'kd', steam_id, ${METRIC_SQL.kd}, + ROW_NUMBER() OVER (ORDER BY ${METRIC_SQL.kd} DESC, kills DESC, steam_id) + FROM base WHERE kills > 0 AND matches >= ${WINNER_MIN_MATCHES} + UNION ALL + SELECT 'playtime', steam_id, minutes::float, ROW_NUMBER() OVER (ORDER BY minutes DESC, steam_id) + FROM base WHERE minutes > 0 + UNION ALL + SELECT 'wins', steam_id, wins::float, ROW_NUMBER() OVER (ORDER BY wins DESC, matches, steam_id) + FROM base WHERE wins > 0) + SELECT t.cat, t.steam_id AS "steamId", t.value, + (SELECT name FROM player_sessions ps WHERE ps.steam_id = t.steam_id AND ps.server_id IN ${ids} + ORDER BY ps.joined_at DESC, ps.id DESC LIMIT 1) AS name + FROM top t WHERE t.place <= 3 ORDER BY t.cat, t.place`)) as Place[]; + const out: SeasonWinners = { kills: [], kd: [], playtime: [], wins: [] }; + for (const r of rows) + out[r.cat].push({ steamId: r.steamId, name: r.name || r.steamId, value: num(r.value) }); + return out; } const shapeRow = (r: BaseRow, rank: number): BoardRow => ({ @@ -490,20 +722,53 @@ interface LineRow extends Record { deathStreak: string; } +/** A career lists the organisation's last ten seasons that have started. */ +const CAREER_SEASONS = 10; + +/** + * The organisation's last seasons that have started, newest first, each finished one with its + * winners on this server's board (`own`: the server, or nobody when the caller may not see it). + */ +async function careerSeasons( + env: Env, + orgId: string, + own: string[] +): Promise<{ season: Season; winners: SeasonWinners | null }[]> { + const now = Date.now(); + const started = pickable(await orgSeasons(env, orgId), now).slice(0, CAREER_SEASONS); + return Promise.all( + started.map(async (season) => ({ + season, + winners: + own.length && isFinished(season, now) + ? await seasonWinners(env, own, new Date(season.startsAt), new Date(season.endsAt!)) + : null + })) + ); +} + /** * A player's career over these servers (all time): rank here and across the organisation, the - * streak, the totals, results by map and by faction, and the last ten matches, all from the - * player's match lines. + * streak, the totals, results by map and by faction, the last ten matches and the organisation's + * last seasons, all from the player's match lines, with the places they won in each finished + * season on this server's board. */ export async function loadCareer( env: Env, - opts: { serverId: string; ids: string[]; nameOf: Map; steamId: string } + opts: { + serverId: string; + orgId: string; + ids: string[]; + nameOf: Map; + steamId: string; + } ): Promise { const { serverId, ids, steamId } = opts; const own = ids.includes(serverId) ? [serverId] : []; - const [serverRank, orgRank, linesRaw] = await Promise.all([ + const [serverRank, orgRank, seasons, linesRaw] = await Promise.all([ rankOf(env, own, steamId), rankOf(env, ids, steamId), + careerSeasons(env, opts.orgId, own), ids.length ? env.db.execute(sql` WITH ${lines(ids, EPOCH, steamId)} @@ -556,6 +821,32 @@ export async function loadCareer( headshots: r.headshots, killStreak: r.killStreak })); + const careerSeason = (season: Season, winners: SeasonWinners | null): CareerSeason => { + const from = Date.parse(season.startsAt); + const to = season.endsAt === null ? Infinity : Date.parse(season.endsAt); + const inIt = rows.filter((r) => { + const at = r.endedAt === null ? NaN : Date.parse(r.endedAt); + return at >= from && at < to; + }); + const places: CareerPlace[] = []; + for (const [category, list] of Object.entries(winners ?? {}) as [ + WinnerCategory, + SeasonWinners[WinnerCategory] + ][]) { + const i = list.findIndex((w) => w.steamId === steamId); + if (i >= 0) places.push({ category, place: i + 1 }); + } + return { + season, + matches: inIt.length, + wins: inIt.filter((r) => r.result === 'win').length, + losses: inIt.filter((r) => r.result === 'loss').length, + draws: inIt.filter((r) => r.result === 'draw').length, + kills: inIt.reduce((n, r) => n + r.kills, 0), + deaths: inIt.reduce((n, r) => n + r.deaths, 0), + places: places.sort((a, b) => a.place - b.place) + }; + }; return { rank: { server: serverRank, org: orgRank, floorMinutes: DEFAULT_FLOOR_MINUTES }, streak: streak(rows.map((r) => r.result)), @@ -577,6 +868,7 @@ export async function loadCareer( factions: groupCareer( rows.map((r) => ({ key: r.faction, result: r.result, kills: r.kills, deaths: r.deaths })) ), - last + last, + seasons: seasons.map((s) => careerSeason(s.season, s.winners)) }; } diff --git a/src/lib/server/orgs.ts b/src/lib/server/orgs.ts index bfde4832..9d057a78 100644 --- a/src/lib/server/orgs.ts +++ b/src/lib/server/orgs.ts @@ -24,6 +24,8 @@ import { gateway } from './gateway'; import { skipQueued } from './json-webhook-queue'; import type { InviteStatus, InviteView, ListSyncSummary, OrgMemberView, OrgView } from '$lib/types'; import { parseDiscordInvite } from '$lib/discord-invite'; +import { isBoardOpens } from '$lib/seasons'; +import { forgetSeasons } from './seasons'; import { BAN_MESSAGE_VARS, DEFAULT_BAN_MESSAGE, @@ -319,9 +321,16 @@ export async function updateOrg( set.discordInviteUrl = url; detail.discordInviteUrl = url; } + if (body.boardOpens !== undefined) { + if (!isBoardOpens(body.boardOpens)) + throw new ApiError(400, 'Pick what the boards open on: official, custom, 30d or all.'); + set.boardOpens = body.boardOpens; + detail.boardOpens = body.boardOpens; + } if (!Object.keys(set).length) throw new ApiError(400, 'Nothing to update.'); set.updatedAt = new Date(); await env.db.update(organizations).set(set).where(eq(organizations.id, org.id)); + if (set.boardOpens !== undefined) forgetSeasons(org.id); await writeAudit(env, req, { actor, orgId: org.id, diff --git a/src/lib/server/seasons.ts b/src/lib/server/seasons.ts new file mode 100644 index 00000000..244f1dff --- /dev/null +++ b/src/lib/server/seasons.ts @@ -0,0 +1,287 @@ +// An organisation's seasons for its boards: the official ones from $lib/seasons and the +// community's own (the seasons table), chained per kind; what its boards open on; which window of +// the kept history a board reads; and an owner's changes to the community's seasons, each +// audited. A season that has not started is listed in the Seasons tab but never read. +import { and, asc, count, eq } from 'drizzle-orm'; +import type { Env } from './env'; +import { ApiError, newId, str } from './http'; +import { writeAudit } from './audit'; +import type { OrgRow, SessionUser } from './access'; +import { organizations, seasons } from './db/schema'; +import { + chainSeasons, + currentSeason, + isBoardOpens, + isFinished, + isStarted, + OFFICIAL_SEASONS, + type BoardOpens, + type Season +} from '$lib/seasons'; +import { isFixedRange, rangeStart, type BoardRange, type FixedRange } from '$lib/leaderboard'; + +export interface OrgSeasons { + /** the official seasons, then the community's own, each kind in start order */ + seasons: Season[]; + opens: BoardOpens; +} + +/** Read once a minute per organisation: every board and career asks. */ +const TTL_MS = 60_000; +const CACHE_MAX = 2_000; +const cache = new Map }>(); + +/** Forgets one organisation's seasons (they changed), or everyone's. */ +export function forgetSeasons(orgId?: string): void { + if (orgId === undefined) cache.clear(); + else cache.delete(orgId); +} + +export async function orgSeasons(env: Env, orgId: string): Promise { + const now = Date.now(); + const hit = cache.get(orgId); + if (hit && hit.until > now) return hit.value; + const value = readSeasons(env, orgId); + cache.set(orgId, { until: now + TTL_MS, value }); + value.catch(() => { + if (cache.get(orgId)?.value === value) cache.delete(orgId); + }); + if (cache.size > CACHE_MAX) + for (const [k, e] of cache) if (e.until <= now || cache.size > CACHE_MAX) cache.delete(k); + return value; +} + +/** Read now, not kept: the Seasons tab shows an owner's change at once. */ +export const listSeasons = (env: Env, orgId: string): Promise => + readSeasons(env, orgId); + +async function readSeasons(env: Env, orgId: string): Promise { + const [[org], own] = await Promise.all([ + env.db + .select({ opens: organizations.boardOpens }) + .from(organizations) + .where(eq(organizations.id, orgId)), + env.db + .select({ key: seasons.id, name: seasons.name, startsAt: seasons.startsAt }) + .from(seasons) + .where(eq(seasons.orgId, orgId)) + .orderBy(asc(seasons.startsAt)) + ]); + return { + seasons: [ + ...chainSeasons('official', OFFICIAL_SEASONS), + ...chainSeasons( + 'custom', + own.map((s) => ({ key: s.key, name: s.name, startsAt: s.startsAt.toISOString() })) + ) + ], + opens: isBoardOpens(org?.opens) ? org.opens : 'official' + }; +} + +/** + * The stretch of history a board reads: from `from` (null: the beginning) to `to` (null: now). + * A season that is still running reads to now, as a rolling range does; only a finished one has + * an end, and then its board no longer changes. + */ +export interface BoardWindow { + range: FixedRange | `s:${string}`; + from: Date | null; + to: Date | null; + season: Season | null; + finished: boolean; +} + +export const fixedWindow = (range: FixedRange, now = Date.now()): BoardWindow => ({ + range, + from: rangeStart(range, now), + to: null, + season: null, + finished: false +}); + +export const seasonWindow = (s: Season, now = Date.now()): BoardWindow => { + const finished = isFinished(s, now); + return { + range: `s:${s.key}`, + from: new Date(s.startsAt), + to: finished ? new Date(s.endsAt!) : null, + season: s, + finished + }; +}; + +/** + * Which window a board's range names: a fixed range as itself; a season that has started as its + * span; anything else (`current`, or a season unknown or not begun) as what the organisation's + * boards open on, its current official season unless it chose otherwise. + */ +export function resolveWindow(range: BoardRange, os: OrgSeasons, now = Date.now()): BoardWindow { + if (isFixedRange(range)) return fixedWindow(range, now); + if (range.startsWith('s:')) { + const key = range.slice(2); + const s = os.seasons.find((x) => x.key === key && isStarted(x, now)); + if (s) return seasonWindow(s, now); + } + const pick = + os.opens === 'custom' + ? (currentSeason(os.seasons, 'custom', now) ?? currentSeason(os.seasons, 'official', now)) + : os.opens === 'official' + ? currentSeason(os.seasons, 'official', now) + : null; + if (pick) return seasonWindow(pick, now); + return fixedWindow(os.opens === '30d' ? '30d' : 'all', now); +} + +/** The window a board's range names for this organisation now, for an export. */ +export const boardWindow = async ( + env: Env, + orgId: string, + range: BoardRange +): Promise => resolveWindow(range, await orgSeasons(env, orgId)); + +/** The seasons a board's picker offers: those that have started, the newest first. */ +export const pickable = (os: OrgSeasons, now = Date.now()): Season[] => + os.seasons + .filter((s) => isStarted(s, now)) + .sort((a, b) => Date.parse(b.startsAt) - Date.parse(a.startsAt)); + +// ---- a community's own seasons ------------------------------------------------------------- + +const NAME_MAX = 40; +const SEASONS_MAX = 100; + +function seasonName(v: unknown): string { + const name = str(v, NAME_MAX).trim(); + if (!name) throw new ApiError(400, 'Give the season a name.'); + return name; +} + +/** A start still to come: a season's standings must not change under anyone already reading them. */ +function futureStart(v: unknown): Date { + const t = typeof v === 'string' ? Date.parse(v) : NaN; + if (!Number.isFinite(t)) throw new ApiError(400, 'Pick when the season starts.'); + if (t <= Date.now()) + throw new ApiError(400, 'A season starts in the future: pick a later date or time.'); + return new Date(t); +} + +/** Another of the organisation's seasons starts at that moment: its unique index refused the write. */ +const startTaken = (err: unknown): boolean => { + const cause = (err as { cause?: { errno?: unknown; constraint?: unknown } })?.cause; + return cause?.errno === '23505' && cause.constraint === 'seasons_org_start_uidx'; +}; + +async function ownSeason(env: Env, org: OrgRow, seasonId: string) { + const [row] = await env.db + .select() + .from(seasons) + .where(and(eq(seasons.id, seasonId), eq(seasons.orgId, org.id))); + if (!row) throw new ApiError(404, 'Season not found.'); + return row; +} + +export async function createSeason( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + body: Record +): Promise<{ id: string }> { + const name = seasonName(body.name); + const startsAt = futureStart(body.startsAt); + const [{ n }] = await env.db + .select({ n: count() }) + .from(seasons) + .where(eq(seasons.orgId, org.id)); + if (n >= SEASONS_MAX) + throw new ApiError(400, `An organisation keeps at most ${SEASONS_MAX} seasons of its own.`); + const id = newId(); + try { + await env.db + .insert(seasons) + .values({ id, orgId: org.id, name, startsAt, createdBy: actor.apiKey ? null : actor.id }); + } catch (err) { + if (startTaken(err)) throw new ApiError(400, 'Another of your seasons starts at that moment.'); + throw err; + } + forgetSeasons(org.id); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'season.create', + outcome: 'ok', + target: name, + detail: { orgId: org.id, seasonId: id, startsAt: startsAt.toISOString() } + }); + return { id }; +} + +/** A new name at any time; a new start only before the season has begun, and still to come. */ +export async function updateSeason( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + seasonId: string, + body: Record +): Promise { + const row = await ownSeason(env, org, seasonId); + const set: Partial = {}; + const detail: Record = { orgId: org.id, seasonId }; + if (body.name !== undefined) { + set.name = seasonName(body.name); + detail.from = row.name; + } + if (body.startsAt !== undefined) { + if (row.startsAt.getTime() <= Date.now()) + throw new ApiError( + 400, + 'This season has started: its start stays put, so its standings never move.' + ); + set.startsAt = futureStart(body.startsAt); + detail.startsAt = set.startsAt.toISOString(); + } + if (!Object.keys(set).length) throw new ApiError(400, 'Nothing to update.'); + try { + await env.db.update(seasons).set(set).where(eq(seasons.id, row.id)); + } catch (err) { + if (startTaken(err)) throw new ApiError(400, 'Another of your seasons starts at that moment.'); + throw err; + } + forgetSeasons(org.id); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'season.update', + outcome: 'ok', + target: set.name ?? row.name, + detail + }); +} + +/** Only a season that has not begun: one that has keeps its standings, and its winners. */ +export async function deleteSeason( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + seasonId: string +): Promise { + const row = await ownSeason(env, org, seasonId); + if (row.startsAt.getTime() <= Date.now()) + throw new ApiError(400, 'This season has started: it stays, with its standings and winners.'); + await env.db.delete(seasons).where(eq(seasons.id, row.id)); + forgetSeasons(org.id); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'season.delete', + outcome: 'ok', + target: row.name, + detail: { orgId: org.id, seasonId: row.id, startsAt: row.startsAt.toISOString() } + }); +} diff --git a/src/routes/(app)/server/[id]/players/[steamId]/+page.server.ts b/src/routes/(app)/server/[id]/players/[steamId]/+page.server.ts index 5e51b3d3..d0bf85ad 100644 --- a/src/routes/(app)/server/[id]/players/[steamId]/+page.server.ts +++ b/src/routes/(app)/server/[id]/players/[steamId]/+page.server.ts @@ -23,6 +23,7 @@ export const load: PageServerLoad = async ({ locals, params }) => { dossier(env, user, server, access, params.steamId), loadCareer(env, { serverId: server.id, + orgId: server.orgId, ids: visible.map((s) => s.id), nameOf: new Map(visible.map((s) => [s.id, s.name])), steamId: params.steamId diff --git a/src/routes/(public)/s/[id]/leaderboard/+page.server.ts b/src/routes/(public)/s/[id]/leaderboard/+page.server.ts index 4cde6265..aee31e8b 100644 --- a/src/routes/(public)/s/[id]/leaderboard/+page.server.ts +++ b/src/routes/(public)/s/[id]/leaderboard/+page.server.ts @@ -19,7 +19,7 @@ export const load: PageServerLoad = (event) => const orgServers = await publicOrgServers(env, ps.org, 'leaderboards'); const ids = q.scope === 'org' ? orgServers.map((s) => s.id) : [ps.server.id]; return { - board: { ...(await loadBoard(env, ids, q)), maxPage: PUBLIC_MAX_PAGE }, + board: { ...(await loadBoard(env, ids, q, ps.org.id)), maxPage: PUBLIC_MAX_PAGE }, orgScope: orgServers.length > 1, heading: publicHeading(ps) }; diff --git a/src/routes/(public)/s/[id]/players/[steamId]/+page.server.ts b/src/routes/(public)/s/[id]/players/[steamId]/+page.server.ts index e6263c4c..d879064f 100644 --- a/src/routes/(public)/s/[id]/players/[steamId]/+page.server.ts +++ b/src/routes/(public)/s/[id]/players/[steamId]/+page.server.ts @@ -28,6 +28,7 @@ export const load: PageServerLoad = (event) => const [career, profiles, combat] = await Promise.all([ loadCareer(env, { serverId: ps.server.id, + orgId: ps.org.id, ids, nameOf: new Map(orgServers.map((s) => [s.id, s.name])), steamId diff --git a/src/routes/api/orgs/[id]/+server.ts b/src/routes/api/orgs/[id]/+server.ts index 9f41f4df..2b31fcf9 100644 --- a/src/routes/api/orgs/[id]/+server.ts +++ b/src/routes/api/orgs/[id]/+server.ts @@ -10,7 +10,7 @@ import { } from '$lib/server/orgs'; /** - * {name} or {discordInviteUrl} or {membersReserved} or {banMessage} for org owners; {serverLimit, suspended, + * {name} or {discordInviteUrl} or {boardOpens} or {membersReserved} or {banMessage} for org owners; {serverLimit, suspended, * reason, allowPublicStatus, allowPublicLeaderboards} for the site owner only. */ export const PATCH = route(async (event) => { diff --git a/src/routes/api/orgs/[id]/seasons/+server.ts b/src/routes/api/orgs/[id]/seasons/+server.ts new file mode 100644 index 00000000..3a5d1725 --- /dev/null +++ b/src/routes/api/orgs/[id]/seasons/+server.ts @@ -0,0 +1,20 @@ +// The organisation's seasons for its boards: the official ones and its own, and what its boards +// open on (set with PATCH /api/orgs/ {boardOpens}). Owners only, as the Seasons tab is. +import { getEnv } from '$lib/server/env'; +import { apiJson, param, readJson, route } from '$lib/server/http'; +import { requireOrgRole } from '$lib/server/access'; +import { createSeason, listSeasons } from '$lib/server/seasons'; + +export const GET = route(async (event) => { + const env = getEnv(); + const { org } = await requireOrgRole(env, event.locals, param(event, 'id'), 'owner'); + return apiJson({ ok: true, ...(await listSeasons(env, org.id)) }); +}); + +/** {name, startsAt}: a season of the organisation's own, starting in the future. */ +export const POST = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireOrgRole(env, event.locals, param(event, 'id'), 'owner'); + const season = await createSeason(env, event.request, user, org, await readJson(event.request)); + return apiJson({ ok: true, season }, 201); +}); diff --git a/src/routes/api/orgs/[id]/seasons/[seasonId]/+server.ts b/src/routes/api/orgs/[id]/seasons/[seasonId]/+server.ts new file mode 100644 index 00000000..2c4a5fb2 --- /dev/null +++ b/src/routes/api/orgs/[id]/seasons/[seasonId]/+server.ts @@ -0,0 +1,27 @@ +import { getEnv } from '$lib/server/env'; +import { apiJson, param, readJson, route } from '$lib/server/http'; +import { requireOrgRole } from '$lib/server/access'; +import { deleteSeason, updateSeason } from '$lib/server/seasons'; + +/** {name?, startsAt?}: a new name at any time, a new start only before the season begins. */ +export const PATCH = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireOrgRole(env, event.locals, param(event, 'id'), 'owner'); + await updateSeason( + env, + event.request, + user, + org, + param(event, 'seasonId'), + await readJson(event.request) + ); + return apiJson({ ok: true }); +}); + +/** Only a season that has not begun (400 otherwise): one that has keeps its standings. */ +export const DELETE = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireOrgRole(env, event.locals, param(event, 'id'), 'owner'); + await deleteSeason(env, event.request, user, org, param(event, 'seasonId')); + return apiJson({ ok: true }); +}); diff --git a/src/routes/api/public/servers/[id]/leaderboard/+server.ts b/src/routes/api/public/servers/[id]/leaderboard/+server.ts index a3fccdf8..bc8619a4 100644 --- a/src/routes/api/public/servers/[id]/leaderboard/+server.ts +++ b/src/routes/api/public/servers/[id]/leaderboard/+server.ts @@ -21,7 +21,7 @@ export const GET = route(async (event) => { ? (await publicOrgServers(env, ps.org, 'leaderboards')).map((s) => s.id) : [ps.server.id]; return apiJson( - { ok: true, ...(await loadBoard(env, ids, q)), maxPage: PUBLIC_MAX_PAGE }, + { ok: true, ...(await loadBoard(env, ids, q, ps.org.id)), maxPage: PUBLIC_MAX_PAGE }, 200, publicHeaders(30) ); diff --git a/src/routes/api/public/servers/[id]/players/[steamId]/+server.ts b/src/routes/api/public/servers/[id]/players/[steamId]/+server.ts index eb7dbf37..8f6c9cea 100644 --- a/src/routes/api/public/servers/[id]/players/[steamId]/+server.ts +++ b/src/routes/api/public/servers/[id]/players/[steamId]/+server.ts @@ -22,6 +22,7 @@ export const GET = route(async (event) => { if (!name) throw new ApiError(404, 'Not found.', 'not_found'); const career = await loadCareer(env, { serverId: ps.server.id, + orgId: ps.org.id, ids, nameOf: new Map(orgServers.map((s) => [s.id, s.name])), steamId diff --git a/src/routes/api/servers/[id]/leaderboard/+server.ts b/src/routes/api/servers/[id]/leaderboard/+server.ts index f40ffae7..f1c14ee7 100644 --- a/src/routes/api/servers/[id]/leaderboard/+server.ts +++ b/src/routes/api/servers/[id]/leaderboard/+server.ts @@ -1,7 +1,8 @@ // One page of the leaderboard: this server, or every server of its organisation the caller can // see, from the match lines and the sessions (all time from each player's settled totals), a -// page kept for a minute. -// ?scope=server|org&range=7d|30d|90d|all&sort=&dir=asc|desc&page=1&minMinutes=60 +// page kept for a minute. A season's range is one of the organisation's seasons; `current` (the +// default) is what its boards open on. +// ?scope=server|org&range=current|s:|7d|30d|90d|all&sort=&dir=asc|desc&page=1&minMinutes=60 import { getEnv } from '$lib/server/env'; import { apiJson, param, route } from '$lib/server/http'; import { accessibleServers, requireServerCap } from '$lib/server/access'; @@ -21,5 +22,5 @@ export const GET = route(async (event) => { q.scope === 'org' ? (await accessibleServers(env, user, server.orgId)).map((s) => s.id) : [server.id]; - return apiJson({ ok: true, ...(await loadBoard(env, ids, q)) }); + return apiJson({ ok: true, ...(await loadBoard(env, ids, q, server.orgId)) }); }); diff --git a/src/routes/api/servers/[id]/leaderboard/export/+server.ts b/src/routes/api/servers/[id]/leaderboard/export/+server.ts index a22231a5..bd91d82f 100644 --- a/src/routes/api/servers/[id]/leaderboard/export/+server.ts +++ b/src/routes/api/servers/[id]/leaderboard/export/+server.ts @@ -1,12 +1,13 @@ // The leaderboard as a CSV file: the board as it is set (scope, range, sort, playtime floor), from // the top, every page of it up to EXPORT_ROWS players. The same check as the board (View); the // organisation scope covers the servers the caller can open, as the board's does. -// ?scope=server|org&range=7d|30d|90d|all&sort=&dir=asc|desc&minMinutes=60 +// ?scope=server|org&range=current|s:|7d|30d|90d|all&sort=&dir=asc|desc&minMinutes=60 import { getEnv } from '$lib/server/env'; import { param, route } from '$lib/server/http'; import { accessibleServers, getOrg, requireServerCap } from '$lib/server/access'; import { assertRate } from '$lib/server/ratelimit'; import { exportBoard } from '$lib/server/leaderboards'; +import { boardWindow } from '$lib/server/seasons'; import { csvCell, fileSlug } from '$lib/server/csv'; import { kdRatio, parseBoardQuery, perHour, winRate, type BoardRow } from '$lib/leaderboard'; @@ -55,11 +56,13 @@ export const GET = route(async (event) => { const ids = org ? (await accessibleServers(env, user, server.orgId)).map((s) => s.id) : [server.id]; - const rows = await exportBoard(env, ids, q); + const win = await boardWindow(env, server.orgId, q.range); + const rows = await exportBoard(env, ids, q, win); const lines = [COLUMNS.map(([name]) => name).join(',')]; for (const r of rows) lines.push(COLUMNS.map(([, value]) => csvCell(value(r))).join(',')); const day = new Date().toISOString().slice(0, 10); - const file = `${fileSlug(org?.name ?? server.name)}-leaderboard-${q.range}-${day}.csv`; + const span = win.season ? fileSlug(win.season.name) || 'season' : win.range; + const file = `${fileSlug(org?.name ?? server.name)}-leaderboard-${span}-${day}.csv`; return new Response(lines.join('\r\n'), { headers: { 'content-type': 'text/csv; charset=utf-8', diff --git a/src/routes/api/servers/[id]/players/[steamId]/career/+server.ts b/src/routes/api/servers/[id]/players/[steamId]/career/+server.ts index 8c81a2ec..2bad649f 100644 --- a/src/routes/api/servers/[id]/players/[steamId]/career/+server.ts +++ b/src/routes/api/servers/[id]/players/[steamId]/career/+server.ts @@ -20,6 +20,7 @@ export const GET = route(async (event) => { ); const career = await loadCareer(env, { serverId: server.id, + orgId: server.orgId, ids: visible.map((s) => s.id), nameOf: new Map(visible.map((s) => [s.id, s.name])), steamId diff --git a/src/test/api-matrix.test.ts b/src/test/api-matrix.test.ts index 39c58a9f..99b7065a 100644 --- a/src/test/api-matrix.test.ts +++ b/src/test/api-matrix.test.ts @@ -84,6 +84,10 @@ const MATRIX: Record = { 'PATCH api/orgs/[id]/roles/[roleId]': 'orgOwner', 'DELETE api/orgs/[id]/roles/[roleId]': 'orgOwner', 'POST api/orgs/[id]/roles/[roleId]/reset': 'orgOwner', + 'GET api/orgs/[id]/seasons': 'orgOwner', + 'POST api/orgs/[id]/seasons': 'orgOwner', + 'PATCH api/orgs/[id]/seasons/[seasonId]': 'orgOwner', + 'DELETE api/orgs/[id]/seasons/[seasonId]': 'orgOwner', 'GET api/orgs/[id]/webhooks': 'orgOwner', 'POST api/orgs/[id]/webhooks': 'orgOwner', 'PATCH api/orgs/[id]/webhooks/[webhookId]': 'orgOwner', diff --git a/src/test/board-cache.test.ts b/src/test/board-cache.test.ts index 53f44696..294ae9b6 100644 --- a/src/test/board-cache.test.ts +++ b/src/test/board-cache.test.ts @@ -20,7 +20,7 @@ const HOUR = 3_600_000; const HERE = '76561198000000301'; const THERE = '76561198000000302'; const LATER = '76561198000000303'; -const q = parseBoardQuery(new URLSearchParams('minMinutes=0')); +const q = parseBoardQuery(new URLSearchParams('minMinutes=0&range=30d')); describe.skipIf(!hasTestDb)('board cache', () => { let env: Env; @@ -66,47 +66,52 @@ describe.skipIf(!hasTestDb)('board cache', () => { }); test('a second look inside the minute is the first one; after it, the board is read again', async () => { - const first = await loadBoard(env, [w.server.id], q); + const first = await loadBoard(env, [w.server.id], q, w.org.id); expect(ids(first)).toEqual([HERE]); await played(w.server.id, LATER); - expect(ids(await loadBoard(env, [w.server.id], q))).toEqual([HERE]); + expect(ids(await loadBoard(env, [w.server.id], q, w.org.id))).toEqual([HERE]); setSystemTime(new Date(Date.now() + 61_000)); - expect(ids(await loadBoard(env, [w.server.id], q))).toEqual([HERE, LATER]); + expect(ids(await loadBoard(env, [w.server.id], q, w.org.id))).toEqual([HERE, LATER]); await env.db.delete(playerSessions).where(eq(playerSessions.steamId, LATER)); }); test('the requests that arrive during a read wait for it; a failed read is not kept', async () => { const down = counted(true); - await expect(loadBoard(down.env, [w.server.id], q)).rejects.toThrow('down'); + await expect(loadBoard(down.env, [w.server.id], q, w.org.id)).rejects.toThrow('down'); const up = counted(); const [a, b] = await Promise.all([ - loadBoard(up.env, [w.server.id], q), - loadBoard(up.env, [w.server.id], q) + loadBoard(up.env, [w.server.id], q, w.org.id), + loadBoard(up.env, [w.server.id], q, w.org.id) ]); expect(up.n.execute).toBe(1); expect(ids(a)).toEqual([HERE]); - expect(b).toBe(a); + expect(b).toEqual(a); }); test('every part of the query is its own board, and so is every set of servers', async () => { const up = counted(); - await loadBoard(up.env, [w.server.id, w.otherServer.id], q); + await loadBoard(up.env, [w.server.id, w.otherServer.id], q, w.org.id); // the same servers in another order are the same board - await loadBoard(up.env, [w.otherServer.id, w.server.id], q); + await loadBoard(up.env, [w.otherServer.id, w.server.id], q, w.org.id); expect(up.n.execute).toBe(1); - await loadBoard(up.env, [w.server.id], q); - await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, page: 2 }); - await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, sort: 'deaths' }); - await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, minMinutes: 1 }); - await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, range: 'all' }); - await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, dir: 'asc' }); - const org = await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, scope: 'org' }); + await loadBoard(up.env, [w.server.id], q, w.org.id); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, page: 2 }, w.org.id); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, sort: 'deaths' }, w.org.id); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, minMinutes: 1 }, w.org.id); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, range: 'all' }, w.org.id); + await loadBoard(up.env, [w.server.id, w.otherServer.id], { ...q, dir: 'asc' }, w.org.id); + const org = await loadBoard( + up.env, + [w.server.id, w.otherServer.id], + { ...q, scope: 'org' }, + w.org.id + ); expect(up.n.execute).toBe(8); expect(org.query.scope).toBe('org'); }); test("an organisation board read by its owner is not a member's who was given one server", async () => { - const query = 'scope=org&minMinutes=0'; + const query = 'scope=org&minMinutes=0&range=30d'; const owner = await callApi(panelBoard, w.users.owner, { params: { id: w.server.id }, query @@ -141,7 +146,7 @@ describe.skipIf(!hasTestDb)('board cache', () => { .update(servers) .set({ publicLeaderboards: true }) .where(eq(servers.id, w.otherServer.id)); - const query = 'scope=org&minMinutes=0'; + const query = 'scope=org&minMinutes=0&range=30d'; const owner = await callApi(panelBoard, w.users.owner, { params: { id: w.otherServer.id }, query @@ -164,7 +169,7 @@ describe.skipIf(!hasTestDb)('board cache', () => { .select({ name: servers.name }) .from(servers) .where(eq(servers.id, w.server.id)); - const before = await loadBoard(env, [w.server.id, w.otherServer.id], q); + const before = await loadBoard(env, [w.server.id, w.otherServer.id], q, w.org.id); expect(ids(before)).toEqual([HERE, THERE]); await played(w.server.id, LATER); const done = await callApi(purge, w.users.owner, { @@ -174,7 +179,7 @@ describe.skipIf(!hasTestDb)('board cache', () => { }); expect(done.status).toBe(200); // sessions stay through a purge, so the board read again has the newcomer - expect(ids(await loadBoard(env, [w.server.id, w.otherServer.id], q))).toEqual([ + expect(ids(await loadBoard(env, [w.server.id, w.otherServer.id], q, w.org.id))).toEqual([ HERE, THERE, LATER diff --git a/src/test/board-export.test.ts b/src/test/board-export.test.ts index c3131416..bbd473a5 100644 --- a/src/test/board-export.test.ts +++ b/src/test/board-export.test.ts @@ -42,10 +42,12 @@ describe.skipIf(!hasTestDb)('leaderboard export', () => { ]); }); + // the last 30 days unless the query names a range: the history here is two hours old, so the + // default (the current season) would leave it out on a season's first two hours const download = async (who: PrincipalName, query: string, serverId = w.server.id) => { const res = await callRaw(exportRoute, w.users[who], { params: { id: serverId }, - query + query: query.includes('range=') ? query : `${query}&range=30d` }); return { res, lines: (await res.text()).split('\r\n') }; }; diff --git a/src/test/career.test.ts b/src/test/career.test.ts index 438d9a9e..3567d860 100644 --- a/src/test/career.test.ts +++ b/src/test/career.test.ts @@ -92,6 +92,7 @@ describe.skipIf(!hasTestDb)('career and boards from the match rows', () => { const career = await loadCareer(env, { serverId: w.server.id, + orgId: w.org.id, ids: [w.server.id], nameOf: new Map(), steamId: STEAM @@ -120,7 +121,8 @@ describe.skipIf(!hasTestDb)('career and boards from the match rows', () => { const board = await loadBoard( env, [w.server.id], - parseBoardQuery(new URLSearchParams('minMinutes=0')) + parseBoardQuery(new URLSearchParams('minMinutes=0&range=30d')), + w.org.id ); const row = board.rows.find((r) => r.steamId === STEAM); expect(row).toMatchObject({ @@ -183,7 +185,8 @@ describe.skipIf(!hasTestDb)('career and boards from the match rows', () => { const board = await loadBoard( env, [w.server.id], - parseBoardQuery(new URLSearchParams('minMinutes=0&sort=perHour')) + parseBoardQuery(new URLSearchParams('minMinutes=0&range=30d&sort=perHour')), + w.org.id ); expect(board.rows.map((r) => r.steamId)).toEqual([STEAM, OTHER]); }); diff --git a/src/test/faction-colours.test.ts b/src/test/faction-colours.test.ts index 3921332c..070ddda2 100644 --- a/src/test/faction-colours.test.ts +++ b/src/test/faction-colours.test.ts @@ -88,7 +88,12 @@ describe.skipIf(!hasTestDb)('faction colours and scores from the game', () => { }); test('the boards read a score that is not a number as no score, not as an error', async () => { - const board = await loadBoard(env, [w.server.id], { ...DEFAULT_BOARD_QUERY, minMinutes: 0 }); + const board = await loadBoard( + env, + [w.server.id], + { ...DEFAULT_BOARD_QUERY, range: '30d', minMinutes: 0 }, + w.org.id + ); const row = board.rows.find((r) => r.steamId === PLAYER); expect([row?.matches, row?.wins, row?.losses, row?.draws]).toEqual([1, 0, 0, 0]); }); diff --git a/src/test/message-stats.test.ts b/src/test/message-stats.test.ts index e57636b1..586c3390 100644 --- a/src/test/message-stats.test.ts +++ b/src/test/message-stats.test.ts @@ -161,14 +161,19 @@ describe.skipIf(!hasTestDb)('stats in messages', () => { draws: 0 }); expect(stats.has(NEW.id)).toBe(false); - const board = await loadBoard(env, [w.server.id], { - scope: 'server', - range: 'all', - sort: 'kills', - dir: 'desc', - page: 1, - minMinutes: 0 - }); + const board = await loadBoard( + env, + [w.server.id], + { + scope: 'server', + range: 'all', + sort: 'kills', + dir: 'desc', + page: 1, + minMinutes: 0 + }, + w.org.id + ); const row = board.rows.find((r) => r.steamId === OWL.id)!; const owl = stats.get(OWL.id)!; expect([row.kills, row.deaths, row.minutes, row.seedMinutes, row.matches, row.wins]).toEqual([ @@ -193,14 +198,19 @@ describe.skipIf(!hasTestDb)('stats in messages', () => { losses: 1, draws: 0 }); - const board = await loadBoard(env, [w.server.id, w.otherServer.id], { - scope: 'org', - range: 'all', - sort: 'kills', - dir: 'desc', - page: 1, - minMinutes: 0 - }); + const board = await loadBoard( + env, + [w.server.id, w.otherServer.id], + { + scope: 'org', + range: 'all', + sort: 'kills', + dir: 'desc', + page: 1, + minMinutes: 0 + }, + w.org.id + ); const row = board.rows.find((r) => r.steamId === OWL.id)!; expect([row.kills, row.deaths, row.minutes, row.matches, row.wins]).toEqual([ org.kills, diff --git a/src/test/outside-review.test.ts b/src/test/outside-review.test.ts index 369e5192..2cf938a0 100644 --- a/src/test/outside-review.test.ts +++ b/src/test/outside-review.test.ts @@ -176,7 +176,8 @@ describe.skipIf(!hasTestDb)('outside review: against the database', () => { }); test('by design: a public leaderboard row carries the SteamID (the career link) and the in-game cash', async () => { - const board = (await get('api/public/servers/[id]/leaderboard', null, 'minMinutes=0')).body as { + const board = (await get('api/public/servers/[id]/leaderboard', null, 'minMinutes=0&range=30d')) + .body as { rows: Record[]; }; const row = board.rows.find((r) => r.name === 'Reader')!; diff --git a/src/test/player-totals-writes.test.ts b/src/test/player-totals-writes.test.ts index 8329f49b..d5153bb4 100644 --- a/src/test/player-totals-writes.test.ts +++ b/src/test/player-totals-writes.test.ts @@ -701,7 +701,8 @@ describe.skipIf(!hasTestDb)('player totals under every kind of write', () => { }); // The two ways the day rows arrive on a database with history: 0038 and 0039 in one migration - // run (Drizzle runs every pending migration in one transaction), or 0039 over 0038's totals. + // run (Drizzle runs every pending migration in one transaction), or 0039 over 0038's totals; + // either way with the migrations after them in the same run. for (const [label, after] of [ [ '0038 and 0039 in one run over a database at 0037', @@ -719,16 +720,18 @@ describe.skipIf(!hasTestDb)('player totals under every kind of write', () => { const { client, db } = connect(url.href); const dir = await mkdtemp(join(tmpdir(), 'warcon-migrate-')); try { - // every migration before these + // every migration before these, and none after them: Drizzle takes the newest one + // applied for the point the database is at, so a later one run first would leave + // these out await cp('drizzle', dir, { recursive: true }); const journal = JSON.parse(await readFile(join(dir, 'meta', '_journal.json'), 'utf8')); - for (const tag of after) { + const first = journal.entries.findIndex((e: { tag: string }) => e.tag === after[0]); + expect(first).toBeGreaterThan(0); + for (const { tag } of journal.entries.slice(first) as { tag: string }[]) { await rm(join(dir, `${tag}.sql`)); - await rm(join(dir, 'meta', `${tag.slice(0, 4)}_snapshot.json`)); + await rm(join(dir, 'meta', `${tag.slice(0, 4)}_snapshot.json`), { force: true }); } - journal.entries = journal.entries.filter( - (e: { tag: string }) => !(after as readonly string[]).includes(e.tag) - ); + journal.entries = journal.entries.slice(0, first); await writeFile(join(dir, 'meta', '_journal.json'), JSON.stringify(journal)); await runMigrations(db, dir); // history as the worker leaves it: closed and open sessions, one over two midnights, diff --git a/src/test/player-totals.test.ts b/src/test/player-totals.test.ts index 1b25ea75..574be579 100644 --- a/src/test/player-totals.test.ts +++ b/src/test/player-totals.test.ts @@ -12,10 +12,12 @@ // of each set of servers are equal column by column, and so are the rows since a spread of // instants (the boards' own 7, 30 and 90 days back; midnights and a millisecond either side; a // join, a leave and a match end and a millisecond either side; random ones; before and after all -// the data), all read in one transaction (one now()); every tenth step and at the end the reads +// the data), and so are the rows of finished seasons between them (neighbouring and random pairs, +// and ends on the start's own day, at its midnight, the day after and later, a millisecond either +// side), all read in one transaction (one now()); every tenth step and at the end the reads // themselves are equal too (every board metric both ways at two floors for all time, and for each -// range, every player's rank, the placeholders' stats, the risk record), and a rebuild leaves both -// tables as they were. +// range and a few finished seasons, every player's rank, the placeholders' stats, the risk +// record), and a rebuild leaves both tables as they were. import { afterAll, beforeAll, describe, expect, setSystemTime, spyOn, test } from 'bun:test'; import { and, eq, isNotNull, sql, type SQL } from 'drizzle-orm'; import type { Env } from '$lib/server/env'; @@ -41,7 +43,8 @@ import { rankOf, riskPerformanceFor } from '$lib/server/leaderboards'; -import { BOARD_METRICS, rangeStart, type BoardQuery } from '$lib/leaderboard'; +import { BOARD_METRICS, type BoardQuery, type FixedRange } from '$lib/leaderboard'; +import { fixedWindow, type BoardWindow } from '$lib/server/seasons'; import { hasTestDb, testEnv } from './db'; import { seedWorld, type World } from './world'; import { @@ -50,7 +53,9 @@ import { oracleRangeBase, oracleRank, oracleRiskRecord, + oracleSeasonBase, rangeRows, + seasonRows, totalsRows } from './totals-oracle'; @@ -473,6 +478,47 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = }); }; + /** + * Finished seasons worth holding the day rows to, from those instants: each one to the next + * and (every tenth step) to a random later one; and from one of them, ends on its own day, at + * its midnight and a millisecond either side, within the day after, at the midnight after + * that and a millisecond either side, and days later. + */ + const windows = (ts: number[], every: boolean): [number, number][] => { + const u = [...new Set(ts)].sort((a, b) => a - b); + const out: [number, number][] = []; + for (let i = 0; i + 1 < u.length; i++) { + out.push([u[i], u[i + 1]]); + if (every) out.push([u[i], u[i + 1 + pick.int(u.length - i - 1)]]); + } + const f = u[pick.int(u.length)]; + const m1 = midnight(f) + DAY; + for (const t of [f + 1, m1 - 1, m1, m1 + 1, m1 + HOUR, m1 + DAY - 1, m1 + DAY, m1 + DAY + 1]) + out.push([f, t]); + out.push([f, m1 + 3 * DAY + HOUR]); + // a season always ends after it starts + return out.filter(([from, to]) => to > from); + }; + /** The rows of each of those seasons, equal column by column, in one transaction. */ + const compareSeasons = async (step: string, every: boolean) => { + const plan: [string[], [number, number][]][] = []; + for (const ids of sets()) plan.push([ids, windows(await instants(ids, every), every)]); + await env.db.transaction(async (tx) => { + for (const [ids, ws] of plan) + for (const [f, t] of ws) { + const from = new Date(f); + const to = new Date(t); + const season = `${from.toISOString()} to ${to.toISOString()}`; + expect({ step, ids, season, rows: await seasonRows(tx, ids, from, to) }).toEqual({ + step, + ids, + season, + rows: await oracleSeasonBase(tx, ids, from, to) + }); + } + }); + }; + /** The reads themselves: boards, ranks, placeholders' stats and the risk record. */ const compareReads = async (step: string) => { await env.db.transaction(async (tx) => { @@ -480,26 +526,44 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = for (const ids of sets()) { const players = (await oracleBase(tx, ids)).map((b) => b.steam_id as string); // all time: every metric both ways at both floors; each range: every metric at the - // default floor, and one more each way round - const boards: BoardQuery[] = []; + // default floor, and one more each way round; two finished seasons: every metric at + // the default floor + const boards: { q: BoardQuery; win: BoardWindow }[] = []; const board = ( - range: BoardQuery['range'], + win: BoardWindow, sort: BoardQuery['sort'], dir: BoardQuery['dir'], minMinutes: number - ) => boards.push({ scope: 'server', range, sort, dir, page: 1, minMinutes }); + ) => + boards.push({ + q: { scope: 'server', range: win.range, sort, dir, page: 1, minMinutes }, + win + }); + // the clock is frozen: each range starts where the board's own does for (const metric of BOARD_METRICS) for (const dir of ['desc', 'asc'] as const) - for (const minMinutes of [0, 60]) board('all', metric.key, dir, minMinutes); - for (const range of ['7d', '30d', '90d'] as const) { - for (const metric of BOARD_METRICS) board(range, metric.key, 'desc', 60); - board(range, BOARD_METRICS[pick.int(BOARD_METRICS.length)].key, 'asc', 60); - board(range, BOARD_METRICS[pick.int(BOARD_METRICS.length)].key, 'desc', 0); + for (const minMinutes of [0, 60]) + board(fixedWindow('all'), metric.key, dir, minMinutes); + for (const range of ['7d', '30d', '90d'] as FixedRange[]) { + for (const metric of BOARD_METRICS) board(fixedWindow(range), metric.key, 'desc', 60); + board(fixedWindow(range), BOARD_METRICS[pick.int(BOARD_METRICS.length)].key, 'asc', 60); + board(fixedWindow(range), BOARD_METRICS[pick.int(BOARD_METRICS.length)].key, 'desc', 0); + } + const spans = windows(await instants(ids, true), false); + for (const [f, t] of [spans[pick.int(spans.length)], [start - DAY, clock - DAY]]) { + const win: BoardWindow = { + range: 's:test', + from: new Date(f), + to: new Date(t), + season: null, + finished: true + }; + for (const metric of BOARD_METRICS) board(win, metric.key, 'desc', 60); } - for (const q of boards) { - // the range starts where exportBoard's does: the clock is frozen - const from = rangeStart(q.range) ?? undefined; - const want = (await oracleBoard(tx, ids, q, EXPORT_ROWS, 0, from)).map((o, i) => ({ + for (const { q, win } of boards) { + const want = ( + await oracleBoard(tx, ids, q, EXPORT_ROWS, 0, win.from ?? undefined, win.to) + ).map((o, i) => ({ rank: i + 1, steamId: o.steamId as string, name: ((o.name as string | null) || o.steamId) as string, @@ -520,10 +584,11 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = cash: Number(o.cash), lastSeen: o.lastSeen ? new Date(o.lastSeen as string).toISOString() : null })); - expect({ step, ids, q, rows: await exportBoard(e, ids, q) }).toEqual({ + expect({ step, ids, q, win, rows: await exportBoard(e, ids, q, win) }).toEqual({ step, ids, q, + win, rows: want }); } @@ -705,6 +770,7 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = } await compareBase(label); await compareRanges(label, step % 10 === 0); + await compareSeasons(label, step % 10 === 0); if (step % 10 === 0) await compareReads(label); } // Everyone leaves; the last sessions close and their matches stay open. @@ -715,6 +781,7 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = for (const g of games.values()) await look(g); await compareBase(`seed ${SEED} end`); await compareRanges(`seed ${SEED} end`, true); + await compareSeasons(`seed ${SEED} end`, true); await compareReads(`seed ${SEED} end`); const before = await table(); const beforeDays = await dayTable(); @@ -779,6 +846,7 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = ); await compareBase(`seed ${SEED} after a purge`); await compareRanges(`seed ${SEED} after a purge`, true); + await compareSeasons(`seed ${SEED} after a purge`, true); const purged = await dayTable(); await env.db.execute(sql`SELECT player_totals_rebuild()`); expect(await dayTable()).toEqual(purged); diff --git a/src/test/seasons.test.ts b/src/test/seasons.test.ts new file mode 100644 index 00000000..72cb4e5e --- /dev/null +++ b/src/test/seasons.test.ts @@ -0,0 +1,415 @@ +// Seasons on a real database: an owner's changes to the organisation's own seasons through the +// routes (a start in the past, a start taken, a started season's start, a deletion, another +// organisation's season named by id, the audit rows), what the boards open on, a board over a +// finished season (cut at its end, no last seen, its winners) and over the one running, what the +// picker offers (never a season still to come, never another organisation's), the cache shared by +// `current` and its season, a career's seasons and places, a season's export name, and a purge +// forgetting a season's winners. +import { afterEach, beforeAll, describe, expect, test } from 'bun:test'; +import { and, eq } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { + auditLog, + matches, + matchPlayers, + organizations, + playerSessions, + seasons, + servers +} from '$lib/server/db/schema'; +import { forgetBoards, loadBoard, loadCareer } from '$lib/server/leaderboards'; +import { forgetSeasons } from '$lib/server/seasons'; +import { parseBoardQuery, type BoardView } from '$lib/leaderboard'; +import { hasTestDb, testEnv } from './db'; +import { callApi, callRaw, stubGateway } from './call'; +import { seedWorld, type World } from './world'; +import { GET as listRoute, POST as createRoute } from '../routes/api/orgs/[id]/seasons/+server'; +import { + DELETE as deleteRoute, + PATCH as updateRoute +} from '../routes/api/orgs/[id]/seasons/[seasonId]/+server'; +import { PATCH as orgRoute } from '../routes/api/orgs/[id]/+server'; +import { GET as panelBoard } from '../routes/api/servers/[id]/leaderboard/+server'; +import { GET as exportRoute } from '../routes/api/servers/[id]/leaderboard/export/+server'; +import { GET as publicBoard } from '../routes/api/public/servers/[id]/leaderboard/+server'; +import { POST as purge } from '../routes/api/servers/[id]/stats/purge/+server'; + +const HOUR = 3_600_000; +const DAY = 24 * HOUR; +const FIRST = '76561198000004001'; +const SECOND = '76561198000004002'; +const LATE = '76561198000004003'; +const scores = [ + { name: 'Valkyra', score: 3 }, + { name: 'Lonestar', score: 1 } +]; + +describe.skipIf(!hasTestDb)('seasons', () => { + let env: Env; + let w: World; + const now = Date.now(); + // Spring is over, Summer runs, Autumn is still to come; Theirs is another organisation's. + const spring = { id: `spring-${now}`, from: now - 20 * DAY }; + const summer = { id: `summer-${now}`, from: now - 10 * DAY }; + const autumn = { id: `autumn-${now}`, from: now + 5 * DAY }; + const theirs = { id: `theirs-${now}` }; + + const match = async (endedAt: number, lines: [string, string, number, number][]) => { + const [m] = await env.db + .insert(matches) + .values({ + serverId: w.server.id, + startedAt: new Date(endedAt - HOUR), + endedAt: new Date(endedAt), + map: 'Europe', + finalScores: scores, + winner: 'Valkyra' + }) + .returning({ id: matches.id }); + await env.db.insert(matchPlayers).values( + lines.map(([steamId, faction, kills, deaths]) => ({ + matchId: m.id, + serverId: w.server.id, + steamId, + name: steamId.slice(-4), + faction, + seconds: 3000, + kills, + deaths + })) + ); + }; + const session = (steamId: string, joinedAt: number, minutes: number) => + env.db.insert(playerSessions).values({ + serverId: w.server.id, + steamId, + name: `Player ${steamId.slice(-1)}`, + joinedAt: new Date(joinedAt), + lastSeen: new Date(joinedAt + minutes * 60_000), + leftAt: new Date(joinedAt + minutes * 60_000) + }); + const board = (range: string, orgId = w.org.id) => + loadBoard( + env, + [w.server.id], + parseBoardQuery(new URLSearchParams({ range, minMinutes: '0' })), + orgId + ); + const rowsOf = (b: BoardView) => b.rows.map((r) => [r.steamId, r.kills, r.matches]); + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + // past starts, which the routes refuse, written as the seasons would stand by now + await env.db.insert(seasons).values([ + { id: spring.id, orgId: w.org.id, name: 'Spring', startsAt: new Date(spring.from) }, + { id: summer.id, orgId: w.org.id, name: 'Summer', startsAt: new Date(summer.from) }, + { id: autumn.id, orgId: w.org.id, name: 'Autumn', startsAt: new Date(autumn.from) }, + { id: theirs.id, orgId: w.otherOrg.id, name: 'Theirs', startsAt: new Date(now - 30 * DAY) } + ]); + // Spring: FIRST plays ten matches and wins them all, SECOND one of them, on the other side + for (let i = 0; i < 10; i++) + await match(spring.from + (i + 1) * 20 * HOUR, [ + [FIRST, 'Valkyra', 3, 1], + ...(i === 0 ? [[SECOND, 'Lonestar', 10, 10] as [string, string, number, number]] : []) + ]); + await session(FIRST, spring.from + DAY, 180); + await session(SECOND, spring.from + DAY, 60); + // the moment Summer starts belongs to Summer, not Spring + await match(summer.from, [[SECOND, 'Lonestar', 100, 1]]); + // Summer: LATE's first visit, FIRST once more + await match(now - 2 * DAY, [ + [LATE, 'Valkyra', 50, 5], + [FIRST, 'Lonestar', 5, 5] + ]); + await session(LATE, now - 2 * DAY - HOUR, 60); + forgetSeasons(); + }); + + afterEach(() => { + forgetBoards(); + forgetSeasons(); + }); + + test('a finished season is cut at its end, with no last seen, and its winners', async () => { + const b = await board(`s:${spring.id}`); + expect(b.when).toMatchObject({ range: `s:${spring.id}`, finished: true }); + expect(b.when.season).toMatchObject({ name: 'Spring', kind: 'custom' }); + expect(b.when.season?.endsAt).toBe(new Date(summer.from).toISOString()); + expect(rowsOf(b)).toEqual([ + [FIRST, 30, 10], + [SECOND, 10, 1] + ]); + expect(b.rows.map((r) => [r.minutes, r.lastSeen])).toEqual([ + [180, null], + [60, null] + ]); + expect(b.winners).toEqual({ + kills: [ + { steamId: FIRST, name: 'Player 1', value: 30 }, + { steamId: SECOND, name: 'Player 2', value: 10 } + ], + // SECOND played one match: under the K/D floor + kd: [{ steamId: FIRST, name: 'Player 1', value: 3 }], + playtime: [ + { steamId: FIRST, name: 'Player 1', value: 180 }, + { steamId: SECOND, name: 'Player 2', value: 60 } + ], + wins: [{ steamId: FIRST, name: 'Player 1', value: 10 }] + }); + }); + + test('the season running reads to now, with last seen and no winners', async () => { + const b = await board(`s:${summer.id}`); + expect(b.when).toMatchObject({ range: `s:${summer.id}`, finished: false }); + expect(rowsOf(b)).toEqual([ + [SECOND, 100, 1], + [LATE, 50, 1], + [FIRST, 5, 1] + ]); + expect(b.rows.find((r) => r.steamId === LATE)?.lastSeen).not.toBeNull(); + expect(b.winners).toBeNull(); + }); + + test('the picker offers the seasons that have started, never one to come or another organisation’s', async () => { + const b = await board('7d'); + const keys = b.seasons.map((s) => s.key); + expect(keys).toContain(spring.id); + expect(keys).toContain(summer.id); + expect(keys).toContain('wardogs-1'); + expect(keys).not.toContain(autumn.id); + expect(keys).not.toContain(theirs.id); + // newest first + expect(keys.indexOf(summer.id)).toBeLessThan(keys.indexOf(spring.id)); + // a season to come, or another organisation's, named in the range is the default board + for (const range of [`s:${autumn.id}`, `s:${theirs.id}`, 's:nothing']) + expect((await board(range)).when.season?.kind).toBe('official'); + // and Theirs is its own organisation's board + const other = await loadBoard( + env, + [w.otherOrgServer.id], + parseBoardQuery(new URLSearchParams({ range: `s:${theirs.id}` })), + w.otherOrg.id + ); + expect(other.when.season?.name).toBe('Theirs'); + }); + + test('the boards open on what the owner picked, at once; anything else is refused', async () => { + expect((await board('current')).when.season?.kind).toBe('official'); + const set = (boardOpens: unknown, who = w.users.owner) => + callApi(orgRoute, who, { method: 'PATCH', params: { id: w.org.id }, body: { boardOpens } }); + expect((await set('nonsense')).status).toBe(400); + expect((await set('custom', w.users.admin)).status).toBe(403); + expect((await set('custom')).status).toBe(200); + expect((await board('current')).when.range).toBe(`s:${summer.id}`); + expect((await set('30d')).status).toBe(200); + expect((await board('current')).when.range).toBe('30d'); + expect((await set('all')).status).toBe(200); + expect((await board('current')).when).toMatchObject({ range: 'all', season: null }); + expect((await set('official')).status).toBe(200); + const rows = await env.db + .select({ detail: auditLog.detail }) + .from(auditLog) + .where(and(eq(auditLog.orgId, w.org.id), eq(auditLog.action, 'org.update'))) + .orderBy(auditLog.id); + expect( + rows.map((r) => (r.detail as { boardOpens?: string } | null)?.boardOpens).filter(Boolean) + ).toEqual(['custom', '30d', 'all', 'official']); + }); + + test('`current` and the season it names are one board, read once', async () => { + await env.db + .update(organizations) + .set({ boardOpens: 'custom' }) + .where(eq(organizations.id, w.org.id)); + forgetSeasons(); + const n = { execute: 0 }; + const db = new Proxy(env.db, { + get(target, prop, receiver) { + if (prop !== 'execute') return Reflect.get(target, prop, receiver); + return (...args: unknown[]) => { + n.execute++; + return (target.execute as (...a: unknown[]) => unknown)(...args); + }; + } + }); + const counted = { ...env, db } as Env; + const q = (range: string) => parseBoardQuery(new URLSearchParams({ range, minMinutes: '0' })); + const a = await loadBoard(counted, [w.server.id], q('current'), w.org.id); + const b = await loadBoard(counted, [w.server.id], q(`s:${summer.id}`), w.org.id); + expect(n.execute).toBe(1); + expect(b.rows).toEqual(a.rows); + // each answers with the query it was asked + expect([a.query.range, b.query.range]).toEqual(['current', `s:${summer.id}`]); + await env.db + .update(organizations) + .set({ boardOpens: 'official' }) + .where(eq(organizations.id, w.org.id)); + }); + + test("a career counts each season's matches and the places won on this server", async () => { + const career = (steamId: string) => + loadCareer(env, { + serverId: w.server.id, + orgId: w.org.id, + ids: [w.server.id], + nameOf: new Map(), + steamId + }); + const first = await career(FIRST); + const of = (c: typeof first, key: string) => c.seasons.find((s) => s.season.key === key); + expect(of(first, spring.id)).toMatchObject({ + matches: 10, + wins: 10, + losses: 0, + kills: 30, + deaths: 10, + places: [ + { category: 'kills', place: 1 }, + { category: 'kd', place: 1 }, + { category: 'playtime', place: 1 }, + { category: 'wins', place: 1 } + ] + }); + expect(of(first, summer.id)).toMatchObject({ matches: 1, kills: 5, losses: 1, places: [] }); + expect(of(first, autumn.id)).toBeUndefined(); + const second = await career(SECOND); + expect(of(second, spring.id)?.places).toEqual([ + { category: 'kills', place: 2 }, + { category: 'playtime', place: 2 } + ]); + expect(of(second, summer.id)).toMatchObject({ matches: 1, kills: 100, places: [] }); + // another server's career page shows no places won here + const elsewhere = await loadCareer(env, { + serverId: w.otherServer.id, + orgId: w.org.id, + ids: [w.server.id, w.otherServer.id], + nameOf: new Map(), + steamId: FIRST + }); + expect(of(elsewhere, spring.id)).toMatchObject({ matches: 10, places: [] }); + }); + + test("an owner's seasons through the routes: future starts only, and a started one stays put", async () => { + const owner = w.users.owner; + const params = { id: w.org.id }; + const create = (body: unknown) => callApi(createRoute, owner, { method: 'POST', params, body }); + const tomorrow = new Date(Math.floor(now / DAY) * DAY + DAY).toISOString(); + expect( + (await create({ name: 'Past', startsAt: new Date(now - DAY).toISOString() })).status + ).toBe(400); + expect((await create({ name: ' ', startsAt: tomorrow })).status).toBe(400); + expect((await create({ name: 'Winter', startsAt: 'soon' })).status).toBe(400); + const made = await create({ name: 'Winter', startsAt: tomorrow }); + expect(made.status).toBe(201); + const id = (made.body as { season: { id: string } }).season.id; + const clash = await create({ name: 'Also winter', startsAt: tomorrow }); + expect(clash.status).toBe(400); + expect(clash.message).toBe('Another of your seasons starts at that moment.'); + + const list = await callApi(listRoute, owner, { params }); + const listed = (list.body as { seasons: { key: string; kind: string }[]; opens: string }) + .seasons; + expect(listed.filter((s) => s.kind === 'custom').map((s) => s.key)).toEqual([ + spring.id, + summer.id, + id, + autumn.id + ]); + expect(JSON.stringify(list.body)).not.toContain('createdBy'); + + const update = (seasonId: string, body: unknown, orgId = w.org.id) => + callApi(updateRoute, owner, { method: 'PATCH', params: { id: orgId, seasonId }, body }); + const remove = (seasonId: string, orgId = w.org.id) => + callApi(deleteRoute, owner, { method: 'DELETE', params: { id: orgId, seasonId } }); + expect((await update(spring.id, { name: 'Spring league' })).status).toBe(200); + const moved = await update(spring.id, { startsAt: tomorrow }); + expect(moved.status).toBe(400); + expect((await remove(spring.id)).status).toBe(400); + const onto = await update(id, { startsAt: new Date(autumn.from).toISOString() }); + expect([onto.status, onto.message]).toEqual([ + 400, + 'Another of your seasons starts at that moment.' + ]); + expect((await update(id, { startsAt: new Date(now + 3 * DAY).toISOString() })).status).toBe( + 200 + ); + expect((await remove(id)).status).toBe(200); + + // another organisation's season, by id, through this one's routes or its own + expect((await update(theirs.id, { name: 'Mine now' })).status).toBe(404); + expect((await remove(theirs.id)).status).toBe(404); + expect((await update(theirs.id, { name: 'Mine now' }, w.otherOrg.id)).status).toBe(404); + expect((await remove(theirs.id, w.otherOrg.id)).status).toBe(404); + const [kept] = await env.db + .select({ name: seasons.name }) + .from(seasons) + .where(eq(seasons.id, theirs.id)); + expect(kept.name).toBe('Theirs'); + + const rows = await env.db + .select({ action: auditLog.action, target: auditLog.target, category: auditLog.category }) + .from(auditLog) + .where(and(eq(auditLog.orgId, w.org.id), eq(auditLog.category, 'org'))) + .orderBy(auditLog.id); + expect(rows.filter((r) => r.action.startsWith('season.'))).toEqual([ + { action: 'season.create', target: 'Winter', category: 'org' }, + { action: 'season.update', target: 'Spring league', category: 'org' }, + { action: 'season.update', target: 'Winter', category: 'org' }, + { action: 'season.delete', target: 'Winter', category: 'org' } + ]); + await env.db.update(seasons).set({ name: 'Spring' }).where(eq(seasons.id, spring.id)); + }); + + test("the panel and public boards answer a season's range; the export is named after it", async () => { + const query = `range=s:${spring.id}&minMinutes=0`; + const panel = await callApi(panelBoard, w.users.viewer, { params: { id: w.server.id }, query }); + expect(panel.status).toBe(200); + expect((panel.body as BoardView).when.season?.name).toBe('Spring'); + expect((panel.body as BoardView).winners?.kills[0].steamId).toBe(FIRST); + const file = await callRaw(exportRoute, w.users.viewer, { params: { id: w.server.id }, query }); + expect(file.headers.get('content-disposition')).toMatch( + /filename="[a-z0-9-]+-leaderboard-spring-\d{4}-\d{2}-\d{2}\.csv"$/ + ); + await file.body?.cancel(); + // public once the organisation and the server allow it + const closed = await callApi(publicBoard, null, { params: { id: w.server.id }, query }); + expect(closed.status).toBe(404); + await env.db + .update(organizations) + .set({ allowPublicLeaderboards: true }) + .where(eq(organizations.id, w.org.id)); + await env.db + .update(servers) + .set({ publicLeaderboards: true }) + .where(eq(servers.id, w.server.id)); + const open = await callApi(publicBoard, null, { params: { id: w.server.id }, query }); + expect(open.status).toBe(200); + const view = open.body as BoardView; + expect(view.when.season?.name).toBe('Spring'); + expect(view.seasons.map((s) => s.key)).not.toContain(autumn.id); + await env.db + .update(servers) + .set({ publicLeaderboards: false }) + .where(eq(servers.id, w.server.id)); + }); + + test("a purge forgets a finished season's winners at once", async () => { + expect((await board(`s:${spring.id}`)).winners?.kills.length).toBe(2); + const [{ name }] = await env.db + .select({ name: servers.name }) + .from(servers) + .where(eq(servers.id, w.server.id)); + const done = await callApi(purge, w.users.owner, { + method: 'POST', + params: { id: w.server.id }, + body: { name } + }); + expect(done.status).toBe(200); + const after = await board(`s:${spring.id}`); + expect(after.winners?.kills).toEqual([]); + // sessions stay through a purge, and so does playtime + expect(after.winners?.playtime.map((p) => p.steamId)).toEqual([FIRST, SECOND]); + }); +}); diff --git a/src/test/totals-oracle.ts b/src/test/totals-oracle.ts index 90414174..0e8c08cb 100644 --- a/src/test/totals-oracle.ts +++ b/src/test/totals-oracle.ts @@ -1,16 +1,22 @@ // The all-time and ranged reads as they were before player_totals and player_days (main at // edf2aab), word for word, for the exactness tests to hold the totals against: each sums every // session and every line of an ended match on the servers asked about, since `from` (the epoch for -// all time). Frozen on purpose: if the reads' meaning changes, this file changes with it in the -// same commit, deliberately. totalsRows and rangeRows, at the end, are the other side. +// all time). A finished season's read is the same sums cut at its end (seasonSums). Frozen on +// purpose: if the reads' meaning changes, this file changes with it in the same commit, +// deliberately. totalsRows, rangeRows and seasonRows, at the end, are the other side. import { sql, type SQL } from 'drizzle-orm'; import type { DbOrTx } from '$lib/server/db'; import { DEFAULT_FLOOR_MINUTES, type BoardMetric, type BoardQuery } from '$lib/leaderboard'; -import { rangeBase, totalsBase } from '$lib/server/leaderboards'; +import { rangeBase, seasonBase, totalsBase } from '$lib/server/leaderboards'; const EPOCH = new Date(0); -const lines = (ids: string[], from: Date, steamId: string | string[] | null) => sql` +const lines = ( + ids: string[], + from: Date, + steamId: string | string[] | null, + to: Date | null = null +) => sql` lines AS ( SELECT p.steam_id, p.match_id, p.server_id, p.faction, p.seconds, p.kills, p.deaths, p.cash_delta, p.headshots, p.team_kills, p.suicides, p.vehicle_kills, p.longest_m, p.kill_streak, p.death_streak, @@ -27,6 +33,7 @@ const lines = (ids: string[], from: Date, steamId: string | string[] | null) => FROM matches m JOIN match_players p ON p.match_id = m.id AND p.server_id = m.server_id WHERE m.server_id IN ${ids} AND m.ended_at IS NOT NULL AND m.ended_at >= ${from} + ${to === null ? sql`` : sql`AND m.ended_at < ${to}`} ${steamId === null ? sql`` : Array.isArray(steamId) ? sql`AND p.steam_id IN ${steamId}` : sql`AND p.steam_id = ${steamId}`})`; const base = (ids: string[], from: Date, steamIds: string[] | null = null) => sql` @@ -61,6 +68,43 @@ const base = (ids: string[], from: Date, steamIds: string[] | null = null) => sq COALESCE(mt.losses, 0) AS losses, COALESCE(mt.draws, 0) AS draws FROM sess FULL JOIN mt USING (steam_id))`; +/** + * A finished season's rows, from `from` to `to`: every session that left in it or was still going + * at its end, for its time in it (an open one up to `to`, or now if sooner); seed time and cash + * only of the sessions that left in it; the lines of the matches that ended in it; no last seen. + */ +const seasonSums = (ids: string[], from: Date, to: Date) => sql` + sess AS ( + SELECT steam_id, + SUM(EXTRACT(EPOCH FROM (LEAST(COALESCE(left_at, now()), ${to}::timestamptz) + - GREATEST(joined_at, ${from}::timestamptz)))) / 60 AS minutes, + COALESCE(SUM(seed_seconds) FILTER (WHERE left_at < ${to}), 0) / 60.0 AS seed_minutes, + COALESCE(SUM(cash) FILTER (WHERE left_at < ${to}), 0) AS cash + FROM player_sessions WHERE server_id IN ${ids} AND last_seen >= ${from} + AND (left_at IS NULL OR left_at >= ${from}) AND (left_at < ${to} OR joined_at < ${to}) + GROUP BY steam_id), + ${lines(ids, from, null, to)}, + mt AS ( + SELECT steam_id, COUNT(*) AS matches, + SUM(kills) AS kills, SUM(deaths) AS deaths, SUM(headshots) AS headshots, + SUM(team_kills) AS team_kills, SUM(suicides) AS suicides, SUM(vehicle_kills) AS vehicle_kills, + MAX(kill_streak) AS kill_streak, MAX(death_streak) AS death_streak, + COUNT(*) FILTER (WHERE result = 'win') AS wins, + COUNT(*) FILTER (WHERE result = 'loss') AS losses, + COUNT(*) FILTER (WHERE result = 'draw') AS draws + FROM lines GROUP BY steam_id), + base AS ( + SELECT steam_id, + COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.seed_minutes, 0) AS seed_minutes, + COALESCE(sess.cash, 0) AS cash, NULL::timestamptz AS last_seen, + COALESCE(mt.kills, 0) AS kills, COALESCE(mt.deaths, 0) AS deaths, + COALESCE(mt.headshots, 0) AS headshots, COALESCE(mt.team_kills, 0) AS team_kills, + COALESCE(mt.suicides, 0) AS suicides, COALESCE(mt.vehicle_kills, 0) AS vehicle_kills, + COALESCE(mt.kill_streak, 0) AS kill_streak, COALESCE(mt.death_streak, 0) AS death_streak, + COALESCE(mt.matches, 0) AS matches, COALESCE(mt.wins, 0) AS wins, + COALESCE(mt.losses, 0) AS losses, COALESCE(mt.draws, 0) AS draws + FROM sess FULL JOIN mt USING (steam_id))`; + const METRIC_SQL: Record = { kills: sql`kills`, deaths: sql`deaths`, @@ -99,18 +143,22 @@ export async function oracleRangeBase( FROM base ORDER BY steam_id`)) as Record[]; } -/** A slice of the board since `from` (all time by default) as boardSlice read it, the counts as text. */ +/** + * A slice of the board since `from` (all time by default), or from `from` to `to` (a finished + * season), as boardSlice read it, the counts as text. + */ export async function oracleBoard( db: DbOrTx, ids: string[], q: BoardQuery, limit: number, offset: number, - from: Date = EPOCH + from: Date = EPOCH, + to: Date | null = null ): Promise[]> { const order = q.dir === 'asc' ? sql`ASC NULLS LAST` : sql`DESC NULLS LAST`; return (await db.execute(sql` - WITH ${base(ids, from)}, + WITH ${to ? seasonSums(ids, from, to) : base(ids, from)}, page AS ( SELECT *, COUNT(*) OVER () AS total FROM base WHERE minutes >= ${q.minMinutes} @@ -176,6 +224,22 @@ export async function totalsRows( FROM base ORDER BY steam_id`)) as Record[]; } +/** Every base row over these servers from `from` to `to`, each column as text. */ +export async function oracleSeasonBase( + db: DbOrTx, + ids: string[], + from: Date, + to: Date +): Promise[]> { + if (!ids.length) return []; + return (await db.execute(sql` + WITH ${seasonSums(ids, from, to)} + SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, + death_streak::text, matches::text, wins::text, losses::text, draws::text + FROM base ORDER BY steam_id`)) as Record[]; +} + /** The same rows from the day rows (rangeBase), as text, to hold against oracleRangeBase. */ export async function rangeRows( db: DbOrTx, @@ -190,3 +254,19 @@ export async function rangeRows( death_streak::text, matches::text, wins::text, losses::text, draws::text FROM base ORDER BY steam_id`)) as Record[]; } + +/** The same rows from the day rows (seasonBase), as text, to hold against oracleSeasonBase. */ +export async function seasonRows( + db: DbOrTx, + ids: string[], + from: Date, + to: Date +): Promise[]> { + if (!ids.length) return []; + return (await db.execute(sql` + WITH ${seasonBase(ids, from, to)} + SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, + death_streak::text, matches::text, wins::text, losses::text, draws::text + FROM base ORDER BY steam_id`)) as Record[]; +} From f9b3e8a28c7eb26c12e2dd37428c32fdf3ccfc7f Mon Sep 17 00:00:00 2001 From: James Causon Date: Tue, 6 Oct 2026 18:48:50 +0100 Subject: [PATCH 025/102] Seasons on the boards: a board leads with what it shows (the season, official or the organisation's, live or finished, and its dates) and one Showing menu holds the official seasons, the organisation's own and the ranges, in place of the range buttons; a finished season shows its winners above its final board and leaves Last seen off. A player's page shows the places they won and a table of their seasons with an all-time row, each season opening its board. The organisation's Seasons tab (owners) sets what its boards open on, lists the official seasons, and adds, renames, moves and deletes its own, a season that has started only renamed --- src/lib/components/CareerPanel.svelte | 100 ++++++- src/lib/components/LeaderboardTable.svelte | 91 ++++-- src/lib/components/Place.svelte | 11 + src/lib/components/SeasonPicker.svelte | 105 +++++++ src/lib/components/SeasonWinners.svelte | 52 ++++ src/routes/(app)/orgs/[id]/+layout.svelte | 1 + .../(app)/orgs/[id]/seasons/+page.server.ts | 19 ++ .../(app)/orgs/[id]/seasons/+page.svelte | 275 ++++++++++++++++++ .../[id]/players/[steamId]/+page.svelte | 2 + .../s/[id]/players/[steamId]/+page.svelte | 1 + src/test/load-matrix.test.ts | 1 + 11 files changed, 637 insertions(+), 21 deletions(-) create mode 100644 src/lib/components/Place.svelte create mode 100644 src/lib/components/SeasonPicker.svelte create mode 100644 src/lib/components/SeasonWinners.svelte create mode 100644 src/routes/(app)/orgs/[id]/seasons/+page.server.ts create mode 100644 src/routes/(app)/orgs/[id]/seasons/+page.svelte diff --git a/src/lib/components/CareerPanel.svelte b/src/lib/components/CareerPanel.svelte index 950c723d..6861d236 100644 --- a/src/lib/components/CareerPanel.svelte +++ b/src/lib/components/CareerPanel.svelte @@ -1,12 +1,23 @@ +{#if places.length} +
+ {#each places as p (p.key)} + {CATEGORY[p.category]}· {p.season.name} + {/each} +
+{/if} +
{#each [['Rank here', rank(career.rank.server)], [`Rank, all ${orgName} servers`, rank(career.rank.org)], ['Streak', career.streak ? `${career.streak.n} ${career.streak.kind === 'win' ? 'win' : 'loss'}${career.streak.n === 1 ? '' : career.streak.kind === 'win' ? 's' : 'es'}` : '—'], ['Matches', `${fmtNum(career.matches)} · ${career.wins}-${career.losses}-${career.draws}`], ['K/D', `${kd(career.kills, career.deaths)} · ${fmtNum(career.kills)} / ${fmtNum(career.deaths)}`], ['Kills per minute', kpm(career.kills, career.minutes)], ['Headshot rate', pct(career.headshots, career.kills)], ['Best streak', career.killStreak ? `${career.killStreak} kill${career.killStreak === 1 ? '' : 's'}` : '—']] as [label, value] (label)}
@@ -56,6 +96,58 @@ Kills, deaths and the rate per minute are the game's own counters over the matches that ended; the headshot rate and best streak come from the kill feed.

+{#if career.seasons.length} + Seasons +
+ + + + + + + + {#each career.seasons as s (s.season.key)} + + + + + + + + + {/each} + + + + + + + + +
SeasonKindKDK/DMatchesW-L-DPlaces won
+ {#if seasonHref}{s.season.name}{:else}{s.season.name}{/if} + {#if !isFinished(s.season, now)}Live{/if} + {s.season.kind === 'official' ? 'Official' : orgName}{fmtNum(s.kills)}{fmtNum(s.deaths)}{kd(s.kills, s.deaths)}{fmtNum(s.matches)}{s.wins}-{s.losses}-{s.draws} + {#each s.places as p (p.category)}{CATEGORY[p.category]}{:else}—{/each} +
All time—{fmtNum(career.kills)}{fmtNum(career.deaths)}{kd(career.kills, career.deaths)}{fmtNum(career.matches)}{career.wins}-{career.losses}-{career.draws}—
+
+

+ A season counts the matches that ended in it, over the same servers as the rest of this page. + Places are on this server's board when the season finished: the top three on kills, K/D (at + least {WINNER_MIN_MATCHES} matches), playtime and wins. +

+{/if} {#if children}{@render children()}{/if}
diff --git a/src/lib/components/LeaderboardTable.svelte b/src/lib/components/LeaderboardTable.svelte index 3ef7699a..1147202b 100644 --- a/src/lib/components/LeaderboardTable.svelte +++ b/src/lib/components/LeaderboardTable.svelte @@ -1,7 +1,11 @@ +{#if board && when} +
+
+
+ {season + ? season.kind === 'official' + ? 'Official season' + : `${orgName || 'Our'} season` + : 'Range'} + {#if season}{final ? 'Finished' : 'Live'}{/if} +
+

+ {season ? season.name : rangeLabel} +

+

{span}

+
+
+ set({ range })} + /> +
+
+ {#if board.winners}{/if} +{/if} +
{#if orgScope}
@@ -94,15 +150,7 @@ >
{/if} -
- {#each BOARD_RANGES as r (r.key)} - - {/each} -
-
{/if} +{#if board && season} +

+ {#if final}{season.name} ended when {next?.name ?? 'the next season'} started; its board counts the + matches that ended before then and no longer changes, so Last seen is left off. A player needs at + least {WINNER_MIN_MATCHES} matches in the season to win on K/D.{:else}{season.name} + counts the matches that ended since it started; all time and the other ranges are in the picker.{/if} +

+{/if} {#if board && !board.hasFeed}

{query.scope === 'org' ? 'None of these servers has' : 'This server has no'} kill feed, so headshots, diff --git a/src/lib/components/Place.svelte b/src/lib/components/Place.svelte new file mode 100644 index 00000000..4bab35a0 --- /dev/null +++ b/src/lib/components/Place.svelte @@ -0,0 +1,11 @@ + + +{n} diff --git a/src/lib/components/SeasonPicker.svelte b/src/lib/components/SeasonPicker.svelte new file mode 100644 index 00000000..9daefdfc --- /dev/null +++ b/src/lib/components/SeasonPicker.svelte @@ -0,0 +1,105 @@ + + + { + if (!wrap.contains(e.target as Node)) open = false; + }} + onkeydown={(e) => e.key === 'Escape' && (open = false)} +/> + +

+ Showing + + {#if open} + + {/if} +
diff --git a/src/lib/components/SeasonWinners.svelte b/src/lib/components/SeasonWinners.svelte new file mode 100644 index 00000000..5de4467c --- /dev/null +++ b/src/lib/components/SeasonWinners.svelte @@ -0,0 +1,52 @@ + + +Winners +
+ {#each WINNER_CATEGORIES as c (c.key)} +
+
+ {c.label}{#if c.key === 'kd'} + · at least {WINNER_MIN_MATCHES} matches{/if} +
+ {#each winners[c.key] as w, i (w.steamId)} +
+ + {w.name} + {value(c.key, w.value)} +
+ {:else} +
Nobody qualified.
+ {/each} +
+ {/each} +
diff --git a/src/routes/(app)/orgs/[id]/+layout.svelte b/src/routes/(app)/orgs/[id]/+layout.svelte index 461c3252..790b1b6d 100644 --- a/src/routes/(app)/orgs/[id]/+layout.svelte +++ b/src/routes/(app)/orgs/[id]/+layout.svelte @@ -20,6 +20,7 @@ ['/servers', 'Servers', 'any'], ['/access', 'Access', 'owner'], ['/roles', 'Roles', 'owner'], + ['/seasons', 'Seasons', 'owner'], ['/players', 'Players', 'any'], ['/bans', 'Ban list', 'ban'], ['/reserved', 'Reserved slots', 'reserve'] diff --git a/src/routes/(app)/orgs/[id]/seasons/+page.server.ts b/src/routes/(app)/orgs/[id]/seasons/+page.server.ts new file mode 100644 index 00000000..5a32f082 --- /dev/null +++ b/src/routes/(app)/orgs/[id]/seasons/+page.server.ts @@ -0,0 +1,19 @@ +import { error } from '@sveltejs/kit'; +import type { PageServerLoad } from './$types'; +import { getEnv } from '$lib/server/env'; +import { requireOrgRole } from '$lib/server/access'; +import { normalizeError } from '$lib/server/http'; +import { listSeasons } from '$lib/server/seasons'; + +/** The organisation's seasons and what its boards open on. Owners (and the site owner) only. */ +export const load: PageServerLoad = async ({ locals, params }) => { + const env = getEnv(); + try { + const { org } = await requireOrgRole(env, locals, params.id, 'owner'); + return await listSeasons(env, org.id); + } catch (err) { + const known = normalizeError(err); + if (!known) throw err; + error(known.status, known.message); + } +}; diff --git a/src/routes/(app)/orgs/[id]/seasons/+page.svelte b/src/routes/(app)/orgs/[id]/seasons/+page.svelte new file mode 100644 index 00000000..11dce6d4 --- /dev/null +++ b/src/routes/(app)/orgs/[id]/seasons/+page.svelte @@ -0,0 +1,275 @@ + + +
+
+ Boards open on +
+ {#each BOARD_OPENS as o (o.key)} + + {/each} +
+

+ For {data.org.name}'s leaderboards, in the panel and on the public pages. Anyone looking can + still pick another season or range on the board. +

+
+ +
+ Official seasons +
+ + + + {#each official as s (s.key)} + + + + + + {:else} + + {/each} + +
SeasonDates
{s.name}{seasonSpan(s, now)}{status(s)}
None yet.
+
+

+ Bulkhead's seasons, the same for every community, each from the moment it launched. Warcon + adds each one when it is announced; they can't be changed here. +

+
+ +
+ {data.org.name} seasons +
+ + + + {#each own as s (s.key)} + + + + + + + {:else} + + + + {/each} + +
NameStarts
{s.name}{seasonDay(s.startsAt)}{status(s)} + + {#if !isStarted(s, now)} + + {/if} +
No seasons of your own yet.
+
+
{ + e.preventDefault(); + add(); + }} + > + + + +
+

+ A season runs until your next one starts, from midnight UTC. Once it has started its start + date is fixed, so finished standings stay put. To end one early, start the next. +

+
+ +
+ Winners +

+ When a season ends, its top three on kills, K/D (at least {WINNER_MIN_MATCHES} matches), playtime + and wins show on its board and on those players' pages, for official seasons and yours alike. +

+
+
+ +{#if editing} + (editing = null)} + > +
{ + e.preventDefault(); + save(); + }} + > + + {#if !isStarted(editing.season, now)} + + {/if} +
+ + +
+
+ +{/if} diff --git a/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte b/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte index d7257085..ed5e4a9e 100644 --- a/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte +++ b/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte @@ -378,6 +378,8 @@ orgName={data.server.orgName} multiServer={data.multiServer} matchHref={(m) => `/server/${encodeURIComponent(m.serverId)}/matches/${m.matchId}`} + seasonHref={(s) => + `/server/${encodeURIComponent(data.server.id)}/leaderboard?range=s:${encodeURIComponent(s.key)}`} />
diff --git a/src/routes/(public)/s/[id]/players/[steamId]/+page.svelte b/src/routes/(public)/s/[id]/players/[steamId]/+page.svelte index 5bb3e4a5..a857282a 100644 --- a/src/routes/(public)/s/[id]/players/[steamId]/+page.svelte +++ b/src/routes/(public)/s/[id]/players/[steamId]/+page.svelte @@ -35,6 +35,7 @@ orgName={data.heading.orgName} multiServer={data.multiServer} matchHref={(m) => `/s/${encodeURIComponent(m.serverId)}/matches/${m.matchId}`} + seasonHref={(s) => `${base}/leaderboard?range=s:${encodeURIComponent(s.key)}`} > {#if data.combat} Combat diff --git a/src/test/load-matrix.test.ts b/src/test/load-matrix.test.ts index 0f630bc8..3d8957c9 100644 --- a/src/test/load-matrix.test.ts +++ b/src/test/load-matrix.test.ts @@ -37,6 +37,7 @@ const MATRIX: Record = { 'orgs/[id]/+page.server.ts': 'orgOwner', 'orgs/[id]/access/+page.server.ts': 'orgOwner', 'orgs/[id]/roles/+page.server.ts': 'orgOwner', + 'orgs/[id]/seasons/+page.server.ts': 'orgOwner', 'orgs/[id]/bans/+page.server.ts': 'lists:ban', 'orgs/[id]/reserved/+page.server.ts': 'lists:reserve', 'orgs/[id]/players/+page.server.ts': 'lists', From c78f0940feabfa3160b03ffd6104eae92b58ebd9 Mon Sep 17 00:00:00 2001 From: James Causon Date: Tue, 6 Oct 2026 18:49:06 +0100 Subject: [PATCH 026/102] README: seasons, official and the organisation's own, on the boards, the careers and the organisation's Seasons tab; the leaderboard's range values and what its answer carries; the seasons routes and the boards' opening setting --- README.md | 83 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 16ef1c8c..f50b0852 100644 --- a/README.md +++ b/README.md @@ -722,8 +722,8 @@ last result as a status code or a short reason, never what the receiver answered Every server page has a **Leaderboards** tab: a board over this server or every server of the organisation you can see, ranked by kills, deaths, K/D, kills per hour of playtime, playtime, seed time (time on with the server low, as a [Seeding reward](#automation-triggers) counts it), -matches played, wins, win rate or cash, over 7, 30 or 90 days or all time, paged, with sortable -headers. A **playtime floor** (an hour by default) keeps a ten-minute visit off the top of the +matches played, wins, win rate or cash, over a [season](#seasons), 7, 30 or 90 days or all time, +paged, with sortable headers. A **playtime floor** (an hour by default) keeps a ten-minute visit off the top of the K/D board. Every stat is summed from the player's line of each match: the worker records one row per player per match with the game's own kill and death counters over that match, the player's time on and side, the change in their cash, and, on servers with a [kill feed](#kill-feed), @@ -740,6 +740,30 @@ plus the sessions still open; 7, 30 and 90 days from the same totals kept per UT part of the range's first day and the sessions still open, so a range still starts to the second (now minus 7 days), not at a midnight. +#### Seasons + +A board shows one season at a time, or a range: the **Showing** menu above it lists the official +WARDOGS seasons, the organisation's own, and the 7, 30 and 90-day and all-time ranges. A season +is a name and a start, and runs until the next season of its kind starts. The official ones ship +with Warcon, each from the moment it launched: Season 1 from the early-access release on +10 September 2026, Season 2 from 15 October 2026 at 16:00 UTC. A new one is added when Bulkhead +announces it, and starts on its real date even when it is added late. An org owner adds the +organisation's own on its **Seasons** tab, each from midnight UTC on a day still to come; a +season that has started can be renamed but not moved or deleted, so its standings stay put, and +to end one early you start the next. Nothing is reset or deleted: a season's board is a window +over the history Warcon keeps anyway, so a past season's board is still there and read-only by +nature. + +The Seasons tab also sets what the organisation's boards **open on**, in the panel and on the +public pages: the current official season (the default), the organisation's current season (the +official one while none of its own runs), the last 30 days, or all time. Anyone looking can pick +another season or range from the menu. A season still running reads like a range, up to now. A +finished one reads up to its end, shows no Last seen column, and has its **winners** above the +board: the top three on kills, K/D (at least ten matches in the season), playtime and wins. A +match counts in the season it ended in. Playtime counts the time inside the season: a session +still going when a season ends gives it the time up to the end, and its seed time and cash count +where it ends, as they do for the ranges. + **Export CSV** on the tab downloads the board as it is set (scope, range, sort, playtime floor), from the top and every page of it, up to 10,000 players: rank, SteamID, name, playtime and seed time in minutes, kills, deaths, K/D, kills per hour, the feed's columns, matches, wins, losses, @@ -749,10 +773,12 @@ imported as text. Each dossier has a **Career** section: rank on the all-time kills board for this server and the organisation, the current win or loss streak, matches with wins, losses and draws, K/D, kills per -minute, headshot rate and best streak, a table per map and per faction (matches, wins, K/D), and -the last ten matches with map, faction, result, time on, kills, deaths and the change in cash, -each opening its match page. Everything is read at page load; the ranks from each player's totals -per server, the matches from the player's own rows. +minute, headshot rate and best streak, the organisation's last ten seasons (the player's matches, +results, kills, deaths and K/D in each, and for a finished season the places they won on this +server's board, also shown as badges at the top), a table per map and per faction (matches, +wins, K/D), and the last ten matches with map, faction, result, time on, kills, deaths and the +change in cash, each opening its match page. Everything is read at page load; the ranks from each +player's totals per server, the matches from the player's own rows. Every server page has a **Matches** tab: the match history, newest first, with the map, when it started, how long it ran, the winner with the final scores (or "abandoned" for a match a restart @@ -1156,25 +1182,25 @@ and shows as _local_, and the live game accepts it only for a player who is conn These need _View_ on the server unless the table says otherwise. -| Route | Answers | -| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `GET /api/servers/:id/players/seen` | everyone who has played on the server: `q` (name, alias or SteamID), `since` (days), `flag` (`banned`, `watched` or `online`), `sort` (`lastSeen`, `firstSeen`, `minutes`, `sessions`, `kills`, `deaths`, `name`), `dir`, `offset`, `limit` (up to 100) | -| `GET /api/servers/:id/players/:steamId` | the dossier: names, sessions, totals per server, bans, risk, the kill feed's summary; notes and why a player is watched only with _Notes & watchlist_ | -| `GET /api/servers/:id/players/:steamId/career` | rank, streak, results by map and faction, the last ten matches | -| `GET /api/servers/:id/players/marks?ids=a,b` | watched, first visit, risk score and Steam name (`steamName`) for up to 200 SteamIDs | -| `GET /api/servers/:id/kills` | the stored kill feed, newest first (see [Kill feed](#kill-feed)): `killer`, `victim`, `player` (a SteamID, or part of a name), `kind` (`headshot`, `teamKill`, `suicide`, `vehicle`, `environment`), `cause`, `minM` (metres), `match`, `limit` (up to 200); `count=1` adds the total. For the next page, send the last kill's `ts` as `before` and its `eventTime` as `beforeTime` | -| `GET /api/servers/:id/matches?page=` | the match history, fifty a page, newest first; the match in progress has no `endedAt` | -| `GET /api/servers/:id/matches/:matchId` | a match that has ended: each player's line, the score timeline, awards | -| `GET /api/servers/:id/leaderboard` | `scope` (`server` or `org`), `range` (`7d`, `30d`, `90d`, `all`), `sort` (`kills`, `deaths`, `kd`, `perHour`, `playtime`, `seeded`, `matches`, `wins`, `winRate`, `cash`), `dir`, `page` (fifty a page), `minMinutes` (default 60) | -| `GET /api/servers/:id/leaderboard/export` | the same query as the board, as a CSV file of every row from the top (up to 10,000; `page` is ignored); ten a minute | -| `GET /api/servers/:id/analytics?range=` | population, uptime, wins per team (`wins`) and, with a kill feed, combat, over `24h`, `7d` or `30d` | -| `GET /api/servers/:id/analytics/periods?range=&tz=` | per hour over `24h`, per day over `7d` and `30d`, oldest first, the last one running: `ts`, `players`, `newPlayers` (here for the first time), `sessions` (that ended in it), `avgSessionS`, `medianSessionS`; days and hours start in `tz`, such as `Europe/Berlin` (UTC when missing or unknown), sent back with `unit` | -| `GET /api/orgs/:orgId/players` | either org list: the organisation's players on the servers the key can see, with the filters of `players/seen` and `server`; `limit` up to 200 | -| `GET /api/steam/profiles?ids=a,b` | Steam name and avatar for up to 100 SteamIDs, as `{"": {"name", "avatar"}}` (null for one Steam does not know; no `ok`); 404 `steam_disabled` when the panel has no Steam key | -| `POST /api/servers/:id/players/:steamId/steam` | asks Steam about the player again and answers the dossier | -| `POST /api/servers/:id/players/:steamId/notes` | _Notes & watchlist_: `{"body": "…"}` adds a note | -| `DELETE /api/servers/:id/players/:steamId/notes/:noteId` | _Notes & watchlist_: the key's own notes; anyone's with _Others' notes_ | -| `PUT /api/servers/:id/players/:steamId/watch` | _Notes & watchlist_: `{"watched": true, "reason": "…"}` puts the player on the organisation's watchlist, `false` takes them off | +| Route | Answers | +| -------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `GET /api/servers/:id/players/seen` | everyone who has played on the server: `q` (name, alias or SteamID), `since` (days), `flag` (`banned`, `watched` or `online`), `sort` (`lastSeen`, `firstSeen`, `minutes`, `sessions`, `kills`, `deaths`, `name`), `dir`, `offset`, `limit` (up to 100) | +| `GET /api/servers/:id/players/:steamId` | the dossier: names, sessions, totals per server, bans, risk, the kill feed's summary; notes and why a player is watched only with _Notes & watchlist_ | +| `GET /api/servers/:id/players/:steamId/career` | rank, streak, results by map and faction, the last ten matches, the organisation's last ten seasons with the places won | +| `GET /api/servers/:id/players/marks?ids=a,b` | watched, first visit, risk score and Steam name (`steamName`) for up to 200 SteamIDs | +| `GET /api/servers/:id/kills` | the stored kill feed, newest first (see [Kill feed](#kill-feed)): `killer`, `victim`, `player` (a SteamID, or part of a name), `kind` (`headshot`, `teamKill`, `suicide`, `vehicle`, `environment`), `cause`, `minM` (metres), `match`, `limit` (up to 200); `count=1` adds the total. For the next page, send the last kill's `ts` as `before` and its `eventTime` as `beforeTime` | +| `GET /api/servers/:id/matches?page=` | the match history, fifty a page, newest first; the match in progress has no `endedAt` | +| `GET /api/servers/:id/matches/:matchId` | a match that has ended: each player's line, the score timeline, awards | +| `GET /api/servers/:id/leaderboard` | `scope` (`server` or `org`), `range` (`current`, the default: what the organisation's boards open on; `s:`, a season by its key from `seasons`; `7d`, `30d`, `90d`, `all`), `sort` (`kills`, `deaths`, `kd`, `perHour`, `playtime`, `seeded`, `matches`, `wins`, `winRate`, `cash`), `dir`, `page` (fifty a page), `minMinutes` (default 60). The answer's `when` says what was read (the range, the season, whether it has finished), `seasons` lists the organisation's seasons that have started, newest first, and `winners` holds a finished season's top three per category | +| `GET /api/servers/:id/leaderboard/export` | the same query as the board, as a CSV file of every row from the top (up to 10,000; `page` is ignored); ten a minute | +| `GET /api/servers/:id/analytics?range=` | population, uptime, wins per team (`wins`) and, with a kill feed, combat, over `24h`, `7d` or `30d` | +| `GET /api/servers/:id/analytics/periods?range=&tz=` | per hour over `24h`, per day over `7d` and `30d`, oldest first, the last one running: `ts`, `players`, `newPlayers` (here for the first time), `sessions` (that ended in it), `avgSessionS`, `medianSessionS`; days and hours start in `tz`, such as `Europe/Berlin` (UTC when missing or unknown), sent back with `unit` | +| `GET /api/orgs/:orgId/players` | either org list: the organisation's players on the servers the key can see, with the filters of `players/seen` and `server`; `limit` up to 200 | +| `GET /api/steam/profiles?ids=a,b` | Steam name and avatar for up to 100 SteamIDs, as `{"": {"name", "avatar"}}` (null for one Steam does not know; no `ok`); 404 `steam_disabled` when the panel has no Steam key | +| `POST /api/servers/:id/players/:steamId/steam` | asks Steam about the player again and answers the dossier | +| `POST /api/servers/:id/players/:steamId/notes` | _Notes & watchlist_: `{"body": "…"}` adds a note | +| `DELETE /api/servers/:id/players/:steamId/notes/:noteId` | _Notes & watchlist_: the key's own notes; anyone's with _Others' notes_ | +| `PUT /api/servers/:id/players/:steamId/watch` | _Notes & watchlist_: `{"watched": true, "reason": "…"}` puts the player on the organisation's watchlist, `false` takes them off | A kill, as the kills route and the event stream carry it (`ts` is when the panel received it, `eventTime` the seconds on the match clock, `killer` is null for the environment): @@ -1426,7 +1452,7 @@ src/lib/config-doc.ts / config-fields.ts ServerSettings.ini parser and line-le src/lib/components/ Modal, MapPicker, PopulationChart, CashChart, ConfigForm, Toasts, badges… src/routes/(auth)/ /sign-in (+ /verify), /setup, /join/[token], /recover (form actions) src/routes/sign-out src/routes/api/passkeys/ WebAuthn ceremonies relayed to Better Auth; src/routes/auth/steam/ the Steam callback -src/routes/(app)/ dashboard, /server/[id]/{,players,players/[steamId],bans,rotation,config,automation,analytics,leaderboard,log,settings}, /audit, /orgs, /orgs/[id]/{,bans,reserved}, /admin/{,users,settings}, /servers, /account +src/routes/(app)/ dashboard, /server/[id]/{,players,players/[steamId],bans,rotation,config,automation,analytics,leaderboard,log,settings}, /audit, /orgs, /orgs/[id]/{,bans,reserved,seasons}, /admin/{,users,settings}, /servers, /account src/routes/(public)/ /s/[id]{,/leaderboard,/players/[steamId]}: the public pages, no session src/routes/api/ JSON API (below) docs/wardogs-api.md the reverse-engineered game-server API @@ -1442,7 +1468,8 @@ which call Better Auth server-side behind the login lockout and the audit trail. own `/api/auth/*` routes only the OAuth callback is reachable over HTTP; everything else answers 404. ``` -GET/POST /api/orgs PATCH/DELETE /api/orgs/:id PATCH {name} | {discordInviteUrl} | {membersReserved} | {banMessage} | site owner: {serverLimit, suspended, reason, allowPublicStatus, allowPublicLeaderboards} +GET/POST /api/orgs PATCH/DELETE /api/orgs/:id PATCH {name} | {discordInviteUrl} | {boardOpens: official|custom|30d|all} | {membersReserved} | {banMessage} | site owner: {serverLimit, suspended, reason, allowPublicStatus, allowPublicLeaderboards} +GET/POST /api/orgs/:id/seasons {name,startsAt} PATCH/DELETE .../:seasonId {name?,startsAt?} the official seasons and the organisation's own, and what its boards open on (owners; a start is still to come, and a started season's stays put) GET /api/orgs/:id/members PATCH/DELETE /api/orgs/:id/members/:userId {role} PUT .../:userId/grants {grants:[{serverId,roleId}]} GET/POST /api/orgs/:id/roles {name,capabilities[]} PATCH/DELETE .../:roleId {name?,capabilities?} POST .../:roleId/reset PUT .../order {ids[]} (every role once, else 409 stale) GET/POST /api/orgs/:id/keys {label,capabilities[],serverIds[]|null,expiresDays} DELETE .../:keyId (POST returns the token once) @@ -1464,7 +1491,7 @@ POST /api/ingest/events where the game posts: [W GET /api/servers/:id/cash?since= cash-in-play samples since a moment (24 h at most), seeds the dashboard chart GET /api/servers/:id/players/marks?ids=a,b&names=… watchlist / first-visit / risk per connected player GET /api/servers/:id/players/:steamId dossier POST .../steam (refresh Steam data) GET .../career rank, streak, results by map and faction, the last ten matches -GET /api/servers/:id/leaderboard?scope=server|org&range=7d|30d|90d|all&sort=kills|deaths|kd|perHour|playtime|matches|wins|winRate|cash&dir=desc|asc&page=1&minMinutes=60 +GET /api/servers/:id/leaderboard?scope=server|org&range=current|s:|7d|30d|90d|all&sort=kills|deaths|kd|perHour|playtime|matches|wins|winRate|cash&dir=desc|asc&page=1&minMinutes=60 GET /api/servers/:id/leaderboard/export? the board as CSV, every row from the top, up to 10,000 POST /api/servers/:id/players/:steamId/notes {body} DELETE .../notes/:noteId PUT .../watch {watched,reason} GET/POST /api/servers/:id/triggers {kind,name,enabled,config} PATCH/DELETE .../:triggerId POST .../dry-run {kind,config} From 195614fceab5fdadbf8597a5c4c7f532104e4b7c Mon Sep 17 00:00:00 2001 From: James Causon Date: Tue, 6 Oct 2026 23:09:15 +0100 Subject: [PATCH 027/102] Quick reasons: an organisation's owners set the buttons under Reason in the ban dialog, each a short name, the reason it fills in and the length it sets, if any (migration 0041, org_ban_reasons; no row is the built-in six). Saved whole through PATCH /api/orgs/:id {banReasons}, by owners only and never a key, each change audited; read with the ban message by whoever may place a ban there (Bans on the server or the org's ban list) on the server's list state, the org's lists and the dossier. Kept off organizations, whose whole row the worker reads with every server every 5 s. The Expires choices gain 3 and 14 days --- drizzle/0043_org_ban_reasons.sql | 7 + drizzle/meta/0043_snapshot.json | 5375 +++++++++++++++++++++++++++ drizzle/meta/_journal.json | 9 +- src/lib/ban-reasons.ts | 87 + src/lib/lists.ts | 2 + src/lib/server/ban-reasons.ts | 66 + src/lib/server/db/schema.ts | 14 + src/lib/server/lists.ts | 24 +- src/lib/server/players.ts | 18 +- src/lib/types.ts | 7 + src/routes/api/orgs/[id]/+server.ts | 9 +- src/test/ban-reasons.test.ts | 354 ++ src/test/view.test.ts | 8 +- 13 files changed, 5962 insertions(+), 18 deletions(-) create mode 100644 drizzle/0043_org_ban_reasons.sql create mode 100644 drizzle/meta/0043_snapshot.json create mode 100644 src/lib/ban-reasons.ts create mode 100644 src/lib/server/ban-reasons.ts create mode 100644 src/test/ban-reasons.test.ts diff --git a/drizzle/0043_org_ban_reasons.sql b/drizzle/0043_org_ban_reasons.sql new file mode 100644 index 00000000..3b58d460 --- /dev/null +++ b/drizzle/0043_org_ban_reasons.sql @@ -0,0 +1,7 @@ +CREATE TABLE "org_ban_reasons" ( + "org_id" text PRIMARY KEY NOT NULL, + "reasons" jsonb NOT NULL, + "updated_at" timestamp with time zone DEFAULT now() NOT NULL +); +--> statement-breakpoint +ALTER TABLE "org_ban_reasons" ADD CONSTRAINT "org_ban_reasons_org_id_organizations_id_fk" FOREIGN KEY ("org_id") REFERENCES "public"."organizations"("id") ON DELETE cascade ON UPDATE no action; \ No newline at end of file diff --git a/drizzle/meta/0043_snapshot.json b/drizzle/meta/0043_snapshot.json new file mode 100644 index 00000000..bf71e9ac --- /dev/null +++ b/drizzle/meta/0043_snapshot.json @@ -0,0 +1,5375 @@ +{ + "id": "9f724321-72db-4ee1-8d18-40c24a1293d5", + "prevId": "14c498ab-6049-414d-99d3-ca88129ea718", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_server_ended_idx": { + "name": "matches_server_ended_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ended_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_ban_reasons": { + "name": "org_ban_reasons", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "reasons": { + "name": "reasons", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "org_ban_reasons_org_id_organizations_id_fk": { + "name": "org_ban_reasons_org_id_organizations_id_fk", + "tableFrom": "org_ban_reasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "board_opens": { + "name": "board_opens", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'official'" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_days": { + "name": "player_days", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "day": { + "name": "day", + "type": "date", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "crossings": { + "name": "crossings", + "type": "timestamp with time zone[]", + "primaryKey": false, + "notNull": false + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_days_server_id_day_steam_id_pk": { + "name": "player_days_server_id_day_steam_id_pk", + "columns": [ + "server_id", + "day", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_totals": { + "name": "player_totals", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_totals_server_id_steam_id_pk": { + "name": "player_totals_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.seasons": { + "name": "seasons", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "starts_at": { + "name": "starts_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "seasons_org_start_uidx": { + "name": "seasons_org_start_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "starts_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "seasons_org_id_organizations_id_fk": { + "name": "seasons_org_id_organizations_id_fk", + "tableFrom": "seasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 09358fb3..1ce022bd 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -302,6 +302,13 @@ "when": 1791741011138, "tag": "0042_seasons", "breakpoints": true + }, + { + "idx": 43, + "version": "7", + "when": 1791741155124, + "tag": "0043_org_ban_reasons", + "breakpoints": true } ] -} +} \ No newline at end of file diff --git a/src/lib/ban-reasons.ts b/src/lib/ban-reasons.ts new file mode 100644 index 00000000..8cc6ab9e --- /dev/null +++ b/src/lib/ban-reasons.ts @@ -0,0 +1,87 @@ +// The organisation's quick reasons: the buttons under Reason in the ban dialog. Each has a short +// name for the button, the reason it fills in, and the length it sets, if any. Shared by the +// editor on the Ban list page, the dialog and the server's check of what an owner saves. +import { EXPIRY_OPTIONS } from './lists'; + +export interface BanReason { + /** what the button says */ + label: string; + /** what it fills in as the ban's reason */ + reason: string; + /** the length it sets in Expires, in days, 0 for permanent; null leaves Expires as it is */ + days: number | null; +} + +/** What an org offers until its owners save a list of their own. */ +export const DEFAULT_BAN_REASONS: BanReason[] = [ + 'Cheating', + 'Team killing', + 'Toxic behaviour', + 'Racism / hate speech', + 'Ban evasion', + 'Griefing' +].map((reason) => ({ label: reason, reason, days: null })); + +export const MAX_BAN_REASONS = 20; +export const MAX_BAN_REASON_LABEL = 32; +/** The reason's own cap on a list entry. */ +export const MAX_BAN_REASON = 200; + +/** The lengths a quick reason may set: the dialog's own Expires choices, in days. */ +export const BAN_REASON_DAYS: number[] = EXPIRY_OPTIONS.flatMap(([value]) => + value === 'custom' ? [] : [Number(value)] +); + +/** How the length reads in the editor: "Not set", "Permanent", "7 days". */ +export const lengthLabel = (days: number | null): string => + days === null + ? 'Not set' + : (EXPIRY_OPTIONS.find(([value]) => value === String(days))?.[1] ?? `${days} days`); + +/** How the length reads on the button, as the ban message's {duration} writes it: Perm, 7d. */ +export const lengthTag = (days: number | null): string => + days === null ? '' : days === 0 ? 'Perm' : `${days}d`; + +const oneLine = (value: unknown, max: number): string => + String(value ?? '') + .replace(/\s+/g, ' ') + .trim() + .slice(0, max) + .trim(); + +/** One row as typed or sent, each text on one line and cut to its cap. */ +export function cleanBanReason(raw: unknown): BanReason { + const o = raw && typeof raw === 'object' ? (raw as Record) : {}; + // anything but a number or nothing is no length at all: NaN, which the check refuses + const days = + o.days === null || o.days === undefined ? null : typeof o.days === 'number' ? o.days : NaN; + return { + label: oneLine(o.label, MAX_BAN_REASON_LABEL), + reason: oneLine(o.reason, MAX_BAN_REASON), + days + }; +} + +/** What stops a list from being saved, in a sentence, or '' when nothing does. */ +export function banReasonsProblem(list: BanReason[]): string { + if (list.length > MAX_BAN_REASONS) + return `An organisation keeps at most ${MAX_BAN_REASONS} quick reasons.`; + if (list.some((r) => !r.label || !r.reason)) + return 'Each quick reason needs a short name and a reason.'; + const names = list.map((r) => r.label.toLowerCase()); + if (new Set(names).size !== names.length) return 'Two quick reasons have the same short name.'; + if (list.some((r) => r.days !== null && !BAN_REASON_DAYS.includes(r.days))) + return `A length is one of ${BAN_REASON_DAYS.map(lengthLabel).join(', ')}, or not set.`; + return ''; +} + +/** A stored list, trusted but read defensively: anything that would not save is left out. */ +export function storedBanReasons(raw: unknown): BanReason[] { + if (!Array.isArray(raw)) return DEFAULT_BAN_REASONS; + const out: BanReason[] = []; + for (const item of raw.slice(0, MAX_BAN_REASONS)) { + const r = cleanBanReason(item); + if (!banReasonsProblem([...out, r])) out.push(r); + } + return out; +} diff --git a/src/lib/lists.ts b/src/lib/lists.ts index ba85f3f1..8234f205 100644 --- a/src/lib/lists.ts +++ b/src/lib/lists.ts @@ -31,7 +31,9 @@ export const REASON_PRESETS = [ export const EXPIRY_OPTIONS = [ ['0', 'Permanent'], ['1', '1 day'], + ['3', '3 days'], ['7', '7 days'], + ['14', '14 days'], ['30', '30 days'], ['custom', 'Until a date…'] ] as const; diff --git a/src/lib/server/ban-reasons.ts b/src/lib/server/ban-reasons.ts new file mode 100644 index 00000000..82ba8c51 --- /dev/null +++ b/src/lib/server/ban-reasons.ts @@ -0,0 +1,66 @@ +// The org's quick reasons ($lib/ban-reasons): read for whoever may open the ban dialog, saved +// whole by an owner. The worker never reads them. +import { eq } from 'drizzle-orm'; +import type { Env } from './env'; +import { ApiError } from './http'; +import { writeAudit } from './audit'; +import type { OrgRow, SessionUser } from './access'; +import { orgBanReasons } from './db/schema'; +import { + banReasonsProblem, + cleanBanReason, + DEFAULT_BAN_REASONS, + storedBanReasons, + type BanReason +} from '$lib/ban-reasons'; + +/** The org's own list, or the built-in six until its owners save one. */ +export async function banReasonsFor(env: Env, orgId: string): Promise { + const [row] = await env.db + .select({ reasons: orgBanReasons.reasons }) + .from(orgBanReasons) + .where(eq(orgBanReasons.orgId, orgId)) + .limit(1); + return row ? storedBanReasons(row.reasons) : DEFAULT_BAN_REASONS; +} + +/** + * Owners: the quick reasons offered to anyone placing a ban in the org, in order; null puts back + * the built-in six. Bans already placed keep their reasons. + */ +export async function setBanReasons( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + value: unknown +): Promise { + let reasons: BanReason[] | null = null; + if (value !== null) { + if (!Array.isArray(value)) + throw new ApiError(400, 'Send the quick reasons as a list, or null for the built-in six.'); + reasons = value.map(cleanBanReason); + const problem = banReasonsProblem(reasons); + if (problem) throw new ApiError(400, problem); + } + if (reasons) + await env.db + .insert(orgBanReasons) + .values({ orgId: org.id, reasons, updatedAt: new Date() }) + .onConflictDoUpdate({ + target: orgBanReasons.orgId, + set: { reasons, updatedAt: new Date() } + }); + else await env.db.delete(orgBanReasons).where(eq(orgBanReasons.orgId, org.id)); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'list.ban_reasons', + outcome: 'ok', + target: org.name, + message: reasons ? 'Quick reasons changed' : 'Quick reasons back to the built-in six', + detail: { orgId: org.id, banReasons: reasons } + }); + return reasons ?? DEFAULT_BAN_REASONS; +} diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 7a20f887..2d4e9f7e 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -226,6 +226,20 @@ export const seasons = pgTable( (t) => [uniqueIndex('seasons_org_start_uidx').on(t.orgId, t.startsAt)] ); +/** + * The org's quick reasons: the buttons under Reason in the ban dialog ($lib/ban-reasons). No row + * means the built-in six. Kept off `organizations`, whose whole row the worker reads with every + * server every few seconds. + */ +export const orgBanReasons = pgTable('org_ban_reasons', { + orgId: text('org_id') + .primaryKey() + .references(() => organizations.id, { onDelete: 'cascade' }), + /** BanReason[], in the order the buttons show */ + reasons: jsonb('reasons').notNull(), + updatedAt: ts('updated_at').notNull().defaultNow() +}); + /** * An org's server roles: a name and the capabilities it carries (see $lib/capabilities). Every org * starts with the three built-ins, which owners may edit but not delete; custom roles are more rows. diff --git a/src/lib/server/lists.ts b/src/lib/server/lists.ts index 6bb21bd5..a877b22d 100644 --- a/src/lib/server/lists.ts +++ b/src/lib/server/lists.ts @@ -37,6 +37,7 @@ import { } from './db/schema'; import { DEFAULT_BAN_MESSAGE } from '$lib/ban-message'; import { noteContainsProtectedWord } from './trigger-rules'; +import { banReasonsFor } from './ban-reasons'; import { requireSteamId } from './steam'; import { desiredFor, memberSlots, summaryOf } from './lists-sync'; import { latestNames } from './sessions'; @@ -288,12 +289,13 @@ function shapeEntry( /** * The org's lists as one person may see them: the lists they edit with their counts, where the - * sync stands on each server (it pushes every list), and the ban message for the ban list's - * editors. + * sync stands on each server (it pushes every list), and the ban message and quick reasons for + * the ban list's editors. */ export async function orgListsView(env: Env, org: OrgRow, role: ListsRole): Promise { const rows = (await orgLists(env, org.id)).filter((l) => role.kinds.includes(l.kind)); - const [counts, srv] = await Promise.all([ + const bans = role.kinds.includes('ban'); + const [counts, srv, banReasons] = await Promise.all([ env.db .select({ listId: listEntries.listId, n: count() }) .from(listEntries) @@ -307,7 +309,8 @@ export async function orgListsView(env: Env, org: OrgRow, role: ListsRole): Prom ) ) .groupBy(listEntries.listId), - orgServerRefs(env, org.id) + orgServerRefs(env, org.id), + bans ? banReasonsFor(env, org.id) : null ]); const syncRows = srv.length ? await env.db @@ -326,7 +329,8 @@ export async function orgListsView(env: Env, org: OrgRow, role: ListsRole): Prom role: role.owner ? 'owner' : 'editor', kinds: role.kinds, membersReserved: org.membersReserved, - banMessage: role.kinds.includes('ban') ? org.banMessage : null, + banMessage: bans ? org.banMessage : null, + banReasons, servers: srv.map((s) => { const y = syncOf.get(s.id); return { @@ -1016,8 +1020,8 @@ export async function serverListsState( ]); const orgBans = !!role?.kinds.includes('ban'); const orgSlots = !!role?.kinds.includes('reserve'); - // who placed a ban, and the message the org wraps its bans in, are for those who manage bans - // here or edit the org's ban list + // who placed a ban, the message the org wraps its bans in and its quick reasons are for those + // who manage bans here or edit the org's ban list const staff = orgBans || access.caps.has('bans.manage'); const out: ServerListsState = { canEditOrgBans: orgBans, @@ -1025,6 +1029,7 @@ export async function serverListsState( orgOwner: !!role?.owner, orgId: server.orgId, banMessage: null, + banReasons: null, bans: {}, reserved: {}, sync: sync @@ -1060,7 +1065,10 @@ export async function serverListsState( membersReserved: false, banMessage: DEFAULT_BAN_MESSAGE }; - if (staff) out.banMessage = org.banMessage; + if (staff) { + out.banMessage = org.banMessage; + out.banReasons = await banReasonsFor(env, server.orgId); + } const desired = await desiredFor(env, server, org); // a ban on the lists is in force: the panel removes the player itself. One the game also // holds in its own list shows as the panel's. diff --git a/src/lib/server/players.ts b/src/lib/server/players.ts index 86777e90..180faad4 100644 --- a/src/lib/server/players.ts +++ b/src/lib/server/players.ts @@ -23,6 +23,7 @@ import { servers, triggers } from './db/schema'; +import { banReasonsFor } from './ban-reasons'; import { getProfiles, isSteamId, steamEnabled, type SteamProfileRow } from './steam'; import { accountAgeDays, assessRisk, namesResemble, type Risk, type RiskPerformance } from './risk'; import { riskPerformanceFor } from './leaderboards'; @@ -390,12 +391,16 @@ export async function dossier( const l = local.get(steamId); const admin = access.caps.has('players.notes.manage'); // What staff wrote about the player is for those who may write it; an org list entry (its - // reason, who added it, where it stands on every server) for those who may edit that list. + // reason, who added it, where it stands on every server) for those who may edit that list, + // and the org's quick reasons for those who may ban on its list. const staff = admin || access.caps.has('players.notes'); - const membership = + const canBan = !!listsRole?.kinds.includes('ban'); + const [membership, banReasons] = await Promise.all([ org && listsRole - ? await orgListMembership(env, org, steamId, listsRole.kinds) - : { ban: null, reserve: null }; + ? orgListMembership(env, org, steamId, listsRole.kinds) + : { ban: null, reserve: null }, + canBan ? banReasonsFor(env, server.orgId) : null + ]); return { steamId, name, @@ -406,8 +411,9 @@ export async function dossier( orgServerCount: allOrgServers.length, orgLists: { ...membership, - canBan: !!listsRole?.kinds.includes('ban'), - canReserve: !!listsRole?.kinds.includes('reserve') + canBan, + canReserve: !!listsRole?.kinds.includes('reserve'), + banReasons }, steamEnabled: steamEnabled(env), steam: steamView(profiles.get(steamId)), diff --git a/src/lib/types.ts b/src/lib/types.ts index 51ce7787..23e2bd47 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -2,6 +2,7 @@ import type { StatusStyle } from './status-styles'; import type { OrgRole } from '$lib/server/access'; import type { BuiltinRole, Capability } from '$lib/capabilities'; +import type { BanReason } from '$lib/ban-reasons'; export type { OrgRole, Capability, BuiltinRole }; @@ -452,6 +453,8 @@ export interface DossierView { reserve: ListEntryView | null; canBan: boolean; canReserve: boolean; + /** the org's quick reasons for the ban dialog; null unless canBan */ + banReasons: BanReason[] | null; }; summary: { sessions: number; @@ -645,6 +648,8 @@ export interface OrgListsView { membersReserved: boolean; /** what a banned player is shown, see $lib/ban-message; null unless the reader edits the ban list */ banMessage: string | null; + /** the buttons under Reason in the ban dialog, see $lib/ban-reasons; null as for banMessage */ + banReasons: BanReason[] | null; servers: { id: string; name: string; @@ -705,6 +710,8 @@ export interface ServerListsState { orgId: string; /** the org's ban message, for those who manage bans here or edit the org's ban list; else null */ banMessage: string | null; + /** the org's quick reasons for the ban dialog, to the same people as banMessage; else null */ + banReasons: BanReason[] | null; bans: Record; reserved: Record; sync: { diff --git a/src/routes/api/orgs/[id]/+server.ts b/src/routes/api/orgs/[id]/+server.ts index 2b31fcf9..0f496a73 100644 --- a/src/routes/api/orgs/[id]/+server.ts +++ b/src/routes/api/orgs/[id]/+server.ts @@ -1,6 +1,7 @@ import { getEnv } from '$lib/server/env'; import { apiJson, param, readJson, route } from '$lib/server/http'; import { requireOrgRole, requireOwner } from '$lib/server/access'; +import { setBanReasons } from '$lib/server/ban-reasons'; import { deleteOrg, setBanMessage, @@ -10,8 +11,9 @@ import { } from '$lib/server/orgs'; /** - * {name} or {discordInviteUrl} or {boardOpens} or {membersReserved} or {banMessage} for org owners; {serverLimit, suspended, - * reason, allowPublicStatus, allowPublicLeaderboards} for the site owner only. + * {name} or {discordInviteUrl} or {boardOpens} or {membersReserved} or {banMessage} or {banReasons} + * for org owners; {serverLimit, suspended, reason, allowPublicStatus, allowPublicLeaderboards} for + * the site owner only. */ export const PATCH = route(async (event) => { const env = getEnv(); @@ -31,6 +33,9 @@ export const PATCH = route(async (event) => { } else if (body.banMessage !== undefined) { const banMessage = await setBanMessage(env, event.request, user, org, body.banMessage); return apiJson({ ok: true, banMessage }); + } else if (body.banReasons !== undefined) { + const banReasons = await setBanReasons(env, event.request, user, org, body.banReasons); + return apiJson({ ok: true, banReasons }); } else { await updateOrg(env, event.request, user, org, body); } diff --git a/src/test/ban-reasons.test.ts b/src/test/ban-reasons.test.ts new file mode 100644 index 00000000..4227b400 --- /dev/null +++ b/src/test/ban-reasons.test.ts @@ -0,0 +1,354 @@ +// The org's quick reasons, the buttons under Reason in the ban dialog: what a list may hold, who +// may change it (an owner of the org, never a key), who may read it (whoever may place a ban there), +// and that one org's list never reaches another. +import { beforeAll, describe, expect, test } from 'bun:test'; +import { join } from 'node:path'; +import { and, desc, eq } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import type { SessionUser } from '$lib/server/access'; +import { + auditLog, + orgBanReasons, + orgMembers, + orgRoles, + organizations, + serverGrants, + user +} from '$lib/server/db/schema'; +import { + BAN_REASON_DAYS, + banReasonsProblem, + cleanBanReason, + DEFAULT_BAN_REASONS, + lengthLabel, + lengthTag, + MAX_BAN_REASONS, + storedBanReasons, + type BanReason +} from '$lib/ban-reasons'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, suspend, type PrincipalName, type World } from './world'; + +const ROUTES = join(import.meta.dir, '..', 'routes', 'api'); +const PLAYER = '76561198000000092'; +const LIST: BanReason[] = [ + { label: 'Rule one', reason: '7 day ban: broke rule one. Appeal at example.org', days: 7 }, + { label: 'Rule two', reason: 'Broke rule two', days: null }, + { label: 'Rule three', reason: 'Permanent ban: broke rule three', days: 0 } +]; +const many = (n: number): BanReason[] => + Array.from({ length: n }, (_, i) => ({ label: `R${i}`, reason: `Reason ${i}`, days: null })); + +describe('a list of quick reasons', () => { + test('each text is one line, cut to its cap', () => { + expect(cleanBanReason({ label: ' Rule\n one ', reason: 'a\tb c', days: 3 })).toEqual({ + label: 'Rule one', + reason: 'a b c', + days: 3 + }); + expect(cleanBanReason({ label: 'x'.repeat(40), reason: 'y'.repeat(250) })).toEqual({ + label: 'x'.repeat(32), + reason: 'y'.repeat(200), + days: null + }); + }); + + test("a length is one of the ban dialog's own choices, or none", () => { + expect(BAN_REASON_DAYS).toEqual([0, 1, 3, 7, 14, 30]); + for (const days of [null, ...BAN_REASON_DAYS]) + expect({ days, problem: banReasonsProblem([{ ...LIST[0], days }]) }).toEqual({ + days, + problem: '' + }); + for (const days of [2, -1, 365, 1.5, NaN]) + expect(banReasonsProblem([{ ...LIST[0], days }])).toMatch(/^A length is one of/); + expect(cleanBanReason({ label: 'a', reason: 'b', days: '7' }).days).toBeNaN(); + }); + + test('each needs a short name and a reason, and no two share a name', () => { + expect(banReasonsProblem(LIST)).toBe(''); + expect(banReasonsProblem([...LIST, { label: '', reason: 'x', days: null }])).toMatch( + /short name and a reason/ + ); + expect(banReasonsProblem([...LIST, { label: 'x', reason: '', days: null }])).toMatch( + /short name and a reason/ + ); + expect(banReasonsProblem([...LIST, { label: 'RULE ONE', reason: 'x', days: null }])).toMatch( + /same short name/ + ); + }); + + test('an org keeps at most twenty', () => { + expect(banReasonsProblem(many(MAX_BAN_REASONS))).toBe(''); + expect(banReasonsProblem(many(MAX_BAN_REASONS + 1))).toMatch(/at most 20/); + }); + + test('a stored list is read leaving out whatever would not save', () => { + expect(storedBanReasons('not a list')).toEqual(DEFAULT_BAN_REASONS); + expect( + storedBanReasons([ + LIST[0], + { label: 'rule one', reason: 'a second Rule one' }, + { label: '', reason: 'no name' }, + LIST[1] + ]) + ).toEqual([LIST[0], LIST[1]]); + }); + + test('a length reads as the editor and the buttons show it', () => { + expect([null, 0, 1, 7].map(lengthLabel)).toEqual(['Not set', 'Permanent', '1 day', '7 days']); + expect([null, 0, 3].map(lengthTag)).toEqual(['', 'Perm', '3d']); + }); +}); + +describe.skipIf(!hasTestDb)("an org's quick reasons", () => { + let env: Env; + let w: World; + /** Bans on the server and no org list: what a server-only moderator role holds */ + let bansOnly: SessionUser; + const as = (who: PrincipalName | SessionUser) => (typeof who === 'string' ? w.users[who] : who); + + const patch = async (who: PrincipalName | SessionUser, banReasons: unknown, orgId = w.org.id) => { + const mod = await import(join(ROUTES, 'orgs/[id]', '+server.ts')); + return callApi(mod.PATCH, as(who), { + method: 'PATCH', + params: { id: orgId }, + body: { banReasons } + }); + }; + const stored = async (orgId = w.org.id) => + (await env.db.select().from(orgBanReasons).where(eq(orgBanReasons.orgId, orgId)))[0]?.reasons ?? + null; + + /** what a server's Bans and Players tabs hand the dialog */ + const state = async (who: PrincipalName | SessionUser, serverId = w.server.id) => { + const mod = await import(join(ROUTES, 'servers/[id]/lists/state', '+server.ts')); + return callApi(mod.GET, as(who), { params: { id: serverId } }); + }; + /** what the org's Ban list and Players pages hand the dialog (the org layout reads the same) */ + const orgLists = async (who: PrincipalName | SessionUser) => { + const mod = await import(join(ROUTES, 'orgs/[id]/lists', '+server.ts')); + return callApi(mod.GET, as(who), { params: { id: w.org.id } }); + }; + /** what a dossier's Ban org-wide hands the dialog */ + const dossier = async (who: PrincipalName | SessionUser) => { + const mod = await import(join(ROUTES, 'servers/[id]/players/[steamId]', '+server.ts')); + return callApi(mod.GET, as(who), { params: { id: w.server.id, steamId: PLAYER } }); + }; + const reasonsIn = (answer: { body: unknown }) => + (answer.body as { banReasons?: BanReason[] | null }).banReasons; + const dossierReasons = (answer: { body: unknown }) => + (answer.body as { dossier: { orgLists: { banReasons: BanReason[] | null } } }).dossier.orgLists + .banReasons; + + beforeAll(async () => { + env = await testEnv(); + w = await seedWorld(env); + stubGateway(); + // rows straight in, as the world makes its own + const id = `u_bansonly_${w.org.id}`; + const roleId = `r_bansonly_${w.org.id}`; + await env.db.insert(orgRoles).values({ + id: roleId, + orgId: w.org.id, + name: 'Bans only', + capabilities: ['server.view', 'bans.manage'], + sortOrder: 4 + }); + await env.db.insert(user).values({ + id, + name: id, + email: `${id}@test.invalid`, + username: id, + displayUsername: id, + role: 'member', + authComplete: true + }); + await env.db.insert(orgMembers).values({ orgId: w.org.id, userId: id, role: 'member' }); + await env.db.insert(serverGrants).values({ serverId: w.server.id, userId: id, roleId }); + bansOnly = { + id, + username: id, + name: id, + role: 'member', + mustChangePassword: false, + image: null, + defaultOrgId: null, + authComplete: true, + authGraceStartedAt: null + }; + }); + + test('an org that never saved a list offers the built-in six', async () => { + expect(reasonsIn(await state('owner'))).toEqual(DEFAULT_BAN_REASONS); + expect(reasonsIn(await orgLists('owner'))).toEqual(DEFAULT_BAN_REASONS); + expect(dossierReasons(await dossier('owner'))).toEqual(DEFAULT_BAN_REASONS); + }); + + test('only an owner of the org changes them, and never through a key', async () => { + for (const who of [ + 'anon', + 'stranger', + 'outsider', + 'member', + 'viewer', + 'operator', + 'admin', + 'elsewhere', + 'orgBans', + 'orgSlots', + 'keyView', + 'keyAll', + 'keyElsewhere', + 'keyBans' + ] as PrincipalName[]) { + const answer = await patch(who, LIST); + expect({ who, refused: answer.status >= 400 }).toEqual({ who, refused: true }); + expect(await stored()).toBeNull(); + } + // an owner of one org cannot reach another's + expect((await patch('owner', LIST, w.otherOrg.id)).status).toBe(404); + expect(await stored(w.otherOrg.id)).toBeNull(); + + const answer = await patch('owner', LIST); + expect(answer.status).toBe(200); + expect(reasonsIn(answer)).toEqual(LIST); + expect(await stored()).toEqual(LIST); + }); + + test('the change is in the audit trail with the list it saved', async () => { + const [row] = await env.db + .select() + .from(auditLog) + .where(and(eq(auditLog.orgId, w.org.id), eq(auditLog.action, 'list.ban_reasons'))) + .orderBy(desc(auditLog.id)) + .limit(1); + expect(row).toMatchObject({ + actorId: w.users.owner!.id, + outcome: 'ok', + message: 'Quick reasons changed' + }); + expect((row.detail as { banReasons: BanReason[] }).banReasons).toEqual(LIST); + }); + + test('a list that would not save is refused and changes nothing', async () => { + for (const bad of [ + 'Rule one', + { label: 'Rule one', reason: 'not in a list' }, + [...LIST, { label: 'rule ONE', reason: 'a second Rule one', days: null }], + [...LIST, { label: 'Rule four', reason: ' ', days: null }], + [{ ...LIST[0], days: 2 }], + [{ ...LIST[0], days: '7' }], + many(MAX_BAN_REASONS + 1) + ]) { + const answer = await patch('owner', bad); + expect({ bad, status: answer.status }).toEqual({ bad, status: 400 }); + expect(await stored()).toEqual(LIST); + } + }); + + test('whoever may place a ban reads them, and nobody else', async () => { + // a server's Bans and Players tabs: Bans on the server, or the org's ban list + for (const who of ['owner', 'site', 'admin', 'orgBans', 'keyAll', 'keyBans'] as PrincipalName[]) + expect({ who, reasons: reasonsIn(await state(who)) }).toEqual({ who, reasons: LIST }); + for (const who of ['viewer', 'operator', 'orgSlots', 'keyView'] as PrincipalName[]) + expect({ who, reasons: reasonsIn(await state(who)) }).toEqual({ who, reasons: null }); + for (const who of [ + 'anon', + 'stranger', + 'outsider', + 'member', + 'elsewhere', + 'keyElsewhere' + ] as PrincipalName[]) + expect({ who, refused: (await state(who)).status >= 400 }).toEqual({ who, refused: true }); + + // the org's list pages: whoever edits its ban list + for (const who of [ + 'owner', + 'site', + 'admin', + 'elsewhere', + 'orgBans', + 'keyAll', + 'keyBans' + ] as PrincipalName[]) + expect({ who, reasons: reasonsIn(await orgLists(who)) }).toEqual({ who, reasons: LIST }); + expect(reasonsIn(await orgLists('orgSlots'))).toBeNull(); + for (const who of [ + 'anon', + 'stranger', + 'outsider', + 'member', + 'viewer', + 'operator', + 'keyView', + 'keyElsewhere' + ] as PrincipalName[]) + expect({ who, refused: (await orgLists(who)).status >= 400 }).toEqual({ who, refused: true }); + + // a dossier, whose Ban org-wide places the ban on the org's list + for (const who of ['owner', 'site', 'admin', 'orgBans', 'keyAll', 'keyBans'] as PrincipalName[]) + expect({ who, reasons: dossierReasons(await dossier(who)) }).toEqual({ who, reasons: LIST }); + for (const who of ['viewer', 'operator', 'orgSlots', 'keyView'] as PrincipalName[]) + expect({ who, reasons: dossierReasons(await dossier(who)) }).toEqual({ who, reasons: null }); + for (const who of [ + 'anon', + 'stranger', + 'outsider', + 'member', + 'elsewhere', + 'keyElsewhere' + ] as PrincipalName[]) + expect({ who, refused: (await dossier(who)).status >= 400 }).toEqual({ who, refused: true }); + }); + + test('Bans on the server alone reads them there, and opens nothing of the org', async () => { + // the server's Bans tab bans onto its own list: the buttons and the ban message go with Bans + const here = await state(bansOnly); + expect(reasonsIn(here)).toEqual(LIST); + expect(here.body).toMatchObject({ canEditOrgBans: false, banMessage: '{reason}' }); + expect((await orgLists(bansOnly)).status).toBe(404); + expect(dossierReasons(await dossier(bansOnly))).toBeNull(); + expect((await patch(bansOnly, [])).status).toBe(403); + expect(await stored()).toEqual(LIST); + }); + + test("one org's list never reaches another's servers", async () => { + expect(reasonsIn(await state('outsider', w.otherOrgServer.id))).toEqual(DEFAULT_BAN_REASONS); + }); + + test('an empty list offers none, and null puts back the built-in six', async () => { + expect((await patch('owner', [])).status).toBe(200); + expect(await stored()).toEqual([]); + expect(reasonsIn(await state('orgBans'))).toEqual([]); + + const reset = await patch('owner', null); + expect(reset.status).toBe(200); + expect(reasonsIn(reset)).toEqual(DEFAULT_BAN_REASONS); + expect(await stored()).toBeNull(); + expect(reasonsIn(await state('orgBans'))).toEqual(DEFAULT_BAN_REASONS); + const [row] = await env.db + .select() + .from(auditLog) + .where(and(eq(auditLog.orgId, w.org.id), eq(auditLog.action, 'list.ban_reasons'))) + .orderBy(desc(auditLog.id)) + .limit(1); + expect(row).toMatchObject({ message: 'Quick reasons back to the built-in six' }); + }); + + test("a suspended org's owners cannot change them", async () => { + await suspend(env, w.org.id); + try { + const answer = await patch('owner', LIST); + expect(answer.status).toBe(403); + expect(await stored()).toBeNull(); + } finally { + await env.db + .update(organizations) + .set({ suspendedAt: null, suspendedReason: '' }) + .where(eq(organizations.id, w.org.id)); + } + }); +}); diff --git a/src/test/view.test.ts b/src/test/view.test.ts index 31cc06de..269da62e 100644 --- a/src/test/view.test.ts +++ b/src/test/view.test.ts @@ -148,7 +148,13 @@ describe.skipIf(!hasTestDb)('what View shows', () => { const viewer = await dossier('viewer'); expect(viewer.notes).toEqual([]); expect(viewer.watch).toMatchObject({ watched: true, reason: '', updatedByName: '' }); - expect(viewer.orgLists).toEqual({ ban: null, reserve: null, canBan: false, canReserve: false }); + expect(viewer.orgLists).toEqual({ + ban: null, + reserve: null, + canBan: false, + canReserve: false, + banReasons: null + }); expect(JSON.stringify(viewer)).not.toContain('suspected alt'); expect(JSON.stringify(viewer)).not.toContain('org-wide ban reason'); From 5e9ff5ff4244896f034324aae91f28c4dca49ae4 Mon Sep 17 00:00:00 2001 From: James Causon Date: Tue, 6 Oct 2026 23:21:44 +0100 Subject: [PATCH 028/102] =?UTF-8?q?Quick=20reasons=20on=20the=20page:=20th?= =?UTF-8?q?e=20org's=20Ban=20list=20tab=20gets=20a=20Quick=20reasons=20str?= =?UTF-8?q?ip=20under=20the=20Ban=20message,=20which=20owners=20open=20int?= =?UTF-8?q?o=20a=20row=20per=20button=20(short=20name,=20reason,=20length,?= =?UTF-8?q?=20and=20a=20=E2=8B=AF=20to=20move=20or=20remove=20it),=20saved?= =?UTF-8?q?=20together,=20with=20a=20reset=20to=20the=20built-in=20six;=20?= =?UTF-8?q?ban=20list=20editors=20see=20them=20read-only.=20The=20ban=20di?= =?UTF-8?q?alog's=20buttons=20are=20the=20org's=20own=20wherever=20it=20op?= =?UTF-8?q?ens=20(the=20org's=20Ban=20list=20and=20Players,=20a=20server's?= =?UTF-8?q?=20Bans=20and=20Players=20tabs=20and=20past=20players,=20a=20do?= =?UTF-8?q?ssier):=20each=20shows=20its=20short=20name=20and=20length=20(7?= =?UTF-8?q?d,=20Perm),=20fills=20in=20its=20reason=20and=20sets=20Expires?= =?UTF-8?q?=20when=20it=20has=20a=20length?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/components/BanDialog.svelte | 36 ++- src/lib/lists.ts | 9 - src/routes/(app)/orgs/[id]/BanListPage.svelte | 3 + .../(app)/orgs/[id]/BanReasonsPanel.svelte | 241 ++++++++++++++++++ .../(app)/orgs/[id]/players/+page.svelte | 1 + .../(app)/server/[id]/bans/+page.svelte | 1 + .../(app)/server/[id]/players/+page.svelte | 2 + .../server/[id]/players/PastPlayers.svelte | 7 +- .../[id]/players/[steamId]/+page.svelte | 1 + 9 files changed, 281 insertions(+), 20 deletions(-) create mode 100644 src/routes/(app)/orgs/[id]/BanReasonsPanel.svelte diff --git a/src/lib/components/BanDialog.svelte b/src/lib/components/BanDialog.svelte index f5c40d84..327f9b41 100644 --- a/src/lib/components/BanDialog.svelte +++ b/src/lib/components/BanDialog.svelte @@ -6,7 +6,8 @@ import { api, errorMessage } from '$lib/api'; import { toast } from '$lib/toast.svelte'; import { DEFAULT_BAN_MESSAGE, renderBanMessage } from '$lib/ban-message'; - import { describeSync, EXPIRY_OPTIONS, expiryIso, REASON_PRESETS } from '$lib/lists'; + import { lengthTag, type BanReason } from '$lib/ban-reasons'; + import { describeSync, EXPIRY_OPTIONS, expiryIso } from '$lib/lists'; import { isSteamId, steamProfiles, type SteamProfile } from '$lib/steam-profiles'; import type { ListSyncServer, ListSyncSummary } from '$lib/types'; import Modal from './Modal.svelte'; @@ -20,6 +21,7 @@ server = null, canOrg, banMessage = null, + reasons, onclose, ondone }: { @@ -34,6 +36,8 @@ canOrg: boolean; /** the org's ban message, where the page has it: the dialog then shows the text it makes */ banMessage?: string | null; + /** the org's quick reasons, the buttons under Reason */ + reasons: BanReason[]; onclose: () => void; ondone: (scope: 'org' | 'server') => unknown; } = $props(); @@ -60,6 +64,12 @@ }); }); + /** A quick reason fills in its reason and, when it has a length, sets Expires. */ + function pick(r: BanReason) { + reason = r.reason; + if (r.days !== null) expiry = String(r.days); + } + let who = $derived(name ? `${name} (${steamId})` : steamId || 'a player'); // A typed id is looked up so the admin sees who they are about to ban. let previewId = $derived(steamId ? '' : isSteamId(id.trim()) ? id.trim() : ''); @@ -180,15 +190,21 @@ bind:value={reason} /> -
- {#each REASON_PRESETS as preset (preset)} - - {/each} -
+ {#if reasons.length} +
+ {#each reasons as r (r.label)} + + {/each} +
+ {/if}
{/if}

- Names are checked as players join; a player who renames mid-session is caught on their - next join. Run the dry run before turning a word list loose. + Names are checked as players join and whenever they change. Run the dry run before + turning a word list loose. +

+ {:else if f.kind === 'name_change'} +
+ Count + + +
+ + or more changes within + + minutes +
+
+
+ Then + + + {#if f.nameAction === 'kick'} + + {/if} +
+ {#if f.nameAction === 'kick'} +
+ Kick reason, shown to the player + + {@render placeholders('name_change', [f.reason])} +
+ {/if} +

+ Names come from the kill feed: each time a player kills or dies, the name it shows is + held against the one the server lists them under. A clan tag put on, taken off or + swapped is not a change.

{:else if f.kind === 'ping_kick'}
From deeac50119f962d554e16e67d3815b81c7ae8cab Mon Sep 17 00:00:00 2001 From: James Causon Date: Mon, 28 Sep 2026 20:43:59 +0100 Subject: [PATCH 032/102] Document the Name change watch --- README.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6f136d64..95b707d8 100644 --- a/README.md +++ b/README.md @@ -536,8 +536,8 @@ create them; every action they take is in the audit trail under the `trigger` ca rule that fired, and can be mirrored to Discord. A rule acts with nobody at the controls, so saving or dry-running one needs, besides _Automation_, the capability for what it does: _Chat_ for the rules that message players (a Kill distance watch that warns among them), _Match control_ for -the map reset, _Kick_ for the rules that kick, the Kill rate watch and a Kill distance watch that -flags or kicks, _Move_ for Team balance (with +the map reset, _Kick_ for the rules that kick, the Kill rate watch, the Name change watch and a +Kill distance watch that flags or kicks, _Move_ for Team balance (with _Chat_ as well when it whispers), _Kill_ for AFK protection (with _Chat_ as well when it broadcasts) and for a Kill distance watch that kills (with _Chat_ as well, for the whisper that comes with it), for a Kill distance watch that bans _Bans_ (on this server) or _Org @@ -552,6 +552,7 @@ delete them. | Empty-server map reset | After the server has been empty for N minutes on a different map or mode, sets the chosen map as next and ends the match (or requests it directly when there is no rotation). | | Kick on connect risk | Kicks players who match rules: VAC ban or game ban (optionally only within the last N days), Steam account younger than N days (optionally private profiles too), banned on another server in the org, or on the watchlist; or whose advisory risk score is at or above a set number from 1 to 100 (medium starts at 20, high at 50; the players table badges 20 and up). Joiners and players reconnecting are judged at once, and everyone on is judged again every minute (a player whose kick did not land, every five). Nobody is judged until the server's reserved slots have been read. Reserved-slot players can be spared. | | Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | +| Name change watch | Flags a player who changes their name mid-game, or with _Kick_ kicks them (a reserved slot can be flagged instead). The game's player list keeps the name a player joined with (a clan tag changed mid-game aside), while the [kill feed](#kill-feed) names both players of every kill as the others see them: each time a player kills or dies, the rule holds the name the feed shows against the one the list has for them. Counts every change, or only a change to the name of another player on the server. Names are compared as they read: case, spacing, punctuation, symbols, invisible characters, look-alike letters, I/l/1 and 0/O are no disguise, nor is a clan tag in brackets dropped or added to a copied name (names of five letters or more); a player's own name with a clan tag put on, taken off or swapped is not a change. Acts at N changes within M minutes (up to two hours): an alert flags a player once a window, a kick acts at every count, and a kicked player who comes back under the taken name goes again. In the kick reason `{name}` is the name the feed showed and `{previous}` the one they are listed under. Flags go to the audit trail and Discord with the name they are listed under and their SteamID (the post opens the player's page). Changing or switching it off drops what it had queued. Needs the kill feed; the worker's memory of names starts over when it restarts. The dry run holds the day's kills against the names of the sessions open at each. | | High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | | Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | | Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | @@ -578,13 +579,13 @@ Team kill whisper, the Team balance and Seeding reward whispers, and every kick the player's and their stats as well. A placeholder with nothing to fill in a message (a player's in a broadcast) is left empty; anything else in braces is sent as typed. -| Placeholders | What they say | -| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Server | `{server}`, `{map}` (as players know it: Zestafona, not NorthAmerica), `{players}` on, `{max}` players, `{scores}` (`Valkyra 45 · Lonestar 30`), `{cap}` (the score cap, 100 on today's builds), `{uptime}` (since the game started) | -| Player | `{name}` (or `{player}`), `{faction}`, `{steamid}`, `{ping}` (ms) | -| Here | `{kills}`, `{deaths}`, `{kd}` (or `{kdr}`), `{playtime}`, `{matches}`, `{wins}`, `{winrate}`, `{seeded}` (seed time): the player's line on this server's all-time leaderboard, from the matches that have ended and their sessions here; 0 for a player new to it | -| Org | `{org_kills}`, `{org_deaths}`, `{org_kd}` (or `{org_kdr}`), `{org_playtime}`, `{org_matches}`, `{org_wins}`, `{org_winrate}`, `{org_seeded}`: the same over every server of the organisation, never another organisation's. Not in a Kill distance rule's text, which can be a ban reason that staff of other servers read | -| A rule's own | Faction change `{previous}` (the side they left); Restart notice `{minutes}` (to the restart window); Match broadcast, see its row; Name filter `{why}`; Team kill `{victim}`, `{count}` (this match); Team balance `{team}`; Kill distance `{weapon}`, `{distance}` (… when the feed sent none), `{count}`; Seeding reward `{minutes}` (seeded), `{until}`, `{days}`; AFK protection `{goal}` | +| Placeholders | What they say | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Server | `{server}`, `{map}` (as players know it: Zestafona, not NorthAmerica), `{players}` on, `{max}` players, `{scores}` (`Valkyra 45 · Lonestar 30`), `{cap}` (the score cap, 100 on today's builds), `{uptime}` (since the game started) | +| Player | `{name}` (or `{player}`), `{faction}`, `{steamid}`, `{ping}` (ms) | +| Here | `{kills}`, `{deaths}`, `{kd}` (or `{kdr}`), `{playtime}`, `{matches}`, `{wins}`, `{winrate}`, `{seeded}` (seed time): the player's line on this server's all-time leaderboard, from the matches that have ended and their sessions here; 0 for a player new to it | +| Org | `{org_kills}`, `{org_deaths}`, `{org_kd}` (or `{org_kdr}`), `{org_playtime}`, `{org_matches}`, `{org_wins}`, `{org_winrate}`, `{org_seeded}`: the same over every server of the organisation, never another organisation's. Not in a Kill distance rule's text, which can be a ban reason that staff of other servers read | +| A rule's own | Faction change `{previous}` (the side they left); Restart notice `{minutes}` (to the restart window); Match broadcast, see its row; Name filter `{why}`; Name change `{previous}` (the name they are listed under; `{name}` is the one the feed showed); Team kill `{victim}`, `{count}` (this match); Team balance `{team}`; Kill distance `{weapon}`, `{distance}` (… when the feed sent none), `{count}`; Seeding reward `{minutes}` (seeded), `{until}`, `{days}`; AFK protection `{goal}` | So `Welcome {player}: {kills} kills here, {org_kills} on all our servers` reaches a regular as `Welcome [ABC] Night Owl: 1234 kills here, 2000 on all our servers`. The stats are read only for a From 01dd82ed4c143cc9622ae1b4e7bb108bc44b28f3 Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 00:00:15 +0100 Subject: [PATCH 033/102] Kill distance live test: the Humvee roadkill test gets 30 s, as the other tests that run deliveries do; its four deliveries and two audit waits take about 5 s, Bun's default limit --- src/test/kill-distance-rule.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/kill-distance-rule.test.ts b/src/test/kill-distance-rule.test.ts index ee9fd8e5..69b7d3c1 100644 --- a/src/test/kill-distance-rule.test.ts +++ b/src/test/kill-distance-rule.test.ts @@ -526,7 +526,7 @@ describe.skipIf(!hasTestDb)('Kill distance rule, live', () => { dead.clear(); forgetMemory(server.id); } - }); + }, 30_000); test('a kick rule kicks once for a burst, with its reason, while the kick lands', async () => { const w = await seedWorld(env); From b9bc751d083591143f85a163283ae733f6d35cea Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 01:07:21 +0100 Subject: [PATCH 034/102] Kill feed names: the names the kill feed shows for a player that are not the one the server lists them under are kept per server, player and name (player_aliases, migration 0042), with when each was first and last shown and the listed player whose name it read as; their own name with a clan tag put on, taken off or swapped is the same name. They are recorded as each batch comes in, on every server with the feed whatever its rules, and filled once from the kill history in the background, a day at a time with a pause between days, by whichever process owns the worker; a server that fails leaves the fill unfinished and it is tried again ten minutes later. Rows are written in key order and a thousand to a statement, and the holder is the newer sighting's. The dossier answers them for the servers the viewer can open, newest first (the 200 newest, with the count of all), leaving out a name the player also had as their own there, and the Players searches match them and answer them per player. The Name change watch's dry run now reads its sessions through the same replay --- drizzle/0044_player_aliases.sql | 11 + drizzle/meta/0044_snapshot.json | 5449 ++++++++++++++++++++++++++++ drizzle/meta/_journal.json | 7 + src/lib/server/aliases.ts | 248 ++ src/lib/server/db/schema.ts | 26 + src/lib/server/feed-events.ts | 75 +- src/lib/server/name-change.test.ts | 52 + src/lib/server/name-change.ts | 82 + src/lib/server/players.ts | 9 +- src/lib/server/poller.ts | 4 + src/lib/server/seen.ts | 34 +- src/lib/server/triggers.ts | 35 +- src/lib/types.ts | 6 + src/test/kill-feed-names.test.ts | 443 +++ 14 files changed, 6433 insertions(+), 48 deletions(-) create mode 100644 drizzle/0044_player_aliases.sql create mode 100644 drizzle/meta/0044_snapshot.json create mode 100644 src/lib/server/aliases.ts create mode 100644 src/test/kill-feed-names.test.ts diff --git a/drizzle/0044_player_aliases.sql b/drizzle/0044_player_aliases.sql new file mode 100644 index 00000000..643078bc --- /dev/null +++ b/drizzle/0044_player_aliases.sql @@ -0,0 +1,11 @@ +CREATE TABLE "player_aliases" ( + "server_id" text NOT NULL, + "steam_id" text NOT NULL, + "name" text NOT NULL, + "holder" text, + "first_seen" timestamp with time zone NOT NULL, + "last_seen" timestamp with time zone NOT NULL, + CONSTRAINT "player_aliases_server_id_steam_id_name_pk" PRIMARY KEY("server_id","steam_id","name") +); +--> statement-breakpoint +CREATE INDEX "player_aliases_steam_idx" ON "player_aliases" USING btree ("steam_id"); \ No newline at end of file diff --git a/drizzle/meta/0044_snapshot.json b/drizzle/meta/0044_snapshot.json new file mode 100644 index 00000000..316b1555 --- /dev/null +++ b/drizzle/meta/0044_snapshot.json @@ -0,0 +1,5449 @@ +{ + "id": "73540293-9ed7-4796-836e-6ccbc1ca0dff", + "prevId": "9f724321-72db-4ee1-8d18-40c24a1293d5", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_server_ended_idx": { + "name": "matches_server_ended_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ended_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_ban_reasons": { + "name": "org_ban_reasons", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "reasons": { + "name": "reasons", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "org_ban_reasons_org_id_organizations_id_fk": { + "name": "org_ban_reasons_org_id_organizations_id_fk", + "tableFrom": "org_ban_reasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "board_opens": { + "name": "board_opens", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'official'" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_aliases": { + "name": "player_aliases", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "holder": { + "name": "holder", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "first_seen": { + "name": "first_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "player_aliases_steam_idx": { + "name": "player_aliases_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_aliases_server_id_steam_id_name_pk": { + "name": "player_aliases_server_id_steam_id_name_pk", + "columns": [ + "server_id", + "steam_id", + "name" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_days": { + "name": "player_days", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "day": { + "name": "day", + "type": "date", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "crossings": { + "name": "crossings", + "type": "timestamp with time zone[]", + "primaryKey": false, + "notNull": false + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_days_server_id_day_steam_id_pk": { + "name": "player_days_server_id_day_steam_id_pk", + "columns": [ + "server_id", + "day", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_totals": { + "name": "player_totals", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_totals_server_id_steam_id_pk": { + "name": "player_totals_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.seasons": { + "name": "seasons", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "starts_at": { + "name": "starts_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "seasons_org_start_uidx": { + "name": "seasons_org_start_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "starts_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "seasons_org_id_organizations_id_fk": { + "name": "seasons_org_id_organizations_id_fk", + "tableFrom": "seasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 1ce022bd..3ea97944 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -309,6 +309,13 @@ "when": 1791741155124, "tag": "0043_org_ban_reasons", "breakpoints": true + }, + { + "idx": 44, + "version": "7", + "when": 1791741216189, + "tag": "0044_player_aliases", + "breakpoints": true } ] } \ No newline at end of file diff --git a/src/lib/server/aliases.ts b/src/lib/server/aliases.ts new file mode 100644 index 00000000..7330de41 --- /dev/null +++ b/src/lib/server/aliases.ts @@ -0,0 +1,248 @@ +// The names the kill feed showed for players that were not the ones the server listed them under +// (player_aliases): what staff see as "in the kill feed as" on the dossier, and what the Players +// searches also match. Recorded as kill batches come in (feed-events.ts), filled once from the +// history, and read only for the servers the viewer can open. +import { sql } from 'drizzle-orm'; +import type { Env } from './env'; +import type { DbOrTx } from './db'; +import { playerAliases, servers, siteSettings } from './db/schema'; +import { forLog } from './http'; +import { isOwner, LostOwnership, withOwnedTransaction } from './leadership'; +import { namesShownElse, sessionSweep, type NameReading, type ShownElse } from './name-change'; + +export interface AliasRow extends ShownElse { + firstSeen: Date; + lastSeen: Date; +} + +/** The most rows one statement writes: each binds six of the 65,535 parameters a statement may. */ +const ROWS_PER_STATEMENT = 1000; + +const byKey = (a: AliasRow, b: AliasRow) => + a.steamId < b.steamId + ? -1 + : a.steamId > b.steamId + ? 1 + : a.name < b.name + ? -1 + : a.name > b.name + ? 1 + : 0; + +/** + * Adds names to a server's record, one row per player and name: a name shown again widens its + * first and last sighting, and the holder is the newer sighting's when it has one. Written in key + * order, so two writers that touch the same rows (overlapping batches, the fill beside a batch) + * lock them in the same order. Rows must not repeat a player and name. + */ +export async function recordAliases( + db: DbOrTx, + serverId: string, + rows: readonly AliasRow[] +): Promise { + const sorted = [...rows].sort(byKey); + for (let i = 0; i < sorted.length; i += ROWS_PER_STATEMENT) + await db + .insert(playerAliases) + .values(sorted.slice(i, i + ROWS_PER_STATEMENT).map((r) => ({ serverId, ...r }))) + .onConflictDoUpdate({ + target: [playerAliases.serverId, playerAliases.steamId, playerAliases.name], + set: { + firstSeen: sql`LEAST(${playerAliases.firstSeen}, excluded.first_seen)`, + lastSeen: sql`GREATEST(${playerAliases.lastSeen}, excluded.last_seen)`, + holder: sql`CASE WHEN excluded.last_seen >= ${playerAliases.lastSeen} + THEN COALESCE(excluded.holder, ${playerAliases.holder}) + ELSE COALESCE(${playerAliases.holder}, excluded.holder) END` + } + }); +} + +/** One name the feed showed for a player, over the servers asked for. */ +export interface FeedName { + name: string; + /** another listed player whose name it read as, when it was someone else's */ + holder: string | null; + lastSeen: string; +} + +/** The most names a dossier lists, newest first. */ +const FEED_NAMES_MAX = 200; + +/** + * A player's names in the kill feed on these servers (the ones the viewer can open), newest first, + * leaving out a name they also played under as their own there; `total` counts them all. + */ +export async function feedNamesOf( + env: Env, + serverIds: readonly string[], + steamId: string +): Promise<{ names: FeedName[]; total: number }> { + if (!serverIds.length) return { names: [], total: 0 }; + const rows = await env.db.execute<{ + name: string; + holder: string | null; + lastSeen: Date; + total: number; + }>(sql` + SELECT a.name, + (array_agg(a.holder ORDER BY a.last_seen DESC) FILTER (WHERE a.holder IS NOT NULL))[1] AS holder, + MAX(a.last_seen) AS "lastSeen", + COUNT(*) OVER ()::int AS total + FROM player_aliases a + WHERE a.steam_id = ${steamId} AND a.server_id IN ${serverIds} + AND NOT EXISTS (SELECT 1 FROM player_sessions s + WHERE s.steam_id = a.steam_id AND s.server_id IN ${serverIds} + AND s.name = a.name) + GROUP BY a.name + ORDER BY MAX(a.last_seen) DESC + LIMIT ${FEED_NAMES_MAX}`); + return { + names: rows.map((r) => ({ + name: r.name, + holder: r.holder, + lastSeen: new Date(r.lastSeen).toISOString() + })), + total: rows[0]?.total ?? 0 + }; +} + +// ---- the history --------------------------------------------------------------------------------- + +/** The site_settings key that says the history has been filled, and up to when. */ +const FILLED = 'kill_feed_aliases_filled'; +const DAY_MS = 86_400_000; + +/** + * Fills the record from the kill feed's history, once: each server's kills, a day at a time, held + * against the sessions open at each (the same replay as the Name change watch's dry run), with a + * pause between days so the database is never busy with it. Live recording meanwhile only merges + * with it. Stops as soon as this process no longer owns the worker; a server that fails is left for + * the next try. Either way the next try starts over, which writes nothing twice. Marks itself done + * once every server is. + */ +export async function fillAliasHistory( + env: Env, + opts: { pauseMs?: number } = {} +): Promise<'done' | 'already' | 'stopped' | 'incomplete'> { + const [mark] = await env.db.execute<{ key: string }>( + sql`SELECT key FROM site_settings WHERE key = ${FILLED}` + ); + if (mark) return 'already'; + const until = new Date(); + const list = await env.db.select({ id: servers.id }).from(servers).orderBy(servers.id); + // One server's failure does not stop the others; the fill is done only once every one is. + let complete = true; + for (const s of list) { + if (!isOwner()) return 'stopped'; + try { + if (!(await fillServer(env, s.id, until.getTime(), opts.pauseMs ?? 50))) return 'stopped'; + } catch (err) { + if (err instanceof LostOwnership) return 'stopped'; + console.warn(`[warcon] filling the kill feed names of ${s.id}:`, forLog(err)); + complete = false; + } + } + if (!complete) return 'incomplete'; + if (!isOwner()) return 'stopped'; + await withOwnedTransaction(env, (tx) => + tx + .insert(siteSettings) + .values({ key: FILLED, value: { through: until.toISOString() } }) + .onConflictDoNothing() + ); + return 'done'; +} + +/** One server's history; false when this process stopped owning the worker on the way. */ +async function fillServer( + env: Env, + serverId: string, + until: number, + pauseMs: number +): Promise { + const sessions = await env.db.execute<{ + steamId: string; + name: string; + joinedAt: Date; + leftAt: Date | null; + }>(sql` + SELECT steam_id AS "steamId", name, joined_at AS "joinedAt", left_at AS "leftAt" + FROM player_sessions WHERE server_id = ${serverId} + ORDER BY joined_at`); + if (!sessions.length) return true; + const listedAt = sessionSweep( + sessions.map((s) => ({ + steamId: s.steamId, + name: s.name, + joinedAt: s.joinedAt, + leftAt: s.leftAt + })) + ); + const readings = new Map(); + const found = new Map(); + const start = new Date(sessions[0].joinedAt).getTime(); + for (let from = start - (start % DAY_MS); from < until; from += DAY_MS) { + const to = Math.min(from + DAY_MS, until); + const kills = await env.db.execute<{ + ts: Date; + killer: string | null; + killerName: string | null; + victim: string; + victimName: string; + }>(sql` + SELECT ts, killer_steam_id AS killer, killer_name AS "killerName", + victim_steam_id AS victim, victim_name AS "victimName" + FROM kills + WHERE server_id = ${serverId} AND ts >= ${new Date(from)} AND ts < ${new Date(to)} + ORDER BY ts, event_time`); + for (const k of kills) { + const at = new Date(k.ts).getTime(); + const shown = [ + ...(k.killer && k.killerName !== null ? [{ steamId: k.killer, name: k.killerName }] : []), + ...(k.victim !== k.killer ? [{ steamId: k.victim, name: k.victimName }] : []) + ]; + for (const a of namesShownElse(shown, listedAt(at), readings)) { + const key = `${a.steamId}\n${a.name}`; + const was = found.get(key); + found.set(key, { + ...a, + holder: a.holder ?? was?.holder ?? null, + firstSeen: was?.firstSeen ?? new Date(at), + lastSeen: new Date(at) + }); + } + } + if (pauseMs && kills.length) await new Promise((r) => setTimeout(r, pauseMs)); + if (!isOwner()) return false; + } + if (found.size) + await withOwnedTransaction(env, (tx) => recordAliases(tx, serverId, [...found.values()])); + return true; +} + +/** How long after a fill that did not finish it is tried again. */ +const FILL_RETRY_MS = 10 * 60_000; +let filling: Promise | null = null; +let filled = false; +let retryAt = 0; + +/** + * Starts filling the history in the background (called at every beat while this process owns the + * worker), unless it is running, done, or waiting to try again after a fill that did not finish. + */ +export function startAliasFill(env: Env): void { + if (filled || filling || Date.now() < retryAt) return; + filling = fillAliasHistory(env) + .then((r) => { + if (r === 'done' || r === 'already') filled = true; + else retryAt = Date.now() + FILL_RETRY_MS; + }) + .catch((err) => { + if (!(err instanceof LostOwnership)) + console.warn('[warcon] filling the kill feed names:', forLog(err)); + retryAt = Date.now() + FILL_RETRY_MS; + }) + .finally(() => { + filling = null; + }); +} diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 41668e35..ae421031 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -585,6 +585,32 @@ export const kills = pgTable( ); export type KillRow = typeof kills.$inferSelect; +/** + * The names the kill feed showed for a player that were not the one the server's player list held + * for them then (a clan tag put on, taken off or swapped is the same name): one row per server, + * player and name, with when it was first and last shown and, when it read as another listed + * player's name, that player. Staff see them on the dossier as "in the kill feed as", and the + * Players searches match them. Written by the worker as kill batches come in (feed-events.ts) and, + * once, from the history (aliases.ts); kept for good. A name that differs is rare, so rows are few. + */ +export const playerAliases = pgTable( + 'player_aliases', + { + serverId: text('server_id').notNull(), + steamId: text('steam_id').notNull(), + /** as the feed showed it */ + name: text('name').notNull(), + /** the listed player whose name it read as, the last time it was someone else's */ + holder: text('holder'), + firstSeen: ts('first_seen').notNull(), + lastSeen: ts('last_seen').notNull() + }, + (t) => [ + primaryKey({ columns: [t.serverId, t.steamId, t.name] }), + index('player_aliases_steam_idx').on(t.steamId) + ] +); + /** * One row per player per match: the game's own scoreboard counters over the match (kills, deaths, * the change in cash) with the player's time on and side, and, on servers with a kill feed, what diff --git a/src/lib/server/feed-events.ts b/src/lib/server/feed-events.ts index 72e6ddf5..da00b3da 100644 --- a/src/lib/server/feed-events.ts +++ b/src/lib/server/feed-events.ts @@ -50,10 +50,12 @@ import { import { nameChangeSettingsKey, nameChangeStep, + namesShownElse, pruneNameTracks, type NameChangeConfig, type NameTracks } from './name-change'; +import { recordAliases } from './aliases'; import { NAME_FLAG } from './name-filter'; import { applyTriggerUpdates, enqueueIntents, wakeDelivery } from './outbox'; import { LostOwnership, withOwnedTransaction } from './leadership'; @@ -73,6 +75,13 @@ export async function onKillsIngested( ): Promise { if (!kills.length) return; emit({ type: 'kills', serverId, kills }); + const named = namedIn(kills); + try { + await recordFeedNames(env, serverId, kills, named); + } catch (err) { + if (!(err instanceof LostOwnership)) + console.warn(`[warcon] kill feed names on ${serverId}:`, publicMessage(err)); + } try { await actOnKillRate(env, serverId, kills); } catch (err) { @@ -88,7 +97,7 @@ export async function onKillsIngested( console.warn(`[warcon] kill-distance rules on ${serverId}:`, publicMessage(err)); } try { - await actOnNameChange(env, serverId, kills, vars); + await actOnNameChange(env, serverId, named, vars); } catch (err) { if (!(err instanceof LostOwnership)) console.warn(`[warcon] name-change rules on ${serverId}:`, publicMessage(err)); @@ -105,6 +114,55 @@ export async function onKillsIngested( } } +/** Both players of every kill as the feed named them, in the order the game played them; a suicide + * names its player once, and the environment no one. */ +function namedIn(batch: KillView[]) { + return [...batch] + .sort((a, b) => a.eventTime - b.eventTime) + .flatMap((k) => [ + ...(k.killer?.steamId ? [{ ...k.killer, k }] : []), + ...(k.victim.steamId && k.victim.steamId !== k.killer?.steamId ? [{ ...k.victim, k }] : []) + ]); +} +type Named = ReturnType; + +/** The names the server's player list holds, by SteamID, from the worker's last look at it (read + * once a look, however many batches come in meanwhile). */ +const listedCache = new WeakMap>(); +function listedOf(serverId: string): ReadonlyMap { + const players = memoryOf(serverId)?.players; + if (!players) return new Map(); + let listed = listedCache.get(players); + if (!listed) + listedCache.set(players, (listed = new Map(players.map((p) => [p.steamId, p.name])))); + return listed; +} + +/** + * Keeps, for staff, the names this batch showed that were not the ones the list holds for their + * players (aliases.ts), on every server with the feed whatever its rules: a name the same as the + * list's, nearly every one, costs a lookup and a compare. + */ +async function recordFeedNames( + env: Env, + serverId: string, + batch: KillView[], + named: Named +): Promise { + const listed = listedOf(serverId); + if (!listed.size) return; + const found = namesShownElse(named, listed); + if (!found.length) return; + const at = new Date(Math.max(...batch.map((k) => Date.parse(k.ts)))); + await withOwnedTransaction(env, (tx) => + recordAliases( + tx, + serverId, + found.map((a) => ({ ...a, firstSeen: at, lastSeen: at })) + ) + ); +} + /** * Each Kill rate rule's window of recent kills per player, in this process's memory: kills are * acted on only in the worker, and a restart starting the windows over costs a flag, not data @@ -391,7 +449,7 @@ export function forgetNameChange(serverId?: string): void { async function actOnNameChange( env: Env, serverId: string, - batch: KillView[], + shown: Named, vars: KillerVars ): Promise { const rows = (await enabledTriggers(env, serverId)).filter((r) => r.kind === 'name_change'); @@ -402,17 +460,8 @@ async function actOnNameChange( // The names the server lists its players under now: nothing to hold the feed against while the // list is empty (a map loading) or not read yet. const m = memoryOf(serverId); - const listed = new Map((m?.players ?? []).map((p) => [p.steamId, p.name])); - if (!listed.size) return; - // Both players of every kill as the feed named them, in the order the game played them; a - // suicide names its player once. - const shown = [...batch] - .sort((a, b) => a.eventTime - b.eventTime) - .flatMap((k) => [ - ...(k.killer?.steamId ? [{ ...k.killer, k }] : []), - ...(k.victim.steamId && k.victim.steamId !== k.killer?.steamId ? [{ ...k.victim, k }] : []) - ]); - if (!shown.length) return; + const listed = listedOf(serverId); + if (!listed.size || !shown.length) return; const now = Date.now(); const out: Evaluation = { intents: [], updates: [] }; // Each rule's tracks move on as it reads; if its actions cannot be queued, they move back. diff --git a/src/lib/server/name-change.test.ts b/src/lib/server/name-change.test.ts index 59005ed8..b5663460 100644 --- a/src/lib/server/name-change.test.ts +++ b/src/lib/server/name-change.test.ts @@ -2,8 +2,10 @@ import { describe, expect, test } from 'bun:test'; import { nameChangeStep, nameKey, + namesShownElse, pruneNameTracks, readName, + sessionSweep, validateNameChange, type NameTracks } from './name-change'; @@ -295,3 +297,53 @@ describe('validateNameChange', () => { ).toMatchObject({ changes: 1, windowMinutes: 120, action: 'alert', takenOnly: true }); }); }); + +describe('the names a batch showed that were not the listed ones', () => { + const server = list(['1', 'Ghostpepper'], ['2', '[R-14] ✪ Silver Fox'], ['3', '[ABC] Steady']); + + test("each player's other name once, with the listed player whose name it read as", () => { + expect( + namesShownElse( + [ + p('1', '✪ SiIver Fox'), + p('1', '✪ SiIver Fox'), + p('1', 'Tango'), + // their own name with another clan tag, a player off the list, a blank name + p('3', '[XYZ] Steady'), + p('9', 'Silver Fox'), + p('2', ' ') + ], + server + ) + ).toEqual([ + { steamId: '1', name: '✪ SiIver Fox', holder: '2' }, + { steamId: '1', name: 'Tango', holder: null } + ]); + }); +}); + +describe('the list as the sessions give it', () => { + test('sessions join in order and leave some seconds after they end; a later session takes over', () => { + const at = (s: number) => new Date(s * 1000); + const listedAt = sessionSweep( + [ + { steamId: '1', name: 'Alpha', joinedAt: at(0), leftAt: at(100) }, + { steamId: '2', name: 'Bravo', joinedAt: at(10), leftAt: null }, + { steamId: '1', name: 'Alpha2', joinedAt: at(105), leftAt: at(200) } + ], + 10_000 + ); + expect([...listedAt(5_000)]).toEqual([['1', 'Alpha']]); + expect([...listedAt(50_000)]).toEqual([ + ['1', 'Alpha'], + ['2', 'Bravo'] + ]); + // ended at 100 s, still listed for the slack, then the next session holds the name + expect(listedAt(104_000).get('1')).toBe('Alpha'); + expect(listedAt(106_000).get('1')).toBe('Alpha2'); + // the first session's end does not take the second one off + expect(listedAt(150_000).get('1')).toBe('Alpha2'); + expect(listedAt(211_000).has('1')).toBe(false); + expect(listedAt(211_000).get('2')).toBe('Bravo'); + }); +}); diff --git a/src/lib/server/name-change.ts b/src/lib/server/name-change.ts index eb2f5961..cfb44d26 100644 --- a/src/lib/server/name-change.ts +++ b/src/lib/server/name-change.ts @@ -241,3 +241,85 @@ export function pruneNameTracks(cfg: NameChangeConfig, tracks: NameTracks, now: const from = now - cfg.windowMinutes * 60_000; for (const [id, t] of tracks) if (t.seenAt < from) tracks.delete(id); } + +/** A name the feed showed for a player that was not the one the list held for them. */ +export interface ShownElse { + steamId: string; + name: string; + /** the listed player whose name it read as, when it was someone else's */ + holder: string | null; +} + +/** + * The names some kills showed that were not the ones the list held for their players (their own + * name with a clan tag put on, taken off or swapped is the same name), each player's name once, + * with the listed player whose name it read as. A player not on the list, or shown under a blank + * name, is not judged. `readings` keeps the names read across calls. + */ +export function namesShownElse( + shown: readonly ShownName[], + listed: ReadonlyMap, + readings: Map = new Map() +): ShownElse[] { + const read = (name: string): NameReading => { + let r = readings.get(name); + if (!r) readings.set(name, (r = readName(name))); + return r; + }; + const out = new Map(); + for (const p of shown) { + const own = listed.get(p.steamId); + if (own === undefined || p.name === own || !p.name.trim()) continue; + const key = `${p.steamId}\n${p.name}`; + if (out.has(key)) continue; + const r = read(p.name); + if (ownName(r, read(own))) continue; + out.set(key, { + steamId: p.steamId, + name: p.name, + holder: holderOf(listed, p.steamId, r, read) + }); + } + return [...out.values()]; +} + +/** One session as a replay reads it: who was listed under which name, from when until when. */ +export interface ListedSession { + steamId: string; + name: string; + joinedAt: Date | string; + leftAt: Date | string | null; +} + +/** + * The player list as a server's sessions give it at a moment, for a replay that moves forward in + * time (`at` never goes back): sessions, given in join order, join it as they start and leave it + * `slackMs` after they end (a kill is received a second or two after it happened); a player's later + * session takes over their name. The name is the session's last, which is the list's but for a clan + * tag changed during it. + */ +export function sessionSweep( + sessions: readonly ListedSession[], + slackMs = 10_000 +): (at: number) => ReadonlyMap { + const listed = new Map(); + const holding = new Map(); + const ends = sessions + .flatMap((s, i) => (s.leftAt ? [{ i, until: new Date(s.leftAt).getTime() + slackMs }] : [])) + .sort((a, b) => a.until - b.until); + let joins = 0; + let leaves = 0; + return (at) => { + for (; joins < sessions.length && new Date(sessions[joins].joinedAt).getTime() <= at; joins++) { + listed.set(sessions[joins].steamId, sessions[joins].name); + holding.set(sessions[joins].steamId, joins); + } + for (; leaves < ends.length && ends[leaves].until < at; leaves++) { + const s = sessions[ends[leaves].i]; + if (holding.get(s.steamId) !== ends[leaves].i) continue; + listed.delete(s.steamId); + holding.delete(s.steamId); + } + return listed; + }; +} diff --git a/src/lib/server/players.ts b/src/lib/server/players.ts index 180faad4..1c7bab45 100644 --- a/src/lib/server/players.ts +++ b/src/lib/server/players.ts @@ -39,6 +39,7 @@ import type { } from '$lib/types'; import { killView } from './feed'; import { latestNames } from './sessions'; +import { feedNamesOf } from './aliases'; export { requireSteamId } from './steam'; @@ -342,7 +343,8 @@ export async function dossier( allOrgServers, combat, performance, - seedRows + seedRows, + feedNames ] = await Promise.all([ getProfiles(env, [steamId], { refresh: !!opts.refreshSteam, @@ -383,7 +385,8 @@ export async function dossier( eq(triggers.enabled, true) ) ) - .limit(1) + .limit(1), + feedNamesOf(env, ids, steamId) ]); const seedRow = seedRows[0]; const seedConfig = seedRow?.config as Partial | undefined; @@ -405,6 +408,8 @@ export async function dossier( steamId, name, names: names.map((n) => n.name), + feedNames: feedNames.names, + feedNamesTotal: feedNames.total, online: online ? { serverId: online.serverId, serverName: nameOf.get(online.serverId) || '' } : null, diff --git a/src/lib/server/poller.ts b/src/lib/server/poller.ts index 675df380..c560ae85 100644 --- a/src/lib/server/poller.ts +++ b/src/lib/server/poller.ts @@ -39,6 +39,7 @@ import { phaseOffset, pickDue, withHold } from './poller-schedule'; import { rollupSamples } from './rollups'; import { liveView } from './live'; import { feedDemoKills, forgetKillDistance, forgetNameChange } from './feed-events'; +import { startAliasFill } from './aliases'; import { publicMessage } from './http'; import * as metrics from './metrics'; import type { LiveView } from '$lib/types'; @@ -238,6 +239,9 @@ async function beat(env: Env): Promise { forgetKillDistance(); forgetNameChange(); } + // Once, in the background: the names the kill feed showed before they were recorded (a fill + // that did not finish is tried again a while later). + startAliasFill(env); if (now - s.settingsAt >= SETTINGS_MS) { s.settingsAt = now; await loadSettings(env).catch((err) => console.error('[warcon] settings', err)); diff --git a/src/lib/server/seen.ts b/src/lib/server/seen.ts index 64e21942..fb7db207 100644 --- a/src/lib/server/seen.ts +++ b/src/lib/server/seen.ts @@ -1,6 +1,7 @@ // Everyone an organisation has seen: one row per SteamID built from player_sessions on the org's -// servers the viewer can open, with every name they played under. A player who never joined one -// of those servers cannot appear here, whatever is searched for. +// servers the viewer can open, with every name they played under and the names the kill feed showed +// for them there that were not those (player_aliases). A player who never joined one of those +// servers cannot appear here, whatever is searched for. import { sql, type SQL } from 'drizzle-orm'; import type { Env } from './env'; import { getProfiles } from './steam'; @@ -18,7 +19,7 @@ export const SEEN_SORTS = [ export type SeenSort = (typeof SEEN_SORTS)[number]; export interface SeenFilters { - /** matches any name used (contains) or the SteamID (prefix) */ + /** matches any name used or shown in the kill feed (contains), or the SteamID (prefix) */ q: string; /** seen in the last N days; null for ever */ since: number | null; @@ -53,6 +54,9 @@ export interface SeenPlayer { name: string; /** every other name seen, most recent first */ aliases: string[]; + /** the names the kill feed showed for them that were not the ones the server listed them under, + * most recent first */ + feedNames: string[]; firstSeen: string; lastSeen: string; sessions: number; @@ -74,6 +78,7 @@ interface Row extends Record { steamId: string; name: string; names: string[]; + feedNames: string[] | null; lastServerId: string; lastServerName: string | null; firstSeen: Date; @@ -124,11 +129,10 @@ export async function seenPlayers( const conds: SQL[] = []; if (f.q) { const q = f.q; - conds.push( - /^\d+$/.test(q) - ? sql`(steam_id LIKE ${q + '%'} OR EXISTS (SELECT 1 FROM unnest(names) n WHERE n ILIKE ${'%' + likeEscape(q) + '%'}))` - : sql`EXISTS (SELECT 1 FROM unnest(names) n WHERE n ILIKE ${'%' + likeEscape(q) + '%'})` - ); + const like = '%' + likeEscape(q) + '%'; + const named = sql`(EXISTS (SELECT 1 FROM unnest(names) n WHERE n ILIKE ${like}) + OR EXISTS (SELECT 1 FROM unnest(feed_names) n WHERE n ILIKE ${like}))`; + conds.push(/^\d+$/.test(q) ? sql`(steam_id LIKE ${q + '%'} OR ${named})` : named); } if (f.since) conds.push(sql`last_seen >= now() - (${f.since} * interval '1 day')`); if (f.serverId && ids.includes(f.serverId)) conds.push(sql`on_server`); @@ -168,8 +172,14 @@ export async function seenPlayers( FROM player_sessions WHERE server_id IN ${ids} ${one} ${recent} GROUP BY steam_id + ), fed AS ( + SELECT steam_id, array_agg(name ORDER BY seen DESC) AS feed_names + FROM (SELECT steam_id, name, MAX(last_seen) AS seen + FROM player_aliases WHERE server_id IN ${ids} + GROUP BY steam_id, name) n + GROUP BY steam_id ), flagged AS ( - SELECT a.*, s.name AS last_server_name, + SELECT a.*, s.name AS last_server_name, f.feed_names, EXISTS (SELECT 1 FROM list_entries e JOIN lists l ON l.id = e.list_id WHERE l.org_id = ${orgId} AND l.server_id IS NULL AND l.kind = 'ban' AND e.removed_at IS NULL @@ -186,8 +196,10 @@ export async function seenPlayers( EXISTS (SELECT 1 FROM player_marks m WHERE m.org_id = ${orgId} AND m.watched AND m.steam_id = a.steam_id) AS watched FROM agg a LEFT JOIN servers s ON s.id = a.last_server_id + LEFT JOIN fed f ON f.steam_id = a.steam_id ) - SELECT steam_id AS "steamId", name, names, last_server_id AS "lastServerId", + SELECT steam_id AS "steamId", name, names, feed_names AS "feedNames", + last_server_id AS "lastServerId", last_server_name AS "lastServerName", first_seen AS "firstSeen", last_seen AS "lastSeen", sessions, minutes, kills, deaths, servers, online, org_banned AS "orgBanned", server_banned AS "serverBanned", watched, @@ -208,6 +220,8 @@ export async function seenPlayers( steamId: r.steamId, name: r.name, aliases: (r.names || []).filter((n: string) => n !== r.name), + // a name the feed showed that they also played under as their own is no other name + feedNames: (r.feedNames || []).filter((n: string) => !(r.names || []).includes(n)), firstSeen: r.firstSeen.toISOString(), lastSeen: r.lastSeen.toISOString(), sessions: r.sessions, diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index ef103427..cbc14aae 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -110,6 +110,7 @@ import { nameChangeSettingsKey, nameChangeStep, pruneNameTracks, + sessionSweep, type NameChangeConfig, type NameReading, type NameTracks @@ -2312,15 +2313,16 @@ export async function dryRun( result.notes.push('Could not read the reserved slots; nobody was spared for one.'); } } - // The list at the kill being replayed: sessions join it in order and leave it once they have - // ended, a few seconds' slack for a kill received just after its player left. - const listed = new Map(); - const holding = new Map(); - const ends = sessions - .flatMap((s, i) => (s.leftAt ? [{ i, until: new Date(s.leftAt).getTime() + 10_000 }] : [])) - .sort((a, b) => a.until - b.until); - let joins = 0; - let leaves = 0; + // The list at the kill being replayed, a few seconds' slack for a kill received just after its + // player left. + const listedAt = sessionSweep( + sessions.map((s) => ({ + steamId: s.steamId, + name: s.name, + joinedAt: s.joinedAt, + leftAt: s.leftAt + })) + ); const tracks: NameTracks = new Map(); const readings = new Map(); const kicked = (steamId: string) => @@ -2328,20 +2330,7 @@ export async function dryRun( for (let i = 0; i < rows.length; i++) { const r = rows[i]; const at = new Date(r.ts).getTime(); - for ( - ; - joins < sessions.length && new Date(sessions[joins].joinedAt).getTime() <= at; - joins++ - ) { - listed.set(sessions[joins].steamId, sessions[joins].name); - holding.set(sessions[joins].steamId, joins); - } - for (; leaves < ends.length && ends[leaves].until < at; leaves++) { - const s = sessions[ends[leaves].i]; - if (holding.get(s.steamId) !== ends[leaves].i) continue; - listed.delete(s.steamId); - holding.delete(s.steamId); - } + const listed = listedAt(at); if (i % 1000 === 0) pruneNameTracks(c, tracks, at); const shown: { steamId: string; name: string }[] = []; if (r.killer && r.killerName !== null) shown.push({ steamId: r.killer, name: r.killerName }); diff --git a/src/lib/types.ts b/src/lib/types.ts index 7df0d4da..8a1c2c72 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -436,6 +436,12 @@ export interface DossierView { steamId: string; name: string; names: string[]; + /** the names the kill feed showed for them that were not the ones the server listed them under, + * newest first, on the servers the viewer can open; `holder` is another listed player whose name + * it read as */ + feedNames: { name: string; holder: string | null; lastSeen: string }[]; + /** how many there are in all: the list holds the newest 200 at most */ + feedNamesTotal: number; online: { serverId: string; serverName: string } | null; steamEnabled: boolean; steam: SteamView | null; diff --git a/src/test/kill-feed-names.test.ts b/src/test/kill-feed-names.test.ts new file mode 100644 index 00000000..e2b31376 --- /dev/null +++ b/src/test/kill-feed-names.test.ts @@ -0,0 +1,443 @@ +// The names the kill feed showed for players that were not the ones the server listed them under: +// recorded as kill batches come through the real ingest, on any server with the feed, one row per +// player and name; shown on the dossier and found by the Players searches only for the servers the +// caller can open, never another organisation's; and filled once from the history. +import { afterAll, beforeAll, describe, expect, spyOn, test } from 'bun:test'; +import { and, eq, inArray } from 'drizzle-orm'; +import { join } from 'node:path'; +import type { Env } from '$lib/server/env'; +import { + kills, + organizations, + playerAliases, + playerSessions, + servers, + siteSettings +} from '$lib/server/db/schema'; +import { newId } from '$lib/server/http'; +import { ingestBatch } from '$lib/server/feed'; +import { onKillsIngested } from '$lib/server/feed-events'; +import { acquireOrRenew, releaseOwnership } from '$lib/server/leadership'; +import { forgetMemory, memoryFor, observeServer } from '$lib/server/observe'; +import { WardogsClient } from '$lib/server/rcon'; +import { fillAliasHistory, recordAliases } from '$lib/server/aliases'; +import { callApi } from './call'; +import { hasTestDb, testEnv } from './db'; +import { seedWorld, type PrincipalName, type World } from './world'; + +const ROUTES = join(import.meta.dir, '..', 'routes', 'api'); +const COPIER = '76561198000000901'; +const ORIGINAL = '76561198000000902'; +const STEADY = '76561198000000903'; +const STRANGER = '76561198000000904'; + +type Named = [steamId: string, name: string]; + +/** One `killed` event as the game posts it, the players named as the feed shows them. */ +const ev = (killer: Named, victim: Named, eventTime = 100) => ({ + eventId: newId(), + type: 'killed', + eventTime, + matchId: 'boot', + mapName: 'Kavkazi', + killerName: killer[1], + killerSteamId: killer[0], + victimName: victim[1], + victimSteamId: victim[0], + cause: 'Id.Item.AK74M', + distance: 5000, + contextTags: [] +}); + +describe.skipIf(!hasTestDb)('the names the kill feed showed', () => { + let env: Env; + const lists = new Map(); + const used: string[] = []; + let spy: ReturnType; + + beforeAll(async () => { + env = { ...(await testEnv()), STEAM_API_KEY: '' }; + expect(await acquireOrRenew(env, 'kill-feed-names')).toBe(true); + // The mock game answers everything but the player list, which the test scripts per server. + spy = spyOn(WardogsClient, 'forServer').mockImplementation(async (_env, server) => { + const client = new WardogsClient( + env, + { id: server.id, host: 'demo', port: 1, scheme: 'http' }, + 'demo', + `feed-names-${server.id}` + ); + const raw = client.raw.bind(client); + client.raw = async (method, path, body, headers) => + method === 'GET' && path === '/v1/players' + ? { + status: 200, + statusText: 'OK', + headers: { 'content-type': 'application/json' }, + text: JSON.stringify({ + players: (lists.get(server.id) ?? []).map(([steamId, name]) => ({ + steamId, + name, + faction: null, + kills: 0 + })) + }) + } + : raw(method, path, body, headers); + return client; + }); + }); + + afterAll(async () => { + spy.mockRestore(); + for (const id of used) forgetMemory(id); + await releaseOwnership(env); + }); + + /** The server's player list, as the worker reads it at a look. */ + const listing = async (w: World, serverId: string, ...players: Named[]) => { + const [server] = await env.db.select().from(servers).where(eq(servers.id, serverId)); + const [org] = await env.db.select().from(organizations).where(eq(organizations.id, w.org.id)); + const m = memoryFor(server, org); + used.push(serverId); + lists.set(serverId, players); + m.playersIntervalMs = 1000; + await observeServer(env, m, { status: true, players: true }); + }; + const post = async (serverId: string, at: Date, ...events: ReturnType[]) => { + const r = await ingestBatch(env, serverId, { serverId: 'i', serverName: 'x', events }, at); + await onKillsIngested(env, serverId, r.kills); + }; + const aliasesOf = (serverId: string) => + env.db + .select() + .from(playerAliases) + .where(eq(playerAliases.serverId, serverId)) + .orderBy(playerAliases.name); + const dossier = async (w: World, who: PrincipalName, serverId: string, steamId: string) => { + const mod = await import(join(ROUTES, 'servers/[id]/players/[steamId]', '+server.ts')); + return callApi(mod.GET, w.users[who], { params: { id: serverId, steamId } }); + }; + const feedNamesIn = (answer: { status: number; body: unknown }) => + answer.status === 200 + ? (answer.body as { dossier: { feedNames: { name: string; holder: string | null }[] } }) + .dossier.feedNames + : answer.status; + const seen = async (w: World, who: PrincipalName, serverId: string, q: string) => { + const { GET } = await import(join(ROUTES, 'servers/[id]/players/seen', '+server.ts')); + return callApi(GET, w.users[who], { + params: { id: serverId }, + query: `q=${encodeURIComponent(q)}` + }); + }; + const orgSeen = async (w: World, who: PrincipalName, q: string) => { + const { GET } = await import(join(ROUTES, 'orgs/[id]/players', '+server.ts')); + return callApi(GET, w.users[who], { + params: { id: w.org.id }, + query: `q=${encodeURIComponent(q)}` + }); + }; + const found = (answer: { body: unknown }) => + (answer.body as { players: { steamId: string; feedNames: string[] }[] }).players.map((p) => [ + p.steamId, + p.feedNames + ]); + const session = (serverId: string, steamId: string, name: string, joinedAt: Date) => ({ + serverId, + steamId, + name, + joinedAt, + lastSeen: joinedAt + }); + + test('a batch records the names its players showed that were not their listed ones, once per player and name, whatever the rules', async () => { + const w = await seedWorld(env); + await listing( + w, + w.server.id, + [COPIER, 'Ghostpepper'], + [ORIGINAL, 'Silver Fox'], + [STEADY, '[ABC] Steady'] + ); + const first = new Date(Date.now() - 60_000); + await post( + w.server.id, + first, + ev([COPIER, 'Silver Fox'], [STEADY, '[XYZ] Steady']), + ev([STRANGER, 'Silver Fox'], [COPIER, 'Tango'], 101), + ev([COPIER, 'Silver Fox'], [ORIGINAL, 'Silver Fox'], 102) + ); + expect( + (await aliasesOf(w.server.id)).map((r) => [ + r.steamId, + r.name, + r.holder, + r.firstSeen.getTime() + ]) + ).toEqual([ + [COPIER, 'Silver Fox', ORIGINAL, first.getTime()], + [COPIER, 'Tango', null, first.getTime()] + ]); + // shown again later: the same row, its last sighting moved + const later = new Date(); + await post(w.server.id, later, ev([COPIER, 'Silver Fox'], [STEADY, '[ABC] Steady'], 130)); + const [again] = (await aliasesOf(w.server.id)).filter((r) => r.name === 'Silver Fox'); + expect([again.firstSeen.getTime(), again.lastSeen.getTime(), again.holder]).toEqual([ + first.getTime(), + later.getTime(), + ORIGINAL + ]); + }); + + test('the dossier lists them for the servers the viewer can open, newest first, leaving out a name the player also had as their own', async () => { + const w = await seedWorld(env); + const now = Date.now(); + const at = (m: number) => new Date(now - m * 60_000); + await env.db + .insert(playerSessions) + .values([ + session(w.server.id, COPIER, 'Ghostpepper', at(120)), + session(w.otherServer.id, COPIER, 'Ghostpepper', at(110)), + session(w.otherServer.id, COPIER, 'Kestrel', at(100)) + ]); + await recordAliases(env.db, w.server.id, [ + { steamId: COPIER, name: 'Silver Fox', holder: ORIGINAL, firstSeen: at(60), lastSeen: at(50) } + ]); + await recordAliases(env.db, w.otherServer.id, [ + { steamId: COPIER, name: 'Cinder', holder: null, firstSeen: at(40), lastSeen: at(30) }, + { steamId: COPIER, name: 'Kestrel', holder: null, firstSeen: at(20), lastSeen: at(10) } + ]); + await recordAliases(env.db, w.otherOrgServer.id, [ + { steamId: COPIER, name: 'Zulu', holder: null, firstSeen: at(5), lastSeen: at(1) } + ]); + const names = (list: unknown) => + Array.isArray(list) + ? list.map((f: { name: string; holder: string | null }) => [f.name, f.holder]) + : list; + // both servers for the owner, newest first; Kestrel was their own name on one of them + expect(names(feedNamesIn(await dossier(w, 'owner', w.server.id, COPIER)))).toEqual([ + ['Cinder', null], + ['Silver Fox', ORIGINAL] + ]); + // a viewer of the first server only, and a member of the second only + expect(names(feedNamesIn(await dossier(w, 'viewer', w.server.id, COPIER)))).toEqual([ + ['Silver Fox', ORIGINAL] + ]); + expect(names(feedNamesIn(await dossier(w, 'elsewhere', w.otherServer.id, COPIER)))).toEqual([ + ['Cinder', null] + ]); + // a key held to the second server reads that server's names, and gets no dossier on the first + expect(names(feedNamesIn(await dossier(w, 'keyElsewhere', w.otherServer.id, COPIER)))).toEqual([ + ['Cinder', null] + ]); + expect(feedNamesIn(await dossier(w, 'keyElsewhere', w.server.id, COPIER))).toBe(404); + // the other organisation's server is never read, and its members get no dossier here + expect(feedNamesIn(await dossier(w, 'elsewhere', w.server.id, COPIER))).toBe(404); + expect(feedNamesIn(await dossier(w, 'stranger', w.server.id, COPIER))).toBe(404); + expect(feedNamesIn(await dossier(w, 'anon', w.server.id, COPIER))).toBe(401); + }); + + test('the searches find a player by a name the feed showed, only on the servers the caller can open', async () => { + const w = await seedWorld(env); + const now = Date.now(); + const at = (m: number) => new Date(now - m * 60_000); + await env.db + .insert(playerSessions) + .values([ + session(w.server.id, COPIER, 'Ghostpepper', at(120)), + session(w.server.id, ORIGINAL, 'Silver Fox', at(120)), + session(w.otherServer.id, COPIER, 'Ghostpepper', at(110)), + session(w.otherOrgServer.id, COPIER, 'Ghostpepper', at(110)) + ]); + await recordAliases(env.db, w.server.id, [ + { steamId: COPIER, name: 'Silver Fox', holder: ORIGINAL, firstSeen: at(60), lastSeen: at(50) } + ]); + await recordAliases(env.db, w.otherServer.id, [ + { steamId: COPIER, name: 'Cinder', holder: null, firstSeen: at(40), lastSeen: at(30) } + ]); + await recordAliases(env.db, w.otherOrgServer.id, [ + { steamId: COPIER, name: 'Zulu', holder: null, firstSeen: at(5), lastSeen: at(1) } + ]); + // the real one by their name, the copier by the name the feed showed for them + expect(found(await seen(w, 'viewer', w.server.id, 'silver')).sort()).toEqual( + [ + [COPIER, ['Silver Fox']], + [ORIGINAL, []] + ].sort() + ); + // a name shown on the other server is not this server's to search + expect(found(await seen(w, 'viewer', w.server.id, 'cinder'))).toEqual([]); + expect(found(await orgSeen(w, 'owner', 'cinder'))).toEqual([ + [COPIER, ['Cinder', 'Silver Fox']] + ]); + // nor is a name shown on another organisation's server, for anyone here + expect(found(await orgSeen(w, 'owner', 'zulu'))).toEqual([]); + // a member of the second server only searches the second server's names + const theirs = await orgSeen(w, 'elsewhere', 'cinder'); + expect(theirs.status).toBe(200); + expect(found(theirs)).toEqual([[COPIER, ['Cinder']]]); + expect(found(await orgSeen(w, 'elsewhere', 'silver'))).toEqual([]); + }); + + test("a name recorded again keeps the newer sighting's holder, and a long list goes in several statements", async () => { + const w = await seedWorld(env); + const now = Date.now(); + const at = (m: number) => new Date(now - m * 60_000); + const silver = (holder: string | null, from: number, to: number) => [ + { steamId: COPIER, name: 'Silver Fox', holder, firstSeen: at(from), lastSeen: at(to) } + ]; + await recordAliases(env.db, w.server.id, silver(ORIGINAL, 10, 5)); + // an older sighting with another holder (the history arriving after the live row) leaves it + await recordAliases(env.db, w.server.id, silver(STEADY, 60, 50)); + // a newer one with nobody's name keeps the holder known + await recordAliases(env.db, w.server.id, silver(null, 2, 1)); + const [row] = await aliasesOf(w.server.id); + expect([row.holder, row.firstSeen.getTime(), row.lastSeen.getTime()]).toEqual([ + ORIGINAL, + at(60).getTime(), + at(1).getTime() + ]); + // a newer one with another holder replaces it + await recordAliases(env.db, w.server.id, silver(STEADY, 0.5, 0)); + expect((await aliasesOf(w.server.id))[0].holder).toBe(STEADY); + // more rows than one statement can bind + await recordAliases( + env.db, + w.otherServer.id, + Array.from({ length: 2500 }, (_, i) => ({ + steamId: COPIER, + name: `Name ${i}`, + holder: null, + firstSeen: at(1), + lastSeen: at(1) + })) + ); + expect(await aliasesOf(w.otherServer.id)).toHaveLength(2500); + }); + + test('a server whose fill fails leaves the others filled and the history unmarked, for the next try', async () => { + const w = await seedWorld(env); + const now = Date.now(); + const at = (m: number) => new Date(now - m * 60_000); + const kill = (serverId: string, minutesAgo: number, killer: Named, victim: Named) => ({ + ts: at(minutesAgo), + serverId, + eventId: newId(), + instanceId: 'i', + matchId: 'm', + eventTime: 1000 - minutesAgo, + map: 'Kavkazi', + killerSteamId: killer[0], + killerName: killer[1], + victimSteamId: victim[0], + victimName: victim[1], + cause: 'Id.Item.AK74M', + tags: [] + }); + for (const serverId of [w.server.id, w.otherServer.id]) { + await env.db + .insert(playerSessions) + .values([ + session(serverId, COPIER, 'Ghostpepper', at(120)), + session(serverId, STEADY, 'Steady', at(120)) + ]); + await env.db + .insert(kills) + .values(kill(serverId, 60, [COPIER, 'Juniper'], [STEADY, 'Steady'])); + } + await env.db.delete(siteSettings).where(eq(siteSettings.key, 'kill_feed_aliases_filled')); + // the second server's reads fail, as a dropped connection would + const dialect = ( + env.db as unknown as { dialect: { sqlToQuery(q: unknown): { params: unknown[] } } } + ).dialect; + const execute = env.db.execute.bind(env.db); + const broken = spyOn(env.db, 'execute').mockImplementation(((q: unknown) => + dialect.sqlToQuery(q).params.includes(w.otherServer.id) + ? Promise.reject(new Error('connection lost')) + : execute(q as Parameters[0])) as typeof env.db.execute); + try { + expect(await fillAliasHistory(env, { pauseMs: 0 })).toBe('incomplete'); + } finally { + broken.mockRestore(); + } + expect((await aliasesOf(w.server.id)).map((r) => r.name)).toEqual(['Juniper']); + expect(await aliasesOf(w.otherServer.id)).toEqual([]); + const [mark] = await env.db + .select() + .from(siteSettings) + .where(eq(siteSettings.key, 'kill_feed_aliases_filled')); + expect(mark).toBeUndefined(); + // the next try fills what was left + expect(await fillAliasHistory(env, { pauseMs: 0 })).toBe('done'); + expect((await aliasesOf(w.otherServer.id)).map((r) => r.name)).toEqual(['Juniper']); + }); + + test('the history is filled once, from the kills against the sessions open at each, merging with what was recorded live', async () => { + const w = await seedWorld(env); + const now = Date.now(); + const at = (m: number) => new Date(now - m * 60_000); + await env.db.insert(playerSessions).values([ + session(w.server.id, COPIER, 'Ghostpepper', at(48 * 60)), + session(w.server.id, ORIGINAL, '[R-14] Silver Fox', at(48 * 60)), + // left before the kills: not listed at them + { ...session(w.server.id, STRANGER, 'Tango', at(200)), lastSeen: at(190), leftAt: at(190) } + ]); + const kill = (minutesAgo: number, killer: Named, victim: Named) => ({ + ts: at(minutesAgo), + serverId: w.server.id, + eventId: newId(), + instanceId: 'i', + matchId: 'm', + eventTime: 1000 - minutesAgo, + map: 'Kavkazi', + killerSteamId: killer[0], + killerName: killer[1], + victimSteamId: victim[0], + victimName: victim[1], + cause: 'Id.Item.AK74M', + tags: [] + }); + await env.db.insert(kills).values([ + // more than a day before the others: another UTC day of the fill + kill(30 * 60, [COPIER, 'Halcyon'], [ORIGINAL, '[R-14] Silver Fox']), + kill(90, [COPIER, 'Ghostpepper'], [ORIGINAL, '[R-14] Silver Fox']), + kill(80, [COPIER, 'Silver Fox'], [ORIGINAL, '[R-14] Silver Fox']), + kill(70, [ORIGINAL, '[R-14] Silver Fox'], [COPIER, 'Tango']), + kill(60, [STRANGER, 'Nightjar'], [COPIER, 'Ghostpepper']) + ]); + // recorded live meanwhile, later than the history + await recordAliases(env.db, w.server.id, [ + { steamId: COPIER, name: 'Silver Fox', holder: ORIGINAL, firstSeen: at(2), lastSeen: at(1) } + ]); + await env.db.delete(siteSettings).where(eq(siteSettings.key, 'kill_feed_aliases_filled')); + // a process that no longer owns the worker leaves it to the next owner, unmarked + await releaseOwnership(env); + expect(await fillAliasHistory(env, { pauseMs: 0 })).toBe('stopped'); + expect(await acquireOrRenew(env, 'kill-feed-names')).toBe(true); + expect(await fillAliasHistory(env, { pauseMs: 0 })).toBe('done'); + expect( + (await aliasesOf(w.server.id)).map((r) => [ + r.steamId, + r.name, + r.holder, + r.firstSeen.getTime(), + r.lastSeen.getTime() + ]) + ).toEqual([ + [COPIER, 'Halcyon', null, at(30 * 60).getTime(), at(30 * 60).getTime()], + [COPIER, 'Silver Fox', ORIGINAL, at(80).getTime(), at(1).getTime()], + [COPIER, 'Tango', null, at(70).getTime(), at(70).getTime()] + ]); + expect(await fillAliasHistory(env, { pauseMs: 0 })).toBe('already'); + // nothing else came of the fill for this world's players + const others = await env.db + .select() + .from(playerAliases) + .where( + and( + eq(playerAliases.serverId, w.server.id), + inArray(playerAliases.steamId, [STRANGER, ORIGINAL]) + ) + ); + expect(others).toEqual([]); + }); +}); From 8c712fd507918dae07bc117747a949635e693b93 Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 00:50:47 +0100 Subject: [PATCH 035/102] Dossier and Players searches show the kill feed names: one line under the dossier's SteamID with the five newest, the rest a press away, another player's name in brass and opening their page, and a link to the player's kills; a line on a Past players or org Players row with up to three, the one the search found first and in brass --- src/lib/feed-names.test.ts | 29 +++++++++ src/lib/feed-names.ts | 18 ++++++ .../(app)/orgs/[id]/players/+page.svelte | 11 ++++ .../server/[id]/players/PastPlayers.svelte | 11 ++++ .../[id]/players/[steamId]/+page.svelte | 59 +++++++++++++++++++ 5 files changed, 128 insertions(+) create mode 100644 src/lib/feed-names.test.ts create mode 100644 src/lib/feed-names.ts diff --git a/src/lib/feed-names.test.ts b/src/lib/feed-names.test.ts new file mode 100644 index 00000000..6a0254ee --- /dev/null +++ b/src/lib/feed-names.test.ts @@ -0,0 +1,29 @@ +import { describe, expect, test } from 'bun:test'; +import { feedNamesLine } from './feed-names'; + +describe('a search row’s kill-feed names', () => { + const names = ['Halcyon', 'Silver Fox', 'Orchid', 'Silverback', 'Tango']; + + test('the ones the search found first, then the newest, and how many more', () => { + expect(feedNamesLine(names, 'silver')).toEqual({ + names: [ + { name: 'Silver Fox', hit: true }, + { name: 'Silverback', hit: true }, + { name: 'Halcyon', hit: false } + ], + more: 2 + }); + }); + + test('without a search, the newest few; a short list, all of it', () => { + expect(feedNamesLine(names, ' ').names.map((n) => n.name)).toEqual([ + 'Halcyon', + 'Silver Fox', + 'Orchid' + ]); + expect(feedNamesLine(['Tango'], 'x')).toEqual({ + names: [{ name: 'Tango', hit: false }], + more: 0 + }); + }); +}); diff --git a/src/lib/feed-names.ts b/src/lib/feed-names.ts new file mode 100644 index 00000000..6c2e81d4 --- /dev/null +++ b/src/lib/feed-names.ts @@ -0,0 +1,18 @@ +// How a Players search row shows the names the kill feed showed for a player that were not the +// ones the server listed them under: a few of them, the ones the search found first, then how many +// more. Pure and client-safe. + +/** Up to `n` of a player's kill-feed names, those containing the search text first (`hit`). */ +export function feedNamesLine( + names: readonly string[], + q: string, + n = 3 +): { names: { name: string; hit: boolean }[]; more: number } { + const needle = q.trim().toLowerCase(); + const hit = (name: string) => !!needle && name.toLowerCase().includes(needle); + const ordered = [...names.filter(hit), ...names.filter((name) => !hit(name))]; + return { + names: ordered.slice(0, n).map((name) => ({ name, hit: hit(name) })), + more: Math.max(0, names.length - n) + }; +} diff --git a/src/routes/(app)/orgs/[id]/players/+page.svelte b/src/routes/(app)/orgs/[id]/players/+page.svelte index f2fc09ff..eab21d1c 100644 --- a/src/routes/(app)/orgs/[id]/players/+page.svelte +++ b/src/routes/(app)/orgs/[id]/players/+page.svelte @@ -13,6 +13,7 @@ import SortHeader from '$lib/components/SortHeader.svelte'; import type { SortLike } from '$lib/table.svelte'; import type { SeenPlayer, SeenSort } from '$lib/server/seen'; + import { feedNamesLine } from '$lib/feed-names'; import type { PageProps } from './$types'; let { data }: PageProps = $props(); @@ -252,6 +253,16 @@ >{/if} {#if p.watched}watch{/if} + {#if p.feedNames.length} + {@const line = feedNamesLine(p.feedNames, f.q)} +
+ in the kill feed as {#each line.names as n, i (n.name)}{n.name}{i < line.names.length - 1 + ? ', ' + : ''}{/each}{#if line.more}{` and ${line.more} more`}{/if} +
+ {/if} {#if p.aliases.length}
also {p.aliases.slice(0, 4).join(', ')}{#if p.aliases.length > 4} diff --git a/src/routes/(app)/server/[id]/players/PastPlayers.svelte b/src/routes/(app)/server/[id]/players/PastPlayers.svelte index aa6946cd..f6a853bb 100644 --- a/src/routes/(app)/server/[id]/players/PastPlayers.svelte +++ b/src/routes/(app)/server/[id]/players/PastPlayers.svelte @@ -11,6 +11,7 @@ import type { SortLike } from '$lib/table.svelte'; import type { SeenPlayer, SeenSort } from '$lib/server/seen'; import type { BanReason } from '$lib/ban-reasons'; + import { feedNamesLine } from '$lib/feed-names'; let { server, @@ -183,6 +184,16 @@ > {/if}
+ {#if p.feedNames.length} + {@const line = feedNamesLine(p.feedNames, q)} +
+ in the kill feed as {#each line.names as f, i (f.name)}{f.name}{i < line.names.length - 1 + ? ', ' + : ''}{/each}{#if line.more}{` and ${line.more} more`}{/if} +
+ {/if}
{p.steamId}
{fmtAgo(p.lastSeen)} diff --git a/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte b/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte index 0462eef3..9ddeb058 100644 --- a/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte +++ b/src/routes/(app)/server/[id]/players/[steamId]/+page.svelte @@ -21,6 +21,29 @@ let { data }: PageProps = $props(); let d = $derived(data.dossier); let id = $derived(data.server.id); + + // The names the kill feed showed for the player: the newest few, the rest a press away. + const FEED_SHOWN = 5; + let feedOpenFor = $state(null); + let feedShown = $derived( + feedOpenFor === d.steamId ? d.feedNames : d.feedNames.slice(0, FEED_SHOWN) + ); + let feedTaken = $derived(d.feedNames.filter((f) => f.holder).length); + // a player with more names than the list holds: what it says is of the newest + let feedOf = $derived( + d.feedNamesTotal > d.feedNames.length + ? `the ${d.feedNames.length} newest of ${d.feedNamesTotal}` + : `the ${d.feedNames.length}` + ); + let feedTakenText = $derived( + feedTaken < d.feedNames.length + ? `${feedTaken} of ${feedOf} ${feedTaken === 1 ? 'was' : 'were'} another player's name on the server` + : d.feedNames.length === 1 + ? "another player's name on the server" + : d.feedNamesTotal > d.feedNames.length + ? `each of ${feedOf} another player's name on the server` + : "each another player's name on the server" + ); let canKick = $derived(can(data.server.caps, 'players.kick')); let chat = $derived(can(data.server.caps, 'chat.send')); let bans = $derived(can(data.server.caps, 'bans.manage')); @@ -194,6 +217,42 @@ >· also seen as {d.names.slice(1, 6).join(', ')}{d.names.length > 6 ? '…' : ''}{/if} + {#if d.feedNames.length} +
+ In the kill feed as + {#each feedShown as f, i (f.name)}{#if f.holder}{f.name}{:else}{f.name}{/if}{i < feedShown.length - 1 ? ', ' : ''}{/each} + {#if d.feedNames.length > FEED_SHOWN} + {#if feedOpenFor === d.steamId} + · + {:else} + and + {/if} + {/if} + {#if feedTaken}· {feedTakenText}{/if} + · + Kills → +
+ {/if} From f86e82d984ab7d0bb99975b0b847fa2fa6bd1cdb Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 00:50:47 +0100 Subject: [PATCH 036/102] Document the kill feed names --- README.md | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 95b707d8..83652ee4 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,10 @@ What is in the box: minute when it is empty. Pages get each observation as it happens over an event stream, and a command you send shows its effect on the next look. Browsers never talk to a game server. - **Past players**: the Players tab switches between who is on now and everyone who has played on - that server, searched by name, alias or SteamID64, with when they were last on, their sessions - and playtime. Anyone who can open the server can look; a row's Ban (for people who hold _Bans_) - lands the moment the player next joins, and Watch needs _Notes_. + that server, searched by name, alias, a name the kill feed showed for them or SteamID64, with + when they were last on, their sessions and playtime. Anyone who can open the server can look; a + row's Ban (for people who hold _Bans_) lands the moment the player next joins, and Watch needs + _Notes_. - **Analytics**: the worker keeps what the game does not: players online over time, players per day and how many of them were new, how long sessions last, cash in play per faction, uptime, time per map, wins per team, busiest hours, player playtime and sessions, match history @@ -410,6 +411,17 @@ watchlist_ can write them, and a note can be deleted by its author or a role wit A [Discord webhook](#discord-webhooks) ticked for _Watched players joining_ posts each time a watched player joins one of the organisation's servers. +On servers with the [kill feed](#kill-feed), the dossier also lists the names the feed showed for +the player that were not the one the server listed them under, newest first: _In the kill feed as_. +The game's player list keeps the name a player joined with (a clan tag changed mid-game aside), so a +player who renames mid-game to hide, often as another player, shows only there. A name that was +another player's on the server at the time is in brass and opens that player's page; the five +newest show, the rest a press away, with a link to the player's kills. A name they also played under +as their own there is left out. Past players and the +organisation's Players find a player by those names too, and show which one the search found. Only +the servers the reader can open are read. The names are recorded as kills come in, kept for good, +and filled once from the kill history, in the background, after the upgrade that adds them. + With a Steam key, the Players tab shows a player's Steam name under an in-game name that does not already hold it (a streamer's hidden name, say), and its filter finds players by that name too. @@ -615,7 +627,8 @@ history (filter by killer, victim, either side, weapon or vehicle, kind of kill distance, with a count, older pages and new kills arriving live; the filter lives in the URL, so a view can be shared), a **Combat** section on Analytics (kills per bucket, weapons, longest kills, top killers with headshot share and team kills), a Combat card on every player dossier (weapons, -most-killed, nemeses, recent kills and deaths), and the team-kill trigger. Team kills are +most-killed, nemeses, recent kills and deaths), the names players showed in it that were not their +own (on their dossiers and in the Players searches), and the team-kill trigger. Team kills are inferred: the feed carries no factions, so Warcon uses the factions it observed for both players at that moment. Feed events are history and are never pruned (a TimescaleDB hypertable with compression where the extension is installed). The @@ -1196,8 +1209,8 @@ These need _View_ on the server unless the table says otherwise. | Route | Answers | | -------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `GET /api/servers/:id/players/seen` | everyone who has played on the server: `q` (name, alias or SteamID), `since` (days), `flag` (`banned`, `watched` or `online`), `sort` (`lastSeen`, `firstSeen`, `minutes`, `sessions`, `kills`, `deaths`, `name`), `dir`, `offset`, `limit` (up to 100) | -| `GET /api/servers/:id/players/:steamId` | the dossier: names, sessions, totals per server, bans, risk, the kill feed's summary; notes and why a player is watched only with _Notes & watchlist_ | +| `GET /api/servers/:id/players/seen` | everyone who has played on the server: `q` (name, alias, a name the kill feed showed for them, or SteamID; each player's `feedNames` are those names), `since` (days), `flag` (`banned`, `watched` or `online`), `sort` (`lastSeen`, `firstSeen`, `minutes`, `sessions`, `kills`, `deaths`, `name`), `dir`, `offset`, `limit` (up to 100) | +| `GET /api/servers/:id/players/:steamId` | the dossier: names, the names the kill feed showed that were not theirs (`feedNames`), sessions, totals per server, bans, risk, the kill feed's summary; notes and why a player is watched only with _Notes & watchlist_ | | `GET /api/servers/:id/players/:steamId/career` | rank, streak, results by map and faction, the last ten matches, the organisation's last ten seasons with the places won | | `GET /api/servers/:id/players/marks?ids=a,b` | watched, first visit, risk score and Steam name (`steamName`) for up to 200 SteamIDs | | `GET /api/servers/:id/kills` | the stored kill feed, newest first (see [Kill feed](#kill-feed)): `killer`, `victim`, `player` (a SteamID, or part of a name), `kind` (`headshot`, `teamKill`, `suicide`, `vehicle`, `environment`), `cause`, `minM` (metres), `match`, `limit` (up to 200); `count=1` adds the total. For the next page, send the last kill's `ts` as `before` and its `eventTime` as `beforeTime` | @@ -1513,7 +1526,7 @@ GET /api/orgs/:id/lists the org lists the calle GET/POST /api/orgs/:id/lists/:kind/entries {steamId,reason,expiresAt} PATCH {reason,expiresAt} / DELETE .../entries/:steamId (kind = ban | reserve, needing Org ban list or Org reserved slots; ?includeRemoved=1) POST /api/orgs/:id/lists/sync push the lists to every org server now GET /api/orgs/:id/lists/import server entries not on the org list POST {entries:[{kind,steamId,reason}]} adopts them (owner) -GET /api/servers/:id/players/seen?q=&since=&flag=&sort=&dir=&offset=&limit= everyone who has played on this server, by name, alias or SteamID (View; 60 a minute) +GET /api/servers/:id/players/seen?q=&since=&flag=&sort=&dir=&offset=&limit= everyone who has played on this server, by name, alias, kill-feed name or SteamID (View; 60 a minute) GET /api/servers/:id/lists/state which bans / reserved slots here come from the org lists or this server's own POST .../lists/sync POST /api/servers/:id/lists/ban/entries {steamId,reason,expiresAt} ban on this server only, placed on sight if the player is away (Bans) PATCH {reason,expiresAt} / DELETE .../entries/:steamId POST /api/servers/:id/lists/reserve/entries {steamId,reason,expiresAt} reserve on this server only (Reserved slots) DELETE .../entries/:steamId From 083ef90fe3ee3500acd4c5680f2654003e365c70 Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 01:23:33 +0100 Subject: [PATCH 037/102] Cash per minute on the boards: a $/min column after Cash, the cash a player made per minute of the time it was made in, seed time left out as kills per hour leaves it, sortable (sort=cashPerMin) and in the CSV export as cash_per_min. A board counts a session's cash where the session ended, so the time it divides by is the whole of those sessions (cashMinutes on each row): a session that began before a range or season counts all its time as it does all its cash, and one still going when a season ended counts in neither, worked out from the rows the boards already read and held against a plain read of every session by the exactness test. The panel's Last seen may wrap after its date, so the sixteen columns fit at 1440 beside the SteamIDs, and the panel board's note no longer says cash is as last seen: it has been added up match by match since 22 September --- src/lib/components/LeaderboardTable.svelte | 16 ++- src/lib/leaderboard.test.ts | 15 +++ src/lib/leaderboard.ts | 21 +++- src/lib/server/leaderboards.ts | 72 +++++++----- .../server/[id]/leaderboard/+page.svelte | 7 +- .../(public)/s/[id]/leaderboard/+page.svelte | 5 +- .../[id]/leaderboard/export/+server.ts | 10 +- src/test/board-export.test.ts | 109 +++++++++++++++++- src/test/player-totals.test.ts | 1 + src/test/totals-oracle.ts | 39 ++++--- 10 files changed, 242 insertions(+), 53 deletions(-) diff --git a/src/lib/components/LeaderboardTable.svelte b/src/lib/components/LeaderboardTable.svelte index 1147202b..83b2d101 100644 --- a/src/lib/components/LeaderboardTable.svelte +++ b/src/lib/components/LeaderboardTable.svelte @@ -13,6 +13,7 @@ BOARD_RANGES, kdRatio, perHour, + perMinute, winRate, type BoardMetric, type BoardQuery, @@ -196,6 +197,13 @@ W-L-D Win % Cash + $/min {#if !final}Last seen{/if} @@ -223,11 +231,15 @@ {r.wins}-{r.losses}-{r.draws} {pct(winRate(r.wins, r.losses, r.draws))} {fmtCash(r.cash)} - {#if !final}{seen(r.lastSeen)}{/if} + {fmtCash(perMinute(r.cash, r.cashMinutes, r.seedMinutes))} + {#if !final} + + {seen(r.lastSeen)} + {/if} {:else} - + {#if !board || loading}Loading…{:else if board.total === 0 && query.minMinutes > 0}Nobody has {fmtMinutes(query.minMinutes)} of playtime in this {what}{final ? '' diff --git a/src/lib/leaderboard.test.ts b/src/lib/leaderboard.test.ts index 605575d2..b1d62aa8 100644 --- a/src/lib/leaderboard.test.ts +++ b/src/lib/leaderboard.test.ts @@ -10,6 +10,7 @@ import { metricValue, parseBoardQuery, perHour, + perMinute, rangeStart, streak, winRate, @@ -80,6 +81,13 @@ describe('ratios with zero denominators', () => { expect(perHour(30, 90, 30)).toBe(30); expect(perHour(30, 90, 90)).toBeNull(); }); + test('cash per minute needs playtime, and seed time is not playtime', () => { + expect(perMinute(900, 90)).toBe(10); + expect(perMinute(900, 0)).toBeNull(); + expect(perMinute(0, 60)).toBe(0); + expect(perMinute(900, 90, 30)).toBe(15); + expect(perMinute(900, 90, 90)).toBeNull(); + }); test('win rate needs a match with a result', () => { expect(winRate(3, 1, 0)).toBe(0.75); expect(winRate(1, 1, 2)).toBe(0.25); @@ -113,6 +121,7 @@ describe('board query', () => { expect( parseBoardQuery(new URLSearchParams('scope=x&range=1y&sort=luck&dir=up&page=0&minMinutes=-5')) ).toEqual({ ...DEFAULT_BOARD_QUERY, page: 1, minMinutes: 0 }); + expect(parseBoardQuery(new URLSearchParams('sort=cashPerMin')).sort).toBe('cashPerMin'); }); test('round-trips through its parameters, defaults left out', () => { expect(boardQueryParams(DEFAULT_BOARD_QUERY)).toEqual({}); @@ -133,6 +142,7 @@ describe('metricValue', () => { steamId: '76561198000000001', name: 'Nomad', minutes: 120, + cashMinutes: 120, seedMinutes: 45, kills: 40, deaths: 0, @@ -155,9 +165,14 @@ describe('metricValue', () => { expect(metricValue(row, 'perHour')).toBe(32); expect(metricValue(row, 'winRate')).toBe(0.5); expect(metricValue(row, 'cash')).toBe(900); + // $900 over the same 75 minutes + expect(metricValue(row, 'cashPerMin')).toBe(12); + // over the whole time of the sessions it came from, when one began before the range + expect(metricValue({ ...row, cashMinutes: 195 }, 'cashPerMin')).toBe(6); expect(metricValue(row, 'seeded')).toBe(45); expect(metricValue({ ...row, minutes: 0 }, 'perHour')).toBeNull(); expect(metricValue({ ...row, minutes: 45 }, 'perHour')).toBeNull(); + expect(metricValue({ ...row, cashMinutes: 45 }, 'cashPerMin')).toBeNull(); }); }); diff --git a/src/lib/leaderboard.ts b/src/lib/leaderboard.ts index e11f1d07..31c2ef8e 100644 --- a/src/lib/leaderboard.ts +++ b/src/lib/leaderboard.ts @@ -22,7 +22,8 @@ export type BoardMetric = | 'matches' | 'wins' | 'winRate' - | 'cash'; + | 'cash' + | 'cashPerMin'; export type SortDir = 'asc' | 'desc'; export const BOARD_RANGES: { key: FixedRange; label: string; ms: number | null }[] = [ @@ -41,7 +42,8 @@ export const BOARD_METRICS: { key: BoardMetric; label: string }[] = [ { key: 'matches', label: 'Matches' }, { key: 'wins', label: 'Wins' }, { key: 'winRate', label: 'Win rate' }, - { key: 'cash', label: 'Cash' } + { key: 'cash', label: 'Cash' }, + { key: 'cashPerMin', label: 'Cash per minute' } ]; const METRIC_KEYS = new Set(BOARD_METRICS.map((m) => m.key)); const RANGE_KEYS = new Set(BOARD_RANGES.map((r) => r.key)); @@ -91,6 +93,12 @@ export interface BoardRow { /** the name last seen with, or the id when no session has one */ name: string; minutes: number; + /** + * the whole time of the sessions the cash came from, what cash per minute divides by: a session + * that began before the range or season counts all of its cash, so all of its minutes too, and + * one still going when a season ended counts in neither; the playtime itself on all time + */ + cashMinutes: number; /** minutes on with the server low, as the Seeding reward counts them (0 without a rule) */ seedMinutes: number; kills: number; @@ -187,6 +195,13 @@ export const kdRatio = (kills: number, deaths: number): number | null => export const perHour = (kills: number, minutes: number, seedMinutes = 0): number | null => minutes - seedMinutes > 0 ? kills / ((minutes - seedMinutes) / 60) : null; +/** + * Cash per minute of the time it was made in (a board row's cashMinutes), seed time left out as + * for kills per hour; nothing without such time. + */ +export const perMinute = (cash: number, minutes: number, seedMinutes = 0): number | null => + minutes - seedMinutes > 0 ? cash / (minutes - seedMinutes) : null; + /** Wins over the matches that had a result; nothing without one. */ export const winRate = (wins: number, losses: number, draws: number): number | null => { const played = wins + losses + draws; @@ -276,6 +291,8 @@ export function metricValue(row: BoardRow, metric: BoardMetric): number | null { return winRate(row.wins, row.losses, row.draws); case 'cash': return row.cash; + case 'cashPerMin': + return perMinute(row.cash, row.cashMinutes, row.seedMinutes); } } diff --git a/src/lib/server/leaderboards.ts b/src/lib/server/leaderboards.ts index 58b86770..192aab69 100644 --- a/src/lib/server/leaderboards.ts +++ b/src/lib/server/leaderboards.ts @@ -81,30 +81,34 @@ const lines = (ids: string[], from: Date, steamId: string | string[] | null) => * over them, then the columns of the reads before player_days (base in src/test/totals-oracle.ts), * word for word: a player's session side only when they have a session in range, the line side * only with a line in range, else the zero the missing side had. Seconds are exact numeric sums, - * so the minutes are the same digits for any `from`. Also read by the exactness test. + * so the minutes are the same digits for any `from`. `cash_minutes` is the whole time of the + * sessions the cash came from, what cash per minute divides by: a session that began before + * `from` counts all of its cash, so all of its time too (from its join, not from `from`). Also + * read by the exactness test. */ export const rangeBase = (ids: string[], from: Date) => sql` edge AS ( SELECT ${from}::timestamptz AS f, (${from}::timestamptz AT TIME ZONE 'UTC')::date + 1 AS d1, ((${from}::timestamptz AT TIME ZONE 'UTC')::date + 1)::timestamp AT TIME ZONE 'UTC' AS m1), parts AS ( - SELECT d.steam_id, d.sessions AS n, d.seconds AS sec, d.seed_seconds AS seed, d.cash, d.last_seen AS ls, - d.matches AS m, d.kills, d.deaths, d.headshots, d.team_kills, d.suicides, d.vehicle_kills, - d.kill_streak, d.death_streak, d.wins, d.losses, d.draws + SELECT d.steam_id, d.sessions AS n, d.seconds AS sec, d.seconds AS cs, d.seed_seconds AS seed, d.cash, + d.last_seen AS ls, d.matches AS m, d.kills, d.deaths, d.headshots, d.team_kills, d.suicides, + d.vehicle_kills, d.kill_streak, d.death_streak, d.wins, d.losses, d.draws FROM player_days d, edge WHERE d.server_id IN ${ids} AND d.day >= edge.d1 UNION ALL - SELECT d.steam_id, 0, EXTRACT(EPOCH FROM (edge.m1 - GREATEST(j, edge.f))), 0, 0, NULL, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + SELECT d.steam_id, 0, EXTRACT(EPOCH FROM (edge.m1 - GREATEST(j, edge.f))), EXTRACT(EPOCH FROM (edge.m1 - j)), + 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 FROM player_days d CROSS JOIN edge CROSS JOIN LATERAL unnest(d.crossings) j WHERE d.server_id IN ${ids} AND d.day = edge.d1 AND d.crossings IS NOT NULL UNION ALL SELECT s.steam_id, 1, EXTRACT(EPOCH FROM (COALESCE(s.left_at, now()) - GREATEST(s.joined_at, edge.f))), + EXTRACT(EPOCH FROM (COALESCE(s.left_at, now()) - s.joined_at)), s.seed_seconds, s.cash, s.last_seen, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 FROM player_sessions s, edge WHERE s.server_id IN ${ids} AND s.last_seen >= edge.f AND (s.left_at IS NULL OR (s.left_at >= edge.f AND s.left_at < edge.m1)) UNION ALL - SELECT p.steam_id, 0, 0, 0, 0, NULL, 1, p.kills, p.deaths, p.headshots, p.team_kills, p.suicides, + SELECT p.steam_id, 0, 0, 0, 0, 0, NULL, 1, p.kills, p.deaths, p.headshots, p.team_kills, p.suicides, p.vehicle_kills, p.kill_streak, p.death_streak, CASE WHEN x.r = 'win' THEN 1 ELSE 0 END, CASE WHEN x.r = 'loss' THEN 1 ELSE 0 END, CASE WHEN x.r = 'draw' THEN 1 ELSE 0 END FROM edge, matches mt @@ -112,16 +116,17 @@ export const rangeBase = (ids: string[], from: Date) => sql` CROSS JOIN LATERAL (SELECT match_result(mt.final_scores, mt.winner, p.faction) AS r) x WHERE mt.server_id IN ${ids} AND mt.ended_at >= edge.f AND mt.ended_at < edge.m1), player AS ( - SELECT steam_id, SUM(n) AS n, SUM(sec) AS sec, SUM(seed) AS seed, MAX(ls) AS ls, SUM(cash) AS cash, - SUM(m) AS m, SUM(kills) AS kills, SUM(deaths) AS deaths, SUM(headshots) AS headshots, - SUM(team_kills) AS team_kills, SUM(suicides) AS suicides, SUM(vehicle_kills) AS vehicle_kills, - MAX(kill_streak) FILTER (WHERE m > 0) AS kill_streak, + SELECT steam_id, SUM(n) AS n, SUM(sec) AS sec, SUM(cs) AS cs, SUM(seed) AS seed, MAX(ls) AS ls, + SUM(cash) AS cash, SUM(m) AS m, SUM(kills) AS kills, SUM(deaths) AS deaths, + SUM(headshots) AS headshots, SUM(team_kills) AS team_kills, SUM(suicides) AS suicides, + SUM(vehicle_kills) AS vehicle_kills, MAX(kill_streak) FILTER (WHERE m > 0) AS kill_streak, MAX(death_streak) FILTER (WHERE m > 0) AS death_streak, SUM(wins) AS wins, SUM(losses) AS losses, SUM(draws) AS draws FROM parts GROUP BY steam_id HAVING SUM(n) > 0 OR SUM(m) > 0), base AS ( SELECT steam_id, CASE WHEN n > 0 THEN sec / 60 ELSE 0 END AS minutes, + CASE WHEN n > 0 THEN cs / 60 ELSE 0 END AS cash_minutes, CASE WHEN n > 0 THEN seed / 60.0 ELSE 0 END AS seed_minutes, CASE WHEN n > 0 THEN cash ELSE 0 END AS cash, CASE WHEN n > 0 THEN ls END AS last_seen, CASE WHEN m > 0 THEN kills ELSE 0 END AS kills, CASE WHEN m > 0 THEN deaths ELSE 0 END AS deaths, @@ -143,9 +148,13 @@ export const rangeBase = (ids: string[], from: Date) => sql` * before `to`. When `to` falls on from's own day, or at its end, only the first day is read, up * to `to`. The sessions still open count up to `to`. A session is in the season when it left in * it or was still going at its end; its seed time and cash go where it left, as the day rows keep - * them, so one still going at `to` gives the season its time and nothing else. Last seen has no - * meaning for a finished season and is left empty. Read against oracleSeasonBase by the - * exactness test. + * them, so one still going at `to` gives the season its time and nothing else. `cash_minutes` is + * the whole time of the sessions the cash came from, as in rangeBase: the time before `from` of + * one that left in the season counts, and none of one still going at `to`. A crossing into D1 + * adds its time from its join to that midnight once `to` is past it; one into the day after Dt, + * or one that left on Dt after `to`, takes back what D1's crossing and the day rows gave it, its + * time from its join, or D1, to Dt's midnight. Last seen has no meaning for a finished season + * and is left empty. Read against oracleSeasonBase by the exactness test. */ export const seasonBase = (ids: string[], from: Date, to: Date) => sql` edge AS ( @@ -156,25 +165,28 @@ export const seasonBase = (ids: string[], from: Date, to: Date) => sql` (${from}::timestamptz AT TIME ZONE 'UTC')::date + 1 AS d1, (${to}::timestamptz AT TIME ZONE 'UTC')::date AS dt) a) b), parts AS ( - SELECT d.steam_id, d.sessions AS n, d.seconds AS sec, d.seed_seconds AS seed, d.cash, + SELECT d.steam_id, d.sessions AS n, d.seconds AS sec, d.seconds AS cs, d.seed_seconds AS seed, d.cash, d.matches AS m, d.kills, d.deaths, d.headshots, d.team_kills, d.suicides, d.vehicle_kills, d.kill_streak, d.death_streak, d.wins, d.losses, d.draws FROM player_days d, edge WHERE d.server_id IN ${ids} AND d.day >= edge.d1 AND d.day < edge.dt UNION ALL - SELECT d.steam_id, 0, EXTRACT(EPOCH FROM (LEAST(edge.m1, edge.t) - GREATEST(j, edge.f))), 0, 0, + SELECT d.steam_id, 0, EXTRACT(EPOCH FROM (LEAST(edge.m1, edge.t) - GREATEST(j, edge.f))), + CASE WHEN edge.late THEN EXTRACT(EPOCH FROM (edge.m1 - j)) ELSE 0 END, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 FROM player_days d CROSS JOIN edge CROSS JOIN LATERAL unnest(d.crossings) j WHERE d.server_id IN ${ids} AND d.day = edge.d1 AND d.crossings IS NOT NULL AND j < edge.t UNION ALL SELECT s.steam_id, CASE WHEN s.left_at < edge.t THEN 1 ELSE 0 END, EXTRACT(EPOCH FROM (LEAST(s.left_at, edge.t) - GREATEST(s.joined_at, edge.f))), + CASE WHEN s.left_at < edge.t THEN EXTRACT(EPOCH FROM (s.left_at - s.joined_at)) ELSE 0 END, CASE WHEN s.left_at < edge.t THEN s.seed_seconds ELSE 0 END, CASE WHEN s.left_at < edge.t THEN s.cash ELSE 0 END, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 FROM player_sessions s, edge WHERE s.server_id IN ${ids} AND s.left_at >= edge.f AND s.left_at < edge.m1 AND (s.left_at < edge.t OR s.joined_at < edge.t) UNION ALL - SELECT d.steam_id, 0, EXTRACT(EPOCH FROM (edge.t - GREATEST(j, edge.mt))), 0, 0, + SELECT d.steam_id, 0, EXTRACT(EPOCH FROM (edge.t - GREATEST(j, edge.mt))), + -GREATEST(EXTRACT(EPOCH FROM (edge.mt - j)), 0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 FROM player_days d CROSS JOIN edge CROSS JOIN LATERAL unnest(d.crossings) j WHERE edge.late AND d.server_id IN ${ids} AND d.day = edge.dt + 1 AND d.crossings IS NOT NULL @@ -182,6 +194,8 @@ export const seasonBase = (ids: string[], from: Date, to: Date) => sql` UNION ALL SELECT s.steam_id, CASE WHEN s.left_at < edge.t THEN 1 ELSE 0 END, EXTRACT(EPOCH FROM (LEAST(s.left_at, edge.t) - GREATEST(s.joined_at, edge.mt))), + CASE WHEN s.left_at < edge.t THEN EXTRACT(EPOCH FROM (s.left_at - GREATEST(s.joined_at, edge.mt))) + ELSE -GREATEST(EXTRACT(EPOCH FROM (edge.mt - s.joined_at)), 0) END, CASE WHEN s.left_at < edge.t THEN s.seed_seconds ELSE 0 END, CASE WHEN s.left_at < edge.t THEN s.cash ELSE 0 END, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 FROM player_sessions s, edge @@ -189,12 +203,12 @@ export const seasonBase = (ids: string[], from: Date, to: Date) => sql` AND (s.left_at < edge.t OR s.joined_at < edge.t) UNION ALL SELECT s.steam_id, 1, EXTRACT(EPOCH FROM (LEAST(now(), edge.t) - GREATEST(s.joined_at, edge.f))), - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 FROM player_sessions s, edge WHERE s.server_id IN ${ids} AND s.left_at IS NULL AND s.last_seen >= edge.f AND s.joined_at < edge.t UNION ALL - SELECT p.steam_id, 0, 0, 0, 0, 1, p.kills, p.deaths, p.headshots, p.team_kills, p.suicides, + SELECT p.steam_id, 0, 0, 0, 0, 0, 1, p.kills, p.deaths, p.headshots, p.team_kills, p.suicides, p.vehicle_kills, p.kill_streak, p.death_streak, CASE WHEN x.r = 'win' THEN 1 ELSE 0 END, CASE WHEN x.r = 'loss' THEN 1 ELSE 0 END, CASE WHEN x.r = 'draw' THEN 1 ELSE 0 END FROM edge, matches mt @@ -204,7 +218,7 @@ export const seasonBase = (ids: string[], from: Date, to: Date) => sql` AND ((mt.ended_at >= edge.f AND mt.ended_at < LEAST(edge.m1, edge.t)) OR (edge.late AND mt.ended_at >= edge.mt AND mt.ended_at < edge.t))), player AS ( - SELECT steam_id, SUM(n) AS n, SUM(sec) AS sec, SUM(seed) AS seed, SUM(cash) AS cash, + SELECT steam_id, SUM(n) AS n, SUM(sec) AS sec, SUM(cs) AS cs, SUM(seed) AS seed, SUM(cash) AS cash, SUM(m) AS m, SUM(kills) AS kills, SUM(deaths) AS deaths, SUM(headshots) AS headshots, SUM(team_kills) AS team_kills, SUM(suicides) AS suicides, SUM(vehicle_kills) AS vehicle_kills, MAX(kill_streak) FILTER (WHERE m > 0) AS kill_streak, @@ -214,6 +228,7 @@ export const seasonBase = (ids: string[], from: Date, to: Date) => sql` base AS ( SELECT steam_id, CASE WHEN n > 0 OR sec <> 0 THEN sec / 60 ELSE 0 END AS minutes, + CASE WHEN n > 0 OR sec <> 0 THEN cs / 60 ELSE 0 END AS cash_minutes, CASE WHEN n > 0 OR sec <> 0 THEN seed / 60.0 ELSE 0 END AS seed_minutes, CASE WHEN n > 0 OR sec <> 0 THEN cash ELSE 0 END AS cash, NULL::timestamptz AS last_seen, CASE WHEN m > 0 THEN kills ELSE 0 END AS kills, CASE WHEN m > 0 THEN deaths ELSE 0 END AS deaths, @@ -231,8 +246,9 @@ export const seasonBase = (ids: string[], from: Date, to: Date) => sql` * The base rows for all time, from the settled totals: `sess` is the pairs with a closed session * plus the open sessions, `mt` the pairs with a line of an ended match, then the join of the reads * before player_totals. The same rows and values as they gave: the seconds are exact numeric sums, - * and a player with no session at all still gets the join's zeros. Also read by the exactness - * test (src/test/player-totals.test.ts). + * and a player with no session at all still gets the join's zeros. All time has no edge, so the + * time behind the cash is the playtime. Also read by the exactness test + * (src/test/player-totals.test.ts). */ export const totalsBase = (ids: string[], steamIds: string[] | null = null) => sql` sess AS ( @@ -257,8 +273,8 @@ export const totalsBase = (ids: string[], steamIds: string[] | null = null) => s GROUP BY steam_id), base AS ( SELECT steam_id, - COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.seed_minutes, 0) AS seed_minutes, - COALESCE(sess.cash, 0) AS cash, sess.last_seen, + COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.minutes, 0) AS cash_minutes, + COALESCE(sess.seed_minutes, 0) AS seed_minutes, COALESCE(sess.cash, 0) AS cash, sess.last_seen, COALESCE(mt.kills, 0) AS kills, COALESCE(mt.deaths, 0) AS deaths, COALESCE(mt.headshots, 0) AS headshots, COALESCE(mt.team_kills, 0) AS team_kills, COALESCE(mt.suicides, 0) AS suicides, COALESCE(mt.vehicle_kills, 0) AS vehicle_kills, @@ -340,13 +356,15 @@ const METRIC_SQL: Record> = { matches: sql`matches`, wins: sql`wins`, winRate: sql`CASE WHEN wins + losses + draws > 0 THEN wins::float / (wins + losses + draws) ELSE NULL END`, - cash: sql`cash` + cash: sql`cash`, + cashPerMin: sql`CASE WHEN cash_minutes - seed_minutes > 0 THEN cash::float / (cash_minutes - seed_minutes) ELSE NULL END` }; interface BaseRow extends Record { steamId: string; name: string | null; minutes: string; + cashMinutes: string; seedMinutes: string; cash: string; lastSeen: Date | null; @@ -409,7 +427,8 @@ async function boardSlice( WHERE minutes >= ${q.minMinutes} ORDER BY ${METRIC_SQL[q.sort]} ${order}, kills DESC, steam_id LIMIT ${limit} OFFSET ${offset}) - SELECT r.steam_id AS "steamId", r.minutes, r.seed_minutes AS "seedMinutes", r.cash, r.last_seen AS "lastSeen", + SELECT r.steam_id AS "steamId", r.minutes, r.cash_minutes AS "cashMinutes", r.seed_minutes AS "seedMinutes", + r.cash, r.last_seen AS "lastSeen", r.kills, r.headshots, r.team_kills AS "teamKills", r.deaths, r.suicides, r.vehicle_kills AS "vehicleKills", r.kill_streak AS "killStreak", r.death_streak AS "deathStreak", r.matches, r.wins, r.losses, r.draws, r.total, @@ -622,6 +641,7 @@ const shapeRow = (r: BaseRow, rank: number): BoardRow => ({ steamId: r.steamId, name: r.name || r.steamId, minutes: Math.round(num(r.minutes)), + cashMinutes: Math.round(num(r.cashMinutes)), seedMinutes: Math.round(num(r.seedMinutes)), kills: num(r.kills), deaths: num(r.deaths), diff --git a/src/routes/(app)/server/[id]/leaderboard/+page.svelte b/src/routes/(app)/server/[id]/leaderboard/+page.svelte index f3747e41..c568c226 100644 --- a/src/routes/(app)/server/[id]/leaderboard/+page.svelte +++ b/src/routes/(app)/server/[id]/leaderboard/+page.svelte @@ -66,9 +66,10 @@ />

Kills and deaths are the game's own scoreboard counters, recorded per match; headshots, team - kills and streaks come from the kill feed; playtime from player sessions, cash as last seen. A - match counts once it has ended, with the result read against the side the player played. Kills - per hour leaves seed time out. Names link to the dossier. + kills and streaks come from the kill feed; playtime and cash from player sessions, cash added up + match by match. A match counts once it has ended, with the result read against the side the + player played. Kills per hour and cash per minute leave seed time out. Names link to the + dossier. {#if publicOn}This board is also public at /s/{id}/leaderboard

Kills and deaths from the game's scoreboard, match by match; headshots, team kills and streaks - from the kill feed; playtime from time seen on the server. A match counts once it has ended. - Names open a player's career. + from the kill feed; playtime from time seen on the server. K/h is kills per hour of that + playtime and $/min cash per minute of the sessions the cash came from, seed time left out of + both. A match counts once it has ended. Names open a player's career.

diff --git a/src/routes/api/servers/[id]/leaderboard/export/+server.ts b/src/routes/api/servers/[id]/leaderboard/export/+server.ts index bd91d82f..9d48da3e 100644 --- a/src/routes/api/servers/[id]/leaderboard/export/+server.ts +++ b/src/routes/api/servers/[id]/leaderboard/export/+server.ts @@ -9,7 +9,14 @@ import { assertRate } from '$lib/server/ratelimit'; import { exportBoard } from '$lib/server/leaderboards'; import { boardWindow } from '$lib/server/seasons'; import { csvCell, fileSlug } from '$lib/server/csv'; -import { kdRatio, parseBoardQuery, perHour, winRate, type BoardRow } from '$lib/leaderboard'; +import { + kdRatio, + parseBoardQuery, + perHour, + perMinute, + winRate, + type BoardRow +} from '$lib/leaderboard'; /** Rounded to `digits` places; empty where the ratio has nothing to divide by. */ const round = (v: number | null, digits: number): number | null => @@ -38,6 +45,7 @@ const COLUMNS: [string, (r: BoardRow) => unknown][] = [ ['draws', (r) => r.draws], ['win_pct', (r) => percent(winRate(r.wins, r.losses, r.draws))], ['cash', (r) => r.cash], + ['cash_per_min', (r) => round(perMinute(r.cash, r.cashMinutes, r.seedMinutes), 1)], ['last_seen', (r) => r.lastSeen] ]; diff --git a/src/test/board-export.test.ts b/src/test/board-export.test.ts index bbd473a5..3c057c6f 100644 --- a/src/test/board-export.test.ts +++ b/src/test/board-export.test.ts @@ -3,7 +3,7 @@ // servers the caller can open, as the board's own is. import { beforeAll, describe, expect, test } from 'bun:test'; import type { Env } from '$lib/server/env'; -import { playerSessions } from '$lib/server/db/schema'; +import { playerSessions, seasons } from '$lib/server/db/schema'; import { BOARD_PAGE } from '$lib/leaderboard'; import { hasTestDb, testEnv } from './db'; import { callRaw, stubGateway } from './call'; @@ -13,6 +13,8 @@ import { GET as exportRoute } from '../routes/api/servers/[id]/leaderboard/expor const PLAYERS = BOARD_PAGE + 5; const FORMULA = '=HYPERLINK("http://evil.example","x")'; const ELSEWHERE = '76561198000000999'; +/** the cash two players made: the first more per minute, the second more in all */ +const CASH: Record = { 0: 6_100, 39: 8_000 }; describe.skipIf(!hasTestDb)('leaderboard export', () => { let env: Env; @@ -23,19 +25,32 @@ describe.skipIf(!hasTestDb)('leaderboard export', () => { stubGateway(); w = await seedWorld(env); const hour = 3_600_000; - const session = (serverId: string, steamId: string, name: string, minutes: number) => ({ + const session = ( + serverId: string, + steamId: string, + name: string, + minutes: number, + cash = 0 + ) => ({ serverId, steamId, name, joinedAt: new Date(Date.now() - 2 * hour), lastSeen: new Date(Date.now() - 2 * hour + minutes * 60_000), - leftAt: new Date(Date.now() - 2 * hour + minutes * 60_000) + leftAt: new Date(Date.now() - 2 * hour + minutes * 60_000), + cash }); await env.db .insert(playerSessions) .values([ ...Array.from({ length: PLAYERS - 1 }, (_, i) => - session(w.server.id, `7656119800000${String(1000 + i)}`, `Player ${i + 1}`, 61 + i) + session( + w.server.id, + `7656119800000${String(1000 + i)}`, + `Player ${i + 1}`, + 61 + i, + CASH[i] + ) ), session(w.server.id, '76561198000002000', FORMULA, 30), session(w.otherServer.id, ELSEWHERE, 'Elsewhere Only', 110) @@ -81,6 +96,7 @@ describe.skipIf(!hasTestDb)('leaderboard export', () => { 'draws', 'win_pct', 'cash', + 'cash_per_min', 'last_seen' ]); // more than one page of the board, in the order it ranks them @@ -91,6 +107,19 @@ describe.skipIf(!hasTestDb)('leaderboard export', () => { expect(lines.map((l) => l.split(',')[0]).slice(1, 4)).toEqual(['1', '2', '3']); }); + test('cash per minute is cash over playtime, and the board ranks by it', async () => { + const column = (lines: string[], name: string) => { + const at = lines[0].split(',').indexOf(name); + return lines.slice(1, 3).map((l) => l.split(',')[at]); + }; + // $6,100 over 61 minutes, then $8,000 over 100 + const rate = (await download('owner', 'minMinutes=0&sort=cashPerMin')).lines; + expect(column(rate, 'steam_id')).toEqual(['76561198000001000', '76561198000001039']); + expect(column(rate, 'cash_per_min')).toEqual(['100', '80']); + const cash = (await download('owner', 'minMinutes=0&sort=cash')).lines; + expect(column(cash, 'steam_id')).toEqual(['76561198000001039', '76561198000001000']); + }); + test('a name that a spreadsheet would run is written as text', async () => { const { lines } = await download('owner', 'minMinutes=0'); const row = lines.find((l) => l.includes('HYPERLINK')); @@ -120,3 +149,75 @@ describe.skipIf(!hasTestDb)('leaderboard export', () => { expect(own.lines.slice(1).map((l) => l.split(',')[1])).toEqual([ELSEWHERE]); }); }); + +describe.skipIf(!hasTestDb)('cash per minute at the edges of a range or a season', () => { + const H = 3_600_000; + const STRADDLER = '76561198000003001'; + const STEADY = '76561198000003002'; + const columns = async (w: World, user: PrincipalName, query: string) => { + const res = await callRaw(exportRoute, w.users[user], { params: { id: w.server.id }, query }); + const [head, ...rows] = (await res.text()).split('\r\n'); + const at = (name: string) => head.split(',').indexOf(name); + return (name: string) => rows.map((r) => r.split(',')[at(name)]); + }; + const session = ( + w: World, + steamId: string, + name: string, + joined: number, + left: number, + cash: number + ) => ({ + serverId: w.server.id, + steamId, + name, + joinedAt: new Date(joined), + lastSeen: new Date(left), + leftAt: new Date(left), + cash + }); + + test('a session that began before the range counts all of its time, as it does all of its cash', async () => { + const env = await testEnv(); + stubGateway(); + const w = await seedWorld(env); + const start = Date.now() - 7 * 24 * H; + await env.db.insert(playerSessions).values([ + // four hours at $100 a minute, the last two inside the seven days + session(w, STRADDLER, 'Straddler', start - 2 * H, start + 2 * H, 24_000), + // two hours at $120 a minute, well inside + session(w, STEADY, 'Steady', start + 5 * 24 * H, start + 5 * 24 * H + 2 * H, 14_400) + ]); + const col = await columns(w, 'owner', 'range=7d&sort=cashPerMin&minMinutes=60'); + expect(col('name')).toEqual(['Steady', 'Straddler']); + expect(col('cash_per_min')).toEqual(['120', '100']); + // the playtime is still what was played inside the range + expect(col('playtime_min')).toEqual(['120', '120']); + }); + + test('a session still going when a season ended gives it no cash and none of its time; the next season gets both', async () => { + const env = await testEnv(); + stubGateway(); + const w = await seedWorld(env); + const now = Date.now(); + const turn = now - 24 * H; + const [before, after] = [`before-${now}`, `after-${now}`]; + await env.db.insert(seasons).values([ + { id: before, orgId: w.org.id, name: 'Before', startsAt: new Date(turn - 10 * 24 * H) }, + { id: after, orgId: w.org.id, name: 'After', startsAt: new Date(turn) } + ]); + await env.db.insert(playerSessions).values([ + // four hours at $100 a minute across the turn of the season + session(w, STRADDLER, 'Straddler', turn - 2 * H, turn + 2 * H, 24_000), + // two hours at $120 a minute before it + session(w, STEADY, 'Steady', turn - 5 * H, turn - 3 * H, 14_400) + ]); + const ended = await columns(w, 'owner', `range=s:${before}&sort=cashPerMin&minMinutes=60`); + expect(ended('name')).toEqual(['Steady', 'Straddler']); + expect(ended('cash')).toEqual(['14400', '0']); + expect(ended('cash_per_min')).toEqual(['120', '']); + const next = await columns(w, 'owner', `range=s:${after}&sort=cashPerMin&minMinutes=60`); + expect(next('name')).toEqual(['Straddler']); + expect(next('cash_per_min')).toEqual(['100']); + }); +}); diff --git a/src/test/player-totals.test.ts b/src/test/player-totals.test.ts index 574be579..21666ca7 100644 --- a/src/test/player-totals.test.ts +++ b/src/test/player-totals.test.ts @@ -568,6 +568,7 @@ describe.skipIf(!hasTestDb)('player totals against the reads they replace', () = steamId: o.steamId as string, name: ((o.name as string | null) || o.steamId) as string, minutes: Math.round(Number(o.minutes)), + cashMinutes: Math.round(Number(o.cashMinutes)), seedMinutes: Math.round(Number(o.seedMinutes)), kills: Number(o.kills), deaths: Number(o.deaths), diff --git a/src/test/totals-oracle.ts b/src/test/totals-oracle.ts index 0e8c08cb..1fd9f288 100644 --- a/src/test/totals-oracle.ts +++ b/src/test/totals-oracle.ts @@ -1,8 +1,10 @@ // The all-time and ranged reads as they were before player_totals and player_days (main at // edf2aab), word for word, for the exactness tests to hold the totals against: each sums every // session and every line of an ended match on the servers asked about, since `from` (the epoch for -// all time). A finished season's read is the same sums cut at its end (seasonSums). Frozen on -// purpose: if the reads' meaning changes, this file changes with it in the same commit, +// all time). A finished season's read is the same sums cut at its end (seasonSums). The time +// behind the cash (cash_minutes) is each counted session's whole length, from its join; the rows +// below compare its value, not its scale (parts that cancel sum to 0.000000 where this reads 0). +// Frozen on purpose: if the reads' meaning changes, this file changes with it in the same commit, // deliberately. totalsRows, rangeRows and seasonRows, at the end, are the other side. import { sql, type SQL } from 'drizzle-orm'; import type { DbOrTx } from '$lib/server/db'; @@ -40,6 +42,7 @@ const base = (ids: string[], from: Date, steamIds: string[] | null = null) => sq sess AS ( SELECT steam_id, SUM(EXTRACT(EPOCH FROM (COALESCE(left_at, now()) - GREATEST(joined_at, ${from}::timestamptz)))) / 60 AS minutes, + SUM(EXTRACT(EPOCH FROM (COALESCE(left_at, now()) - joined_at))) / 60 AS cash_minutes, SUM(seed_seconds) / 60.0 AS seed_minutes, MAX(last_seen) AS last_seen, SUM(cash) AS cash FROM player_sessions WHERE server_id IN ${ids} AND last_seen >= ${from} @@ -58,8 +61,8 @@ const base = (ids: string[], from: Date, steamIds: string[] | null = null) => sq FROM lines GROUP BY steam_id), base AS ( SELECT steam_id, - COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.seed_minutes, 0) AS seed_minutes, - COALESCE(sess.cash, 0) AS cash, sess.last_seen, + COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.cash_minutes, 0) AS cash_minutes, + COALESCE(sess.seed_minutes, 0) AS seed_minutes, COALESCE(sess.cash, 0) AS cash, sess.last_seen, COALESCE(mt.kills, 0) AS kills, COALESCE(mt.deaths, 0) AS deaths, COALESCE(mt.headshots, 0) AS headshots, COALESCE(mt.team_kills, 0) AS team_kills, COALESCE(mt.suicides, 0) AS suicides, COALESCE(mt.vehicle_kills, 0) AS vehicle_kills, @@ -78,6 +81,8 @@ const seasonSums = (ids: string[], from: Date, to: Date) => sql` SELECT steam_id, SUM(EXTRACT(EPOCH FROM (LEAST(COALESCE(left_at, now()), ${to}::timestamptz) - GREATEST(joined_at, ${from}::timestamptz)))) / 60 AS minutes, + COALESCE(SUM(EXTRACT(EPOCH FROM (left_at - joined_at))) FILTER (WHERE left_at < ${to}), 0) / 60 + AS cash_minutes, COALESCE(SUM(seed_seconds) FILTER (WHERE left_at < ${to}), 0) / 60.0 AS seed_minutes, COALESCE(SUM(cash) FILTER (WHERE left_at < ${to}), 0) AS cash FROM player_sessions WHERE server_id IN ${ids} AND last_seen >= ${from} @@ -95,8 +100,9 @@ const seasonSums = (ids: string[], from: Date, to: Date) => sql` FROM lines GROUP BY steam_id), base AS ( SELECT steam_id, - COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.seed_minutes, 0) AS seed_minutes, - COALESCE(sess.cash, 0) AS cash, NULL::timestamptz AS last_seen, + COALESCE(sess.minutes, 0) AS minutes, COALESCE(sess.cash_minutes, 0) AS cash_minutes, + COALESCE(sess.seed_minutes, 0) AS seed_minutes, COALESCE(sess.cash, 0) AS cash, + NULL::timestamptz AS last_seen, COALESCE(mt.kills, 0) AS kills, COALESCE(mt.deaths, 0) AS deaths, COALESCE(mt.headshots, 0) AS headshots, COALESCE(mt.team_kills, 0) AS team_kills, COALESCE(mt.suicides, 0) AS suicides, COALESCE(mt.vehicle_kills, 0) AS vehicle_kills, @@ -115,7 +121,8 @@ const METRIC_SQL: Record = { matches: sql`matches`, wins: sql`wins`, winRate: sql`CASE WHEN wins + losses + draws > 0 THEN wins::float / (wins + losses + draws) ELSE NULL END`, - cash: sql`cash` + cash: sql`cash`, + cashPerMin: sql`CASE WHEN cash_minutes - seed_minutes > 0 THEN cash::float / (cash_minutes - seed_minutes) ELSE NULL END` }; /** Every all-time base row over these servers (or these players), each column as text. */ @@ -137,7 +144,8 @@ export async function oracleRangeBase( if (!ids.length) return []; return (await db.execute(sql` WITH ${base(ids, from, steamIds)} - SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + SELECT steam_id, minutes::text, trim_scale(cash_minutes)::text AS cash_minutes, seed_minutes::text, + cash::text, last_seen::text, kills::text, deaths::text, headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, death_streak::text, matches::text, wins::text, losses::text, draws::text FROM base ORDER BY steam_id`)) as Record[]; @@ -164,7 +172,8 @@ export async function oracleBoard( WHERE minutes >= ${q.minMinutes} ORDER BY ${METRIC_SQL[q.sort]} ${order}, kills DESC, steam_id LIMIT ${limit} OFFSET ${offset}) - SELECT r.steam_id AS "steamId", r.minutes::text, r.seed_minutes::text AS "seedMinutes", r.cash::text, + SELECT r.steam_id AS "steamId", r.minutes::text, r.cash_minutes::text AS "cashMinutes", + r.seed_minutes::text AS "seedMinutes", r.cash::text, r.last_seen AS "lastSeen", r.kills::text, r.headshots::text, r.team_kills::text AS "teamKills", r.deaths::text, r.suicides::text, r.vehicle_kills::text AS "vehicleKills", r.kill_streak::text AS "killStreak", r.death_streak::text AS "deathStreak", r.matches::text, @@ -218,7 +227,8 @@ export async function totalsRows( if (!ids.length) return []; return (await db.execute(sql` WITH ${totalsBase(ids, steamIds)} - SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + SELECT steam_id, minutes::text, trim_scale(cash_minutes)::text AS cash_minutes, seed_minutes::text, + cash::text, last_seen::text, kills::text, deaths::text, headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, death_streak::text, matches::text, wins::text, losses::text, draws::text FROM base ORDER BY steam_id`)) as Record[]; @@ -234,7 +244,8 @@ export async function oracleSeasonBase( if (!ids.length) return []; return (await db.execute(sql` WITH ${seasonSums(ids, from, to)} - SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + SELECT steam_id, minutes::text, trim_scale(cash_minutes)::text AS cash_minutes, seed_minutes::text, + cash::text, last_seen::text, kills::text, deaths::text, headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, death_streak::text, matches::text, wins::text, losses::text, draws::text FROM base ORDER BY steam_id`)) as Record[]; @@ -249,7 +260,8 @@ export async function rangeRows( if (!ids.length) return []; return (await db.execute(sql` WITH ${rangeBase(ids, from)} - SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + SELECT steam_id, minutes::text, trim_scale(cash_minutes)::text AS cash_minutes, seed_minutes::text, + cash::text, last_seen::text, kills::text, deaths::text, headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, death_streak::text, matches::text, wins::text, losses::text, draws::text FROM base ORDER BY steam_id`)) as Record[]; @@ -265,7 +277,8 @@ export async function seasonRows( if (!ids.length) return []; return (await db.execute(sql` WITH ${seasonBase(ids, from, to)} - SELECT steam_id, minutes::text, seed_minutes::text, cash::text, last_seen::text, kills::text, deaths::text, + SELECT steam_id, minutes::text, trim_scale(cash_minutes)::text AS cash_minutes, seed_minutes::text, + cash::text, last_seen::text, kills::text, deaths::text, headshots::text, team_kills::text, suicides::text, vehicle_kills::text, kill_streak::text, death_streak::text, matches::text, wins::text, losses::text, draws::text FROM base ORDER BY steam_id`)) as Record[]; From 46db0d634d8b913c6bea1551b5dd40afae10f5cf Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 01:27:50 +0100 Subject: [PATCH 038/102] Public board columns: an organisation's owners choose which columns its public boards leave out (organizations.board_hidden, migration 0043; empty is every column, so a column added later shows). Saved through PATCH /api/orgs/:id {boardHidden} by owners only and never a key, each change audited; kills can't be left out, since a board opens ranked by them. Read with what the boards open on, in the read already kept a minute per organisation and forgotten on a change, so it costs no new query. The public page's load answers the columns, and a sort by one of them ranks by kills instead; the public JSON, the panel's board and its export keep every number and every sort --- drizzle/0045_board_hidden.sql | 1 + drizzle/meta/0045_snapshot.json | 5456 +++++++++++++++++ drizzle/meta/_journal.json | 7 + src/lib/leaderboard.test.ts | 36 + src/lib/leaderboard.ts | 56 +- src/lib/seasons.test.ts | 6 +- src/lib/server/db/schema.ts | 5 + src/lib/server/orgs.ts | 10 +- src/lib/server/seasons.ts | 23 +- .../s/[id]/leaderboard/+page.server.ts | 10 +- src/routes/api/orgs/[id]/+server.ts | 6 +- src/test/board-columns.test.ts | 220 + 12 files changed, 5820 insertions(+), 16 deletions(-) create mode 100644 drizzle/0045_board_hidden.sql create mode 100644 drizzle/meta/0045_snapshot.json create mode 100644 src/test/board-columns.test.ts diff --git a/drizzle/0045_board_hidden.sql b/drizzle/0045_board_hidden.sql new file mode 100644 index 00000000..f88ec10e --- /dev/null +++ b/drizzle/0045_board_hidden.sql @@ -0,0 +1 @@ +ALTER TABLE "organizations" ADD COLUMN "board_hidden" text[] DEFAULT '{}'::text[] NOT NULL; \ No newline at end of file diff --git a/drizzle/meta/0045_snapshot.json b/drizzle/meta/0045_snapshot.json new file mode 100644 index 00000000..a8cf3664 --- /dev/null +++ b/drizzle/meta/0045_snapshot.json @@ -0,0 +1,5456 @@ +{ + "id": "f5895cff-2df5-4dc5-9528-9410de4080d7", + "prevId": "73540293-9ed7-4796-836e-6ccbc1ca0dff", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_server_ended_idx": { + "name": "matches_server_ended_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ended_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_ban_reasons": { + "name": "org_ban_reasons", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "reasons": { + "name": "reasons", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "org_ban_reasons_org_id_organizations_id_fk": { + "name": "org_ban_reasons_org_id_organizations_id_fk", + "tableFrom": "org_ban_reasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "board_opens": { + "name": "board_opens", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'official'" + }, + "board_hidden": { + "name": "board_hidden", + "type": "text[]", + "primaryKey": false, + "notNull": true, + "default": "'{}'::text[]" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_aliases": { + "name": "player_aliases", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "holder": { + "name": "holder", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "first_seen": { + "name": "first_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "player_aliases_steam_idx": { + "name": "player_aliases_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_aliases_server_id_steam_id_name_pk": { + "name": "player_aliases_server_id_steam_id_name_pk", + "columns": [ + "server_id", + "steam_id", + "name" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_days": { + "name": "player_days", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "day": { + "name": "day", + "type": "date", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "crossings": { + "name": "crossings", + "type": "timestamp with time zone[]", + "primaryKey": false, + "notNull": false + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_days_server_id_day_steam_id_pk": { + "name": "player_days_server_id_day_steam_id_pk", + "columns": [ + "server_id", + "day", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_totals": { + "name": "player_totals", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_totals_server_id_steam_id_pk": { + "name": "player_totals_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.seasons": { + "name": "seasons", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "starts_at": { + "name": "starts_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "seasons_org_start_uidx": { + "name": "seasons_org_start_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "starts_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "seasons_org_id_organizations_id_fk": { + "name": "seasons_org_id_organizations_id_fk", + "tableFrom": "seasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 3ea97944..d45aceb3 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -316,6 +316,13 @@ "when": 1791741216189, "tag": "0044_player_aliases", "breakpoints": true + }, + { + "idx": 45, + "version": "7", + "when": 1791741237500, + "tag": "0045_board_hidden", + "breakpoints": true } ] } \ No newline at end of file diff --git a/src/lib/leaderboard.test.ts b/src/lib/leaderboard.test.ts index b1d62aa8..b695d606 100644 --- a/src/lib/leaderboard.test.ts +++ b/src/lib/leaderboard.test.ts @@ -1,9 +1,12 @@ import { describe, expect, test } from 'bun:test'; import { + BOARD_COLUMNS, + BOARD_METRICS, boardQueryParams, DEFAULT_BOARD_QUERY, DEFAULT_FLOOR_MINUTES, groupCareer, + hiddenColumns, kdRatio, matchResult, meetsFloor, @@ -11,9 +14,12 @@ import { parseBoardQuery, perHour, perMinute, + publicQuery, rangeStart, + storedHidden, streak, winRate, + type BoardQuery, type BoardRow } from './leaderboard'; @@ -136,6 +142,36 @@ describe('board query', () => { }); }); +describe('the columns a public board leaves out', () => { + test("an owner names any column but kills, in any order; it keeps the table's", () => { + expect(hiddenColumns([])).toEqual([]); + expect(hiddenColumns(['cash', 'seeded', 'cash'])).toEqual(['seeded', 'cash']); + for (const bad of [['kills'], ['seeded', 'kills'], ['luck'], [1], 'cash', null, { cash: true }]) + expect({ bad, hidden: hiddenColumns(bad) }).toEqual({ bad, hidden: null }); + }); + + test('a stored list is read leaving out what is not a column today', () => { + expect(storedHidden(['cash', 'gone', 'kills', 'seeded'])).toEqual(['seeded', 'cash']); + expect(storedHidden(null)).toEqual([]); + }); + + test('a sort by a column left out ranks by kills, the board’s first order', () => { + const q: BoardQuery = { ...DEFAULT_BOARD_QUERY, sort: 'cash', dir: 'asc', page: 2 }; + expect(publicQuery(q, ['cash'])).toEqual({ ...q, sort: 'kills', dir: 'desc' }); + expect(publicQuery(q, ['seeded', 'headshots'])).toBe(q); + expect(publicQuery({ ...q, sort: 'wins' }, ['results']).sort).toBe('kills'); + expect(publicQuery({ ...q, sort: 'cashPerMin' }, ['cashPerMin']).sort).toBe('kills'); + }); + + test('every metric a board sorts by has its column', () => { + for (const m of BOARD_METRICS) + expect({ metric: m.key, column: BOARD_COLUMNS.some((c) => c.sort === m.key) }).toEqual({ + metric: m.key, + column: true + }); + }); +}); + describe('metricValue', () => { const row: BoardRow = { rank: 1, diff --git a/src/lib/leaderboard.ts b/src/lib/leaderboard.ts index 31c2ef8e..90add6a3 100644 --- a/src/lib/leaderboard.ts +++ b/src/lib/leaderboard.ts @@ -1,4 +1,4 @@ -// Leaderboards and careers: the vocabulary (ranges, seasons, scopes, metrics), how a board +// Leaderboards and careers: the vocabulary (ranges, seasons, scopes, metrics, columns), how a board // request travels in a query string, and the maths that turns stored counts into a result, a // streak or a ratio. Pure and client-safe; the queries live in $lib/server/leaderboards.ts and // mirror the result rule below in SQL where they aggregate. @@ -179,6 +179,60 @@ export function boardQueryParams(q: BoardQuery): Record { return out; } +/** + * The board's columns after rank and player, in table order: what each is called on the Seasons + * tab and above the column, and the metric its header sorts by. Kills always show, since a board + * opens ranked by them; an organisation's owners may leave any other out of its public boards. + */ +export const BOARD_COLUMNS = [ + { key: 'playtime', label: 'Playtime', head: 'Playtime', sort: 'playtime' }, + { key: 'seeded', label: 'Seed time', head: 'Seeded', sort: 'seeded' }, + { key: 'kills', label: 'Kills', head: 'K', sort: 'kills' }, + { key: 'deaths', label: 'Deaths', head: 'D', sort: 'deaths' }, + { key: 'kd', label: 'Kills per death', head: 'K/D', sort: 'kd' }, + { key: 'perHour', label: 'Kills per hour', head: 'K/h', sort: 'perHour' }, + { key: 'headshots', label: 'Headshots', head: 'HS', sort: null }, + { key: 'teamKills', label: 'Team kills', head: 'TK', sort: null }, + { key: 'matches', label: 'Matches', head: 'Matches', sort: 'matches' }, + { key: 'results', label: 'Wins, losses, draws', head: 'W-L-D', sort: 'wins' }, + { key: 'winRate', label: 'Win rate', head: 'Win %', sort: 'winRate' }, + { key: 'cash', label: 'Cash', head: 'Cash', sort: 'cash' }, + { key: 'cashPerMin', label: 'Cash per minute', head: '$/min', sort: 'cashPerMin' }, + { key: 'lastSeen', label: 'Last seen', head: 'Last seen', sort: null } +] as const satisfies readonly { + key: string; + label: string; + head: string; + sort: BoardMetric | null; +}[]; +export type BoardColumn = (typeof BOARD_COLUMNS)[number]['key']; +/** The column no board leaves out. */ +export const FIXED_COLUMN: BoardColumn = 'kills'; + +/** + * The columns to leave out of an organisation's public boards, as an owner sends them: column + * keys, never kills, in the table's order with repeats dropped. Null for anything else. + */ +export function hiddenColumns(v: unknown): BoardColumn[] | null { + if (!Array.isArray(v)) return null; + const keys = new Set(v); + for (const k of keys) + if (k === FIXED_COLUMN || !BOARD_COLUMNS.some((c) => c.key === k)) return null; + return BOARD_COLUMNS.filter((c) => keys.has(c.key)).map((c) => c.key); +} + +/** The stored list read back: whatever is not one of today's columns (or is kills) is left out. */ +export const storedHidden = (v: unknown): BoardColumn[] => + Array.isArray(v) + ? BOARD_COLUMNS.filter((c) => c.key !== FIXED_COLUMN && v.includes(c.key)).map((c) => c.key) + : []; + +/** A public board's query: a sort by a column the organisation leaves out ranks by kills instead. */ +export function publicQuery(q: BoardQuery, hidden: readonly BoardColumn[]): BoardQuery { + const off = BOARD_COLUMNS.some((c) => c.sort === q.sort && hidden.includes(c.key)); + return off ? { ...q, sort: DEFAULT_BOARD_QUERY.sort, dir: DEFAULT_BOARD_QUERY.dir } : q; +} + /** Where a rolling range starts; null for all time. */ export const rangeStart = (range: FixedRange, now = Date.now()): Date | null => { const ms = BOARD_RANGES.find((r) => r.key === range)?.ms ?? null; diff --git a/src/lib/seasons.test.ts b/src/lib/seasons.test.ts index 40dbf022..349db893 100644 --- a/src/lib/seasons.test.ts +++ b/src/lib/seasons.test.ts @@ -107,7 +107,8 @@ describe('resolveWindow', () => { ]); const os = (opens: OrgSeasons['opens']): OrgSeasons => ({ seasons: [...official, ...custom], - opens + opens, + hidden: [] }); const now = at('2026-10-20T12:00:00.000Z'); @@ -151,7 +152,8 @@ describe('resolveWindow', () => { expect(resolveWindow('current', os('custom'), before)).toMatchObject({ range: 'all' }); const theirsLater: OrgSeasons = { seasons: [...official, ...chainSeasons('custom', [{ key: 'x', name: 'X', startsAt: NOV }])], - opens: 'custom' + opens: 'custom', + hidden: [] }; expect(resolveWindow('current', theirsLater, now).range).toBe('s:o2'); expect(resolveWindow('current', { ...theirsLater, opens: 'official' }, before).range).toBe( diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index ae421031..4b2e2fbd 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -202,6 +202,11 @@ export const organizations = pgTable('organizations', { banMessage: text('ban_message').notNull().default('{reason}'), /** what the org's boards open on: official | custom | 30d | all ($lib/seasons, BOARD_OPENS) */ boardOpens: text('board_opens').notNull().default('official'), + /** the columns its public boards leave out ($lib/leaderboard, BOARD_COLUMNS); none = every one */ + boardHidden: text('board_hidden') + .array() + .notNull() + .default(sql`'{}'::text[]`), createdAt: ts('created_at').notNull().defaultNow(), updatedAt: ts('updated_at').notNull().defaultNow() }); diff --git a/src/lib/server/orgs.ts b/src/lib/server/orgs.ts index 9d057a78..8049e944 100644 --- a/src/lib/server/orgs.ts +++ b/src/lib/server/orgs.ts @@ -25,6 +25,7 @@ import { skipQueued } from './json-webhook-queue'; import type { InviteStatus, InviteView, ListSyncSummary, OrgMemberView, OrgView } from '$lib/types'; import { parseDiscordInvite } from '$lib/discord-invite'; import { isBoardOpens } from '$lib/seasons'; +import { hiddenColumns } from '$lib/leaderboard'; import { forgetSeasons } from './seasons'; import { BAN_MESSAGE_VARS, @@ -327,10 +328,17 @@ export async function updateOrg( set.boardOpens = body.boardOpens; detail.boardOpens = body.boardOpens; } + if (body.boardHidden !== undefined) { + const hidden = hiddenColumns(body.boardHidden); + if (!hidden) + throw new ApiError(400, "Leave out only the board's own columns, and never kills."); + set.boardHidden = hidden; + detail.boardHidden = hidden; + } if (!Object.keys(set).length) throw new ApiError(400, 'Nothing to update.'); set.updatedAt = new Date(); await env.db.update(organizations).set(set).where(eq(organizations.id, org.id)); - if (set.boardOpens !== undefined) forgetSeasons(org.id); + if (set.boardOpens !== undefined || set.boardHidden !== undefined) forgetSeasons(org.id); await writeAudit(env, req, { actor, orgId: org.id, diff --git a/src/lib/server/seasons.ts b/src/lib/server/seasons.ts index 244f1dff..f66f104e 100644 --- a/src/lib/server/seasons.ts +++ b/src/lib/server/seasons.ts @@ -1,7 +1,8 @@ // An organisation's seasons for its boards: the official ones from $lib/seasons and the -// community's own (the seasons table), chained per kind; what its boards open on; which window of -// the kept history a board reads; and an owner's changes to the community's seasons, each -// audited. A season that has not started is listed in the Seasons tab but never read. +// community's own (the seasons table), chained per kind; what its boards open on and the columns +// its public boards leave out; which window of the kept history a board reads; and an owner's +// changes to the community's seasons, each audited. A season that has not started is listed in +// the Seasons tab but never read. import { and, asc, count, eq } from 'drizzle-orm'; import type { Env } from './env'; import { ApiError, newId, str } from './http'; @@ -18,12 +19,21 @@ import { type BoardOpens, type Season } from '$lib/seasons'; -import { isFixedRange, rangeStart, type BoardRange, type FixedRange } from '$lib/leaderboard'; +import { + isFixedRange, + rangeStart, + storedHidden, + type BoardColumn, + type BoardRange, + type FixedRange +} from '$lib/leaderboard'; export interface OrgSeasons { /** the official seasons, then the community's own, each kind in start order */ seasons: Season[]; opens: BoardOpens; + /** the columns its public boards leave out */ + hidden: BoardColumn[]; } /** Read once a minute per organisation: every board and career asks. */ @@ -58,7 +68,7 @@ export const listSeasons = (env: Env, orgId: string): Promise => async function readSeasons(env: Env, orgId: string): Promise { const [[org], own] = await Promise.all([ env.db - .select({ opens: organizations.boardOpens }) + .select({ opens: organizations.boardOpens, hidden: organizations.boardHidden }) .from(organizations) .where(eq(organizations.id, orgId)), env.db @@ -75,7 +85,8 @@ async function readSeasons(env: Env, orgId: string): Promise { own.map((s) => ({ key: s.key, name: s.name, startsAt: s.startsAt.toISOString() })) ) ], - opens: isBoardOpens(org?.opens) ? org.opens : 'official' + opens: isBoardOpens(org?.opens) ? org.opens : 'official', + hidden: storedHidden(org?.hidden) }; } diff --git a/src/routes/(public)/s/[id]/leaderboard/+page.server.ts b/src/routes/(public)/s/[id]/leaderboard/+page.server.ts index aee31e8b..df95c1db 100644 --- a/src/routes/(public)/s/[id]/leaderboard/+page.server.ts +++ b/src/routes/(public)/s/[id]/leaderboard/+page.server.ts @@ -1,5 +1,6 @@ // The public leaderboard: 404 unless leaderboards are on for the server. The org scope covers -// only the organisation's servers whose leaderboards are public too. +// only the organisation's servers whose leaderboards are public too. The page leaves out the +// columns the organisation's owners chose, and a sort by one of them ranks by kills instead. import type { PageServerLoad } from './$types'; import { getEnv } from '$lib/server/env'; import { @@ -9,17 +10,20 @@ import { requirePublicServer } from '$lib/server/public'; import { loadBoard } from '$lib/server/leaderboards'; -import { parseBoardQuery, PUBLIC_MAX_PAGE } from '$lib/leaderboard'; +import { orgSeasons } from '$lib/server/seasons'; +import { parseBoardQuery, publicQuery, PUBLIC_MAX_PAGE } from '$lib/leaderboard'; export const load: PageServerLoad = (event) => publicLoad(event, async () => { const env = getEnv(); const ps = await requirePublicServer(env, event.params.id, 'leaderboards'); - const q = parseBoardQuery(event.url.searchParams, PUBLIC_MAX_PAGE); + const { hidden } = await orgSeasons(env, ps.org.id); + const q = publicQuery(parseBoardQuery(event.url.searchParams, PUBLIC_MAX_PAGE), hidden); const orgServers = await publicOrgServers(env, ps.org, 'leaderboards'); const ids = q.scope === 'org' ? orgServers.map((s) => s.id) : [ps.server.id]; return { board: { ...(await loadBoard(env, ids, q, ps.org.id)), maxPage: PUBLIC_MAX_PAGE }, + hidden, orgScope: orgServers.length > 1, heading: publicHeading(ps) }; diff --git a/src/routes/api/orgs/[id]/+server.ts b/src/routes/api/orgs/[id]/+server.ts index 0f496a73..20aa3a21 100644 --- a/src/routes/api/orgs/[id]/+server.ts +++ b/src/routes/api/orgs/[id]/+server.ts @@ -11,9 +11,9 @@ import { } from '$lib/server/orgs'; /** - * {name} or {discordInviteUrl} or {boardOpens} or {membersReserved} or {banMessage} or {banReasons} - * for org owners; {serverLimit, suspended, reason, allowPublicStatus, allowPublicLeaderboards} for - * the site owner only. + * {name} or {discordInviteUrl} or {boardOpens} or {boardHidden} or {membersReserved} or + * {banMessage} or {banReasons} for org owners; {serverLimit, suspended, reason, allowPublicStatus, + * allowPublicLeaderboards} for the site owner only. */ export const PATCH = route(async (event) => { const env = getEnv(); diff --git a/src/test/board-columns.test.ts b/src/test/board-columns.test.ts new file mode 100644 index 00000000..44d330e0 --- /dev/null +++ b/src/test/board-columns.test.ts @@ -0,0 +1,220 @@ +// The columns an organisation's public boards leave out: who may change them (an owner of the +// org, never a key), what a change must hold, the audit row, and what each board does with them: +// the public page leaves them out and ranks by kills where it was asked to sort by one, while the +// public JSON, the panel's board and its export keep every number. Another organisation's boards +// are never touched. +import { afterAll, beforeAll, describe, expect, test } from 'bun:test'; +import { and, desc, eq } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { auditLog, organizations, playerSessions, servers } from '$lib/server/db/schema'; +import type { BoardColumn, BoardView } from '$lib/leaderboard'; +import { hasTestDb, testEnv } from './db'; +import { callApi, callLoad, callRaw, stubGateway } from './call'; +import { seedWorld, suspend, type PrincipalName, type World } from './world'; +import { PATCH as orgRoute } from '../routes/api/orgs/[id]/+server'; +import { GET as seasonsRoute } from '../routes/api/orgs/[id]/seasons/+server'; +import { load as seasonsTab } from '../routes/(app)/orgs/[id]/seasons/+page.server'; +import { load as publicPage } from '../routes/(public)/s/[id]/leaderboard/+page.server'; +import { GET as publicJson } from '../routes/api/public/servers/[id]/leaderboard/+server'; +import { GET as panelBoard } from '../routes/api/servers/[id]/leaderboard/+server'; +import { GET as exportRoute } from '../routes/api/servers/[id]/leaderboard/export/+server'; + +const HIDDEN: BoardColumn[] = ['seeded', 'headshots', 'teamKills', 'results', 'cash']; +const PLAYER = '76561198000005001'; + +describe.skipIf(!hasTestDb)("an organisation's public board columns", () => { + let env: Env; + let w: World; + + const patch = (who: PrincipalName, boardHidden: unknown, orgId = w.org.id) => + callApi(orgRoute, w.users[who], { + method: 'PATCH', + params: { id: orgId }, + body: { boardHidden } + }); + const stored = async (orgId = w.org.id) => + ( + await env.db + .select({ hidden: organizations.boardHidden }) + .from(organizations) + .where(eq(organizations.id, orgId)) + )[0].hidden; + // the last 30 days: the history here is two hours old, so the default (the current season) + // would leave it out on a season's first two hours + const RANGE = 'range=30d'; + /** the public page as an anonymous visitor gets it */ + const page = async (query = '', serverId = w.server.id) => { + const answer = await callLoad(publicPage, null, { + params: { id: serverId }, + query: query ? `${RANGE}&${query}` : RANGE + }); + expect(answer.status).toBe(200); + return answer.body as { hidden: BoardColumn[]; board: BoardView }; + }; + const open = (serverId: string, on: boolean) => + env.db.update(servers).set({ publicLeaderboards: on }).where(eq(servers.id, serverId)); + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + await open(w.server.id, true); + await open(w.otherOrgServer.id, true); + // one player with an hour and a half and some cash, so every board has a row + const joined = Date.now() - 2 * 3_600_000; + await env.db.insert(playerSessions).values({ + serverId: w.server.id, + steamId: PLAYER, + name: 'Cashed', + joinedAt: new Date(joined), + lastSeen: new Date(joined + 90 * 60_000), + leftAt: new Date(joined + 90 * 60_000), + cash: 9_000 + }); + }); + + afterAll(async () => { + await open(w.server.id, false); + await open(w.otherOrgServer.id, false); + }); + + test('every column shows until an owner leaves some out', async () => { + expect(await stored()).toEqual([]); + expect((await page()).hidden).toEqual([]); + }); + + test('only an owner of the org changes them, and never through a key', async () => { + for (const who of [ + 'anon', + 'stranger', + 'outsider', + 'member', + 'viewer', + 'operator', + 'admin', + 'elsewhere', + 'orgBans', + 'orgSlots', + 'keyView', + 'keyAll', + 'keyElsewhere', + 'keyBans' + ] as PrincipalName[]) { + const answer = await patch(who, HIDDEN); + expect({ who, refused: answer.status >= 400 }).toEqual({ who, refused: true }); + expect(await stored()).toEqual([]); + } + // an owner of one org cannot reach another's + expect((await patch('owner', HIDDEN, w.otherOrg.id)).status).toBe(404); + expect(await stored(w.otherOrg.id)).toEqual([]); + + expect((await patch('owner', HIDDEN)).status).toBe(200); + expect(await stored()).toEqual(HIDDEN); + }); + + test('the change is in the audit trail with the columns it left out', async () => { + const [row] = await env.db + .select() + .from(auditLog) + .where(and(eq(auditLog.orgId, w.org.id), eq(auditLog.action, 'org.update'))) + .orderBy(desc(auditLog.id)) + .limit(1); + expect(row).toMatchObject({ actorId: w.users.owner!.id, outcome: 'ok' }); + expect((row.detail as { boardHidden: BoardColumn[] }).boardHidden).toEqual(HIDDEN); + }); + + test('anything but the board’s own columns is refused and changes nothing', async () => { + for (const bad of [ + 'cash', + ['kills'], + ['seeded', 'kills'], + ['luck'], + [1], + null, + { cash: true } + ]) { + const answer = await patch('owner', bad); + expect({ bad, status: answer.status }).toEqual({ bad, status: 400 }); + expect(await stored()).toEqual(HIDDEN); + } + }); + + test('the public page leaves them out at once, and a sort by one ranks by kills', async () => { + const asked = await page('sort=cash&dir=asc'); + expect(asked.hidden).toEqual(HIDDEN); + expect(asked.board.query).toMatchObject({ sort: 'kills', dir: 'desc' }); + expect(asked.board.rows.map((r) => r.steamId)).toEqual([PLAYER]); + expect((await page('sort=wins')).board.query.sort).toBe('kills'); + expect((await page('sort=seeded')).board.query.sort).toBe('kills'); + // a column still shown keeps its sort + expect((await page('sort=cashPerMin&dir=asc')).board.query).toMatchObject({ + sort: 'cashPerMin', + dir: 'asc' + }); + }); + + test('the public JSON, the panel and the export keep every number and every sort', async () => { + const json = await callApi(publicJson, null, { + params: { id: w.server.id }, + query: `${RANGE}&sort=cash` + }); + expect(json.status).toBe(200); + const view = json.body as BoardView; + expect(view.query.sort).toBe('cash'); + expect(view.rows[0]).toMatchObject({ steamId: PLAYER, cash: 9_000 }); + expect(json.body).not.toHaveProperty('hidden'); + + const panel = await callApi(panelBoard, w.users.viewer, { + params: { id: w.server.id }, + query: `${RANGE}&sort=cash` + }); + expect((panel.body as BoardView).query.sort).toBe('cash'); + expect((panel.body as BoardView).rows[0].cash).toBe(9_000); + + const file = await callRaw(exportRoute, w.users.viewer, { + params: { id: w.server.id }, + query: `${RANGE}&sort=cash` + }); + const [head, first] = (await file.text()).split('\r\n'); + expect(head.split(',')).toContain('cash'); + expect(first.split(',')[head.split(',').indexOf('cash')]).toBe('9000'); + }); + + test("the Seasons tab and its route show them to the org's owners", async () => { + const tab = await callLoad(seasonsTab, w.users.owner, { params: { id: w.org.id } }); + expect((tab.body as { hidden: BoardColumn[] }).hidden).toEqual(HIDDEN); + const listed = await callApi(seasonsRoute, w.users.owner, { params: { id: w.org.id } }); + expect((listed.body as { hidden: BoardColumn[] }).hidden).toEqual(HIDDEN); + for (const who of ['viewer', 'admin', 'keyAll'] as PrincipalName[]) { + const refused = await callLoad(seasonsTab, w.users[who], { params: { id: w.org.id } }); + expect({ who, refused: refused.status >= 400 }).toEqual({ who, refused: true }); + } + }); + + test("another organisation's public board keeps every column", async () => { + const theirs = await page('sort=cash', w.otherOrgServer.id); + expect(theirs.hidden).toEqual([]); + expect(theirs.board.query.sort).toBe('cash'); + }); + + test('repeats are dropped, the order is the table’s, and none shows every column again', async () => { + expect((await patch('owner', ['cash', 'seeded', 'cash'])).status).toBe(200); + expect(await stored()).toEqual(['seeded', 'cash']); + expect((await patch('owner', [])).status).toBe(200); + expect(await stored()).toEqual([]); + expect((await page()).hidden).toEqual([]); + }); + + test("a suspended org's owners cannot change them", async () => { + await suspend(env, w.org.id); + try { + expect((await patch('owner', HIDDEN)).status).toBe(403); + expect(await stored()).toEqual([]); + } finally { + await env.db + .update(organizations) + .set({ suspendedAt: null, suspendedReason: '' }) + .where(eq(organizations.id, w.org.id)); + } + }); +}); From 0dd54aac5ac5061b0679ba4b39339fd5b96e82b8 Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 01:38:15 +0100 Subject: [PATCH 039/102] Public board columns on the page: the organisation's Seasons tab gets a Public board columns panel under Boards open on, a box per column of the board (kills always shown), the header row visitors will see and Save; the public board leaves out the columns chosen, and the note on a missing kill feed goes with Headshots and Team kills. The panel's own board keeps every column --- src/lib/components/LeaderboardTable.svelte | 116 +++++++++++------- .../(app)/orgs/[id]/BoardColumnsPanel.svelte | 97 +++++++++++++++ .../(app)/orgs/[id]/seasons/+page.svelte | 10 +- .../(public)/s/[id]/leaderboard/+page.svelte | 1 + 4 files changed, 179 insertions(+), 45 deletions(-) create mode 100644 src/routes/(app)/orgs/[id]/BoardColumnsPanel.svelte diff --git a/src/lib/components/LeaderboardTable.svelte b/src/lib/components/LeaderboardTable.svelte index 83b2d101..126d3d9d 100644 --- a/src/lib/components/LeaderboardTable.svelte +++ b/src/lib/components/LeaderboardTable.svelte @@ -1,8 +1,9 @@ + +
+ Public board columns +
+ {#each BOARD_COLUMNS as c (c.key)} + {@const fixed = c.key === FIXED_COLUMN} + {@const on = fixed || !off.includes(c.key)} + + {/each} +
+ Visitors see +
+ + + + + + {#each visible as c (c.key)} + + {/each} + + +
#Player{c.head}
+
+
+ + +
+

+ For {org.name}'s public boards, each server's and the organisation's. Rank, player and kills + always show. The panel's Leaderboards tab and its CSV export keep every column and the board's + JSON keeps every number, so leaving a column out tidies the page without hiding anything. +

+
diff --git a/src/routes/(app)/orgs/[id]/seasons/+page.svelte b/src/routes/(app)/orgs/[id]/seasons/+page.svelte index 11dce6d4..d8f763a8 100644 --- a/src/routes/(app)/orgs/[id]/seasons/+page.svelte +++ b/src/routes/(app)/orgs/[id]/seasons/+page.svelte @@ -1,13 +1,15 @@ @@ -202,6 +294,7 @@ {#if d.online}online · {onThisServer ? 'this server' : d.online.serverName}{/if} + {#if d.bans.length}{bannedBadge}{/if} {#if d.watch.watched}watchlist{/if} risk {d.risk.level} · {d.risk.score} @@ -256,8 +349,8 @@ -
- {#each [['Sessions', fmtNum(d.summary.sessions), 'A session is one stay on a server, from joining to leaving.'], ['Playtime', d.summary.sessions ? minutes(d.summary.minutes) : '—', ''], ['Seed progress', d.summary.seedReward ? `${fmtNum(d.summary.seedReward.minutes)} / ${fmtNum(d.summary.seedReward.requiredMinutes)} min` : '—', 'Unspent seeding time toward this server’s next reward. It resets when the reward is granted.'], ['Cash earned', fmtCash(d.summary.cash), 'Total cash earned across the servers visible to you.'], ['Kills', fmtNum(d.summary.kills), SCOREBOARD_NOTE], ['Deaths', fmtNum(d.summary.deaths), SCOREBOARD_NOTE], ['Longest alive', fmtDuration(d.summary.longestAliveSeconds), 'Longest recorded interval between joining, a death, a match start, and departure. Available for sessions tracked by the event feed.'], ['K/D', kd(d.summary.kills, d.summary.deaths), SCOREBOARD_NOTE], ['First seen', d.summary.firstSeen ? fmtTime(d.summary.firstSeen) : '—', '']] as [label, value, note] (label)} +
+ {#each [['Sessions', fmtNum(d.summary.sessions), 'A session is one stay on a server, from joining to leaving.'], ['Playtime', d.summary.sessions ? minutes(d.summary.minutes) : '—', ''], ['Seeded', d.summary.seedMinutes ? minutes(d.summary.seedMinutes) : '—', 'Time on with the server low, as a Seeding reward counts it.'], ['Seed progress', d.summary.seedReward ? `${fmtNum(d.summary.seedReward.minutes)} / ${fmtNum(d.summary.seedReward.requiredMinutes)} min` : '—', 'Unspent seeding time toward this server’s next reward. It resets when the reward is granted.'], ['Cash earned', fmtCash(d.summary.cash), 'Total cash earned across the servers visible to you.'], ['Kills', fmtNum(d.summary.kills), SCOREBOARD_NOTE], ['Deaths', fmtNum(d.summary.deaths), SCOREBOARD_NOTE], ['Longest alive', fmtDuration(d.summary.longestAliveSeconds), 'Longest recorded interval between joining, a death, a match start, and departure. Available for sessions tracked by the event feed.'], ['K/D', kd(d.summary.kills, d.summary.deaths), SCOREBOARD_NOTE], ['First seen', d.summary.firstSeen ? fmtTime(d.summary.firstSeen) : '—', '']] as [label, value, note] (label)}
{label}
{value}
@@ -267,19 +360,31 @@
- {#if d.bannedOn.length} + {#if d.bans.length}
- Banned on {d.bannedOn.length} of {d.orgServerCount} server{d.orgServerCount === 1 - ? '' - : 's'} in this organisation. - {#each d.bannedOn as b (b.serverId)} -
- {b.serverName}{#if b.reason}: {b.reason}{/if}{#if b.bannedBy} - (by {b.bannedBy}){/if} -
- {/each} +
+ {#if orgBan}Banned on every server in this organisation.{:else}Banned on {bannedServers.length} + of {d.orgServerCount} server{d.orgServerCount === 1 ? '' : 's'} in this organisation.{/if} +
+
+ {#each d.bans as b (b.source + (b.serverId ?? ''))} +
+ {SOURCE_LABEL[b.source]} + {b.serverId ? b.serverName : `Every server in ${data.server.orgName}`}{#if b.reason}: {b.reason}{/if} + {banMore(b)} + {#if b.canUnban}{/if} +
+ {/each} +
{/if} @@ -292,6 +397,7 @@ Server Sessions Playtime + Seeded K D Last seen @@ -308,12 +414,13 @@ > {s.sessions}{minutes(s.minutes)} + {s.seedMinutes ? minutes(s.seedMinutes) : '—'} {fmtNum(s.kills)}{fmtNum(s.deaths)} {fmtTime(s.lastSeen)} {:else} Never seen on a server you can access. @@ -443,23 +550,34 @@
- Admin actions on this player +
+ Admin actions on this player + All in the audit trail → +
{#each d.actions as a (a.id)} + {@const said = detailOf(a)} + {@const length = lengthOf(a)} - + - {:else} @@ -476,117 +594,134 @@
- {#if onThisServer && (canKick || chat)} + {#if onThisServer ? canKick || chat || canBanAny : canBanAny}
- Quick actions (online here) -
- - + Quick actions + {#if onThisServer}online here{:else}not on {data.server.name}{/if} +
+ {#if onThisServer} +
+ + +
+
+ + + +
+ {:else} +

+ Whisper and kick need the player on {data.server.name}. A ban waits for them: they are + removed the moment they join. +

+
+ +
+ {/if} +
+ {/if} + + + {#if d.seedReward} + {@const r = d.seedReward} + {@const pct = Math.min(100, Math.round((r.seconds / (r.minutes * 60)) * 100))} +
+
+ Seeding reward + Rule →
-
- - + {Math.floor(r.seconds / 60)} of {r.minutes} min in the last {r.windowDays} day{r.windowDays === + 1 + ? '' + : 's'} - + {pct}%
+
+

{seedLine(r)}

+

+ {#if r.untilFull}Seed time on {data.server.name} with {r.lowAt} or fewer on, banked once the + server fills with the player still on, so a seed in progress shows once it is banked.{:else}Seed + time on {data.server.name}: every minute with {r.lowAt} or fewer on.{/if} +

{/if} - - {#if d.orgLists.canBan || d.orgLists.canReserve} + + {#if d.orgLists.canReserve}
Organisation lists Open the lists →
-
- {#if d.orgLists.canBan} -
- {#if d.orgLists.ban} - {@const b = d.orgLists.ban} - banned org-wide - {b.reason || 'no reason'} · by {b.addedByName || '—'}{#if b.expiresAt} - · until {fmtTime(b.expiresAt)}{/if} - - {#each b.servers as s (s.serverId)} - {s.serverName} - {/each} - - - {:else} - Not on the organisation's ban list. - - {/if} -
- {/if} - {#if d.orgLists.canReserve} -
- {#if d.orgLists.reserve} - {@const r = d.orgLists.reserve} - reserved slot - {r.reason || 'org-wide'}{#if r.member} - · member{/if}{#if r.expiresAt} - · until {fmtTime(r.expiresAt)}{/if} - - {#each r.servers as s (s.serverId)} - {s.serverName} - {/each} - - {#if !r.member} - - {/if} - {:else} - No reserved slot from the organisation. - + {#if d.orgLists.reserve} + {@const r = d.orgLists.reserve} + reserved slot + {r.reason || 'org-wide'}{#if r.member} + · member{/if}{#if r.expiresAt} + · until {fmtTime(r.expiresAt)}{/if} + + {#each r.servers as s (s.serverId)} + {s.serverName} - {/if} -
+ {/each} + + {#if !r.member} + + {/if} + {:else} + No reserved slot from the organisation. + {/if}
@@ -771,9 +906,16 @@ orgName={data.server.orgName} steamId={d.steamId} name={d.name} - canOrg - reasons={d.orgLists.banReasons ?? []} + server={bans ? { id, name: data.server.name } : null} + canOrg={d.orgLists.canBan} + scope="server" + reason={reason.trim()} + banMessage={d.banDialog?.message ?? null} + reasons={d.banDialog?.reasons ?? []} onclose={() => (banning = false)} - ondone={() => invalidateAll()} + ondone={() => { + reason = ''; + return invalidateAll(); + }} /> {/if} diff --git a/src/test/ban-reasons.test.ts b/src/test/ban-reasons.test.ts index 4227b400..96cae2fa 100644 --- a/src/test/ban-reasons.test.ts +++ b/src/test/ban-reasons.test.ts @@ -138,9 +138,10 @@ describe.skipIf(!hasTestDb)("an org's quick reasons", () => { }; const reasonsIn = (answer: { body: unknown }) => (answer.body as { banReasons?: BanReason[] | null }).banReasons; - const dossierReasons = (answer: { body: unknown }) => - (answer.body as { dossier: { orgLists: { banReasons: BanReason[] | null } } }).dossier.orgLists - .banReasons; + const dossierDialog = (answer: { body: unknown }) => + (answer.body as { dossier: { banDialog: { reasons: BanReason[]; message: string } | null } }) + .dossier.banDialog; + const dossierReasons = (answer: { body: unknown }) => dossierDialog(answer)?.reasons ?? null; beforeAll(async () => { env = await testEnv(); @@ -288,7 +289,7 @@ describe.skipIf(!hasTestDb)("an org's quick reasons", () => { ] as PrincipalName[]) expect({ who, refused: (await orgLists(who)).status >= 400 }).toEqual({ who, refused: true }); - // a dossier, whose Ban org-wide places the ban on the org's list + // a dossier, whose ban dialog bans on this server's own list (Bans) or the org's, as the tab for (const who of ['owner', 'site', 'admin', 'orgBans', 'keyAll', 'keyBans'] as PrincipalName[]) expect({ who, reasons: dossierReasons(await dossier(who)) }).toEqual({ who, reasons: LIST }); for (const who of ['viewer', 'operator', 'orgSlots', 'keyView'] as PrincipalName[]) @@ -310,7 +311,8 @@ describe.skipIf(!hasTestDb)("an org's quick reasons", () => { expect(reasonsIn(here)).toEqual(LIST); expect(here.body).toMatchObject({ canEditOrgBans: false, banMessage: '{reason}' }); expect((await orgLists(bansOnly)).status).toBe(404); - expect(dossierReasons(await dossier(bansOnly))).toBeNull(); + // and so does the dossier's ban dialog, which bans onto the same list + expect(dossierDialog(await dossier(bansOnly))).toEqual({ reasons: LIST, message: '{reason}' }); expect((await patch(bansOnly, [])).status).toBe(403); expect(await stored()).toEqual(LIST); }); diff --git a/src/test/view.test.ts b/src/test/view.test.ts index b9979aab..6f2fa7d4 100644 --- a/src/test/view.test.ts +++ b/src/test/view.test.ts @@ -148,13 +148,8 @@ describe.skipIf(!hasTestDb)('what View shows', () => { const viewer = await dossier('viewer'); expect(viewer.notes).toEqual([]); expect(viewer.watch).toMatchObject({ watched: true, reason: '', updatedByName: '' }); - expect(viewer.orgLists).toEqual({ - ban: null, - reserve: null, - canBan: false, - canReserve: false, - banReasons: null - }); + expect(viewer.orgLists).toEqual({ reserve: null, canBan: false, canReserve: false }); + expect(viewer.banDialog).toBeNull(); expect(JSON.stringify(viewer)).not.toContain('suspected alt'); // Who is banned and why is View, as a server's Bans tab says it; who placed it is not. expect(viewer.bans).toEqual([ @@ -171,23 +166,29 @@ describe.skipIf(!hasTestDb)('what View shows', () => { 'suspected alt of a banned player' ]); expect(operator.watch.reason).toBe('watch for team kills'); - expect(operator.orgLists.ban).toBeNull(); + expect(operator.bans.map((b: { by: string }) => b.by)).toEqual(['']); const admin = await dossier('admin'); - expect(admin.orgLists.ban).toMatchObject({ reason: 'org-wide ban reason' }); + expect(admin.bans).toEqual([ + expect.objectContaining({ source: 'org', reason: 'org-wide ban reason', by: 'admin' }) + ]); expect(admin.orgLists.reserve).toMatchObject({ reason: 'sponsor, paid until March' }); expect(admin.orgLists).toMatchObject({ canBan: true, canReserve: true }); // one list's editor reads that list's entry and nothing of the other's const bans = await dossier('orgBans'); expect(bans.orgLists).toMatchObject({ reserve: null, canBan: true, canReserve: false }); - expect(bans.orgLists.ban).toMatchObject({ - reason: 'org-wide ban reason', - addedByName: 'admin' - }); + expect(bans.bans).toEqual([ + expect.objectContaining({ + source: 'org', + reason: 'org-wide ban reason', + by: 'admin', + canUnban: true + }) + ]); expect(JSON.stringify(bans)).not.toContain('sponsor, paid until March'); const slots = await dossier('orgSlots'); - expect(slots.orgLists).toMatchObject({ ban: null, canBan: false, canReserve: true }); + expect(slots.orgLists).toMatchObject({ canBan: false, canReserve: true }); expect(slots.orgLists.reserve).toMatchObject({ reason: 'sponsor, paid until March' }); // the ban's reason as the Bans tab gives every reader; its author stays with the ban list's expect(slots.bans).toEqual([ From 76d1b8351c80b5d5f7bdbfdbd7bf40a36c1631bc Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 19:01:52 +0100 Subject: [PATCH 050/102] README: player page bans, history, seed time; risk kick line --- README.md | 61 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 8415f8e8..2b29a967 100644 --- a/README.md +++ b/README.md @@ -309,14 +309,14 @@ site owner hold every capability on every server in scope. | Match control | end/restart match, change map, next map, weather | | ✓ | ✓ | | Live rotation | add, remove and reorder rotation entries on the running server | | ✓ | ✓ | | Notes & watchlist | read and add player notes (delete your own), watch and unwatch, the reason a player is watched | | ✓ | ✓ | -| Bans | ban and unban on the server; a Kill distance watch that bans here | | | ✓ | +| Bans | ban and unban on the server, from a dossier too, and see who placed its bans; a Kill distance watch that bans here | | | ✓ | | Reserved slots | reserve and unreserve on this server, with a note and an expiry, and read the notes; a Seeding reward rule that hands out slots here | | | ✓ | -| Org ban list | the organisation's ban list, enforced on every server; sync; a player's entry on it in the dossier; a Kill distance watch that bans everywhere | | | ✓ | +| Org ban list | the organisation's ban list, enforced on every server; sync; who placed a ban, and Unban org-wide, in a dossier; a Kill distance watch that bans everywhere | | | ✓ | | Org reserved slots | the organisation's reserved-slot list, handed out on every server; sync; a player's entry on it in the dossier; a Seeding reward rule that hands out slots everywhere | | | ✓ | | Others' notes | delete anyone's note | | | ✓ | | Save rotation | save the rotation, rotation mode on and off | | | ✓ | | Config & settings | read, validate and apply the config document; score tick, sponsor image, connection test, the game's raw status | | | ✓ | -| Automation | see the triggers and what they did; create, edit, dry-run and delete them | | | ✓ | +| Automation | see the triggers and what they did; create, edit, dry-run and delete them; a player's Seeding reward progress | | | ✓ | | Audit trail | everyone's actions on the server in the audit log, not just your own; the game server's own RCON log | | | ✓ | | Raw RCON | any /v1 route on the game server directly, except the config document | | | ✓ | @@ -403,13 +403,35 @@ through `/api/passkeys/*`, and codes, recovery keys and Steam through the panel' ### Player dossiers, risk and the watchlist -Every player name in the panel links to a dossier: sessions, playtime, kills and deaths on each -of the organisation's servers, the names they have used, the admin actions taken on them (kicks, -bans, whispers, trigger actions), notes admins have left, and a watchlist flag with a reason. -Notes and the watchlist are shared by every server in the organisation; roles with _Notes & -watchlist_ can write them, and a note can be deleted by its author or a role with _Others' notes_. -A [Discord webhook](#discord-webhooks) ticked for _Watched players joining_ posts each time a -watched player joins one of the organisation's servers. +Every player name in the panel links to a dossier: sessions, playtime, seed time, kills and deaths +on each of the organisation's servers, the names they have used, every ban that holds them, the +admin actions taken on them (kicks, bans, whispers, trigger actions), notes admins have left, and a +watchlist flag with a reason. Notes and the watchlist are shared by every server in the +organisation; roles with _Notes & watchlist_ can write them, and a note can be deleted by its author +or a role with _Others' notes_. A [Discord webhook](#discord-webhooks) ticked for _Watched players +joining_ posts each time a watched player joins one of the organisation's servers. + +The **bans** box lists every ban that holds the player on the servers you can open: the +organisation's list (once: it holds them on every server), each server's own list, and a ban the +game holds on its own list, with the reason and when it lifts. Who placed a panel ban is shown, as +on the Bans tab, to people who hold _Bans_ on that server or may edit the org's ban list (a ban on +the game's own list shows the name the game keeps, as the Bans tab does), and each ban has +an **Unban** for people who may lift it: _Bans_ there for a server's own list or the game's, _Org ban +list_ for the organisation's. **Ban…** opens the ban dialog whether or not the player is on: this +server only with _Bans_, every server with _Org ban list_, with a length and the organisation's +quick reasons. Whisper and Kick need the player on the server. + +**Admin actions on this player** names each action and says what it was about: the reason a kick +or ban was given, what a whisper said, how long a ban or reserved slot lasts. A rule's row keeps +its own short line ("Kicked …: 3 team kills this match"), never the text a rule sent. The table +holds the newest 50 rows you may read in the audit trail; **All in the audit trail** opens them +all, with the trail's filters by action and by person. + +With a [Seeding reward](#automation-triggers) switched on for the server, people with _Automation_ +there see where the player stands with it: the seed time banked on that server over the rule's +window against the minutes it asks for and what is left, or the reserved slot they hold, which the +rule passes over them for. With seed time banked only once the server fills, a seed in progress +shows once it is banked. On servers with the [kill feed](#kill-feed), the dossier also lists the names the feed showed for the player that were not the one the server listed them under, newest first: _In the kill feed as_. @@ -428,13 +450,18 @@ already hold it (a streamer's hidden name, say), and its filter finds players by With `STEAM_API_KEY` set, the dossier also shows the Steam persona, account age (public profiles only), VAC and game bans, refreshed daily and on demand, and what its friends list shows, looked at weekly. The **advisory risk score** is worked out when someone looks, for that reader: a ban on -another server, or games recorded there, count only if the reader can open that server. The score +another server, or games recorded there, count only if the reader can open that server. A ban +counts whether the panel placed it (a server's own list, or the organisation's, which holds the +player everywhere and so counts only on the dossier) or the game holds it on its own list. The score is bounded to 0–100. Recent bans weigh more than old ones; multiple banned friends, a private profile or friends list, local bans, name resemblance, and the watchlist add evidence. Extreme win rate, K/D, and headshot percentage across recorded games add smaller weights only after minimum match/kill counts. Headshot percentage uses kill-feed games only; the other totals use the panel's match and session history. A _Kick on connect risk_ rule that kicks at a risk score judges -everyone on the server against the whole organisation. +everyone on the server against the whole organisation. Its line in the audit trail and on Discord +says _banned on another server of this organisation_ or _Name resembles a banned player_, never +which server, why, or whom: the server's staff need not be able to open that server, and its +dossier shows the details to people who can. At most 200 Steam friends are checked per account, and a partial count is labelled as such; the friends lookups keep to a fifth of the 100,000 calls a day Steam allows a key. Steam provides no documented profile-comments read endpoint to this panel, so comments are not @@ -501,9 +528,9 @@ Bans and reserved slots that your servers already hold show up on the list pages **import**: an owner reviews them, and importing puts them on the org list, marks them as managed on the servers that have them, and applies them to the rest. On a server's Bans tab a local ban can be promoted the same way (owners), or added to the org list while this server's own copy stays local -(ban list editors). Every dossier shows the player's entry on each org list the reader may edit, -and lets them ban or unban org-wide, or hand out and withdraw a reserved slot, without leaving the -page. +(ban list editors). A dossier shows the player's slot on the org's reserved-slot list to that +list's editors, who can hand one out or withdraw it there; an org ban shows in its bans box, where +the ban list's editors can lift it, and its Ban… places one. A ban or reserved slot with an **expiry** is lifted by the panel when the time comes: the entry moves to the list's history as expired; an expired ban stops being enforced at once, and an @@ -571,7 +598,7 @@ delete them. | Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. A kill that comes within a minute of the killer's own death is not counted: the player is dead, so it is a round already on its way, and the game credits a vehicle's shell that lands after the vehicle was destroyed to the gunner's own weapon, from wherever the gunner is by then (an M4 kill from 2,300 m). The audit trail notes each kill left out this way, with how long after the death it came; Discord is not told. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | | Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap; when a new match is evened up, players whose clan is mostly on the other side move first, then those with the fewest clanmates beside them), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move, sent without the kill the Players tab's Move adds. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | | Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | -| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier history, the leaderboard's Seed time column and the dry run show it. | +| Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier (a total, per server and per session, and the player's progress toward the reward for _Automation_ holders), the leaderboard's Seed time column and the dry run show it. | | AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | **Dry run** replays the last 24 hours of the server's own history (joins, player counts, empty @@ -1229,7 +1256,7 @@ These need _View_ on the server unless the table says otherwise. | Route | Answers | | -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `GET /api/servers/:id/players/seen` | everyone who has played on the server: `q` (name, alias, a name the kill feed showed for them, or SteamID; each player's `feedNames` are those names), `since` (days), `flag` (`banned`, `watched` or `online`), `sort` (`lastSeen`, `firstSeen`, `minutes`, `sessions`, `kills`, `deaths`, `name`), `dir`, `offset`, `limit` (up to 100) | -| `GET /api/servers/:id/players/:steamId` | the dossier: names, the names the kill feed showed that were not theirs (`feedNames`), sessions, totals per server, bans, risk, the kill feed's summary; notes and why a player is watched only with _Notes & watchlist_ | +| `GET /api/servers/:id/players/:steamId` | the dossier: names, the names the kill feed showed that were not theirs (`feedNames`), sessions, totals per server with seed time, every ban in force (`bans`), risk, the kill feed's summary, the admin actions you may read with a kick's reason and a whisper's text; notes and why a player is watched only with _Notes & watchlist_; the Seeding reward's progress (`seedReward`) only with _Automation_ | | `GET /api/servers/:id/players/:steamId/career` | rank, streak, results by map and faction, the last ten matches, the organisation's last ten seasons with the places won | | `GET /api/servers/:id/players/marks?ids=a,b` | watched, first visit, risk score and Steam name (`steamName`) for up to 200 SteamIDs | | `GET /api/servers/:id/kills` | the stored kill feed, newest first (see [Kill feed](#kill-feed)): `killer`, `victim`, `player` (a SteamID, or part of a name), `kind` (`headshot`, `teamKill`, `suicide`, `vehicle`, `environment`), `cause`, `minM` (metres), `match`, `limit` (up to 200); `count=1` adds the total. For the next page, send the last kill's `ts` as `before` and its `eventTime` as `beforeTime` | From 4071db45b20acc608ea5c2371f4fb934c5e0fc88 Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 22:41:10 +0100 Subject: [PATCH 051/102] Team plan: deal and even up the sides, clan tags shared --- src/lib/clan.test.ts | 11 ++ src/lib/clan.ts | 13 +++ src/lib/server/two-teams.test.ts | 10 -- src/lib/server/two-teams.ts | 13 +-- src/lib/team-plan.test.ts | 155 ++++++++++++++++++++++++++++ src/lib/team-plan.ts | 170 +++++++++++++++++++++++++++++++ 6 files changed, 350 insertions(+), 22 deletions(-) create mode 100644 src/lib/clan.test.ts create mode 100644 src/lib/clan.ts create mode 100644 src/lib/team-plan.test.ts create mode 100644 src/lib/team-plan.ts diff --git a/src/lib/clan.test.ts b/src/lib/clan.test.ts new file mode 100644 index 00000000..edb7ec0f --- /dev/null +++ b/src/lib/clan.test.ts @@ -0,0 +1,11 @@ +import { expect, test } from 'bun:test'; +import { clanTag } from './clan'; + +test('clanTag reads a short bracketed tag at the front, in one case', () => { + expect(clanTag('[ABC] Name')).toBe('abc'); + expect(clanTag(' {Wolf}Name')).toBe('wolf'); + expect(clanTag('(TAG) x')).toBe('tag'); + expect(clanTag('Name [ABC]')).toBeNull(); + expect(clanTag('[] Name')).toBeNull(); + expect(clanTag('[a tag far too long to be one] Name')).toBeNull(); +}); diff --git a/src/lib/clan.ts b/src/lib/clan.ts new file mode 100644 index 00000000..5f093b55 --- /dev/null +++ b/src/lib/clan.ts @@ -0,0 +1,13 @@ +// Clan tags, as the Team balance rule and the Players tab's Teams view both read them. + +/** + * A player's clan tag: a short tag in brackets at the front of the name ("[ABC] Name", "{ABC}Name"), + * in one case, or null. + */ +export function clanTag(name: string): string | null { + const m = /^\s*(?:\[([^\]]{1,12})\]|\{([^}]{1,12})\}|\(([^)]{1,12})\)|<([^>]{1,12})>)/u.exec( + name + ); + const tag = (m?.[1] ?? m?.[2] ?? m?.[3] ?? m?.[4] ?? '').normalize('NFKC').trim().toLowerCase(); + return tag || null; +} diff --git a/src/lib/server/two-teams.test.ts b/src/lib/server/two-teams.test.ts index 454f6fb5..f3532903 100644 --- a/src/lib/server/two-teams.test.ts +++ b/src/lib/server/two-teams.test.ts @@ -1,6 +1,5 @@ import { describe, expect, test } from 'bun:test'; import { - clanTag, emptyTwoTeamsState, TWO_TEAMS_ASK_WINDOW_MS, TWO_TEAMS_FORGET_MS, @@ -510,15 +509,6 @@ describe('twoTeamsStep balancing', () => { expect(new Set(r.moves.map((m) => m.to)).size).toBe(1); }); - test('clanTag reads a short bracketed tag at the front, in one case', () => { - expect(clanTag('[ABC] Name')).toBe('abc'); - expect(clanTag(' {Wolf}Name')).toBe('wolf'); - expect(clanTag('(TAG) x')).toBe('tag'); - expect(clanTag('Name [ABC]')).toBeNull(); - expect(clanTag('[] Name')).toBeNull(); - expect(clanTag('[a tag far too long to be one] Name')).toBeNull(); - }); - test('a move a person made from the panel is kept, not put back', () => { const players = [...side('v', 7, V), ...side('m', 5, M)]; const state = seeded(players); diff --git a/src/lib/server/two-teams.ts b/src/lib/server/two-teams.ts index 2f7a1282..e8a9f489 100644 --- a/src/lib/server/two-teams.ts +++ b/src/lib/server/two-teams.ts @@ -11,6 +11,7 @@ import { settingsFingerprint } from './fingerprint'; import { ApiError, str } from './http'; import { MAX_CHAT } from '$lib/chat'; +import { clanTag } from '$lib/clan'; /** How long a move is waited on before it is asked for again (the player is still on the closed faction). */ export const TWO_TEAMS_RETRY_MS = 30_000; @@ -121,18 +122,6 @@ export function validateTwoTeams(c: Record): TwoTeamsConfig { */ export const twoTeamsSettingsKey = (cfg: TwoTeamsConfig): string => settingsFingerprint(cfg); -/** - * A player's clan tag: a short tag in brackets at the front of the name ("[ABC] Name", "{ABC}Name"), - * in one case, or null. - */ -export function clanTag(name: string): string | null { - const m = /^\s*(?:\[([^\]]{1,12})\]|\{([^}]{1,12})\}|\(([^)]{1,12})\)|<([^>]{1,12})>)/u.exec( - name - ); - const tag = (m?.[1] ?? m?.[2] ?? m?.[3] ?? m?.[4] ?? '').normalize('NFKC').trim().toLowerCase(); - return tag || null; -} - /** What the rule remembers between player lists (the worker's memory, per rule). */ export interface TwoTeamsState { /** diff --git a/src/lib/team-plan.test.ts b/src/lib/team-plan.test.ts new file mode 100644 index 00000000..37400d1a --- /dev/null +++ b/src/lib/team-plan.test.ts @@ -0,0 +1,155 @@ +import { describe, expect, test } from 'bun:test'; +import { deal, evenUp, recordRating, type PlanPlayer } from './team-plan'; + +/** mulberry32: the same deals for the same seed */ +function rng(seed: number) { + let a = seed >>> 0; + return () => { + a = (a + 0x6d2b79f5) >>> 0; + let t = a; + t = Math.imul(t ^ (t >>> 15), t | 1); + t ^= t + Math.imul(t ^ (t >>> 7), t | 61); + return ((t ^ (t >>> 14)) >>> 0) / 4294967296; + }; +} + +const V = 'Valkyra'; +const M = 'Manticore'; +const L = 'Lonestar'; +const on = (id: string, side: string | null, name = `Player ${id}`): PlanPlayer => ({ + steamId: id, + name, + side +}); +const many = (prefix: string, n: number, side: string | null, tag = '') => + Array.from({ length: n }, (_, i) => on(`${prefix}${i}`, side, `${tag}Player ${prefix}${i}`)); +const sizes = (out: Map, sides: string[]) => + sides.map((s) => [...out.values()].filter((v) => v === s).length); +const spread = (xs: number[]) => Math.max(...xs) - Math.min(...xs); +const moved = (players: PlanPlayer[], out: Map) => + players.filter((p) => out.get(p.steamId) !== p.side); + +describe('deal', () => { + test('puts everyone on one of the sides, none more than one ahead, whatever the numbers', () => { + const random = rng(1); + for (const sides of [ + [V, M], + [V, M, L] + ]) + for (let n = 0; n <= 41; n++) { + const players = [...many('v', Math.ceil(n / 2), V), ...many('l', Math.floor(n / 2), L)]; + for (const clans of [false, true]) { + const out = deal(players, sides, { clans, random }); + expect(out.size).toBe(n); + expect([...out.values()].every((s) => sides.includes(s))).toBe(true); + if (n) expect(spread(sizes(out, sides))).toBeLessThanOrEqual(1); + } + } + }); + + test('takes everyone off a side left out of the shuffle, and those on no side', () => { + const players = [ + ...many('v', 9, V), + ...many('m', 6, M), + ...many('l', 4, L), + ...many('x', 3, null) + ]; + const out = deal(players, [V, M], { clans: false, random: rng(2) }); + expect(sizes(out, [V, M]).sort()).toEqual([11, 11]); + expect([...out.values()].includes(L)).toBe(false); + }); + + test('keeps a clan on one side while it has room, and only the overflow goes elsewhere', () => { + const random = rng(3); + const players = [...many('v', 10, V), ...many('m', 6, M), ...many('c', 4, M, '[ABC] ')]; + for (let i = 0; i < 20; i++) { + const out = deal(players, [V, M], { clans: true, random }); + expect( + new Set(players.filter((p) => p.steamId[0] === 'c').map((p) => out.get(p.steamId))).size + ).toBe(1); + } + // twelve of a clan on a twenty-player server: ten together, the other two across + const big = [...many('c', 12, V, '[ABC] '), ...many('m', 8, M)]; + const out = deal(big, [V, M], { clans: true, random }); + expect( + sizes( + new Map( + big.filter((p) => p.steamId[0] === 'c').map((p) => [p.steamId, out.get(p.steamId)!]) + ), + [V, M] + ).sort((a, b) => a - b) + ).toEqual([2, 10]); + // and with clans not kept, tags mean nothing + const loose = deal(players, [V, M], { clans: false, random: rng(4) }); + expect(spread(sizes(loose, [V, M]))).toBe(0); + }); + + test('by a rating, the strong are shared out and the sides add up about the same', () => { + const players = Array.from({ length: 20 }, (_, i) => on(`p${i}`, i < 14 ? V : M)); + const rating = (p: PlanPlayer) => Number(p.steamId.slice(1)) + 1; + for (let seed = 0; seed < 20; seed++) { + const out = deal(players, [V, M], { clans: false, rating, random: rng(seed) }); + const sum = (s: string) => + players.filter((p) => out.get(p.steamId) === s).reduce((t, p) => t + rating(p), 0); + expect(Math.abs(sum(V) - sum(M))).toBeLessThanOrEqual(2); + expect(out.get('p19')).not.toBe(out.get('p18')); + } + }); + + test('moves no more players than it must: each team takes the side most of it is on', () => { + const random = rng(5); + // already dealt by strength: the deal comes out the same, and nobody moves + const players = Array.from({ length: 8 }, (_, i) => + on(`p${i}`, [0, 3, 4, 7].includes(i) ? M : V) + ); + const rating = (p: PlanPlayer) => Number(p.steamId.slice(1)); + expect(moved(players, deal(players, [V, M], { clans: false, rating, random }))).toEqual([]); + // at random, at most half of a two-sided server moves + const mixed = [...many('v', 13, V), ...many('m', 11, M)]; + for (let i = 0; i < 50; i++) + expect( + moved(mixed, deal(mixed, [V, M], { clans: false, random })).length + ).toBeLessThanOrEqual(12); + }); +}); + +describe('evenUp', () => { + test('moves the fewest players, those off the sides first, and no clan players while others can go', () => { + const random = rng(6); + const players = [ + ...many('t', 3, V, '[RDX] '), + ...many('v', 11, V), + ...many('m', 9, M), + on('l0', L) + ]; + for (let i = 0; i < 20; i++) { + const out = evenUp(players, [V, M], { clans: true, random }); + expect(sizes(out, [V, M])).toEqual([12, 12]); + const gone = moved(players, out); + expect(gone.length).toBe(3); + expect(gone.some((p) => p.steamId === 'l0')).toBe(true); + expect(gone.some((p) => p.name.startsWith('[RDX]'))).toBe(false); + } + }); + + test('leaves sides within one alone, and places a player on no side', () => { + const players = [...many('v', 7, V), ...many('m', 6, M), on('x', null)]; + const out = evenUp(players, [V, M], { clans: false, random: rng(7) }); + expect(moved(players, out).map((p) => [p.steamId, out.get(p.steamId)])).toEqual([['x', M]]); + }); + + test('with clans kept and only clan players on the big side, still evens up', () => { + const players = [...many('t', 6, V, '[RDX] '), ...many('m', 2, M)]; + const out = evenUp(players, [V, M], { clans: true, random: rng(8) }); + expect(sizes(out, [V, M])).toEqual([4, 4]); + }); +}); + +test('recordRating counts a player with no record as 1 and grows with kills over deaths', () => { + expect(recordRating(null)).toBe(1); + expect(recordRating({ kills: 0, deaths: 0 })).toBe(1); + expect(recordRating({ kills: 30, deaths: 10 })).toBe(2); + expect(recordRating({ kills: 3, deaths: 0 })).toBeLessThan( + recordRating({ kills: 60, deaths: 20 }) + ); +}); diff --git a/src/lib/team-plan.ts b/src/lib/team-plan.ts new file mode 100644 index 00000000..ee61e390 --- /dev/null +++ b/src/lib/team-plan.ts @@ -0,0 +1,170 @@ +// The Players tab's Teams view: which side each player goes to when someone shuffles or evens up +// the teams. Pure: the page keeps the plan, and nobody moves until it is saved, one changeTeam per +// player. +import { clanTag } from './clan'; + +export interface PlanPlayer { + steamId: string; + name: string; + /** the side the player is on now; null when the game has them on none */ + side: string | null; +} + +/** How Shuffle deals the teams: at random, or spread by each player's K/D on record here. */ +export type ShuffleMode = 'random' | 'record'; + +/** + * The kills and deaths a K/D on record starts from, so a player with little history counts as + * about 1 and one good match does not make anyone the strongest on the server. + */ +export const RECORD_PRIOR = 10; + +/** A player's K/D over the matches they finished on this server, smoothed by RECORD_PRIOR. */ +export function recordRating(record: { kills: number; deaths: number } | null | undefined): number { + return ((record?.kills ?? 0) + RECORD_PRIOR) / ((record?.deaths ?? 0) + RECORD_PRIOR); +} + +function shuffled(xs: T[], random: () => number): T[] { + const a = xs.slice(); + for (let i = a.length - 1; i > 0; i--) { + const j = Math.floor(random() * (i + 1)); + [a[i], a[j]] = [a[j], a[i]]; + } + return a; +} + +/** Every order of a few sides (WARDOGS has three, so six). */ +function orders(xs: T[]): T[][] { + if (xs.length <= 1) return [xs.slice()]; + return xs.flatMap((x, i) => + orders([...xs.slice(0, i), ...xs.slice(i + 1)]).map((o) => [x, ...o]) + ); +} + +/** + * Everyone dealt onto `sides` in even numbers, no side more than one player ahead of another. + * Clanmates (two or more players on one tag) go together while their side has room, biggest clan + * first. The strongest player left goes to the side whose players add up weakest so far; without + * a rating each player's strength is a random number, which makes the deal random. Each team then + * takes the side most of it is on already, so as few players move as the deal allows. Returns + * every player's side. + */ +export function deal( + players: PlanPlayer[], + sides: string[], + opts: { clans: boolean; rating?: (p: PlanPlayer) => number; random?: () => number } +): Map { + const random = opts.random ?? Math.random; + const out = new Map(); + const k = sides.length; + if (!k || !players.length) return out; + const strength = new Map( + players.map((p) => [p.steamId, opts.rating ? opts.rating(p) : random()]) + ); + const tie = new Map(players.map((p) => [p.steamId, random()])); + const of = (p: PlanPlayer) => strength.get(p.steamId)!; + const stronger = (a: PlanPlayer, b: PlanPlayer) => + of(b) - of(a) || tie.get(a.steamId)! - tie.get(b.steamId)!; + + const byTag = new Map(); + const units: PlanPlayer[][] = []; + for (const p of players) { + const tag = opts.clans ? clanTag(p.name) : null; + if (!tag) units.push([p]); + else if (byTag.has(tag)) byTag.get(tag)!.push(p); + else byTag.set(tag, [p]); + } + for (const members of byTag.values()) units.push(members.sort(stronger)); + const total = (u: PlanPlayer[]) => u.reduce((s, p) => s + of(p), 0); + units.sort((a, b) => b.length - a.length || total(b) - total(a) || stronger(a[0], b[0])); + + // Teams 0..k-1: `base` players each, and `bigger` of them one more. + const base = Math.floor(players.length / k); + let bigger = players.length % k; + const size = new Array(k).fill(0); + const sum = new Array(k).fill(0); + const room = (t: number) => size[t] < base || (size[t] === base && bigger > 0); + const weakest = () => { + let best = -1; + for (let t = 0; t < k; t++) + if ( + room(t) && + (best < 0 || sum[t] < sum[best] || (sum[t] === sum[best] && size[t] < size[best])) + ) + best = t; + return best; + }; + const team = new Map(); + for (const unit of units) { + let t = -1; + for (const p of unit) { + if (t < 0 || !room(t)) t = weakest(); + if (size[t] === base) bigger--; + size[t]++; + sum[t] += of(p); + team.set(p.steamId, t); + } + } + + // Name the teams: of the ways to give each team a side, the one that leaves the most players + // where they are (ties at random). More sides than WARDOGS has keep the order they came in. + let label = sides.slice(); + if (k <= 6) { + let best = -1; + for (const o of shuffled(orders(sides), random)) { + let stay = 0; + for (const p of players) if (p.side === o[team.get(p.steamId)!]) stay++; + if (stay > best) { + best = stay; + label = o; + } + } + } + for (const p of players) out.set(p.steamId, label[team.get(p.steamId)!]); + return out; +} + +/** + * The fewest moves that bring `sides` within one player of each other. Players on a side that is + * not one of `sides`, or on none, go to the smallest; then players leave the biggest side for the + * smallest one at a time, players without a clan tag first when clans are kept together. Returns + * every player's side. + */ +export function evenUp( + players: PlanPlayer[], + sides: string[], + opts: { clans: boolean; random?: () => number } +): Map { + const random = opts.random ?? Math.random; + const out = new Map(); + if (!sides.length) return out; + const count = new Map(sides.map((s) => [s, 0])); + const order = new Map(sides.map((s) => [s, random()])); + const n = (s: string) => count.get(s)!; + const smallest = () => + sides.reduce((a, b) => + n(b) < n(a) || (n(b) === n(a) && order.get(b)! < order.get(a)!) ? b : a + ); + const biggest = () => + sides.reduce((a, b) => + n(b) > n(a) || (n(b) === n(a) && order.get(b)! < order.get(a)!) ? b : a + ); + const put = (p: PlanPlayer, to: string) => { + const from = out.get(p.steamId); + if (from !== undefined) count.set(from, n(from) - 1); + out.set(p.steamId, to); + count.set(to, n(to) + 1); + }; + const pick = (xs: PlanPlayer[]) => (xs.length ? xs[Math.floor(random() * xs.length)] : undefined); + + for (const p of players) if (p.side !== null && count.has(p.side)) put(p, p.side); + for (const p of shuffled(players, random)) if (!out.has(p.steamId)) put(p, smallest()); + for (;;) { + const hi = biggest(); + const lo = smallest(); + if (n(hi) - n(lo) <= 1) break; + const there = players.filter((p) => out.get(p.steamId) === hi); + put((opts.clans && pick(there.filter((p) => !clanTag(p.name)))) || pick(there)!, lo); + } + return out; +} From 1664f9ac5e587e69e5354b42a69e67017d27d404 Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 22:41:10 +0100 Subject: [PATCH 052/102] Player marks carry each player's record on the server --- src/lib/server/players.ts | 20 ++++++++-- src/lib/types.ts | 2 + src/test/team-record.test.ts | 76 ++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 src/test/team-record.test.ts diff --git a/src/lib/server/players.ts b/src/lib/server/players.ts index 0dc67f57..d40cf16b 100644 --- a/src/lib/server/players.ts +++ b/src/lib/server/players.ts @@ -21,6 +21,7 @@ import { playerMarks, playerNotes, playerSessions, + playerTotals, serverBans, servers, triggers @@ -266,7 +267,7 @@ export async function marksFor( // Bans elsewhere in the org count only where the reader could open them, as in the dossier. const orgIds = (await accessibleServers(env, user, server.orgId)).map((s) => s.id); const staff = access.caps.has('players.notes') || access.caps.has('players.notes.manage'); - const [profiles, local, counts, performance] = await Promise.all([ + const [profiles, local, counts, performance, totals] = await Promise.all([ getProfiles(env, ids), localSignals(env, server.orgId, orgIds, server.id, players), env.db @@ -274,9 +275,21 @@ export async function marksFor( .from(playerSessions) .where(and(eq(playerSessions.serverId, server.id), inArray(playerSessions.steamId, ids))) .groupBy(playerSessions.steamId), - riskPerformanceFor(env, orgIds, ids) + riskPerformanceFor(env, orgIds, ids), + // the matches each player finished here, which the Teams view's shuffle can spread by + env.db + .select({ + steamId: playerTotals.steamId, + kills: playerTotals.kills, + deaths: playerTotals.deaths + }) + .from(playerTotals) + .where(and(eq(playerTotals.serverId, server.id), inArray(playerTotals.steamId, ids))) ]); const visits = new Map(counts.map((c) => [c.steamId, num(c.n)])); + const records = new Map( + totals.map((t) => [t.steamId, { kills: num(t.kills), deaths: num(t.deaths) }]) + ); return ids.map((steamId) => { const l = local.get(steamId); return { @@ -285,7 +298,8 @@ export async function marksFor( reason: staff ? (l?.watched?.reason ?? '') : '', firstVisit: (visits.get(steamId) ?? 0) <= 1, risk: riskFor(env, profiles.get(steamId), l, performance.get(steamId), staff), - steamName: profiles.get(steamId)?.persona || null + steamName: profiles.get(steamId)?.persona || null, + record: records.get(steamId) ?? null }; }); } diff --git a/src/lib/types.ts b/src/lib/types.ts index ee909506..47650349 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -384,6 +384,8 @@ export interface PlayerMark { risk: RiskView; /** the Steam profile's name, as the dossier shows it; null without a profile on record */ steamName: string | null; + /** kills and deaths over the matches the player finished on this server; null before the first */ + record: { kills: number; deaths: number } | null; } export interface PlayerNoteView { diff --git a/src/test/team-record.test.ts b/src/test/team-record.test.ts new file mode 100644 index 00000000..2cb68abf --- /dev/null +++ b/src/test/team-record.test.ts @@ -0,0 +1,76 @@ +// The players table's marks carry each player's kills and deaths over the matches they finished on +// this server (player_totals), which the Teams view's "Spread by record here" shuffle deals by. The +// player page already shows the same counts per server to anyone who can open it. +import { beforeAll, describe, expect, test } from 'bun:test'; +import type { Env } from '$lib/server/env'; +import { matches, matchPlayers } from '$lib/server/db/schema'; +import type { PlayerMark } from '$lib/types'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, type World } from './world'; +import { GET as marksRoute } from '../routes/api/servers/[id]/players/marks/+server'; + +const PLAYED = '76561198000000851'; +const NEW = '76561198000000852'; +const HOUR = 3_600_000; + +describe.skipIf(!hasTestDb)('records on the players table', () => { + let env: Env; + let w: World; + + const finished = async (serverId: string, kills: number, deaths: number) => { + const [m] = await env.db + .insert(matches) + .values({ + serverId, + startedAt: new Date(Date.now() - 2 * HOUR), + endedAt: new Date(Date.now() - HOUR), + map: 'Europe', + finalScores: [ + { name: 'Valkyra', score: 3 }, + { name: 'Lonestar', score: 1 } + ], + winner: 'Valkyra' + }) + .returning({ id: matches.id }); + await env.db.insert(matchPlayers).values({ + matchId: m.id, + serverId, + steamId: PLAYED, + name: 'Player', + faction: 'Valkyra', + seconds: 3000, + kills, + deaths + }); + }; + const marks = (who: World['users'][keyof World['users']]) => + callApi(marksRoute, who, { + params: { id: w.server.id }, + query: new URLSearchParams({ ids: `${PLAYED},${NEW}`, names: 'Player\nJoiner' }).toString() + }); + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + await finished(w.server.id, 20, 8); + await finished(w.server.id, 10, 2); + // the same player's matches on the org's other server are not this server's record + await finished(w.otherServer.id, 99, 1); + }); + + test("a viewer reads each player's record on this server, and null before their first match", async () => { + const answer = await marks(w.users.viewer); + expect(answer.status).toBe(200); + const got = (answer.body as { marks: PlayerMark[] }).marks; + expect(got.find((m) => m.steamId === PLAYED)?.record).toEqual({ kills: 30, deaths: 10 }); + expect(got.find((m) => m.steamId === NEW)?.record).toBeNull(); + }); + + test('another org, a key held to the other server and nobody signed in get nothing', async () => { + expect((await marks(w.users.outsider)).status).toBe(404); + expect((await marks(w.users.keyElsewhere)).status).toBe(404); + expect((await marks(null)).status).toBe(401); + }); +}); From f6b9f8cf378548c870cf3a535e9fd58939ef8af2 Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 22:41:10 +0100 Subject: [PATCH 053/102] Players tab: Teams view to arrange, shuffle and move Save sends changeTeam per player with kill: false, so each move keeps Move's check, its audit row and the same-side refusal. No new route. --- .../(app)/server/[id]/players/+page.svelte | 25 +- .../server/[id]/players/TeamsView.svelte | 724 ++++++++++++++++++ src/test/player-actions.test.ts | 35 +- 3 files changed, 779 insertions(+), 5 deletions(-) create mode 100644 src/routes/(app)/server/[id]/players/TeamsView.svelte diff --git a/src/routes/(app)/server/[id]/players/+page.svelte b/src/routes/(app)/server/[id]/players/+page.svelte index 62395231..feef3157 100644 --- a/src/routes/(app)/server/[id]/players/+page.svelte +++ b/src/routes/(app)/server/[id]/players/+page.svelte @@ -16,6 +16,7 @@ import { TableSort, matches } from '$lib/table.svelte'; import type { LiveView, Player, PlayerMark, ServerListsState, Status } from '$lib/types'; import PastPlayers from './PastPlayers.svelte'; + import TeamsView from './TeamsView.svelte'; import type { PageProps, Snapshot } from './$types'; let { data }: PageProps = $props(); @@ -27,8 +28,10 @@ let bans = $derived(can(data.server.caps, 'bans.manage')); let anyAction = $derived(canKick || canKill || canMove || chat || bans); let notes = $derived(can(data.server.caps, 'players.notes')); - /** who is on now, or everyone who has played here */ - let view = $state<'online' | 'past'>('online'); + /** who is on now, the same players by side, or everyone who has played here */ + let view = $state<'online' | 'teams' | 'past'>('online'); + /** the Teams view stays mounted once opened, so its plan survives a look at the other views */ + let teamsOpened = $state(false); /** may the user write to the organisation's lists? Decides the ban dialog's default scope. */ let listState = $state(null); let banning = $state(null); @@ -249,6 +252,15 @@ aria-selected={view === 'online'} onclick={() => (view = 'online')}>Online now · {all.length} +
+ {#if teamsOpened} + {#key id} + + {/key} + {/if} {#if view === 'past'} - {:else} + {:else if view === 'online'}
+ // The Players tab's Teams view: one column per faction, players dragged between them (or sent to + // the next side with a button, or picked from a menu on a phone), Shuffle and Even up to fill in a + // plan, and Save to move everyone in it, one changeTeam each without the kill. Nobody moves until + // Save. Without Move the columns are only shown. + import { untrack } from 'svelte'; + import { SvelteMap, SvelteSet } from 'svelte/reactivity'; + import { ApiError, errorMessage, rconPost } from '$lib/api'; + import { factionColor } from '$lib/format'; + import { toast } from '$lib/toast.svelte'; + import { deal, evenUp, recordRating, type PlanPlayer, type ShuffleMode } from '$lib/team-plan'; + import Badge from '$lib/components/Badge.svelte'; + import Modal from '$lib/components/Modal.svelte'; + import type { FactionScore, Player, PlayerMark } from '$lib/types'; + + let { + serverId, + players, + scores, + marks, + canMove + }: { + serverId: string; + players: Player[]; + scores: FactionScore[] | null | undefined; + marks: Record; + canMove: boolean; + } = $props(); + + /** About three moves a second, as the Team balance rule sends them. */ + const MOVE_GAP_MS = 340; + const COLS: Record = { + 1: 'md:grid-cols-1', + 2: 'md:grid-cols-2', + 3: 'md:grid-cols-3' + }; + const SHUFFLES: { mode: ShuffleMode; label: string; hint: string }[] = [ + { mode: 'random', label: 'Random', hint: 'Even numbers, anyone can land on any side.' }, + { + mode: 'record', + label: 'Spread by record here', + hint: 'Deals players out by their K/D over every match they have finished on this server.' + } + ]; + + /** SteamID -> the side the player is to go to */ + const plan = new SvelteMap(); + /** sides Shuffle and Even up leave out */ + const out = new SvelteSet(); + let clans = $state(true); + let restored = $state(false); + let dragging = $state(null); + let over = $state(null); + let shuffleOpen = $state(false); + /** the card whose side menu is open (phones) */ + let sideMenu = $state(null); + let confirming = $state(false); + + type RowState = 'waiting' | 'moving' | 'moved' | 'there' | 'gone' | 'failed'; + interface RunRow { + steamId: string; + name: string; + to: string; + state: RowState; + note: string; + } + let run = $state<{ + rows: RunRow[]; + finished: boolean; + stopping: boolean; + stopped: string; + } | null>(null); + let busy = $derived(!!run && !run.finished); + let destroyed = false; + $effect(() => () => { + destroyed = true; + }); + + const storeKey = () => `warcon.teams.${serverId}`; + $effect(() => { + untrack(() => { + try { + const saved = JSON.parse(localStorage.getItem(storeKey()) || '{}'); + if (Array.isArray(saved.out)) + for (const s of saved.out) if (typeof s === 'string') out.add(s); + if (typeof saved.clans === 'boolean') clans = saved.clans; + } catch { + /* nothing saved, or private mode */ + } + restored = true; + }); + }); + $effect(() => { + const view = { out: [...out], clans }; + if (!restored) return; + try { + localStorage.setItem(storeKey(), JSON.stringify(view)); + } catch { + /* private mode */ + } + }); + + /** the match's factions in the game's order, then any a player is on that the status leaves out */ + let factions = $derived.by(() => { + const names = (scores ?? []).map((f) => f.name); + for (const p of players) if (p.faction && !names.includes(p.faction)) names.push(p.faction); + return names; + }); + let byId = $derived(new Map(players.map((p) => [p.steamId, p]))); + const targetOf = (p: Player) => plan.get(p.steamId) ?? p.faction; + let openSides = $derived(factions.filter((f) => !out.has(f))); + + // A planned move is done once the player is on that side, however they got there. A player who + // is not on the list keeps their place in the plan: the list empties for half a minute at a map + // change. + $effect(() => { + const now = byId; + untrack(() => { + for (const [id, side] of plan) if (now.get(id)?.faction === side) plan.delete(id); + }); + }); + + let moves = $derived( + players.filter((p) => { + const to = plan.get(p.steamId); + return to !== undefined && to !== p.faction; + }) + ); + const byName = (a: Player, b: Player) => + a.name.localeCompare(b.name, undefined, { sensitivity: 'base' }); + let columns = $derived( + factions.map((f) => { + const mine = players.filter((p) => targetOf(p) === f); + return { + name: f, + color: factionColor(f, scores), + now: players.filter((p) => p.faction === f).length, + open: !out.has(f), + cards: [ + ...mine.filter((p) => p.faction !== f).sort(byName), + ...mine.filter((p) => p.faction === f).sort(byName) + ] + }; + }) + ); + let sideless = $derived(players.filter((p) => targetOf(p) === null).sort(byName)); + let inPlay = $derived(columns.filter((c) => c.open)); + let spread = $derived( + inPlay.length + ? Math.max(...inPlay.map((c) => c.cards.length)) - + Math.min(...inPlay.map((c) => c.cards.length)) + : 0 + ); + let groups = $derived( + factions + .map((f) => ({ + name: f, + color: factionColor(f, scores), + who: moves.filter((p) => plan.get(p.steamId) === f).map((p) => p.name) + })) + .filter((g) => g.who.length) + ); + + const plural = (n: number, word: string) => `${n} ${word}${n === 1 ? '' : 's'}`; + + function place(steamId: string, side: string) { + const p = byId.get(steamId); + if (!p || busy) return; + if (side === p.faction) plan.delete(steamId); + else plan.set(steamId, side); + } + function next(p: Player) { + const i = factions.indexOf(targetOf(p) ?? ''); + place(p.steamId, factions[(i + 1) % factions.length]); + } + function apply(sides: Map) { + plan.clear(); + for (const p of players) { + const to = sides.get(p.steamId); + if (to !== undefined && to !== p.faction) plan.set(p.steamId, to); + } + } + const planPlayers = (): PlanPlayer[] => + players.map((p) => ({ steamId: p.steamId, name: p.name, side: p.faction })); + function twoSides() { + if (openSides.length >= 2) return true; + toast('Tick In shuffle on at least two sides.', 'err'); + return false; + } + function shuffle(mode: ShuffleMode) { + shuffleOpen = false; + if (busy || !twoSides()) return; + const rating = + mode === 'record' ? (p: PlanPlayer) => recordRating(marks[p.steamId]?.record) : undefined; + apply(deal(planPlayers(), openSides, { clans, rating })); + } + function even() { + if (busy || !twoSides()) return; + apply(evenUp(planPlayers(), openSides, { clans })); + } + + function dragStart(e: DragEvent, p: Player) { + if (!canMove || busy) return; + e.dataTransfer?.setData('text/plain', p.steamId); + if (e.dataTransfer) e.dataTransfer.effectAllowed = 'move'; + dragging = p.steamId; + } + function dragOver(e: DragEvent, side: string) { + if (!dragging) return; + e.preventDefault(); + if (e.dataTransfer) e.dataTransfer.dropEffect = 'move'; + over = side; + } + function dragLeave(e: DragEvent, side: string) { + const into = e.relatedTarget as Node | null; + if (over === side && !(e.currentTarget as Node).contains(into)) over = null; + } + function drop(e: DragEvent, side: string) { + if (!dragging) return; + e.preventDefault(); + place(dragging, side); + dragging = null; + over = null; + } + function dragEnd() { + dragging = null; + over = null; + } + + /** + * Moves everyone in the plan, one at a time and about three a second, without the kill. A player + * who has left, or is on the side already, is passed over; a refusal about one player is noted + * and the run goes on; anything else (the server, the panel's own limit, the connection) stops + * it. Whoever was not moved stays in the plan. + */ + async function save() { + confirming = false; + const rows: RunRow[] = moves.map((p) => ({ + steamId: p.steamId, + name: p.name, + to: plan.get(p.steamId)!, + state: 'waiting', + note: '' + })); + if (!rows.length || busy) return; + run = { rows, finished: false, stopping: false, stopped: '' }; + const r = run; + let last = 0; + for (const row of r.rows) { + if (r.stopping || destroyed) break; + const p = byId.get(row.steamId); + if (!p) { + row.state = 'gone'; + continue; + } + if (p.faction === row.to) { + row.state = 'there'; + continue; + } + const wait = last + MOVE_GAP_MS - Date.now(); + if (wait > 0) await new Promise((done) => setTimeout(done, wait)); + if (r.stopping || destroyed) break; + last = Date.now(); + row.state = 'moving'; + try { + await rconPost(serverId, 'changeTeam', { + steamId: row.steamId, + faction: row.to, + kill: false + }); + row.state = 'moved'; + } catch (err) { + const code = err instanceof ApiError ? err.code : undefined; + if (code === 'same_side') row.state = 'there'; + else if (code === 'player_not_found') row.state = 'gone'; + else { + row.state = 'failed'; + row.note = errorMessage(err); + if (!(err instanceof ApiError && err.status === 400)) { + r.stopped = row.note; + break; + } + } + } + } + r.finished = true; + } + function closeRun() { + if (!run) return; + if (run.finished) run = null; + else run.stopping = true; + } + const STATE_TEXT: Record = { + waiting: 'waiting', + moving: 'moving…', + moved: 'moved', + there: 'already there', + gone: 'left the server', + failed: '' + }; + let runDone = $derived( + run ? run.rows.filter((x) => x.state !== 'waiting' && x.state !== 'moving').length : 0 + ); + let runMoved = $derived( + run ? run.rows.filter((x) => x.state === 'moved' || x.state === 'there').length : 0 + ); + let runTitle = $derived( + !run + ? '' + : !run.finished + ? `Moving ${plural(run.rows.length, 'player')} · ${runDone} done` + : runMoved === run.rows.length + ? `Moved ${plural(run.rows.length, 'player')}` + : `Moved ${runMoved} of ${plural(run.rows.length, 'player')}` + ); + + + { + if (!(e.target as Element | null)?.closest?.('[data-team-menu]')) { + shuffleOpen = false; + sideMenu = null; + } + }} + onkeydown={(e) => { + if (e.key === 'Escape') { + shuffleOpen = false; + sideMenu = null; + } + }} +/> + +{#snippet card(p: Player)} + {@const to = targetOf(p)} + {@const moved = to !== p.faction} + +
dragStart(e, p)} + ondragend={dragEnd} + > + {#if canMove} + + {/if} +
+ {p.name} + + {p.kills}–{p.deaths} + {#if marks[p.steamId]?.firstVisit}new{/if} + {#if moved} + from {p.faction ?? 'no side'} + {/if} + +
+ + {#if canMove} + + {#if moved && p.faction} + {@const from = p.faction} + + {/if} +
+ + {#if sideMenu === p.steamId} + + {/if} +
+ {/if} +
+{/snippet} + +{#if canMove} +
+
+
+ +
+ {#if shuffleOpen} + + {/if} +
+ + + {#if inPlay.length}{inPlay.map((c) => `${c.name} ${c.cards.length}`).join(' v ')} + · {spread <= 1 ? 'even' : `off by ${spread}`} ·{/if} + {moves.length ? `${plural(moves.length, 'move')} planned` : 'no moves planned'} + +
+ + +
+
+{/if} + +{#if !players.length} +

No players connected.

+{:else} + {#if sideless.length} +
+
+ No side yet + {sideless.length} +
+
+ {#each sideless as p (p.steamId)}{@render card(p)}{/each} +
+
+ {/if} +
+ {#each columns as c (c.name)} +
dragOver(e, c.name)} + ondragleave={(e) => dragLeave(e, c.name)} + ondrop={(e) => drop(e, c.name)} + > +
+ + {c.name} + {c.cards.length} + {#if c.cards.length !== c.now}was {c.now}{/if} + {#if canMove} + + {/if} +
+
+ {#each c.cards as p (p.steamId)}{@render card(p)}{/each} + {#if !c.cards.length} +
+ {canMove ? 'No one here. Drag players onto this side.' : 'No one on this side.'} +
+ {/if} +
+
+ {/each} +
+{/if} +

+ {#if canMove} + Shuffle deals everyone into even teams on the sides ticked In shuffle, keeping clan tags + together when that is ticked; Even up moves the fewest players to get the sides within one. + Neither moves anyone: drag players around afterwards, and nothing happens in game until Save. A + player who picks the planned side themselves drops out of the plan. + {:else} + Arranging the teams needs Move on this server. + {/if} +

+ +{#if confirming} + (confirming = false)}> + {#each groups as g (g.name)} +
+ To {g.name} + {g.who.join(', ')} +
+ {/each} +

+ Each player is switched to the new side without a kill, as Team balance switches them. The + moves go out one at a time, about three a second; anyone who has left, or is on that side + already, is passed over. +

+ {#snippet actions()} + + + {/snippet} + +{/if} + +{#if run} + {@const r = run} + + {#if !r.finished} +
+
+
+ {/if} +
+ {#each r.rows as row (row.steamId)} +
+ {#if row.state === 'moved' || row.state === 'there'} + + {:else if row.state === 'gone' || row.state === 'failed'} + + {:else} + + {/if} + {row.name} + → {row.to} + {row.state === 'failed' + ? row.note + : row.state === 'waiting' && r.finished + ? 'not sent' + : STATE_TEXT[row.state]} +
+ {/each} +
+ {#if r.finished && r.stopped} +

Stopped: {r.stopped}

+ {/if} + {#if r.finished && runMoved < r.rows.length} +

Players not moved stay in the plan, so Save tries them again.

+ {/if} + {#snippet actions()} + {#if r.finished} + + {:else} + + {/if} + {/snippet} + +{/if} diff --git a/src/test/player-actions.test.ts b/src/test/player-actions.test.ts index ea215f58..228b20f5 100644 --- a/src/test/player-actions.test.ts +++ b/src/test/player-actions.test.ts @@ -174,12 +174,17 @@ describe.skipIf(!hasTestDb)('Kick, Kill and Move apart', () => { stubGateway(); }); - const move = async (who: SessionUser, steamId: unknown, faction: unknown) => { + const move = async ( + who: SessionUser | null, + steamId: unknown, + faction: unknown, + extra: Record = {} + ) => { const { POST } = await import(join(ROUTES, 'servers/[id]/rcon/[action]', '+server.ts')); return callApi(POST, who, { method: 'POST', params: { id: w.server.id, action: 'changeTeam' }, - body: { steamId, faction } + body: { steamId, faction, ...extra } }); }; @@ -209,6 +214,32 @@ describe.skipIf(!hasTestDb)('Kick, Kill and Move apart', () => { expect(requests).toEqual([`PATCH /v1/players/${PLAYER}`, `POST /v1/players/${PLAYER}/kill`]); }); + test('without the kill, as the Teams view saves, is the move alone, behind the same check', async () => { + await holds(['players.move']); + requests.length = 0; + const got = await move(w.users.viewer!, PLAYER, 'Valkyra', { kill: false }); + expect([got.status, requests]).toEqual([200, [`PATCH /v1/players/${PLAYER}`]]); + expect((got.body as { result: { message: string } }).result.message).toBe( + 'Moved to Valkyra.' + ); + // View alone, another org's owner, a key held to the org's other server and nobody signed + // in are refused before the game hears of it + await holds([]); + requests.length = 0; + const refused: [string, SessionUser | null, number][] = [ + ['viewer', w.users.viewer, 403], + ['outsider', w.users.outsider, 404], + ['keyElsewhere', w.users.keyElsewhere, 404], + ['anon', null, 401] + ]; + for (const [who, user, status] of refused) + expect([who, (await move(user, PLAYER, 'Valkyra', { kill: false })).status]).toEqual([ + who, + status + ]); + expect(requests).toEqual([]); + }); + test('of a player the list does not hold goes to the game, which answers for them', async () => { await holds(['players.move']); requests.length = 0; From ed55e83760c0333cbdb5a696496cbf8efcd84fd7 Mon Sep 17 00:00:00 2001 From: James Causon Date: Wed, 7 Oct 2026 22:41:10 +0100 Subject: [PATCH 054/102] README: Teams view --- README.md | 54 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 2b29a967..c30893c4 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,16 @@ What is in the box: when they were last on, their sessions and playtime. Anyone who can open the server can look; a row's Ban (for people who hold _Bans_) lands the moment the player next joins, and Watch needs _Notes_. +- **Arrange the teams**: the Players tab's Teams view shows who is on each side, one column per + faction. With _Move_, drag players between the columns (or send one to the next side with its + button, or pick the side from its menu on a phone), or let Shuffle fill them in: _Random_, or + _Spread by record here_, which deals players out by their K/D over the matches they finished on + that server (smoothed, so a newcomer counts as about 1). Even up moves the fewest players that + get the sides within one. Both keep clan tags together when that is ticked, and leave out the + sides unticked _In shuffle_ (a closed faction). Nothing moves until Save, which moves the players + one at a time, about three a second, without the kill, and says who was moved, who had left and + who was on that side already; whoever was not moved stays in the plan. A Team balance rule keeps + those moves, and evens the sides up again at the next match start as it always does. - **Analytics**: the worker keeps what the game does not: players online over time, players per day and how many of them were new, how long sessions last, cash in play per faction, uptime, time per map, wins per team, busiest hours, player playtime and sessions, match history @@ -299,26 +309,26 @@ what it shipped with, and add roles of their own, say a `Trial staff` that may k which the tab's columns and every role picker follow; a new role goes in last. Org owners and the site owner hold every capability on every server in scope. -| Capability | Unlocks | viewer | operator | admin | -| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | -------- | ----- | -| View | what is happening on the server: status, players, kills, rotation, who is banned and who holds a reserved slot, analytics, leaderboards, player stats. Every role has it. | ✓ | ✓ | ✓ | -| Chat | broadcast; whisper one player, several, or everyone on a faction | | ✓ | ✓ | -| Kick | kick a player; the rules that kick or flag players | | ✓ | ✓ | -| Kill | kill a player's character; AFK protection, and a Kill distance watch that kills | | ✓ | ✓ | -| Move | move a player to another team, which kills them so they respawn on it (a move to the side they are on is refused); a Team balance rule | | ✓ | ✓ | -| Match control | end/restart match, change map, next map, weather | | ✓ | ✓ | -| Live rotation | add, remove and reorder rotation entries on the running server | | ✓ | ✓ | -| Notes & watchlist | read and add player notes (delete your own), watch and unwatch, the reason a player is watched | | ✓ | ✓ | -| Bans | ban and unban on the server, from a dossier too, and see who placed its bans; a Kill distance watch that bans here | | | ✓ | -| Reserved slots | reserve and unreserve on this server, with a note and an expiry, and read the notes; a Seeding reward rule that hands out slots here | | | ✓ | -| Org ban list | the organisation's ban list, enforced on every server; sync; who placed a ban, and Unban org-wide, in a dossier; a Kill distance watch that bans everywhere | | | ✓ | -| Org reserved slots | the organisation's reserved-slot list, handed out on every server; sync; a player's entry on it in the dossier; a Seeding reward rule that hands out slots everywhere | | | ✓ | -| Others' notes | delete anyone's note | | | ✓ | -| Save rotation | save the rotation, rotation mode on and off | | | ✓ | -| Config & settings | read, validate and apply the config document; score tick, sponsor image, connection test, the game's raw status | | | ✓ | -| Automation | see the triggers and what they did; create, edit, dry-run and delete them; a player's Seeding reward progress | | | ✓ | -| Audit trail | everyone's actions on the server in the audit log, not just your own; the game server's own RCON log | | | ✓ | -| Raw RCON | any /v1 route on the game server directly, except the config document | | | ✓ | +| Capability | Unlocks | viewer | operator | admin | +| ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | -------- | ----- | +| View | what is happening on the server: status, players, kills, rotation, who is banned and who holds a reserved slot, analytics, leaderboards, player stats. Every role has it. | ✓ | ✓ | ✓ | +| Chat | broadcast; whisper one player, several, or everyone on a faction | | ✓ | ✓ | +| Kick | kick a player; the rules that kick or flag players | | ✓ | ✓ | +| Kill | kill a player's character; AFK protection, and a Kill distance watch that kills | | ✓ | ✓ | +| Move | move a player to another team, which kills them so they respawn on it (a move to the side they are on is refused); arrange the teams on the Players tab, which moves without the kill; a Team balance rule | | ✓ | ✓ | +| Match control | end/restart match, change map, next map, weather | | ✓ | ✓ | +| Live rotation | add, remove and reorder rotation entries on the running server | | ✓ | ✓ | +| Notes & watchlist | read and add player notes (delete your own), watch and unwatch, the reason a player is watched | | ✓ | ✓ | +| Bans | ban and unban on the server, from a dossier too, and see who placed its bans; a Kill distance watch that bans here | | | ✓ | +| Reserved slots | reserve and unreserve on this server, with a note and an expiry, and read the notes; a Seeding reward rule that hands out slots here | | | ✓ | +| Org ban list | the organisation's ban list, enforced on every server; sync; who placed a ban, and Unban org-wide, in a dossier; a Kill distance watch that bans everywhere | | | ✓ | +| Org reserved slots | the organisation's reserved-slot list, handed out on every server; sync; a player's entry on it in the dossier; a Seeding reward rule that hands out slots everywhere | | | ✓ | +| Others' notes | delete anyone's note | | | ✓ | +| Save rotation | save the rotation, rotation mode on and off | | | ✓ | +| Config & settings | read, validate and apply the config document; score tick, sponsor image, connection test, the game's raw status | | | ✓ | +| Automation | see the triggers and what they did; create, edit, dry-run and delete them; a player's Seeding reward progress | | | ✓ | +| Audit trail | everyone's actions on the server in the audit log, not just your own; the game server's own RCON log | | | ✓ | +| Raw RCON | any /v1 route on the game server directly, except the config document | | | ✓ | View is what is happening on the server and nothing about how it is run. The config document, the triggers, staff notes on players and the game's RCON log each need the capability that manages @@ -1258,7 +1268,7 @@ These need _View_ on the server unless the table says otherwise. | `GET /api/servers/:id/players/seen` | everyone who has played on the server: `q` (name, alias, a name the kill feed showed for them, or SteamID; each player's `feedNames` are those names), `since` (days), `flag` (`banned`, `watched` or `online`), `sort` (`lastSeen`, `firstSeen`, `minutes`, `sessions`, `kills`, `deaths`, `name`), `dir`, `offset`, `limit` (up to 100) | | `GET /api/servers/:id/players/:steamId` | the dossier: names, the names the kill feed showed that were not theirs (`feedNames`), sessions, totals per server with seed time, every ban in force (`bans`), risk, the kill feed's summary, the admin actions you may read with a kick's reason and a whisper's text; notes and why a player is watched only with _Notes & watchlist_; the Seeding reward's progress (`seedReward`) only with _Automation_ | | `GET /api/servers/:id/players/:steamId/career` | rank, streak, results by map and faction, the last ten matches, the organisation's last ten seasons with the places won | -| `GET /api/servers/:id/players/marks?ids=a,b` | watched, first visit, risk score and Steam name (`steamName`) for up to 200 SteamIDs | +| `GET /api/servers/:id/players/marks?ids=a,b` | watched, first visit, risk score, Steam name (`steamName`) and kills and deaths over the matches finished on this server (`record`, null before the first) for up to 200 SteamIDs | | `GET /api/servers/:id/kills` | the stored kill feed, newest first (see [Kill feed](#kill-feed)): `killer`, `victim`, `player` (a SteamID, or part of a name), `kind` (`headshot`, `teamKill`, `suicide`, `vehicle`, `environment`), `cause`, `minM` (metres), `match`, `limit` (up to 200); `count=1` adds the total. For the next page, send the last kill's `ts` as `before` and its `eventTime` as `beforeTime` | | `GET /api/servers/:id/matches?page=` | the match history, fifty a page, newest first; the match in progress has no `endedAt` | | `GET /api/servers/:id/matches/:matchId` | a match that has ended: each player's line, the score timeline, awards | @@ -1560,7 +1570,7 @@ POST /api/servers/:id/stats/purge {name} deletes the server's ki GET/POST/DELETE /api/servers/:id/feed the kill feed setup: token and URL (POST mints or replaces, owners only) POST /api/ingest/events where the game posts: [WDServerFeed] Url is the origin, the game adds this path (Authorization: Bearer wkf_…); not a panel route GET /api/servers/:id/cash?since= cash-in-play samples since a moment (24 h at most), seeds the dashboard chart -GET /api/servers/:id/players/marks?ids=a,b&names=… watchlist / first-visit / risk per connected player +GET /api/servers/:id/players/marks?ids=a,b&names=… watchlist / first-visit / risk / record here per connected player GET /api/servers/:id/players/:steamId dossier POST .../steam (refresh Steam data) GET .../career rank, streak, results by map and faction, the last ten matches GET /api/servers/:id/leaderboard?scope=server|org&range=current|s:|7d|30d|90d|all&sort=kills|deaths|kd|perHour|playtime|matches|wins|winRate|cash|cashPerMin&dir=desc|asc&page=1&minMinutes=60 GET /api/servers/:id/leaderboard/export? the board as CSV, every row from the top, up to 10,000 From 9ca18cf4f8293776a0d5a0c761942f67fed585fb Mon Sep 17 00:00:00 2001 From: James Causon Date: Thu, 8 Oct 2026 20:31:53 +0100 Subject: [PATCH 055/102] Team kill limit: crashes can be left out of the count - A vehicle that blows up is reported as its driver's or pilot's kill of everyone aboard. A rule whose notCounted holds VehicleExplosion leaves those out; a vehicle blown up by a weapon, and a roadkill, still count. - Opt-in: the default list is unchanged. No migration, no new route. --- src/lib/causes.test.ts | 37 ++++++++++++- src/lib/causes.ts | 13 +++++ src/lib/server/feed-events.ts | 29 +++++----- src/lib/server/trigger-rules.ts | 18 +++---- src/lib/server/triggers.test.ts | 45 +++++++++++++--- src/lib/server/triggers.ts | 31 +++++++---- src/test/access.test.ts | 6 ++- src/test/team-kill-rule.test.ts | 93 +++++++++++++++++++++++++++++---- 8 files changed, 220 insertions(+), 52 deletions(-) diff --git a/src/lib/causes.test.ts b/src/lib/causes.test.ts index 0dba9a8d..3e43a688 100644 --- a/src/lib/causes.test.ts +++ b/src/lib/causes.test.ts @@ -1,5 +1,12 @@ import { describe, expect, test } from 'bun:test'; -import { causeKind, causeLabel, knownCauses } from './causes'; +import { + causeKind, + causeLabel, + isVehicleCrash, + knownCauses, + notCountedLabel, + VEHICLE_CRASH +} from './causes'; describe('causeLabel', () => { test('named weapons, tools, buildables and vehicles', () => { @@ -90,3 +97,31 @@ describe('causeKind', () => { expect(causeKind(null)).toBe('none'); }); }); + +describe('isVehicleCrash', () => { + test("a vehicle's own blast is a crash; a weapon that blows one up, or a roadkill, is not", () => { + const heli = 'Vehicle.Variant.Air.Rotary.ROT_04.Default'; + expect(isVehicleCrash({ cause: heli, tags: ['VehicleExplosion'] })).toBe(true); + expect( + isVehicleCrash({ cause: heli.toUpperCase(), tags: ['Penetration', 'VehicleExplosion'] }) + ).toBe(true); + expect(isVehicleCrash({ cause: heli, tags: [] })).toBe(false); + expect(isVehicleCrash({ cause: heli, tags: ['RoadKill'] })).toBe(false); + expect(isVehicleCrash({ cause: 'Id.Item.C4Explosive', tags: ['VehicleExplosion'] })).toBe( + false + ); + expect( + isVehicleCrash({ + cause: 'Id.Vehicle.WeaponExtension.TNK_01.Artillery', + tags: ['VehicleExplosion'] + }) + ).toBe(false); + expect(isVehicleCrash({ cause: null, tags: ['VehicleExplosion'] })).toBe(false); + }); + + test("the Team kill limit's entry for crashes is named in any case, the rest by their cause", () => { + expect(notCountedLabel(VEHICLE_CRASH)).toBe('Vehicle crash'); + expect(notCountedLabel('vehicleexplosion')).toBe('Vehicle crash'); + expect(notCountedLabel('Id.Buildable.BarbedWire')).toBe('Barbed wire'); + }); +}); diff --git a/src/lib/causes.ts b/src/lib/causes.ts index 9dd17c7c..e787cf53 100644 --- a/src/lib/causes.ts +++ b/src/lib/causes.ts @@ -118,6 +118,19 @@ const LABELS: Record = { * runs into a teammate's barbed wire is reported as killed by whoever built it. */ export const TEAM_KILL_NOT_COUNTED: readonly string[] = ['Id.Buildable.BarbedWire']; +/** + * The entry of a Team kill limit's list that leaves out crashes, by the feed's own tag: a vehicle + * that blows up kills whoever is aboard, and the feed reports each death as a kill by its driver + * or pilot, with the vehicle as the cause. A vehicle blown up by a weapon has that weapon as the + * cause instead, so a teammate's charge or rocket is not a crash. + */ +export const VEHICLE_CRASH = 'VehicleExplosion'; +/** Whether a kill is a crash: a vehicle's own blast, reported as its driver's or pilot's kill. */ +export const isVehicleCrash = (k: { cause: string | null; tags: readonly string[] }): boolean => + causeKind(k.cause) === 'vehicle' && k.tags.includes(VEHICLE_CRASH); +/** An entry of a Team kill limit's list by name. */ +export const notCountedLabel = (entry: string): string => + entry.toLowerCase() === VEHICLE_CRASH.toLowerCase() ? 'Vehicle crash' : causeLabel(entry); /** The table by lower-case tag, for a lookup in any case. */ const BY_TAG = new Map( diff --git a/src/lib/server/feed-events.ts b/src/lib/server/feed-events.ts index da00b3da..27438ee5 100644 --- a/src/lib/server/feed-events.ts +++ b/src/lib/server/feed-events.ts @@ -598,19 +598,20 @@ function killerVars(env: Env, serverId: string) { } type KillerVars = ReturnType; -/** A player's team kills in a match by one cause (null for none), as a rule counts them. */ +/** A player's team kills in a match by one cause (null for none) and tags, as a rule counts them. */ interface CauseCount { cause: string | null; + tags: string[]; n: number; } /** * How many team kills each of these players has in the match the batch arrived in, up to and - * including the batch, by cause: the rows that carry that match, as its match page counts them. - * Leaving and joining again does not start the count over, and a batch acted on late does not - * count the ones that came after it. A batch that came in while no match was open (a server's - * first seconds, or just after its stats were purged) counts with the other such kills of the - * hour before. + * including the batch, by cause and tags: the rows that carry that match, as its match page + * counts them. Leaving and joining again does not start the count over, and a batch acted on late + * does not count the ones that came after it. A batch that came in while no match was open (a + * server's first seconds, or just after its stats were purged) counts with the other such kills + * of the hour before. */ async function teamKillsThisMatch( env: Env, @@ -639,7 +640,12 @@ async function teamKillsThisMatch( ? killsOfMatch(stamp.row, stamp.startedAt, stamp.endedAt) : null; const rows = await env.db - .select({ steamId: kills.killerSteamId, cause: kills.cause, n: sql`COUNT(*)` }) + .select({ + steamId: kills.killerSteamId, + cause: kills.cause, + tags: kills.tags, + n: sql`COUNT(*)` + }) .from(kills) .where( and( @@ -653,11 +659,11 @@ async function teamKillsThisMatch( lte(kills.ts, at) ) ) - .groupBy(kills.killerSteamId, kills.cause); + .groupBy(kills.killerSteamId, kills.cause, kills.tags); const out = new Map(); for (const r of rows) { const list = out.get(r.steamId!) ?? out.set(r.steamId!, []).get(r.steamId!)!; - list.push({ cause: r.cause, n: Number(r.n) }); + list.push({ cause: r.cause, tags: r.tags as string[], n: Number(r.n) }); } return out; } @@ -675,8 +681,7 @@ async function actOnTeamKills( .map((row) => { const cfg = row.config as TeamKillConfig; const byKiller = new Map(); - for (const k of teamKills) - if (countsForTeamKill(cfg, k.cause)) byKiller.set(k.killer!.steamId, k); + for (const k of teamKills) if (countsForTeamKill(cfg, k)) byKiller.set(k.killer!.steamId, k); return { row, cfg, byKiller }; }) .filter((r) => r.byKiller.size); @@ -688,7 +693,7 @@ async function actOnTeamKills( for (const { row, cfg, byKiller } of rules) { const acts = [...byKiller].flatMap(([steamId, k]) => { const count = (counts.get(steamId) ?? []).reduce( - (n, c) => (countsForTeamKill(cfg, c.cause) ? n + c.n : n), + (n, c) => (countsForTeamKill(cfg, c) ? n + c.n : n), 0 ); const stage = teamKillStage(cfg, count); diff --git a/src/lib/server/trigger-rules.ts b/src/lib/server/trigger-rules.ts index fbb07001..cdcb1f88 100644 --- a/src/lib/server/trigger-rules.ts +++ b/src/lib/server/trigger-rules.ts @@ -12,7 +12,7 @@ import { validateNameChange, type NameChangeConfig } from './name-change'; import { causeTags } from './cause-tags'; import { RESTART_AFTER_HOURS, restartWindow } from '$lib/uptime'; import { MAX_CHAT } from '$lib/chat'; -import { TEAM_KILL_NOT_COUNTED } from '$lib/causes'; +import { isVehicleCrash, TEAM_KILL_NOT_COUNTED, VEHICLE_CRASH } from '$lib/causes'; import { mapName } from '$lib/format'; import { UNKNOWN } from './message-vars'; import type { SteamProfileRow } from './db/schema'; @@ -151,9 +151,9 @@ export interface RestartNoticeConfig { /** * Acts on team kills the kill feed reports, counted per killer within each match: a whisper * from `warnAt` team kills on (0 = never), a kick at `kickAt` (0 = never). Team kills by a cause - * in `notCounted` (feed tags, any case) are left out of the count and never acted on; they stay - * team kills everywhere else. A rule saved before the list existed has none and leaves out - * TEAM_KILL_NOT_COUNTED. + * in `notCounted` (feed tags, any case) are left out of the count and never acted on, and so are + * crashes when it holds VEHICLE_CRASH; they stay team kills everywhere else. A rule saved before + * the list existed has none and leaves out TEAM_KILL_NOT_COUNTED. */ export interface TeamKillConfig { warnAt: number; @@ -568,14 +568,14 @@ export function broadcastWanted( export const teamKillNotCounted = (cfg: Pick): readonly string[] => Array.isArray(cfg.notCounted) ? cfg.notCounted : TEAM_KILL_NOT_COUNTED; -/** Whether a team-kill rule counts a team kill by this cause: one with no cause always counts. */ +/** Whether a team-kill rule counts a team kill: one with no cause always counts. */ export function countsForTeamKill( cfg: Pick, - cause: string | null | undefined + k: { cause: string | null; tags: readonly string[] } ): boolean { - if (!cause) return true; - const lower = cause.toLowerCase(); - return !teamKillNotCounted(cfg).some((c) => c.toLowerCase() === lower); + const left = teamKillNotCounted(cfg).map((c) => c.toLowerCase()); + if (left.includes(VEHICLE_CRASH.toLowerCase()) && isVehicleCrash(k)) return false; + return !k.cause || !left.includes(k.cause.toLowerCase()); } /** What a team-kill rule does once the killer's count this match has reached `count`. */ diff --git a/src/lib/server/triggers.test.ts b/src/lib/server/triggers.test.ts index 54bf9046..891955e8 100644 --- a/src/lib/server/triggers.test.ts +++ b/src/lib/server/triggers.test.ts @@ -779,6 +779,10 @@ describe('team_kill', () => { 'Id.Item.ATMine', 'Id.Item.Claymore' ]); + expect(notCounted(['Id.Buildable.BarbedWire', 'VehicleExplosion'])).toEqual([ + 'Id.Buildable.BarbedWire', + 'VehicleExplosion' + ]); expect(() => notCounted(['Barbed wire'])).toThrow('kill feed tag'); expect(() => notCounted(Array.from({ length: 41 }, (_, i) => `Id.Item.W${i}`))).toThrow( 'at most 40' @@ -787,16 +791,41 @@ describe('team_kill', () => { test('countsForTeamKill: any cause but those left out, in any case; an older rule leaves out barbed wire', () => { const wire = 'Id.Buildable.BarbedWire'; + const by = (cause: string | null) => ({ cause, tags: [] }); // saved before the list existed - expect(countsForTeamKill({}, wire)).toBe(false); - expect(countsForTeamKill({}, 'ID.BUILDABLE.BARBEDWIRE')).toBe(false); - expect(countsForTeamKill({}, 'Id.Item.AK74M')).toBe(true); - expect(countsForTeamKill({}, null)).toBe(true); + expect(countsForTeamKill({}, by(wire))).toBe(false); + expect(countsForTeamKill({}, by('ID.BUILDABLE.BARBEDWIRE'))).toBe(false); + expect(countsForTeamKill({}, by('Id.Item.AK74M'))).toBe(true); + expect(countsForTeamKill({}, by(null))).toBe(true); // a list, even an empty one, is what the rule says - expect(countsForTeamKill({ notCounted: [] }, wire)).toBe(true); - expect(countsForTeamKill({ notCounted: ['Id.Item.Claymore'] }, wire)).toBe(true); - expect(countsForTeamKill({ notCounted: ['Id.Item.Claymore'] }, 'id.item.claymore')).toBe(false); - expect(countsForTeamKill({ notCounted: [wire] }, null)).toBe(true); + expect(countsForTeamKill({ notCounted: [] }, by(wire))).toBe(true); + expect(countsForTeamKill({ notCounted: ['Id.Item.Claymore'] }, by(wire))).toBe(true); + expect(countsForTeamKill({ notCounted: ['Id.Item.Claymore'] }, by('id.item.claymore'))).toBe( + false + ); + expect(countsForTeamKill({ notCounted: [wire] }, by(null))).toBe(true); + }); + + test('countsForTeamKill: a crash is left out when the list holds it, in any case; a teammate who blows a vehicle up, or runs one over, still counts', () => { + const heli = 'Vehicle.Variant.Air.Rotary.Littlebird.Default'; + const crash = { cause: heli, tags: ['VehicleExplosion'] }; + const crashes = { notCounted: ['Id.Buildable.BarbedWire', 'VehicleExplosion'] }; + expect(countsForTeamKill(crashes, crash)).toBe(false); + expect(countsForTeamKill({ notCounted: ['vehicleexplosion'] }, crash)).toBe(false); + // a rule without it, saved before the list or since + expect(countsForTeamKill({}, crash)).toBe(true); + expect(countsForTeamKill({ notCounted: ['Id.Buildable.BarbedWire'] }, crash)).toBe(true); + expect( + countsForTeamKill(crashes, { cause: 'Id.Item.C4Explosive', tags: ['VehicleExplosion'] }) + ).toBe(true); + expect( + countsForTeamKill(crashes, { + cause: 'Id.Vehicle.WeaponExtension.STN_01.MistralAA', + tags: ['VehicleExplosion'] + }) + ).toBe(true); + expect(countsForTeamKill(crashes, { cause: heli, tags: ['RoadKill'] })).toBe(true); + expect(countsForTeamKill(crashes, { cause: null, tags: ['VehicleExplosion'] })).toBe(true); }); test('teamKillStage: a whisper from warnAt on, a kick from kickAt on', () => { diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index cbc14aae..be57e9ee 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -137,7 +137,7 @@ import { } from './kill-distance'; import { banNeeds, PANEL_BAN, type PanelBanParams } from './rule-ban'; import { RULE_KILL, RULE_KILL_NEEDS, type RuleKillParams } from './rule-kill'; -import { causeLabel } from '$lib/causes'; +import { causeLabel, isVehicleCrash, notCountedLabel, VEHICLE_CRASH } from '$lib/causes'; import { emptyTwoTeamsState, teamName, @@ -2031,11 +2031,18 @@ export async function dryRun( const c = cfg as TeamKillConfig; // Each team kill in the window, with the killer's running count in the match it arrived in: // the rows carrying that match from two minutes before it opened (killsOfMatch), else, for - // a kill that came in with no match open, the other such kills of the hour before. A kill by - // a cause the rule does not count adds to no count and comes back with none. - const notCounted = JSON.stringify(teamKillNotCounted(c).map((x) => x.toLowerCase())); - const counts = (cause: SQL) => - sql`(${cause} IS NULL OR lower(${cause}) NOT IN (SELECT jsonb_array_elements_text(${notCounted}::text::jsonb)))`; + // a kill that came in with no match open, the other such kills of the hour before. A kill the + // rule does not count (by its cause, or a crash) adds to no count and comes back with none. + const listed = teamKillNotCounted(c).map((x) => x.toLowerCase()); + const notCounted = JSON.stringify(listed); + const crashes = listed.includes(VEHICLE_CRASH.toLowerCase()); + // countsForTeamKill over the kill row `k`, with isVehicleCrash in SQL: no cause is no crash + const counts = (k: SQL) => + sql`(${k}.cause IS NULL OR lower(${k}.cause) NOT IN (SELECT jsonb_array_elements_text(${notCounted}::text::jsonb)))${ + crashes + ? sql` AND NOT COALESCE(${k}.cause ILIKE 'Vehicle.%' AND ${k}.tags ? ${VEHICLE_CRASH}::text, false)` + : sql`` + }`; const rows = await env.db.execute<{ ts: Date; killerName: string; @@ -2043,15 +2050,16 @@ export async function dryRun( victimName: string; map: string | null; cause: string | null; + tags: string[]; n: string | null; }>(sql` SELECT k.ts, k.killer_name AS "killerName", k.killer_steam_id AS "killerSteamId", - k.victim_name AS "victimName", k.map, k.cause, - CASE WHEN ${counts(sql`k.cause`)} THEN + k.victim_name AS "victimName", k.map, k.cause, k.tags, + CASE WHEN ${counts(sql`k`)} THEN (SELECT COUNT(*) FROM kills k2 WHERE k2.event_type = 'killed' AND k2.parsed_kill AND k2.server_id = k.server_id AND k2.killer_steam_id = k.killer_steam_id - AND k2.team_kill AND ${counts(sql`k2.cause`)} AND k2.ts <= k.ts + AND k2.team_kill AND ${counts(sql`k2`)} AND k2.ts <= k.ts AND k2.match_row IS NOT DISTINCT FROM k.match_row AND k2.ts >= COALESCE((SELECT m.started_at - interval '2 minutes' FROM matches m WHERE m.id = k.match_row AND m.server_id = k.server_id), @@ -2065,7 +2073,10 @@ export async function dryRun( const left = new Map(); for (const r of rows) { if (r.n === null) { - const label = causeLabel(r.cause); + const label = + crashes && isVehicleCrash({ cause: r.cause, tags: r.tags }) + ? notCountedLabel(VEHICLE_CRASH) + : causeLabel(r.cause); left.set(label, (left.get(label) ?? 0) + 1); continue; } diff --git a/src/test/access.test.ts b/src/test/access.test.ts index 3bf50150..bd29fdf0 100644 --- a/src/test/access.test.ts +++ b/src/test/access.test.ts @@ -520,7 +520,11 @@ describe.skipIf(!hasTestDb)('access', () => { ['name_filter', { characters: 'ascii' }, 'players.kick'], ['name_filter', { characters: 'ascii', action: 'alert' }, 'players.kick'], ['team_kill', { kickAt: 3 }, 'players.kick'], - ['team_kill', { kickAt: 3, notCounted: ['Id.Item.Claymore'] }, 'players.kick'], + [ + 'team_kill', + { kickAt: 3, notCounted: ['Id.Item.Claymore', 'VehicleExplosion'] }, + 'players.kick' + ], ['kill_rate', { maxKills: 20 }, 'players.kick'], ['kill_distance', { causes: [DEFIB], action: 'flag' }, 'players.kick'], ['kill_distance', { causes: [DEFIB], action: 'warn' }, 'chat.send'], diff --git a/src/test/team-kill-rule.test.ts b/src/test/team-kill-rule.test.ts index 83cdd11e..4a3d16cf 100644 --- a/src/test/team-kill-rule.test.ts +++ b/src/test/team-kill-rule.test.ts @@ -3,9 +3,9 @@ // does not start it over. A batch counts up to itself, even when it is acted on after its match // closed or after later batches came in; one that came in with no match open counts that server's // such kills of the hour before. Team kills by a cause the rule leaves out (barbed wire, unless its -// list says otherwise) stay team kills but add to no count and are never acted on. The dry run -// replays the same count, and rules saved with the old default texts are moved to the new ones by -// migration 0035. +// list says otherwise), and crashes when its list holds them, stay team kills but add to no count +// and are never acted on. The dry run replays the same count, and rules saved with the old default +// texts are moved to the new ones by migration 0035. import { afterAll, beforeAll, describe, expect, test } from 'bun:test'; import { randomUUID } from 'node:crypto'; import { and, asc, eq, sql } from 'drizzle-orm'; @@ -27,7 +27,14 @@ const BUILDER = { id: '76561198000000505', name: 'Builder' }; const FENCER = { id: '76561198000000506', name: 'Fencer' }; const SAPPER = { id: '76561198000000507', name: 'Sapper' }; const MIXER = { id: '76561198000000508', name: 'Mixer' }; +const PILOT = { id: '76561198000000509', name: 'Pilot' }; +const BLASTER = { id: '76561198000000510', name: 'Blaster' }; +const DRIVER = { id: '76561198000000511', name: 'Driver' }; +const GUNNER = { id: '76561198000000512', name: 'Gunner' }; const WIRE = 'Id.Buildable.BarbedWire'; +const HELI = 'Vehicle.Variant.Air.Rotary.Littlebird.Default'; +/** the feed's tag on a death in a vehicle's blast, and the list's entry for crashes */ +const EXPLOSION = 'VehicleExplosion'; const MIN = 60_000; const ago = (ms: number) => new Date(Date.now() - ms); @@ -35,7 +42,8 @@ const ago = (ms: number) => new Date(Date.now() - ms); const eventOf = ( killer: typeof STAYER, victim: typeof STAYER, - cause: string | null = 'Id.Item.AK74M' + cause: string | null = 'Id.Item.AK74M', + tags: string[] = [] ) => ({ eventId: randomUUID(), type: 'killed', @@ -48,13 +56,18 @@ const eventOf = ( victimSteamId: victim.id, cause, distance: 3000, - contextTags: [] + contextTags: tags.map((t) => `Meta.Progression.Context.Player.KillContext.${t}`) }); /** One feed batch with one kill, as the game posts it. */ -const batchOf = (killer: typeof STAYER, victim: typeof STAYER, cause?: string | null) => ({ +const batchOf = ( + killer: typeof STAYER, + victim: typeof STAYER, + cause?: string | null, + tags?: string[] +) => ({ serverId: randomUUID(), serverName: 'Test', - events: [eventOf(killer, victim, cause)] + events: [eventOf(killer, victim, cause, tags)] }); describe.skipIf(!hasTestDb)('Team kill limit, live', () => { @@ -107,15 +120,20 @@ describe.skipIf(!hasTestDb)('Team kill limit, live', () => { serverId: string, killer: typeof STAYER, now = new Date(), - cause?: string | null + cause?: string | null, + tags?: string[] ) => { - const r = await ingestBatch(env, serverId, batchOf(killer, MATE, cause), now); + const r = await ingestBatch(env, serverId, batchOf(killer, MATE, cause, tags), now); expect(r.kills.map((k) => k.teamKill)).toEqual([true]); return r.kills; }; /** ...and handed to the rules at once, as the worker does. */ - const arrives = async (serverId: string, killer: typeof STAYER, cause?: string | null) => - onKillsIngested(env, serverId, await receive(serverId, killer, new Date(), cause)); + const arrives = async ( + serverId: string, + killer: typeof STAYER, + cause?: string | null, + tags?: string[] + ) => onKillsIngested(env, serverId, await receive(serverId, killer, new Date(), cause, tags)); /** A rule as saved; without `extra` it is one saved before the list of causes not counted existed. */ const ruleOn = async (serverId: string, extra: Record = {}) => { @@ -179,6 +197,10 @@ describe.skipIf(!hasTestDb)('Team kill limit, live', () => { session(w.server.id, FENCER, 5 * MIN), session(w.server.id, SAPPER, 5 * MIN), session(w.server.id, MIXER, 5 * MIN), + session(w.server.id, PILOT, 5 * MIN), + session(w.server.id, BLASTER, 5 * MIN), + session(w.server.id, DRIVER, 5 * MIN), + session(w.server.id, GUNNER, 5 * MIN), session(w.otherServer.id, STAYER, 125 * MIN), session(w.otherServer.id, MATE, 125 * MIN) ]); @@ -363,6 +385,55 @@ describe.skipIf(!hasTestDb)('Team kill limit, live', () => { ]); }); + test('a rule that leaves out crashes: a pilot who crashes with a teammate aboard is not counted, a teammate who blows a vehicle up or runs one over is', async () => { + const crashes = await ruleOn(w.server.id, { notCounted: [WIRE, EXPLOSION] }); + invalidateTriggers(w.server.id); + await arrives(w.server.id, PILOT, HELI, [EXPLOSION]); + expect(await actionsOn(crashes, PILOT.id)).toEqual([]); + // a rule without it whispers the pilot, as before + expect(await actionsOn(here, PILOT.id)).toEqual([['whisper', 1]]); + // and the crash adds nothing to the pilot's next team kill + await arrives(w.server.id, PILOT); + expect(await actionsOn(crashes, PILOT.id)).toEqual([['whisper', 1]]); + await arrives(w.server.id, BLASTER, 'Id.Item.C4Explosive', [EXPLOSION]); + await arrives(w.server.id, DRIVER, HELI, ['RoadKill']); + // a kill in a blast with no cause is no vehicle's own + await arrives(w.server.id, GUNNER, null, [EXPLOSION]); + expect(await actionsOn(crashes, BLASTER.id)).toEqual([['whisper', 1]]); + expect(await actionsOn(crashes, DRIVER.id)).toEqual([['whisper', 1]]); + expect(await actionsOn(crashes, GUNNER.id)).toEqual([['whisper', 1]]); + await env.db.update(triggers).set({ enabled: false }).where(eq(triggers.id, crashes)); + invalidateTriggers(w.server.id); + }); + + test('the dry run leaves out crashes the same way, and says how many', async () => { + const server = { ...w.server, name: 'one' } as Parameters[1]; + const of = (r: Awaited>) => + r.items + .map((i) => i.text) + .filter((t) => /^(whisper|kick) (Pilot|Blaster|Driver|Gunner)\b/.test(t)); + const r = await dryRun(env, server, 'team_kill', { + warnAt: 1, + kickAt: 3, + notCounted: [EXPLOSION] + }); + expect(of(r)).toEqual([ + 'whisper Pilot: Careful, Pilot: that was a team kill (1 this match).', + 'whisper Blaster: Careful, Blaster: that was a team kill (1 this match).', + 'whisper Driver: Careful, Driver: that was a team kill (1 this match).', + 'whisper Gunner: Careful, Gunner: that was a team kill (1 this match).' + ]); + expect(r.notes).toContain('Not counted: 1 by Vehicle crash.'); + const all = await dryRun(env, server, 'team_kill', { warnAt: 1, kickAt: 3, notCounted: [] }); + expect(of(all)).toEqual([ + 'whisper Pilot: Careful, Pilot: that was a team kill (1 this match).', + 'whisper Pilot: Careful, Pilot: that was a team kill (2 this match).', + 'whisper Blaster: Careful, Blaster: that was a team kill (1 this match).', + 'whisper Driver: Careful, Driver: that was a team kill (1 this match).', + 'whisper Gunner: Careful, Gunner: that was a team kill (1 this match).' + ]); + }); + test('migration 0035 moves the old default texts to "this match" and leaves written ones', async () => { const saved = (config: Record) => ({ id: newId(), From 3cf0e6fbffc1a034d7a0ded72b9da596cb74a4a7 Mon Sep 17 00:00:00 2001 From: James Causon Date: Thu, 8 Oct 2026 20:31:53 +0100 Subject: [PATCH 056/102] Automation tab: Vehicle crash under Not counted --- .../(app)/server/[id]/automation/+page.svelte | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 05f49bf0..6ab6ef95 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -5,7 +5,14 @@ import { MAX_CHAT } from '$lib/chat'; import { fmtAgo, fmtSpan, fmtTime, mapLabel } from '$lib/format'; import { can } from '$lib/capabilities'; - import { causeKind, causeLabel, knownCauses, TEAM_KILL_NOT_COUNTED } from '$lib/causes'; + import { + causeKind, + causeLabel, + knownCauses, + notCountedLabel, + TEAM_KILL_NOT_COUNTED, + VEHICLE_CRASH + } from '$lib/causes'; import { placeholdersFor, unfilled, type PlaceholderGroupKey } from '$lib/placeholders'; import { isSteamId } from '$lib/steam-profiles'; import { toast } from '$lib/toast.svelte'; @@ -226,9 +233,18 @@ const openAtFirst = (open: () => boolean) => (node: HTMLDetailsElement) => { node.open = untrack(open); }; - /** What a Team kill limit can leave out of its count: things placed that a teammate runs into. */ + /** + * What a Team kill limit can leave out of its count: things placed that a teammate runs into, + * and crashes. + */ const notCountedChoices = (chosen: string[]) => - causeChoices((c) => causeKind(c) === 'buildable' || PLACED.has(c.toLowerCase()), chosen); + [ + ...causeChoices( + (c) => causeKind(c) === 'buildable' || PLACED.has(c.toLowerCase()), + chosen.filter((c) => !holds([VEHICLE_CRASH], c)) + ), + { cause: VEHICLE_CRASH, label: notCountedLabel(VEHICLE_CRASH) } + ].sort((a, b) => a.label.localeCompare(b.label)); const holds = (list: string[], cause: string) => list.some((c) => c.toLowerCase() === cause.toLowerCase()); /** A kind that lacks what it needs stays in the menu, greyed, with the reason in a few words. */ @@ -904,7 +920,7 @@ left.length > 3 ? `${left.length} causes not counted` : left.length - ? `${left.map((x) => causeLabel(x)).join(', ')} not counted` + ? `${left.map((x) => notCountedLabel(x)).join(', ')} not counted` : '' ] .filter(Boolean) From 8a885c83795da4dcdb153b6590fdbe951be54e85 Mon Sep 17 00:00:00 2001 From: James Causon Date: Thu, 8 Oct 2026 20:31:53 +0100 Subject: [PATCH 057/102] README: vehicle crashes in the Team kill limit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c30893c4..9f3d993e 100644 --- a/README.md +++ b/README.md @@ -603,7 +603,7 @@ delete them. | Name filter | Kicks joiners whose name breaks the rule, or with _Alert only_ just records them (audit trail and Discord). A character policy: any, Latin letters (keeps José and Müller, optionally with Cyrillic, Greek, Arabic, Hebrew, Thai, Devanagari, Chinese, Japanese or Korean beside them) or ASCII only; digits, spaces and keyboard punctuation always pass, emoji and symbols only when allowed, and a name can be required to hold N letters. Blocked words: a built-in English list of slurs and hate terms, your own words (up to 200) and exceptions for names that would match but are fine. Words are caught through case, leetspeak, look-alike letters, stretching and spelling out (`n.a.z.i`). The kick reason's `{why}` says what kind of fault it was, never the word. Reserved-slot players can be spared. Checked at the join and again whenever the name changes, clan tag included: the game can show the tag a moment after the player is in. A kick rule also checks a player who reconnects. Its dry run checks everyone who has played on the server, under each name they used. | | Name change watch | Flags a player who changes their name mid-game, or with _Kick_ kicks them (a reserved slot can be flagged instead). The game's player list keeps the name a player joined with (a clan tag changed mid-game aside), while the [kill feed](#kill-feed) names both players of every kill as the others see them: each time a player kills or dies, the rule holds the name the feed shows against the one the list has for them. Counts every change, or only a change to the name of another player on the server. Names are compared as they read: case, spacing, punctuation, symbols, invisible characters, look-alike letters, I/l/1 and 0/O are no disguise, nor is a clan tag in brackets dropped or added to a copied name (names of five letters or more); a player's own name with a clan tag put on, taken off or swapped is not a change. Acts at N changes within M minutes (up to two hours): an alert flags a player once a window, a kick acts at every count, and a kicked player who comes back under the taken name goes again. In the kick reason `{name}` is the name the feed showed and `{previous}` the one they are listed under. Flags go to the audit trail and Discord with the name they are listed under and their SteamID (the post opens the player's page). Changing or switching it off drops what it had queued. Needs the kill feed; the worker's memory of names starts over when it restarts. The dry run holds the day's kills against the names of the sessions open at each. | | High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | -| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), and any other buildable or placed charge ticked. Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | +| Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), any other buildable or placed charge ticked, and vehicle crashes when ticked (when a vehicle blows up, a helicopter flown into the ground say, the game reports everyone aboard as killed by its driver or pilot; a teammate who blows a vehicle up with a charge, rocket or gun is still counted). Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | | Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | | Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. A kill that comes within a minute of the killer's own death is not counted: the player is dead, so it is a round already on its way, and the game credits a vehicle's shell that lands after the vehicle was destroyed to the gunner's own weapon, from wherever the gunner is by then (an M4 kill from 2,300 m). The audit trail notes each kill left out this way, with how long after the death it came; Discord is not told. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | | Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap; when a new match is evened up, players whose clan is mostly on the other side move first, then those with the fewest clanmates beside them), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move, sent without the kill the Players tab's Move adds. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | From 48792980731c43cfcf6a9d2a093e24003f285c8e Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 00:09:51 +0100 Subject: [PATCH 058/102] Bounty rule: a kill streak puts a bounty on a player - No new route: saving needs Automation and Chat, plus Reserved slots or Org reserved slots for a slot reward (requireRuleCaps) - Bounties webhook class posts player-facing cards, no SteamIDs - No migration: the open bounty lives in triggers.state --- src/lib/placeholders.ts | 15 +- src/lib/rule-kinds.ts | 7 + src/lib/server/bounty.test.ts | 272 +++++++++++++ src/lib/server/bounty.ts | 334 ++++++++++++++++ src/lib/server/db/schema.ts | 3 +- src/lib/server/feed-events.ts | 249 +++++++++++- src/lib/server/observe.ts | 6 + src/lib/server/outbox.ts | 86 +++- src/lib/server/poller.ts | 2 + src/lib/server/trigger-rules.ts | 12 +- src/lib/server/triggers.ts | 324 ++++++++++++++-- src/lib/server/webhook-delivery.ts | 90 ++++- src/lib/types.ts | 5 +- src/test/access.test.ts | 73 +++- src/test/bounty-rule.test.ts | 604 +++++++++++++++++++++++++++++ 15 files changed, 2040 insertions(+), 42 deletions(-) create mode 100644 src/lib/server/bounty.test.ts create mode 100644 src/lib/server/bounty.ts create mode 100644 src/test/bounty-rule.test.ts diff --git a/src/lib/placeholders.ts b/src/lib/placeholders.ts index 4f51d5ed..fe3f2d52 100644 --- a/src/lib/placeholders.ts +++ b/src/lib/placeholders.ts @@ -61,8 +61,9 @@ interface MessageRule { fields: readonly string[]; own: readonly string[]; player: boolean; - /** its text can be kept where staff read it (a Kill distance reason becomes a ban reason), so it - * has no org-wide stats: staff of this server may not see the organisation's other servers */ + /** its text can be kept where staff read it (a Kill distance reason becomes a ban reason), or is + * said to the whole server (a Bounty's), so it has no org-wide stats: staff of this server may + * not see the organisation's other servers, and a player's are told to them alone */ kept?: boolean; } @@ -92,7 +93,15 @@ export const MESSAGE_RULES: Readonly>> seed_reward: { fields: ['message'], own: ['minutes', 'until', 'days'], player: true }, afk_protection: { fields: ['message', 'doneMessage'], own: ['goal'], player: false }, // the name the player had before the change - name_change: { fields: ['reason'], own: ['previous'], player: true } + name_change: { fields: ['reason'], own: ['previous'], player: true }, + // said to the whole server, so no org-wide stats: `{name}` is the marked player when the bounty is + // set and the claimer after, `{target}` always the marked player + bounty: { + fields: ['setMessage', 'claimMessage', 'whisper'], + own: ['target', 'streak', 'reward', 'days', 'until'], + player: true, + kept: true + } }; export type PlaceholderGroupKey = 'own' | 'player' | 'stats' | 'org' | 'server'; diff --git a/src/lib/rule-kinds.ts b/src/lib/rule-kinds.ts index e542b1d8..9cc06087 100644 --- a/src/lib/rule-kinds.ts +++ b/src/lib/rule-kinds.ts @@ -92,6 +92,13 @@ export const RULE_KINDS: { kind: TriggerKind; group: RuleGroup; label: string; b label: 'Seeding reward', blurb: 'Give players who stay while the server is quiet a reserved slot.' }, + { + kind: 'bounty', + group: 'Players', + label: 'Bounty', + blurb: + 'Put a bounty on a player on a kill streak; whoever kills them first gets a reserved slot.' + }, { kind: 'afk_protection', group: 'Players', diff --git a/src/lib/server/bounty.test.ts b/src/lib/server/bounty.test.ts new file mode 100644 index 00000000..256893e6 --- /dev/null +++ b/src/lib/server/bounty.test.ts @@ -0,0 +1,272 @@ +import { describe, expect, test } from 'bun:test'; +import { + bountyReplay, + bountyState, + bountyStep, + bountyTrack, + bountyVersion, + claims, + forgetBounties, + fromEarlierMatch, + keepBounties, + lapseWords, + rewardWords, + savedBounty, + validateBounty, + type BountyKill, + type BountyPlayer, + type BountyTrack +} from './bounty'; + +const RED = 'Valkyra'; +const BLUE = 'Lonestar'; +const p = (n: number, faction: string | null = RED): BountyPlayer => ({ + steamId: `7656119800000${String(n).padStart(4, '0')}`, + name: `Player ${n}`, + faction +}); +const A = p(1, RED); +const B = p(2, BLUE); +const C = p(3, BLUE); +const D = p(4, RED); +let seq = 0; +const kill = ( + killer: BountyPlayer | null, + victim: BountyPlayer, + o: { suicide?: boolean; teamKill?: boolean } = {} +): BountyKill => ({ + eventId: `e${++seq}`, + killer, + victim, + suicide: !!o.suicide, + teamKill: !!o.teamKill +}); +const fresh = (): BountyTrack => ({ runs: new Map(), open: null }); +const step = (track: BountyTrack, kills: BountyKill[], canMark = true, streak = 3) => + bountyStep({ streak }, track, kills, { canMark, now: 1000 }); + +describe('the Bounty rule, settings', () => { + test('defaults, clamps and the announcement a blank one gets', () => { + const d = validateBounty({}); + expect(d).toEqual({ + streak: 15, + minPlayers: 20, + reward: 'slot', + slotDays: 1, + scope: 'server', + setMessage: 'BOUNTY on {name}: {streak} kills without dying. Kill them for {reward}.', + claimMessage: '', + whisper: '' + }); + const c = validateBounty({ + streak: 1, + minPlayers: -5, + reward: 'none', + slotDays: 9999, + scope: 'org', + setMessage: ' ', + claimMessage: 'x'.repeat(400) + }); + expect([c.streak, c.minPlayers, c.reward, c.slotDays, c.scope]).toEqual([ + 3, + 0, + 'none', + 365, + 'org' + ]); + expect(c.setMessage).toBe('BOUNTY on {name}: {streak} kills without dying. Who ends the run?'); + expect(c.claimMessage).toHaveLength(256); + // anything but 'none' is a slot, anything but 'org' this server's list + expect(validateBounty({ reward: 'role', scope: 'all' })).toMatchObject({ + reward: 'slot', + scope: 'server' + }); + }); + + test('the reward in words', () => { + expect(rewardWords({ reward: 'slot', slotDays: 1 })).toBe('a reserved slot for 1 day'); + expect(rewardWords({ reward: 'slot', slotDays: 3 })).toBe('a reserved slot for 3 days'); + expect(rewardWords({ reward: 'none', slotDays: 3 })).toBe(''); + }); +}); + +describe('the Bounty rule, runs and bounties', () => { + test('a run of kills without dying puts a bounty on the player at the count', () => { + const t = fresh(); + expect(step(t, [kill(A, B), kill(A, C)])).toEqual([]); + expect(t.runs.get(A.steamId)).toBe(2); + const [set] = step(t, [kill(A, B)]); + expect(set).toMatchObject({ kind: 'set', bounty: { steamId: A.steamId, streak: 3, best: 3 } }); + expect(t.open?.steamId).toBe(A.steamId); + // more kills while marked grow the run the claim will name + step(t, [kill(A, C), kill(A, B)]); + expect(t.open).toMatchObject({ streak: 3, best: 5 }); + }); + + test('any death ends a run; a team kill or a suicide adds nothing to one', () => { + const t = fresh(); + step(t, [kill(A, B), kill(A, C)]); + step(t, [kill(A, D, { teamKill: true })]); + expect(t.runs.get(A.steamId)).toBe(2); + step(t, [kill(null, A)]); + expect(t.runs.has(A.steamId)).toBe(false); + step(t, [kill(A, B), kill(A, C), kill(D, A, { teamKill: true })]); + expect(t.runs.has(A.steamId)).toBe(false); + step(t, [kill(A, B), kill(A, A, { suicide: true })]); + expect(t.runs.has(A.steamId)).toBe(false); + expect(t.open).toBeNull(); + }); + + test('nobody is marked while too few are on; the run counts all the same', () => { + const t = fresh(); + expect(step(t, [kill(A, B), kill(A, C), kill(A, B)], false)).toEqual([]); + expect(t.open).toBeNull(); + // enough on now: marked at their next kill + expect(step(t, [kill(A, C)])[0]).toMatchObject({ kind: 'set', bounty: { streak: 4 } }); + }); + + test('one bounty at a time: the next player on a run is marked at their next kill', () => { + const t = fresh(); + step(t, [kill(A, B), kill(A, C), kill(A, B)]); + expect(step(t, [kill(B, D), kill(B, D), kill(B, D)])).toEqual([]); + expect(t.open?.steamId).toBe(A.steamId); + // C claims A's; B, on a run of 3 already, is marked at their next kill + const ended = step(t, [kill(C, A)]); + expect(ended.map((e) => e.kind)).toEqual(['claim']); + expect(step(t, [kill(B, D)])[0]).toMatchObject({ + kind: 'set', + bounty: { steamId: B.steamId, streak: 4 } + }); + }); + + test('only an enemy whose side is known claims it: not a teammate, a suicide or the environment', () => { + const t = fresh(); + step(t, [kill(A, B), kill(A, C), kill(A, B)]); + const open = t.open!; + expect(step(t, [kill(D, A, { teamKill: true })])).toEqual([]); + expect(step(t, [kill(A, A, { suicide: true })])).toEqual([]); + expect(step(t, [kill(null, A)])).toEqual([]); + // a kill between players whose sides the panel has not seen is no claim + expect(step(t, [kill(p(9, null), A)])).toEqual([]); + expect(step(t, [kill(B, { ...A, faction: null })])).toEqual([]); + // a player the panel takes for an enemy (no team kill) but on the same side is no claim either + expect(claims(kill(D, A), open)).toBe(false); + expect(t.open).toBe(open); + const [claim] = step(t, [kill(B, A)]); + expect(claim).toMatchObject({ kind: 'claim', claimer: B, bounty: { steamId: A.steamId } }); + expect(t.open).toBeNull(); + }); + + test('the kill that claims it can put the next bounty on the claimer', () => { + const t = fresh(); + step(t, [kill(A, B), kill(A, C), kill(A, B), kill(B, D), kill(B, D)]); + const out = step(t, [kill(B, A)]); + expect(out.map((e) => e.kind)).toEqual(['claim', 'set']); + expect(t.open).toMatchObject({ steamId: B.steamId, streak: 3 }); + }); +}); + +describe('the Bounty rule, lapses', () => { + test('what the panel says of each', () => { + const b = { name: 'Player 1', best: 17 }; + expect(lapseWords(b, 'left')).toBe( + 'The bounty on Player 1 lapsed: they left the server (a run of 17).' + ); + expect(lapseWords(b, 'match')).toBe( + 'The bounty on Player 1 lapsed: the match ended (a run of 17).' + ); + expect(lapseWords(b, 'lost')).toBe( + 'The bounty on Player 1 lapsed: the server was out of reach (a run of 17).' + ); + }); + + test('a bounty is from an earlier match only when both are matches the panel opened', () => { + expect(fromEarlierMatch('m12', 'm13')).toBe(true); + expect(fromEarlierMatch('m12', 'm12')).toBe(false); + // set or claimed while no match was open (a server's first seconds): it stands + expect(fromEarlierMatch('h480000', 'm13')).toBe(false); + expect(fromEarlierMatch('m12', 'h480001')).toBe(false); + expect(fromEarlierMatch('', 'm13')).toBe(false); + }); +}); + +describe('the Bounty rule, its memory', () => { + test('an open bounty is read back only under the save it was set in', () => { + const row = { config: { streak: 15 }, updatedAt: new Date(5000) }; + const version = bountyVersion(row); + const open = { ...A, streak: 15, best: 17, setAt: 4000, match: 'm12' }; + const state = bountyState(version, open); + expect(savedBounty(state, version)).toEqual(open); + expect(savedBounty(state, bountyVersion({ ...row, updatedAt: new Date(6000) }))).toBeNull(); + expect(savedBounty(state, bountyVersion({ ...row, config: { streak: 20 } }))).toBeNull(); + expect(savedBounty(bountyState(version, null), version)).toBeNull(); + expect(savedBounty(null, version)).toBeNull(); + expect(savedBounty({ version, open: { steamId: 7 } }, version)).toBeNull(); + }); + + test("a rule's track comes back from its row once, and starts over after a save", () => { + forgetBounties(); + const row = { + id: 'rule-1', + serverId: 'server-1', + config: { streak: 3 }, + updatedAt: new Date(1000), + state: null as unknown + }; + const open = { ...A, streak: 3, best: 3, setAt: 900, match: 'm3' }; + row.state = bountyState(bountyVersion(row), open); + const first = bountyTrack(row).track; + expect(first.open).toEqual(open); + first.runs.set(B.steamId, 2); + // the same rule: the memory, not the row + row.state = null; + expect(bountyTrack(row).track).toBe(first); + // saved again: started over, the old state not read back + row.updatedAt = new Date(2000); + row.state = bountyState(bountyVersion({ ...row, updatedAt: new Date(1000) }), open); + const after = bountyTrack(row).track; + expect(after).not.toBe(first); + expect(after.open).toBeNull(); + expect(after.runs.size).toBe(0); + // a rule no longer on is dropped + keepBounties('server-1', new Set()); + row.state = bountyState(bountyVersion(row), open); + expect(bountyTrack(row).track.open).toEqual(open); + forgetBounties('server-1'); + }); +}); + +describe('the Bounty rule, replayed', () => { + test('runs start over and an open bounty lapses at a new match; a leave lapses it too', () => { + const batch = (at: number, match: string, kills: BountyKill[], players = 50) => ({ + kind: 'kills' as const, + at, + match, + players, + kills + }); + const { outcomes, open } = bountyReplay({ streak: 3, minPlayers: 20 }, [ + batch(1, 'm1', [kill(A, B), kill(A, C)]), + // a new match: A's run of 2 starts over + batch(2, 'm2', [kill(A, B), kill(A, C)]), + batch(3, 'm2', [kill(A, B)], 10), + batch(4, 'm2', [kill(A, C)]), + batch(5, 'm3', [kill(B, C)]), + batch(6, 'm3', [kill(B, C), kill(B, D), kill(B, D)]), + { kind: 'left', at: 7, steamId: B.steamId }, + batch(8, 'm3', [kill(C, D), kill(C, D), kill(C, D), kill(C, D)]), + batch(9, 'm3', [kill(A, C)]) + ]); + expect(outcomes.map((o) => [o.kind, o.at, o.bounty.steamId, 'why' in o ? o.why : ''])).toEqual([ + // too few on at 3; marked at the next kill + ['set', 4, A.steamId, ''], + ['lapse', 5, A.steamId, 'match'], + ['set', 6, B.steamId, ''], + ['lapse', 7, B.steamId, 'left'], + ['set', 8, C.steamId, ''], + ['claim', 9, C.steamId, ''] + ]); + expect(outcomes[0]).toMatchObject({ bounty: { streak: 4 }, players: 50 }); + expect(open).toBeNull(); + }); +}); diff --git a/src/lib/server/bounty.ts b/src/lib/server/bounty.ts new file mode 100644 index 00000000..94b21561 --- /dev/null +++ b/src/lib/server/bounty.ts @@ -0,0 +1,334 @@ +// The Bounty rule's own part: who is on a run, when a run puts a bounty on a player, which kill +// claims it, and the worker's memory of both. A run is the match page's Best streak (feedRecord): a +// kill of another player that is not a team kill or a suicide adds to the killer's run, any death +// ends the victim's. One bounty is open on a server at a time; the first enemy to kill the marked +// player claims it, and a team kill, a suicide or the environment never does, so nobody clears +// their own or has a friend do it. It lapses when the player leaves, the match ends, or the panel +// loses sight of the server (it cannot tell what happened meanwhile). No database +// and no game server here: the live path (feed-events.ts for kills, triggers.ts for leaves and match +// ends) and the dry run (triggers.ts) run the same steps. +import { ApiError, int, str } from './http'; +import { settingsFingerprint } from './fingerprint'; +import { MAX_CHAT } from '$lib/chat'; + +/** + * The outbox action of a claimed bounty's reserved slot: a panel action, the player goes on a + * reserved list. + */ +export const BOUNTY_REWARD = 'bounty_reward'; +/** + * The outbox actions that note a bounty claimed and a bounty lapsing: panel actions whose audit row is + * the delivery, so the trail says who claimed it whatever the rule announces. + */ +export const BOUNTY_CLAIM = 'bounty_claim'; +export const BOUNTY_LAPSE = 'bounty_lapse'; + +export type BountyReward = 'slot' | 'none'; +/** Where a claimed slot goes: this server's own reserved list, or the organisation's. */ +export type BountyScope = 'server' | 'org'; + +export interface BountyConfig { + /** kills in a row without dying, in one match, that put a bounty on a player */ + streak: number; + /** nobody is marked while fewer than this many are on */ + minPlayers: number; + reward: BountyReward; + /** how long the claimer's reserved slot lasts */ + slotDays: number; + scope: BountyScope; + /** broadcast when a bounty is set */ + setMessage: string; + /** broadcast when it is claimed; '' for none */ + claimMessage: string; + /** whispered to the claimer; '' for none */ + whisper: string; +} + +export const BOUNTY_SET_MESSAGE = + 'BOUNTY on {name}: {streak} kills without dying. Kill them for {reward}.'; +export const BOUNTY_SET_MESSAGE_PLAIN = + 'BOUNTY on {name}: {streak} kills without dying. Who ends the run?'; + +/** What a rule's reward needs of whoever saves it: a slot here, or on the organisation's list. */ +export const bountyScope = (c: unknown): BountyScope => + c && typeof c === 'object' && (c as Record).scope === 'org' ? 'org' : 'server'; +export const bountyReward = (c: unknown): BountyReward => + c && typeof c === 'object' && (c as Record).reward === 'none' ? 'none' : 'slot'; + +export function validateBounty(c: Record): BountyConfig { + const reward = bountyReward(c); + return { + streak: int(c.streak, 15, 3, 200), + minPlayers: int(c.minPlayers, 20, 0, 1000), + reward, + slotDays: int(c.slotDays, 1, 1, 365), + scope: bountyScope(c), + setMessage: + str(c.setMessage, MAX_CHAT) || + (reward === 'slot' ? BOUNTY_SET_MESSAGE : BOUNTY_SET_MESSAGE_PLAIN), + claimMessage: str(c.claimMessage, MAX_CHAT), + whisper: str(c.whisper, MAX_CHAT) + }; +} + +const days = (n: number) => `${n} day${n === 1 ? '' : 's'}`; + +/** The reward in words, for `{reward}` and the panel's own lines; '' for none. */ +export const rewardWords = (cfg: Pick): string => + cfg.reward === 'slot' ? `a reserved slot for ${days(cfg.slotDays)}` : ''; + +/** One player of a kill as the rule reads them. */ +export interface BountyPlayer { + steamId: string; + name: string; + faction: string | null; +} + +/** One kill as the rule reads it. */ +export interface BountyKill { + eventId: string; + killer: BountyPlayer | null; + victim: BountyPlayer; + suicide: boolean; + teamKill: boolean; +} + +/** The bounty open on a server. */ +export interface OpenBounty extends BountyPlayer { + /** the run that put the bounty on them */ + streak: number; + /** their longest run since it was set, for the claim (in memory; written with the next change) */ + best: number; + /** when it was set (ms) */ + setAt: number; + /** + * the match it was set in (matchKey of the batch), so one read back after a restart is not + * claimed in a later match; '' until known + */ + match: string; +} + +/** A rule's runs and its open bounty. */ +export interface BountyTrack { + runs: Map; + open: OpenBounty | null; +} + +export type BountyEvent = + | { kind: 'set'; bounty: OpenBounty; kill: BountyKill } + | { kind: 'claim'; bounty: OpenBounty; claimer: BountyPlayer; kill: BountyKill }; + +/** A kill that adds to the killer's run: of another player, not a team kill or a suicide. */ +const scores = (k: BountyKill): boolean => + !!k.killer && !k.suicide && !k.teamKill && k.killer.steamId !== k.victim.steamId; + +/** + * A kill that claims the bounty on its victim: one that scores, by a player whose side is known and + * not the victim's. A kill between players whose sides the panel has not seen could be a friend's. + */ +export const claims = (k: BountyKill, open: Pick): boolean => + k.victim.steamId === open.steamId && + scores(k) && + !!k.killer!.faction && + !!k.victim.faction && + k.killer!.faction !== k.victim.faction; + +/** + * Takes in kills in the order the game played them: a claim first (the marked player's death), + * then the victim's run ends and the killer's grows, and a run that reaches the rule's count while + * no bounty is open, with `canMark` (enough players on), puts one on the killer. The claimer can be + * marked by the very kill that claims. Moves `track` on and returns what happened. + */ +export function bountyStep( + cfg: Pick, + track: BountyTrack, + inOrder: BountyKill[], + at: { canMark: boolean; now: number } +): BountyEvent[] { + const out: BountyEvent[] = []; + for (const k of inOrder) { + if (track.open && claims(k, track.open)) { + out.push({ kind: 'claim', bounty: track.open, claimer: k.killer!, kill: k }); + track.open = null; + } + track.runs.delete(k.victim.steamId); + if (!scores(k)) continue; + const killer = k.killer!; + const run = (track.runs.get(killer.steamId) ?? 0) + 1; + track.runs.set(killer.steamId, run); + if (track.open?.steamId === killer.steamId) track.open.best = Math.max(track.open.best, run); + else if (!track.open && at.canMark && run >= cfg.streak) { + track.open = { + steamId: killer.steamId, + name: killer.name || killer.steamId, + faction: killer.faction, + streak: run, + best: run, + setAt: at.now, + match: '' + }; + out.push({ kind: 'set', bounty: track.open, kill: k }); + } + } + return out; +} + +/** + * Why an open bounty lapses: its player left, the match ended, or the panel lost sight of the server + * (out of reach for a few looks, its own restart among them), after which it cannot tell either. + */ +export type BountyLapse = 'left' | 'match' | 'lost'; + +/** What the panel says of a lapse. */ +export const lapseWords = (b: Pick, why: BountyLapse): string => + `The bounty on ${b.name} lapsed: ${ + why === 'left' + ? 'they left the server' + : why === 'match' + ? 'the match ended' + : 'the server was out of reach' + } (a run of ${b.best}).`; + +/** + * Whether a bounty set in match `set` is from before the match `now` (both matchKey): only two + * matches the panel opened are told apart, so a bounty set or claimed while none was open stands. + */ +export const fromEarlierMatch = (set: string, now: string): boolean => + set.startsWith('m') && now.startsWith('m') && set !== now; + +// ---- the worker's memory ------------------------------------------------------------------------ + +/** + * What a rule's open bounty and runs were kept under: its settings and its last save. Any save of the + * rule (switching it off and on included) calls off an open bounty and starts the runs over; the + * saved state of an older save is not read back. + */ +export const bountyVersion = (row: { config: unknown; updatedAt: Date | null }): string => + `${settingsFingerprint(row.config)}:${row.updatedAt?.getTime() ?? 0}`; + +/** The rule's state as written to its row: the open bounty, under the version it was set in. */ +export interface BountyState { + version: string; + open: OpenBounty | null; +} + +/** The open bounty a row's saved state holds for this version, if any. */ +export function savedBounty(state: unknown, version: string): OpenBounty | null { + const s = state as Partial | null; + if (!s || s.version !== version || !s.open || typeof s.open !== 'object') return null; + const o = s.open; + return typeof o.steamId === 'string' && typeof o.name === 'string' + ? { + steamId: o.steamId, + name: o.name, + faction: typeof o.faction === 'string' ? o.faction : null, + streak: Number(o.streak) || 0, + best: Number(o.best) || Number(o.streak) || 0, + setAt: Number(o.setAt) || 0, + match: typeof o.match === 'string' ? o.match : '' + } + : null; +} + +export const bountyState = (version: string, open: OpenBounty | null): BountyState => ({ + version, + open: open ? { ...open } : null +}); + +/** + * Each Bounty rule's runs and open bounty in this process's memory, by server and rule. The open + * bounty is also written to the rule's row as it changes, so a restart keeps the hunt and forgets + * only the runs. Kept only for servers with the rule on. + */ +const memory = new Map>(); + +/** The rule's track, read back from its row's state the first time this process sees it. */ +export function bountyTrack(row: { + id: string; + serverId: string; + config: unknown; + state: unknown; + updatedAt: Date | null; +}): { version: string; track: BountyTrack } { + const version = bountyVersion(row); + let mine = memory.get(row.serverId); + if (!mine) memory.set(row.serverId, (mine = new Map())); + let m = mine.get(row.id); + if (!m || m.version !== version) { + m = { version, track: { runs: new Map(), open: savedBounty(row.state, version) } }; + mine.set(row.id, m); + } + return m; +} + +/** Drops the tracks of a server's rules that are no longer on. */ +export function keepBounties(serverId: string, live: ReadonlySet): void { + const mine = memory.get(serverId); + if (!mine) return; + for (const id of mine.keys()) if (!live.has(id)) mine.delete(id); + if (!mine.size) memory.delete(serverId); +} + +/** Forgets the tracks of one server (removed from the worker), or of every server. */ +export function forgetBounties(serverId?: string): void { + if (serverId) memory.delete(serverId); + else memory.clear(); +} + +// ---- the dry run ---------------------------------------------------------------------------------- + +/** One thing the replay takes in, in the order it happened. */ +export type BountyReplayEvent = + | { + kind: 'kills'; + at: number; + /** the match the batch was stamped with (matchKey) */ + match: string; + /** players on when the batch came in */ + players: number; + kills: BountyKill[]; + } + | { kind: 'left'; at: number; steamId: string }; + +export type BountyOutcome = + | { kind: 'set'; at: number; bounty: OpenBounty; players: number } + | { kind: 'claim'; at: number; bounty: OpenBounty; claimer: BountyPlayer } + | { kind: 'lapse'; at: number; bounty: OpenBounty; why: BountyLapse }; + +/** + * The live rule over a stretch of history: batches through bountyStep, runs started over and the + * open bounty lapsed at each new match, and lapsed when its player's session closes. + */ +export function bountyReplay( + cfg: Pick, + events: BountyReplayEvent[] +): { outcomes: BountyOutcome[]; open: OpenBounty | null } { + const track: BountyTrack = { runs: new Map(), open: null }; + const outcomes: BountyOutcome[] = []; + let match: string | null = null; + for (const e of events) { + if (e.kind === 'left') { + if (track.open?.steamId === e.steamId) { + outcomes.push({ kind: 'lapse', at: e.at, bounty: track.open, why: 'left' }); + track.open = null; + } + continue; + } + if (match !== null && e.match !== match) { + if (track.open) outcomes.push({ kind: 'lapse', at: e.at, bounty: track.open, why: 'match' }); + track.open = null; + track.runs.clear(); + } + match = e.match; + for (const x of bountyStep(cfg, track, e.kills, { + canMark: e.players >= cfg.minPlayers, + now: e.at + })) + outcomes.push( + x.kind === 'set' + ? { kind: 'set', at: e.at, bounty: { ...x.bounty }, players: e.players } + : { kind: 'claim', at: e.at, bounty: { ...x.bounty }, claimer: x.claimer } + ); + } + return { outcomes, open: track.open }; +} diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index d0b0a1e3..661a3d75 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -845,7 +845,8 @@ export const triggers = pgTable( 'two_teams', 'kill_distance', 'afk_protection', - 'name_change' + 'name_change', + 'bounty' ] }).notNull(), name: text('name').notNull(), diff --git a/src/lib/server/feed-events.ts b/src/lib/server/feed-events.ts index 27438ee5..72f5f6d4 100644 --- a/src/lib/server/feed-events.ts +++ b/src/lib/server/feed-events.ts @@ -2,14 +2,15 @@ // event bus (the SSE route fans them to browsers; in the split roles every web process gets them // through the relay stream), and the team-kill rules get their turn. Their intents go through // the same outbox as every other trigger, so delivery, audit and the Discord mirror are shared. -// The Kill rate, Kill distance and Name change rules see every batch; the rest of the work is for -// batches with team kills. +// The Kill rate, Kill distance, Name change and Bounty rules see every batch; the rest of the work is +// for batches with team kills. import { and, eq, gte, inArray, isNull, lte, sql } from 'drizzle-orm'; import type { Env } from './env'; import { emit } from './events'; import { kills, matches } from './db/schema'; import { killsOfMatch } from './matches'; import { + bountyLapse, enabledTriggers, killDistanceAct, renderTemplate, @@ -20,7 +21,7 @@ import { type Evaluation, type StatsRead } from './triggers'; -import { messageVars, serverVars, type MessageVars } from './message-vars'; +import { keptVars, messageVars, serverVars, type MessageVars } from './message-vars'; import { mapName } from '$lib/format'; import { countsForTeamKill, MAX_REASON, type TeamKillConfig } from './trigger-rules'; import { MAX_CHAT } from '$lib/chat'; @@ -61,7 +62,20 @@ import { applyTriggerUpdates, enqueueIntents, wakeDelivery } from './outbox'; import { LostOwnership, withOwnedTransaction } from './leadership'; import { memoryOf } from './observe'; import { publicMessage } from './http'; -import { notifyTeamKills } from './webhook-delivery'; +import { notifyBounty, notifyTeamKills, type BountyCard } from './webhook-delivery'; +import { + BOUNTY_CLAIM, + BOUNTY_REWARD, + bountyState, + fromEarlierMatch, + bountyStep, + bountyTrack, + keepBounties, + rewardWords, + type BountyConfig, + type BountyKill, + type BountyPlayer +} from './bounty'; import { isDemoServer } from './env'; import { drainMockFeed } from './mockgame'; import { ingestBatch } from './feed'; @@ -102,6 +116,12 @@ export async function onKillsIngested( if (!(err instanceof LostOwnership)) console.warn(`[warcon] name-change rules on ${serverId}:`, publicMessage(err)); } + try { + await actOnBounty(env, serverId, kills, vars); + } catch (err) { + if (!(err instanceof LostOwnership)) + console.warn(`[warcon] bounty rules on ${serverId}:`, publicMessage(err)); + } const teamKills = kills.filter((k) => k.teamKill && k.killer); if (!teamKills.length) return; const m = memoryOf(serverId); @@ -544,6 +564,227 @@ async function actOnNameChange( } } +/** A kill as the Bounty rule reads it. */ +const bountyKill = (k: KillView): BountyKill => ({ + eventId: k.eventId, + killer: k.killer + ? { steamId: k.killer.steamId, name: k.killer.name, faction: k.killer.faction } + : null, + victim: { steamId: k.victim.steamId, name: k.victim.name, faction: k.victim.faction }, + suicide: k.suicide, + teamKill: k.teamKill +}); + +const dateOf = (d: Date) => d.toISOString().slice(0, 10); + +/** + * The Bounty rule (one per server) over a batch: runs grow and end in the order the game played the + * kills, a run that reaches the rule's count while enough players are on and no bounty is open sets + * one (announced), and the first enemy kill of the marked player claims it (noted, announced when the + * rule says, the claimer whispered when it says, and the reserved slot queued). The open bounty is + * written to the rule's row with the actions; if they cannot be written, the bounty in memory goes + * back to what it was. Players of the Bounties channel get a card once it is written. + */ +async function actOnBounty( + env: Env, + serverId: string, + batch: KillView[], + vars: KillerVars +): Promise { + const rows = (await enabledTriggers(env, serverId)).filter((r) => r.kind === 'bounty'); + keepBounties(serverId, new Set(rows.map((r) => r.id))); + if (!rows.length) return; + const m = memoryOf(serverId); + // The most anyone says is on: a status a few seconds old must not hide a full list. + const on = Math.max(m?.status?.playerCount || 0, m?.players.length ?? 0); + const sorted = [...batch].sort((a, b) => a.eventTime - b.eventTime); + const inOrder = sorted.map(bountyKill); + const byEvent = new Map(sorted.map((k) => [k.eventId, k])); + const serverName = m?.status?.serverName || m?.server.name || ''; + const now = Date.now(); + for (const row of rows) { + const cfg = row.config as BountyConfig; + const { version, track } = bountyTrack(row); + const before = track.open; + const out: Evaluation = { intents: [], updates: [] }; + const cards: BountyCard[] = []; + // The match this batch was stamped with, read only when a bounty is set or its player dies. + let stamped: string | undefined; + const batchMatch = async () => + (stamped ??= matchKey(await stampedMatch(env, serverId, batch), Date.parse(batch[0].ts))); + // A bounty read back after a restart can be from a match that ended while no worker watched: + // the batch that could claim it says which match it is in, and an earlier match's lapses. + const open = track.open; + if ( + open?.match.startsWith('m') && + inOrder.some((k) => k.victim.steamId === open.steamId) && + fromEarlierMatch(open.match, await batchMatch()) && + track.open === open + ) { + track.open = null; + track.runs.clear(); + const lapse = bountyLapse(row, cfg, version, open, 'match', new Date(now), sorted[0].map); + out.intents.push(lapse.intent); + out.updates.push(lapse.update); + cards.push(lapse.card); + } + const events = bountyStep(cfg, track, inOrder, { canMark: on >= cfg.minPlayers, now }); + if (!events.length && !out.intents.length) continue; + // a bounty set here is of the batch's match + for (const e of events) if (e.kind === 'set') e.bounty.match = await batchMatch(); + const reward = rewardWords(cfg); + const slot = cfg.reward === 'slot'; + const until = slot ? dateOf(new Date(now + cfg.slotDays * 86400_000)) : ''; + const own = (target: string, streak: number, map: string) => ({ + target, + streak, + reward, + days: slot ? cfg.slotDays : '', + until, + ...(map ? { map: mapName(map) } : {}) + }); + // said to the whole server, or to the claimer, so no org-wide stats (keptVars) + const stats = await vars.stats( + events.flatMap((e) => + e.kind === 'set' + ? [{ steamId: e.bounty.steamId, text: cfg.setMessage }] + : [ + { steamId: e.claimer.steamId, text: cfg.claimMessage }, + { steamId: e.claimer.steamId, text: cfg.whisper } + ] + ), + { org: false } + ); + const say = (text: string, who: BountyPlayer, extra: MessageVars, max: number) => + renderTemplate(text, keptVars(vars.about(who, stats, extra)), max); + const card = { reward, orgWide: slot && cfg.scope === 'org', at: new Date(now).toISOString() }; + for (const e of events) { + const k = byEvent.get(e.kill.eventId)!; + const dedupe = (what: string) => [row.id, what, k.eventId].join(':'); + if (e.kind === 'set') { + const b = e.bounty; + const message = say(cfg.setMessage, b, own(b.name, b.streak, k.map), MAX_CHAT); + out.intents.push({ + trigger: row, + action: 'broadcast', + params: { message }, + target: b.steamId, + okMessage: `Announced the bounty on ${b.name} (${b.streak} kills).`, + detail: { name: b.name, streak: b.streak, stage: 'set', eventId: k.eventId }, + steamId: null, + dedupeKey: dedupe('set') + }); + out.updates.push({ + id: row.id, + lastFiredAt: new Date(now), + lastResult: `Bounty on ${b.name} (${b.streak} kills)` + }); + cards.push({ + ...card, + kind: 'set', + map: k.map || null, + name: b.name, + faction: b.faction, + streak: b.streak + }); + continue; + } + const b = e.bounty; + const c = e.claimer; + const claimer = c.name || c.steamId; + const claimed = `${claimer} claimed the bounty on ${b.name} (a run of ${b.best}).`; + const extra = own(b.name, b.best, k.map); + out.intents.push({ + trigger: row, + action: BOUNTY_CLAIM, + params: {}, + target: c.steamId, + okMessage: claimed, + detail: { + name: claimer, + target: b.name, + targetSteamId: b.steamId, + run: b.best, + eventId: k.eventId + }, + steamId: null, + dedupeKey: dedupe('claim') + }); + if (cfg.claimMessage) + out.intents.push({ + trigger: row, + action: 'broadcast', + params: { message: say(cfg.claimMessage, c, extra, MAX_CHAT) }, + target: c.steamId, + okMessage: `Announced ${claimer}'s claim on ${b.name}.`, + detail: { name: claimer, target: b.name, stage: 'claim', eventId: k.eventId }, + steamId: null, + dedupeKey: dedupe('claimed') + }); + if (slot) + out.intents.push({ + trigger: row, + action: BOUNTY_REWARD, + params: { + steamId: c.steamId, + name: claimer, + reason: `Bounty on ${b.name}, ${serverName}`.slice(0, 200), + slotDays: cfg.slotDays, + scope: cfg.scope + }, + target: c.steamId, + okMessage: `Reserved a slot for ${claimer}.`, + detail: { name: claimer, target: b.name, slotDays: cfg.slotDays }, + // The slot was won; it is granted even if the claimer leaves before delivery. + steamId: null, + dedupeKey: dedupe('reward') + }); + if (cfg.whisper) + out.intents.push({ + trigger: row, + action: 'whisper', + params: { steamId: c.steamId, message: say(cfg.whisper, c, extra, MAX_CHAT) }, + target: c.steamId, + okMessage: `Whispered ${claimer}.`, + detail: { name: claimer }, + steamId: c.steamId, + dedupeKey: dedupe('whisper') + }); + out.updates.push({ + id: row.id, + lastFiredAt: new Date(now), + lastResult: claimed.slice(0, -1) + }); + cards.push({ + ...card, + kind: 'claim', + map: k.map || null, + claimer, + target: b.name, + run: b.best + }); + } + // The open bounty as it stands after the batch, on the last update (they are applied in order). + const state = bountyState(version, track.open); + out.updates[out.updates.length - 1].state = state; + const after = track.open; + let queued = 0; + try { + await withOwnedTransaction(env, async (tx) => { + queued = await enqueueIntents(tx, serverId, out.intents); + await applyTriggerUpdates(tx, out.updates); + }); + } catch (err) { + // Not written: the bounty goes back to what it was, unless a look has moved it on since. + if (track.open === after) track.open = before; + throw err; + } + row.state = state; + if (queued) wakeDelivery(); + void notifyBounty(env, serverId, serverName, cards); + } +} + /** * The placeholders of a message about a kill's killer (or either of its players): the server as the * worker last saw it, the player (their side as the kill has it, their ping from the last player diff --git a/src/lib/server/observe.ts b/src/lib/server/observe.ts index 4bf7baf3..ef858c59 100644 --- a/src/lib/server/observe.ts +++ b/src/lib/server/observe.ts @@ -647,6 +647,12 @@ export async function observeServer(env: Env, m: ServerMemory, kinds: ObserveKin recovered: wasOffline, // the lines the match stage will write, for the broadcast's {mvp} and {top} matchLines: matchEnd ? closeTallies(m.tallies, prevStatusAt).rows : [], + // the sessions open after this look: a leaver's, gone past the grace, closes at it + // (the map itself follows when the look is written) + present: { + has: (steamId: string) => + m.presence.open.has(steamId) && !diff.left.some((s) => s.steamId === steamId) + }, ts }, rows diff --git a/src/lib/server/outbox.ts b/src/lib/server/outbox.ts index 77a672e7..1cb44b69 100644 --- a/src/lib/server/outbox.ts +++ b/src/lib/server/outbox.ts @@ -33,6 +33,7 @@ import { deliveries } from './metrics'; import { NAME_FLAG } from './name-filter'; import { KILL_RATE_FLAG } from './kill-rate'; import { KILL_DISTANCE_FLAG, KILL_DISTANCE_SKIP } from './kill-distance'; +import { BOUNTY_CLAIM, BOUNTY_LAPSE, BOUNTY_REWARD } from './bounty'; import { writeAudit } from './audit'; import { PANEL_BAN, type PanelBanParams } from './rule-ban'; import { killAndTell, RULE_KILL, RULE_KILL_MAX_AGE_MS } from './rule-kill'; @@ -54,7 +55,10 @@ const PANEL_ACTIONS = new Set([ NAME_FLAG, KILL_RATE_FLAG, KILL_DISTANCE_FLAG, - KILL_DISTANCE_SKIP + KILL_DISTANCE_SKIP, + BOUNTY_REWARD, + BOUNTY_CLAIM, + BOUNTY_LAPSE ]); /** The most rows one claim takes, oldest first. */ @@ -470,15 +474,18 @@ async function release(env: Env, row: OutboxRow): Promise { */ async function deliverOne(env: Env, row: OutboxRow): Promise<'held' | 'refused' | void> { if (row.action === 'seed_reward') return deliverSeedReward(env, row); + if (row.action === BOUNTY_REWARD) return deliverBountyReward(env, row); if (row.action === PANEL_BAN) return deliverPanelBan(env, row); - // An alert-only Name filter match, a Name change, Kill rate or Kill distance flag, or a Kill - // distance rule's note of a kill it left out: the audit row (and, but for the note, its Discord - // card) is the whole delivery. + // An alert-only Name filter match, a Name change, Kill rate or Kill distance flag, a Kill + // distance rule's note of a kill it left out, or a bounty claimed or lapsed: the audit row (and, + // but for the Kill distance note, its Discord card) is the whole delivery. if ( row.action === NAME_FLAG || row.action === KILL_RATE_FLAG || row.action === KILL_DISTANCE_FLAG || - row.action === KILL_DISTANCE_SKIP + row.action === KILL_DISTANCE_SKIP || + row.action === BOUNTY_CLAIM || + row.action === BOUNTY_LAPSE ) { const holds = await stillHolds(env, row); if (holds === null) return release(env, row); @@ -663,6 +670,75 @@ async function deliverSeedReward(env: Env, row: OutboxRow): Promise { } } +/** + * A claimed bounty's slot, like a Seeding reward's: the claimer goes on this server's reserved list or + * the organisation's for the rule's number of days from now, and the server is nudged to sync. A + * claimer who already holds a slot there that ends sooner has it made to last as long; one whose slot + * lasts as long or longer (or for good) keeps it as it is. Won slots do not go stale. + */ +async function deliverBountyReward(env: Env, row: OutboxRow): Promise { + const p = row.params as { + steamId: string; + name: string; + reason: string; + slotDays: number; + scope: 'server' | 'org'; + }; + stats.inFlight++; + try { + if (!isOwner()) throw new LostOwnership(); + const m = memoryOf(row.serverId); + const server = m?.server ?? (await getServer(env, row.serverId)); + const org = m?.org ?? (server ? await getOrg(env, server.orgId) : null); + if (!server || !org) return await finish(env, row, 'skipped', 'Server no longer exists.'); + const here = p.scope !== 'org'; + const list = here + ? await serverListOf(env, server, 'reserve') + : await listOf(env, org.id, 'reserve'); + const expiresAt = new Date(Date.now() + p.slotDays * 86400_000); + const { added, lengthened } = await grantEntry( + env, + list, + { + steamId: p.steamId, + reason: p.reason, + expiresAt, + addedByName: `trigger: ${row.triggerName}` + }, + { lengthen: true } + ); + if (!added && !lengthened) + return await finish( + env, + row, + 'skipped', + `${p.name} already holds a reserved slot ${here ? `on ${server.name}` : `in ${org.name}`} that lasts as long or longer.` + ); + // The next sync puts the slot on the server; this server syncs at its next look. + m?.reserved.add(p.steamId); + if (m) { + m.syncAt = 0; + gateway().observeSoon(row.serverId, { lists: true }); + } + const until = expiresAt.toISOString().slice(0, 10); + await finish( + env, + row, + 'delivered', + added + ? `Reserved a slot for ${p.name} until ${until}.` + : `${p.name}'s reserved slot now lasts until ${until}.` + ); + } catch (err) { + if (err instanceof LostOwnership) return; // the lease sweep marks it unknown + // the error goes to the log, a fixed phrase to the row: it may name what it failed on + console.error('[warcon] bounty reward', forLog(err)); + await finish(env, row, 'failed', 'Could not write the reserved slot.'); + } finally { + stats.inFlight--; + } +} + /** * A rule's ban is a panel action, not a game request: the player goes on the server's own ban list, * or the organisation's, with the rule's reason, for its number of days or for good. It is written diff --git a/src/lib/server/poller.ts b/src/lib/server/poller.ts index c560ae85..05617d04 100644 --- a/src/lib/server/poller.ts +++ b/src/lib/server/poller.ts @@ -39,6 +39,7 @@ import { phaseOffset, pickDue, withHold } from './poller-schedule'; import { rollupSamples } from './rollups'; import { liveView } from './live'; import { feedDemoKills, forgetKillDistance, forgetNameChange } from './feed-events'; +import { forgetBounties } from './bounty'; import { startAliasFill } from './aliases'; import { publicMessage } from './http'; import * as metrics from './metrics'; @@ -290,6 +291,7 @@ async function refreshRoster(env: Env, s: Scheduler, now: number): Promise forgetMemory(m.server.id); forgetKillDistance(m.server.id); forgetNameChange(m.server.id); + forgetBounties(m.server.id); } if (now - s.expiryAt >= EXPIRY_MS) { s.expiryAt = now; diff --git a/src/lib/server/trigger-rules.ts b/src/lib/server/trigger-rules.ts index cdcb1f88..2f8b899f 100644 --- a/src/lib/server/trigger-rules.ts +++ b/src/lib/server/trigger-rules.ts @@ -9,6 +9,7 @@ import { validateKillDistance, type KillDistanceConfig } from './kill-distance'; import { validateTwoTeams, type TwoTeamsConfig } from './two-teams'; import { validateAfkProtection, type AfkProtectionConfig } from './afk-protection'; import { validateNameChange, type NameChangeConfig } from './name-change'; +import { validateBounty, type BountyConfig } from './bounty'; import { causeTags } from './cause-tags'; import { RESTART_AFTER_HOURS, restartWindow } from '$lib/uptime'; import { MAX_CHAT } from '$lib/chat'; @@ -34,7 +35,8 @@ export const TRIGGER_KINDS: TriggerKind[] = [ 'two_teams', 'kill_distance', 'afk_protection', - 'name_change' + 'name_change', + 'bounty' ]; export const TRIGGER_LABELS: Record = { welcome: 'Welcome whisper', @@ -52,7 +54,8 @@ export const TRIGGER_LABELS: Record = { two_teams: 'Team balance', kill_distance: 'Kill distance watch', afk_protection: 'AFK protection', - name_change: 'Name change watch' + name_change: 'Name change watch', + bounty: 'Bounty' }; export interface WelcomeConfig { @@ -226,7 +229,8 @@ export type TriggerConfig = | TwoTeamsConfig | KillDistanceConfig | AfkProtectionConfig - | NameChangeConfig; + | NameChangeConfig + | BountyConfig; /** A kick reason: not chat, so not held to the game's chat cap. */ export const MAX_REASON = 200; @@ -421,6 +425,8 @@ export function validateConfig(kind: TriggerKind, raw: unknown): TriggerConfig { return validateAfkProtection(c); case 'name_change': return validateNameChange(c); + case 'bounty': + return validateBounty(c); } } diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index be57e9ee..da4de01a 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -105,6 +105,7 @@ import { type WelcomeConfig } from './trigger-rules'; import { MAX_CHAT } from '$lib/chat'; +import { notifyBounty, type BountyCard } from './webhook-delivery'; import { NAME_FLAG, nameFilterTargets, nameVerdict, type NameFilterConfig } from './name-filter'; import { nameChangeSettingsKey, @@ -161,6 +162,24 @@ import { afkStep, type AfkProtectionConfig } from './afk-protection'; +import { + BOUNTY_LAPSE, + bountyReplay, + bountyReward, + bountyScope, + bountyState, + bountyTrack, + forgetBounties, + lapseWords, + rewardWords, + savedBounty, + bountyVersion, + type BountyConfig, + type BountyKill, + type BountyLapse, + type BountyReplayEvent, + type OpenBounty +} from './bounty'; import { fmtUptime, RESTART_AFTER_HOURS, restartWindow } from '$lib/uptime'; import { DEFAULT_SCORE_CAP } from '$lib/match'; import { mapName } from '$lib/format'; @@ -203,9 +222,18 @@ const shape = (t: TriggerRow): TriggerView => ({ lastResult: t.lastResult, fireCount: t.fireCount, createdAt: t.createdAt ? t.createdAt.toISOString() : null, - ...(t.kind === 'afk_protection' ? { phase: afkPhase(t.state) } : {}) + ...(t.kind === 'afk_protection' ? { phase: afkPhase(t.state) } : {}), + ...(t.kind === 'bounty' ? { bounty: openBounty(t) } : {}) }); +/** A Bounty rule's open bounty, as its row shows it: the one its last save holds, if any. */ +function openBounty(t: TriggerRow): TriggerView['bounty'] { + const b = savedBounty(t.state, bountyVersion(t)); + return b + ? { steamId: b.steamId, name: b.name, streak: b.streak, setAt: new Date(b.setAt).toISOString() } + : null; +} + /** Where an AFK protection rule stands, as its row shows it; null until the worker has looked. */ function afkPhase(state: unknown): TriggerView['phase'] { const s = afkState(state); @@ -237,7 +265,7 @@ async function triggerOf(env: Env, serverId: string, id: string): Promise, + Exclude, [Capability, string] > = { welcome: ['chat.send', 'messages players'], @@ -256,16 +284,27 @@ const RULE_NEEDS: Record< name_change: ['players.kick', 'flags or kicks players'] }; +/** What a reserved slot a rule hands out needs: one here, or on the organisation's list. */ +const SLOT_NEEDS: Record<'server' | 'org', [Capability, string]> = { + org: ['lists.reserve', "edits the organisation's reserved-slot list"], + server: ['slots.manage', 'reserves slots on this server'] +}; + /** * What one rule needs of whoever saves it. The Seeding reward reserves slots: here, or on the * organisation's list. A Kill distance rule flags, warns, kills (and whispers), kicks, or bans: - * here, or on the organisation's ban list. + * here, or on the organisation's ban list. A Bounty broadcasts, and reserves the claimer a slot when + * it has a reward. */ export function ruleNeeds(kind: TriggerKind, config: unknown): [Capability, string] { if (kind === 'seed_reward') - return (config as Partial | null)?.scope !== 'server' - ? ['lists.reserve', "edits the organisation's reserved-slot list"] - : ['slots.manage', 'reserves slots on this server']; + return SLOT_NEEDS[ + (config as Partial | null)?.scope !== 'server' ? 'org' : 'server' + ]; + if (kind === 'bounty') + return bountyReward(config) === 'slot' + ? SLOT_NEEDS[bountyScope(config)] + : ['chat.send', 'messages players']; if (kind === 'kill_distance') { const action = killDistanceAction(config); if (action === 'ban') return banNeeds(killDistanceBanScope(config)); @@ -282,6 +321,8 @@ export function ruleNeeds(kind: TriggerKind, config: unknown): [Capability, stri */ function ruleAlsoNeeds(kind: TriggerKind, config: unknown): [Capability, string] | null { if (kind === 'kill_distance' && killDistanceAction(config) === 'kill') return RULE_KILL_NEEDS[1]; + if (kind === 'bounty' && bountyReward(config) === 'slot') + return ['chat.send', 'messages players']; if (kind === 'two_teams' && str((config as Partial | null)?.message)) return ['chat.send', 'whispers players']; const afk = config as Partial | null; @@ -323,9 +364,14 @@ export async function createTrigger( const row = await env.db.transaction(async (tx) => { // Seed time is one count per server, taken against one threshold, so one rule holds it. Two // Team balance rules would move a player back and forth, killing them at every move; two AFK - // protection rules would kill everyone twice a round. Saves to one server take turns, so two at - // once cannot both find none. - if (kind === 'seed_reward' || kind === 'two_teams' || kind === 'afk_protection') { + // protection rules would kill everyone twice a round; two Bounty rules would mark two players at + // once. Saves to one server take turns, so two at once cannot both find none. + if ( + kind === 'seed_reward' || + kind === 'two_teams' || + kind === 'afk_protection' || + kind === 'bounty' + ) { await tx.execute(sql`SELECT pg_advisory_xact_lock(hashtext(${`triggers:${server.id}`}))`); const [other] = await tx .select({ name: triggers.name }) @@ -384,6 +430,8 @@ export async function updateTrigger( if (body.config !== undefined) set.config = validateConfig(row.kind, body.config); if (row.kind === 'ping_kick' && (body.config !== undefined || body.enabled !== undefined)) set.state = null; + // Any save of a Bounty rule calls off its open bounty: the worker starts it over (bounty.ts). + if (row.kind === 'bounty') set.state = null; // Switched on again, a Team balance rule starts over in the worker (its memory is keyed on this): // who switched sides while it was off is unknown, so whoever is on then counts as placed. Whether // it was off is the row's at the write, not the read above, so a switch-off landing between them @@ -527,6 +575,9 @@ export interface TickContext { recovered?: boolean; /** at a boundary, every player's line of the match that ended, from the worker's tallies */ matchLines: MatchLineVars[]; + /** the players with an open session: on, or gone for less than the leave grace; absent, nobody + * is known to have left */ + present?: { has(steamId: string): boolean }; ts: Date; } @@ -762,6 +813,10 @@ export async function evaluateTriggers( case 'afk_protection': evalAfkProtection(ctx, row, row.config as AfkProtectionConfig, out); break; + case 'bounty': + // Kills move it on as they arrive (feed-events.ts); a look ends it. + evalBounty(env, ctx, row, row.config as BountyConfig, out); + break; } } catch (err) { const message = err instanceof Error ? err.message : String(err); @@ -1455,6 +1510,93 @@ function evalAfkProtection( out.updates.push(update); } +/** + * A Bounty rule at each look: a match end starts the runs over, and an open bounty lapses when the + * match ends, when its player's session closes (gone past the leave grace, so a map change's empty + * list is no leave), or at the first look after the server was out of reach (whatever happened + * meanwhile, its 24-hour restart among it, is unknown). Kills set and claim bounties as they arrive + * (feed-events.ts). The bounty is let go here, before the look is written, so no kill claims it + * meanwhile; a look whose write fails leaves it open on the rule's row only, where a restart reads + * it back and the next look or claim lapses it (a claim checks the bounty's match). + */ +function evalBounty( + env: Env, + ctx: TickContext, + row: TriggerRow, + cfg: BountyConfig, + out: Evaluation +) { + const { version, track } = bountyTrack(row); + if (ctx.matchEnd || ctx.recovered) track.runs.clear(); + const open = track.open; + if (!open) return; + const why: BountyLapse | null = ctx.matchEnd + ? 'match' + : ctx.recovered + ? 'lost' + : ctx.playersObserved && ctx.present && !ctx.present.has(open.steamId) + ? 'left' + : null; + if (!why) return; + track.open = null; + const lapse = bountyLapse( + row, + cfg, + version, + open, + why, + ctx.ts, + ctx.matchEnd?.map ?? ctx.status.map + ); + out.intents.push(lapse.intent); + out.updates.push(lapse.update); + const serverName = ctx.status.serverName || ctx.server.name; + (out.afterCommit ??= []).push( + () => void notifyBounty(env, ctx.server.id, serverName, [lapse.card]) + ); +} + +/** + * What a bounty lapsing writes: the note in the trail (Recent actions, the Automation mirror), the + * rule's row with no bounty open, and the card for a Bounties channel, posted once it is written. + */ +export function bountyLapse( + row: TriggerRow, + cfg: BountyConfig, + version: string, + open: OpenBounty, + why: BountyLapse, + at: Date, + map: string | null +): { intent: Intent; update: TriggerUpdate; card: BountyCard } { + const state = bountyState(version, null); + row.state = state; + const message = lapseWords(open, why); + return { + intent: { + trigger: row, + action: BOUNTY_LAPSE, + params: {}, + target: open.steamId, + okMessage: message, + detail: { name: open.name, streak: open.streak, run: open.best, why }, + steamId: null, + dedupeKey: key(row, 'lapse', open.steamId, open.setAt) + }, + update: { id: row.id, lastFiredAt: at, lastResult: message, state }, + card: { + kind: 'lapse', + at: at.toISOString(), + map: map || null, + reward: rewardWords(cfg), + orgWide: cfg.reward === 'slot' && cfg.scope === 'org', + name: open.name, + run: open.best, + why + } + }; +} + // A match boundary is one tick, so the rule keeps no state: the end message then the start // message, each an outbox row keyed on the tick. // A match end the rule is holding until the server has its players on again, per rule (in memory @@ -1468,6 +1610,7 @@ export function forgetRuleMemory(): void { twoTeamsMemory.clear(); staffMoves.clear(); afkEmpty.clear(); + forgetBounties(); } function evalMatchBroadcast( @@ -1878,6 +2021,26 @@ const REPLAY_ROWS_MAX = 5000; /** The risk dry run judges at most this many players (the latest on), for its Steam lookups. */ const RISK_REPLAY_MAX = 2000; +/** + * Where a replay of a per-match rule starts: the start of the match already running at `from` (two + * minutes before it, as killsOfMatch reads a match), at most six hours back, else `from`. + */ +async function matchStartBefore(env: Env, serverId: string, from: Date): Promise { + const [open] = await env.db.execute<{ startedAt: Date | null }>(sql` + SELECT MIN(started_at) AS "startedAt" FROM matches + WHERE server_id = ${serverId} AND started_at < ${from} + AND (ended_at IS NULL OR ended_at >= ${from})`); + return new Date( + Math.max( + Math.min( + from.getTime(), + open?.startedAt ? new Date(open.startedAt).getTime() - 120_000 : Infinity + ), + from.getTime() - 6 * 3600_000 + ) + ); +} + /** Replays the last 24 hours of this server's history against a rule. Touches nobody. */ export async function dryRun( env: Env, @@ -1899,6 +2062,10 @@ export async function dryRun( }; const push = (at: Date, text: string) => { result.fires++; + note(at, text); + }; + /** a line of the replay that is not a firing of its own (a bounty claimed or lapsed) */ + const note = (at: Date, text: string) => { if (result.items.length < 50) result.items.push({ at: at.toISOString(), text }); }; const joins = (withFaction = false) => @@ -2172,24 +2339,137 @@ export async function dryRun( ); return result; } + if (kind === 'bounty') { + const c = cfg as BountyConfig; + // Every kill of the window through the live rule's own step, batch by batch as they came in, + // from the start of a match already running when the window opens (at most six hours back), so + // a run at the window's edge is the live one. Each batch is judged against the player count of + // the server's last sample before it, and a marked player's bounty lapses when their session + // closed. Only what happened in the window is listed. + const since = await matchStartBefore(env, server.id, from); + const rows = await env.db.execute<{ + ts: Date; + eventId: string; + matchRow: number | null; + killer: string | null; + killerName: string | null; + killerFaction: string | null; + victim: string; + victimName: string; + victimFaction: string | null; + suicide: boolean; + teamKill: boolean; + }>(sql` + SELECT ts, event_id AS "eventId", match_row AS "matchRow", killer_steam_id AS killer, + killer_name AS "killerName", killer_faction AS "killerFaction", + victim_steam_id AS victim, victim_name AS "victimName", + victim_faction AS "victimFaction", suicide, team_kill AS "teamKill" + FROM kills + WHERE server_id = ${server.id} AND ts >= ${since} + ORDER BY ts ASC, event_time ASC LIMIT ${KILL_RATE_REPLAY_MAX}`); + const counts = await env.db.execute<{ ts: Date; n: number | null }>(sql` + SELECT ts, player_count AS n FROM samples + WHERE server_id = ${server.id} AND ok AND ts >= ${new Date(since.getTime() - 10 * 60_000)} + ORDER BY ts ASC`); + const leaves = await env.db.execute<{ steamId: string; leftAt: Date }>(sql` + SELECT steam_id AS "steamId", left_at AS "leftAt" FROM player_sessions + WHERE server_id = ${server.id} AND left_at >= ${since} + ORDER BY left_at ASC LIMIT ${NAME_SESSIONS_MAX}`); + const sampled = counts.map((r) => ({ at: new Date(r.ts).getTime(), n: Number(r.n ?? 0) })); + let next = 0; + let on = 0; + const events: BountyReplayEvent[] = []; + for (let i = 0; i < rows.length;) { + const at = new Date(rows[i].ts).getTime(); + let j = i; + while (j < rows.length && new Date(rows[j].ts).getTime() === at) j++; + for (; next < sampled.length && sampled[next].at <= at; next++) on = sampled[next].n; + const batch = rows.slice(i, j); + events.push({ + kind: 'kills', + at, + match: matchKey(batch[0].matchRow === null ? null : Number(batch[0].matchRow), at), + players: on, + kills: batch.map((r): BountyKill => ({ + eventId: r.eventId, + killer: r.killer + ? { steamId: r.killer, name: r.killerName || r.killer, faction: r.killerFaction } + : null, + victim: { steamId: r.victim, name: r.victimName, faction: r.victimFaction }, + suicide: !!r.suicide, + teamKill: !!r.teamKill + })) + }); + i = j; + } + for (const l of leaves) + events.push({ kind: 'left', at: new Date(l.leftAt).getTime(), steamId: l.steamId }); + // a leave dated to the same moment as a batch comes after it: a player is seen, then gone + events.sort((a, b) => a.at - b.at || (a.kind === b.kind ? 0 : a.kind === 'kills' ? -1 : 1)); + const { outcomes, open } = bountyReplay(c, events); + const reward = rewardWords(c); + const slot = c.reward === 'slot'; + const counted = { set: 0, claim: 0, lapse: 0 }; + for (const o of outcomes) { + if (o.at < from.getTime()) continue; + counted[o.kind]++; + const at = new Date(o.at); + const b = o.bounty; + if (o.kind === 'set') { + const v = keptVars( + dryRunVars( + server.name, + { name: b.name, steamId: b.steamId }, + { + target: b.name, + streak: b.streak, + reward, + days: slot ? c.slotDays : '', + until: slot ? dateOf(new Date(o.at + c.slotDays * 86400_000)) : '' + } + ) + ); + push( + at, + `bounty on ${b.name} (${b.streak} kills, ${o.players} on): ${renderTemplate(c.setMessage, v, MAX_CHAT)}` + ); + } else if (o.kind === 'claim') + note( + at, + `claimed by ${o.claimer.name || o.claimer.steamId}: ${b.name} after a run of ${b.best}${slot ? `, ${reward}` : ''}` + ); + else + note( + at, + o.why === 'left' + ? `lapsed: ${b.name} left (a run of ${b.best})` + : `lapsed: the match ended, ${b.name} on a run of ${b.best}` + ); + } + const [feed] = await env.db + .select({ configured: sql`feed_token_hash IS NOT NULL` }) + .from(servers) + .where(eq(servers.id, server.id)); + if (!feed?.configured) + result.notes.push( + 'This server has no kill feed set up (Config tab), so the rule cannot see any kills.' + ); + const n = (x: number, one: string, many = `${one}s`) => `${x} ${x === 1 ? one : many}`; + result.notes.push( + `${n(counted.set, 'bounty', 'bounties')} set, ${counted.claim} claimed, ${counted.lapse} lapsed${open ? ', one still open' : ''}. Runs start over at each match, and nobody is marked while the server's samples show fewer than ${c.minPlayers} on.` + ); + if (rows.length >= KILL_RATE_REPLAY_MAX) + result.notes.push( + `Replayed the first ${KILL_RATE_REPLAY_MAX.toLocaleString('en')} kills only.` + ); + return result; + } if (kind === 'kill_distance') { const c = cfg as KillDistanceConfig; // The kills of the window the rule counts, per match as the live rule counts them, from the // start of a match already running when the window opens (at most six hours back), so a count // at the window's edge is the live one. Only what happened in the window is listed. - const [open] = await env.db.execute<{ startedAt: Date | null }>(sql` - SELECT MIN(started_at) AS "startedAt" FROM matches - WHERE server_id = ${server.id} AND started_at < ${from} - AND (ended_at IS NULL OR ended_at >= ${from})`); - const since = new Date( - Math.max( - Math.min( - from.getTime(), - open?.startedAt ? new Date(open.startedAt).getTime() - 120_000 : Infinity - ), - from.getTime() - 6 * 3600_000 - ) - ); + const since = await matchStartBefore(env, server.id, from); // from 0 m a kill without a distance counts too const far = c.minDistanceM > 0 ? sql`AND distance_m >= ${c.minDistanceM}` : sql``; const rows = await env.db.execute<{ diff --git a/src/lib/server/webhook-delivery.ts b/src/lib/server/webhook-delivery.ts index 504c0e41..002ab580 100644 --- a/src/lib/server/webhook-delivery.ts +++ b/src/lib/server/webhook-delivery.ts @@ -10,6 +10,8 @@ import { OWNERS_ROWS } from './audit-rows'; import { escapeMarkdown } from './webhook-status-core'; import { KILL_DISTANCE_SKIP } from './kill-distance'; import { causeLabel } from '$lib/causes'; +import { mapName } from '$lib/format'; +import type { BountyLapse } from './bounty'; import { FAILURES_ONLY } from '$lib/rule-kinds'; import type { KillView } from '$lib/types'; @@ -21,7 +23,8 @@ export const WEBHOOK_EVENTS = [ 'management', 'auth', 'teamkills', - 'watched' + 'watched', + 'bounties' ] as const; export type WebhookEvent = (typeof WEBHOOK_EVENTS)[number]; export const WEBHOOK_EVENT_LABELS: Record = { @@ -32,7 +35,8 @@ export const WEBHOOK_EVENT_LABELS: Record = { management: 'Servers, members, invite links, accounts', auth: 'Sign-ins and sign-in failures', teamkills: 'Team kills (from the kill feed)', - watched: 'Watched players joining' + watched: 'Watched players joining', + bounties: "Bounties (set, claimed and lapsed, for a players' channel)" }; /** Which event class an audit row belongs to. */ @@ -155,6 +159,7 @@ const ACTION_TITLES: Record = { 'trigger.kill_distance': 'Trigger · kill distance watch', 'trigger.afk_protection': 'Trigger · AFK protection', 'trigger.name_change': 'Trigger · name change watch', + 'trigger.bounty': 'Trigger · bounty', 'player.note': 'Player note', 'player.watch': 'Watchlist', 'list.add': 'Org list · added', @@ -243,6 +248,87 @@ export function buildTeamKillEmbed(appName: string, serverName: string, k: KillV const WATCHED_COLOR = 0x5b8def; +const BOUNTY_COLORS = { set: 0xd4a843, claim: 0x7bc462, lapse: 0x8a8a90 } as const; + +/** A bounty as a Bounties channel shows it: for players, so names only, never a SteamID. */ +export type BountyCard = { + /** when it happened (ISO) */ + at: string; + /** the map's id, as the game names it */ + map: string | null; + /** the reward in words; '' for none */ + reward: string; + /** the slot is on every server of the organisation */ + orgWide: boolean; +} & ( + | { kind: 'set'; name: string; faction: string | null; streak: number } + | { kind: 'claim'; claimer: string; target: string; run: number } + | { kind: 'lapse'; name: string; run: number; why: BountyLapse } +); + +/** One bounty set, claimed or lapsed as an embed: who, the run, the reward, where. */ +export function buildBountyEmbed(appName: string, serverName: string, c: BountyCard): Embed { + const reward = c.reward + ? `Reward: ${plain(c.reward, 80)}${c.orgWide ? ', on every server' : ''}` + : ''; + const where = `${plain(serverName, 80)}${c.map ? ` · ${plain(mapName(c.map), 40)}` : ''}`; + const card = + c.kind === 'set' + ? { + // the name goes in the body, where it is escaped like every other name (titles are not) + title: 'Bounty set', + lines: [ + `**${plain(c.name, 60)}**: ${c.streak} kills without dying${c.faction ? `, for ${plain(c.faction, 30)}` : ''}`, + reward + ] + } + : c.kind === 'claim' + ? { + title: 'Bounty claimed', + lines: [ + `**${plain(c.claimer, 60)}** ended **${plain(c.target, 60)}**'s run at ${c.run}`, + reward + ] + } + : { + title: 'Bounty lapsed', + lines: [ + c.why === 'left' + ? `**${plain(c.name, 60)}** left the server on a run of ${c.run}` + : `The match ended with **${plain(c.name, 60)}** on a run of ${c.run}` + ] + }; + return { + title: card.title, + description: clip([...card.lines, where].filter(Boolean).join('\n'), 2000), + color: BOUNTY_COLORS[c.kind], + timestamp: c.at, + footer: { text: appName } + }; +} + +/** Posts a bounty to the org's webhooks with Bounties ticked for the server. Never throws. */ +export async function notifyBounty( + env: Env, + serverId: string, + serverName: string, + cards: BountyCard[] +): Promise { + try { + if (!cards.length) return; + const orgId = await orgOfServer(env, serverId); + if (!orgId) return; + const hooks = hooksFor(await enabledWebhooks(env, orgId), 'bounties', serverId); + if (!hooks.length) return; + for (const c of cards) { + const embed = buildBountyEmbed(env.APP_NAME || 'Warcon', serverName, c); + for (const hook of hooks) enqueue(env, hook, embed); + } + } catch (err) { + console.error('[warcon] webhook bounties', err); + } +} + /** The player's page in the panel, for a staff post about one player; none without an origin. */ export function dossierUrl(origin: string | undefined, serverId: string, steamId: string) { if (!origin || !/^\d{17}$/.test(steamId)) return undefined; diff --git a/src/lib/types.ts b/src/lib/types.ts index 47650349..163bade8 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -578,7 +578,8 @@ export type TriggerKind = | 'two_teams' | 'kill_distance' | 'afk_protection' - | 'name_change'; + | 'name_change' + | 'bounty'; export interface TriggerView { id: string; @@ -592,6 +593,8 @@ export interface TriggerView { createdAt: string | null; /** an AFK protection rule's standing: acting while the server seeds, or off since a match went live */ phase?: { on: boolean; since: string | null; why: string } | null; + /** a Bounty rule's open bounty: on whom, the run that set it, and when */ + bounty?: { steamId: string; name: string; streak: number; setAt: string } | null; } export interface DryRunResult { diff --git a/src/test/access.test.ts b/src/test/access.test.ts index bd29fdf0..2a93ce8f 100644 --- a/src/test/access.test.ts +++ b/src/test/access.test.ts @@ -536,7 +536,8 @@ describe.skipIf(!hasTestDb)('access', () => { ['name_change', { takenOnly: true }, 'players.kick'], ['name_change', { action: 'kick' }, 'players.kick'], ['seed_reward', { minutes: 60, scope: 'server' }, 'slots.manage'], - ['seed_reward', { minutes: 60, scope: 'org' }, 'lists.reserve'] + ['seed_reward', { minutes: 60, scope: 'org' }, 'lists.reserve'], + ['bounty', { reward: 'none' }, 'chat.send'] ]; for (const [kind, config, cap] of rules) { await holds([]); @@ -667,6 +668,76 @@ describe.skipIf(!hasTestDb)('access', () => { } }); + test('a Bounty rule broadcasts, so Chat; a reward needs the reserved list it goes on as well', async () => { + const w = await seedWorld(env); + const params = { id: w.server.id }; + const holds = (caps: string[]) => + env.db + .update(orgRoles) + .set({ capabilities: ['server.view', 'automation.manage', ...caps] }) + .where(eq(orgRoles.id, w.roles.viewer)); + const routes = ['POST api/servers/[id]/triggers', 'POST api/servers/[id]/triggers/dry-run']; + const slot = (scope: string) => ({ kind: 'bounty', config: { reward: 'slot', scope } }); + // nobody outside the server reaches the rule at all, with or without a reward + for (const [who, status] of [ + ['anon', 401], + ['outsider', 404], + ['elsewhere', 404], + ['keyView', 403], + ['viewer', 403] + ] as const) + for (const route of routes) + for (const body of [slot('server'), { kind: 'bounty', config: { reward: 'none' } }]) + expect([who, route, (await api(w, who, route, { params, body })).status]).toEqual([ + who, + route, + status + ]); + // a slot here needs Reserved slots and Chat, one on every server Org reserved slots and Chat: + // neither alone, nor the other list's + for (const [caps, scope] of [ + [['slots.manage'], 'server'], + [['chat.send'], 'server'], + [['lists.reserve', 'chat.send'], 'server'], + [['lists.reserve'], 'org'], + [['chat.send'], 'org'], + [['slots.manage', 'chat.send'], 'org'] + ] as const) { + await holds([...caps]); + for (const route of routes) { + const got = await api(w, 'viewer', route, { params, body: slot(scope) }); + expect([caps, scope, route, got.status]).toEqual([caps, scope, route, 403]); + } + } + for (const [caps, scope] of [ + [['slots.manage', 'chat.send'], 'server'], + [['lists.reserve', 'chat.send'], 'org'] + ] as const) { + await holds([...caps]); + const got = await api(w, 'viewer', routes[1], { params, body: slot(scope) }); + expect([caps, scope, got.status]).toEqual([caps, scope, 200]); + } + // an announcement-only rule needs Chat alone, and its author cannot give it a slot by an edit + await holds(['chat.send']); + const made = await api(w, 'viewer', routes[0], { + params, + body: { kind: 'bounty', config: { reward: 'none' } } + }); + expect(made.status).toBe(201); + const triggerId = (made.body as { trigger: { id: string } }).trigger.id; + for (const scope of ['server', 'org']) { + const edit = await api(w, 'viewer', 'PATCH api/servers/[id]/triggers/[triggerId]', { + params: { id: w.server.id, triggerId }, + body: { config: { reward: 'slot', scope } } + }); + expect([scope, edit.status]).toEqual([scope, 403]); + } + // one per server: two would put two bounties up at once + await holds(['chat.send', 'slots.manage']); + const second = await api(w, 'viewer', routes[0], { params, body: slot('server') }); + expect(second.status).toBe(409); + }); + test('a Name filter rule: who may save, dry-run and switch it on', async () => { const w = await seedWorld(env); const body = { kind: 'name_filter', config: { characters: 'ascii', action: 'alert' } }; diff --git a/src/test/bounty-rule.test.ts b/src/test/bounty-rule.test.ts new file mode 100644 index 00000000..508b61fd --- /dev/null +++ b/src/test/bounty-rule.test.ts @@ -0,0 +1,604 @@ +// A Bounty rule as the worker runs it, against the database and a stand-in game: kills come in +// through the real ingest, which takes both players' sides from the sessions the worker's looks +// wrote; a run of kills without dying puts a bounty on a player while enough are on, announced to +// the server; a teammate, a suicide or the environment never ends it, an enemy's kill claims it, +// and the claimer's reserved slot goes on the list the rule names. A leave or a match end lapses +// it, a worker restart keeps it, any save of the rule calls it off. A Bounties webhook gets a card +// for each, with names and never a SteamID. The dry run replays the day's kills the same way. +import { afterAll, beforeAll, describe, expect, spyOn, test } from 'bun:test'; +import { and, eq, isNull } from 'drizzle-orm'; +import { join } from 'node:path'; +import type { Env } from '$lib/server/env'; +import { + auditLog, + kills, + listEntries, + lists, + matches, + organizations, + outbox, + playerSessions, + samples, + servers, + triggers, + webhooks +} from '$lib/server/db/schema'; +import { acquireOrRenew, releaseOwnership } from '$lib/server/leadership'; +import { onKillsIngested } from '$lib/server/feed-events'; +import { ingestBatch } from '$lib/server/feed'; +import { + forgetMemory, + memoryFor, + observeServer, + OFFLINE_AFTER_FAILURES, + type ServerMemory +} from '$lib/server/observe'; +import { startDelivery, stopDelivery } from '$lib/server/outbox'; +import { WardogsClient } from '$lib/server/rcon'; +import { closeAllSessions, LEAVE_GRACE_MS } from '$lib/server/sessions'; +import { dryRun, invalidateTriggers, validateConfig } from '$lib/server/triggers'; +import { BOUNTY_CLAIM, BOUNTY_LAPSE, BOUNTY_REWARD, forgetBounties } from '$lib/server/bounty'; +import { encryptSecret } from '$lib/server/crypto'; +import { newId } from '$lib/server/http'; +import { resetWebhookQueues } from '$lib/server/webhook-delivery'; +import { callApi, stubGateway, type CallInput, type Outcome } from './call'; +import { hasTestDb, testEnv } from './db'; +import { seedWorld, type PrincipalName, type World } from './world'; + +const ROUTES = join(import.meta.dir, '..', 'routes'); +/** A route as a person calls it: `METHOD path` under src/routes. */ +async function api( + w: World, + who: PrincipalName, + route: string, + input: Omit = {} +): Promise { + const [method, path] = route.split(' '); + const mod = await import(join(ROUTES, path, '+server.ts')); + return callApi(mod[method], w.users[who], { ...input, method }); +} + +// The mock game's scoreboard has Valkyra, Lonestar and Manticore. +const A = '76561198000000901'; // Valkyra +const B = '76561198000000902'; // Lonestar +const C = '76561198000000903'; // Lonestar +const D = '76561198000000904'; // Valkyra, A's teammate +const SIDE: Record = { + [A]: 'Valkyra', + [B]: 'Lonestar', + [C]: 'Lonestar', + [D]: 'Valkyra' +}; +const name = (steamId: string) => `p${steamId.slice(-3)}`; + +let clock = 100; +/** One `killed` event as the game posts it. */ +const ev = (killer: string | null, victim: string, o: { suicide?: boolean } = {}) => ({ + eventId: newId(), + type: 'killed', + eventTime: clock++, + matchId: 'boot', + mapName: 'Kavkazi', + ...(killer ? { killerName: name(killer), killerSteamId: killer } : {}), + victimName: name(victim), + victimSteamId: victim, + cause: 'Id.Item.AK74M', + distance: 4000, + contextTags: o.suicide ? ['Meta.Progression.Context.Player.KillContext.Suicide'] : [] +}); + +describe.skipIf(!hasTestDb)('Bounty rule, live', () => { + let env: Env; + let spy: ReturnType; + /** who the stand-in game lists, per server */ + const listed = new Map(); + const broadcasts: [string, string][] = []; + const whispers: [string, string, string][] = []; + /** what reached Discord */ + const posts: { title: string; description: string }[] = []; + const realFetch = globalThis.fetch; + + beforeAll(async () => { + env = { ...(await testEnv()), STEAM_API_KEY: '' }; + stubGateway(); + expect(await acquireOrRenew(env, 'bounty test')).toBe(true); + spy = spyOn(WardogsClient, 'forServer').mockImplementation(async (_env, server) => { + const client = new WardogsClient( + env, + { id: server.id, host: 'demo', port: 1, scheme: 'http' }, + 'demo', + `bounty-${server.id}` + ); + const raw = client.raw.bind(client); + const ok = (text: string) => ({ + status: 200, + statusText: 'OK', + headers: { 'content-type': 'application/json' }, + text + }); + client.raw = async (method, path, body, headers) => { + if (method === 'GET' && path === '/v1/players') + return ok( + JSON.stringify({ + players: (listed.get(server.id) ?? []).map((steamId) => ({ + name: name(steamId), + steamId, + faction: SIDE[steamId], + kills: 0 + })) + }) + ); + if (method === 'POST' && path === '/v1/broadcast') { + broadcasts.push([server.id, JSON.parse(body ?? '{}').message]); + return ok('{"message":"Broadcast sent."}'); + } + const whisper = /^\/v1\/players\/(\d{17})\/message$/.exec(path); + if (method === 'POST' && whisper) { + whispers.push([server.id, whisper[1], JSON.parse(body ?? '{}').message]); + return ok('{"message":"Message sent."}'); + } + return raw(method, path, body, headers); + }; + return client; + }); + globalThis.fetch = (async (url: string | URL | Request, init?: RequestInit) => { + if (!String(url).includes('discord.test')) return realFetch(url, init); + posts.push(...(JSON.parse(String(init?.body ?? '{}')).embeds ?? [])); + return new Response('{"id":"1"}', { status: 200 }); + }) as typeof fetch; + }); + afterAll(async () => { + await stopDelivery(); + spy.mockRestore(); + globalThis.fetch = realFetch; + resetWebhookQueues(); + await releaseOwnership(env); + }); + + /** The worker's memory of a server, fresh. */ + const memoryOf = async (w: World): Promise => { + const [server] = await env.db.select().from(servers).where(eq(servers.id, w.server.id)); + const [org] = await env.db.select().from(organizations).where(eq(organizations.id, w.org.id)); + forgetMemory(server.id); + return memoryFor(server, org); + }; + /** A look at the server with these players on, their sides as SIDE has them. */ + const look = async (m: ServerMemory, ...on: string[]) => { + listed.set(m.server.id, on); + m.playersIntervalMs = 1000; + await observeServer(env, m, { status: true, players: true }); + // the stand-in's scoreboard counts its own players; the rule reads the most anyone says is on + m.status = { ...m.status!, playerCount: on.length }; + }; + const post = async (serverId: string, events: ReturnType[]) => { + const r = await ingestBatch(env, serverId, { serverId: 'i', serverName: 'x', events }); + await onKillsIngested(env, serverId, r.kills); + return r; + }; + const rule = async (w: World, config: Record) => { + const id = newId(); + await env.db.insert(triggers).values({ + id, + serverId: w.server.id, + orgId: w.org.id, + kind: 'bounty', + name: 'Bounty', + enabled: true, + config: validateConfig('bounty', config) + }); + invalidateTriggers(w.server.id); + return id; + }; + const rowsOf = (triggerId: string) => + env.db.select().from(outbox).where(eq(outbox.triggerId, triggerId)).orderBy(outbox.id); + const stateOf = async (triggerId: string) => + ( + await env.db + .select({ state: triggers.state }) + .from(triggers) + .where(eq(triggers.id, triggerId)) + )[0].state as { open: { steamId: string; streak: number; match: string } | null } | null; + const rowOf = async (id: number) => + (await env.db.select().from(outbox).where(eq(outbox.id, id)))[0]; + /** Runs the delivery loop until the rows are done. */ + const deliver = async (...ids: number[]) => { + startDelivery(env); + for (let i = 0; i < 100; i++) { + const rows = await Promise.all(ids.map(rowOf)); + if (rows.every((r) => r.state !== 'pending' && r.state !== 'sending')) break; + await Bun.sleep(50); + } + await stopDelivery(); + return Promise.all(ids.map(rowOf)); + }; + const slotsOf = (w: World, steamId: string) => + env.db + .select({ serverId: lists.serverId, expiresAt: listEntries.expiresAt }) + .from(listEntries) + .innerJoin(lists, eq(lists.id, listEntries.listId)) + .where( + and( + eq(lists.orgId, w.org.id), + eq(lists.kind, 'reserve'), + eq(listEntries.steamId, steamId), + isNull(listEntries.removedAt) + ) + ); + const bountiesHook = (w: World) => + env.db.insert(webhooks).values({ + id: newId(), + orgId: w.org.id, + label: 'bounties', + urlEnc: encryptSecret(env, 'https://discord.test/api/webhooks/1/bounties'), + events: ['bounties'], + serverIds: null + }); + /** Discord posts go out in bursts, a second and a half after the first. */ + const postsSoon = async (n: number) => { + for (let i = 0; i < 60 && posts.length < n; i++) await Bun.sleep(100); + return posts; + }; + + test('a run sets a bounty; a teammate, a suicide and the environment do not end it; an enemy claims it and wins a slot here', async () => { + const w = await seedWorld(env); + await bountiesHook(w); + posts.length = 0; + const m = await memoryOf(w); + await look(m, A, B, C, D); + const id = await rule(w, { + streak: 3, + minPlayers: 2, + slotDays: 2, + scope: 'server', + claimMessage: '{name} took {target} down after {streak}, for {reward}', + whisper: 'Yours until {until}, {name}' + }); + await post(w.server.id, [ev(A, B), ev(A, C)]); + expect(await rowsOf(id)).toHaveLength(0); + await post(w.server.id, [ev(A, B)]); + const [set] = await rowsOf(id); + expect(set).toMatchObject({ + action: 'broadcast', + target: A, + steamId: null, + okMessage: 'Announced the bounty on p901 (3 kills).', + params: { + message: 'BOUNTY on p901: 3 kills without dying. Kill them for a reserved slot for 2 days.' + } + }); + expect((await stateOf(id))?.open).toMatchObject({ steamId: A, streak: 3 }); + // A's teammate, A's own death and the environment: no claim, the bounty stands + await post(w.server.id, [ev(D, A)]); + await post(w.server.id, [ev(A, A, { suicide: true })]); + await post(w.server.id, [ev(null, A)]); + expect(await rowsOf(id)).toHaveLength(1); + expect((await stateOf(id))?.open?.steamId).toBe(A); + // the panel's own view of the rule names the open bounty + const view = await api(w, 'owner', 'GET api/servers/[id]/triggers', { + params: { id: w.server.id } + }); + const listedRule = (view.body as { triggers: { id: string; bounty: unknown }[] }).triggers.find( + (t) => t.id === id + ); + expect(listedRule?.bounty).toMatchObject({ steamId: A, name: 'p901', streak: 3 }); + // an enemy's kill claims it + await post(w.server.id, [ev(B, A)]); + const rows = await rowsOf(id); + expect(rows.slice(1).map((r) => [r.action, r.target, r.steamId])).toEqual([ + [BOUNTY_CLAIM, B, null], + ['broadcast', B, null], + [BOUNTY_REWARD, B, null], + ['whisper', B, B] + ]); + expect(rows[1].okMessage).toBe('p902 claimed the bounty on p901 (a run of 3).'); + const until = new Date(Date.now() + 2 * 86400_000).toISOString().slice(0, 10); + expect((rows[2].params as { message: string }).message).toBe( + 'p902 took p901 down after 3, for a reserved slot for 2 days' + ); + expect((rows[4].params as { message: string }).message).toBe(`Yours until ${until}, p902`); + expect((await stateOf(id))?.open).toBeNull(); + // delivered: the broadcasts and the whisper reach the game, the slot goes on this server's list + const done = await deliver(...rows.map((r) => r.id)); + expect(done.map((r) => r.state)).toEqual(Array(5).fill('delivered')); + expect(done[3].outcome).toBe(`Reserved a slot for p902 until ${until}.`); + expect(broadcasts.filter(([s]) => s === w.server.id).map(([, t]) => t)).toEqual([ + 'BOUNTY on p901: 3 kills without dying. Kill them for a reserved slot for 2 days.', + 'p902 took p901 down after 3, for a reserved slot for 2 days' + ]); + expect(whispers.filter(([s]) => s === w.server.id)).toEqual([ + [w.server.id, B, `Yours until ${until}, p902`] + ]); + const slots = await slotsOf(w, B); + expect(slots.map((s) => s.serverId)).toEqual([w.server.id]); + expect(Math.abs(slots[0].expiresAt!.getTime() - (Date.now() + 2 * 86400_000))).toBeLessThan( + 60_000 + ); + // the trail has the claim under the rule + const audited = await env.db + .select({ message: auditLog.message }) + .from(auditLog) + .where(and(eq(auditLog.serverId, w.server.id), eq(auditLog.action, 'trigger.bounty'))); + expect(audited.map((a) => a.message)).toContain( + 'p902 claimed the bounty on p901 (a run of 3).' + ); + // the Bounties channel: a card for each, names and never a SteamID + const cards = await postsSoon(2); + expect(cards.map((c) => c.title)).toEqual(['Bounty set', 'Bounty claimed']); + expect(cards[0].description).toContain('**p901**: 3 kills without dying, for Valkyra'); + expect(cards[1].description).toContain("**p902** ended **p901**'s run at 3"); + expect(cards[1].description).toContain('Reward: a reserved slot for 2 days'); + for (const c of cards) expect(c.description).not.toMatch(/\d{17}/); + }); + + test('a claimer whose slot lasts longer keeps it; one whose slot ends sooner has it made to last; the org list when the rule says', async () => { + const w = await seedWorld(env); + const m = await memoryOf(w); + await look(m, A, B, C, D); + const id = await rule(w, { streak: 3, minPlayers: 2, slotDays: 3, scope: 'org' }); + await post(w.server.id, [ev(A, B), ev(A, C), ev(A, B), ev(C, A)]); + const reward = (await rowsOf(id)).find((r) => r.action === BOUNTY_REWARD)!; + expect(reward.params).toMatchObject({ steamId: C, scope: 'org', slotDays: 3 }); + const [first] = await deliver(reward.id); + expect(first.state).toBe('delivered'); + expect((await slotsOf(w, C)).map((s) => s.serverId)).toEqual([null]); + // claimed again: a slot as long already, kept as it is + await post(w.server.id, [ev(A, B), ev(A, C), ev(A, B), ev(C, A)]); + const again = (await rowsOf(id)).filter((r) => r.action === BOUNTY_REWARD)[1]; + const [kept] = await deliver(again.id); + expect([kept.state, kept.outcome]).toEqual([ + 'skipped', + `p903 already holds a reserved slot in ${w.org.name} that lasts as long or longer.` + ]); + // a slot that ends sooner is made to last as long + await env.db + .update(listEntries) + .set({ expiresAt: new Date(Date.now() + 3600_000) }) + .where(eq(listEntries.steamId, C)); + await post(w.server.id, [ev(A, B), ev(A, C), ev(A, B), ev(C, A)]); + const third = (await rowsOf(id)).filter((r) => r.action === BOUNTY_REWARD)[2]; + const [longer] = await deliver(third.id); + expect(longer.outcome).toMatch(/^p903's reserved slot now lasts until /); + const [slot] = await slotsOf(w, C); + expect(slot.expiresAt!.getTime()).toBeGreaterThan(Date.now() + 2 * 86400_000); + }, 30_000); + + test('nobody is marked with too few on; one bounty at a time; any save of the rule calls it off', async () => { + const w = await seedWorld(env); + const m = await memoryOf(w); + await look(m, A, B, C, D); + const id = await rule(w, { streak: 3, minPlayers: 5, reward: 'none' }); + await post(w.server.id, [ev(A, B), ev(A, C), ev(A, B), ev(A, C)]); + expect(await rowsOf(id)).toHaveLength(0); + // fewer asked for: a save starts the runs over, so three more kills + const patch = (body: Record) => + api(w, 'owner', 'PATCH api/servers/[id]/triggers/[triggerId]', { + params: { id: w.server.id, triggerId: id }, + body + }); + expect((await patch({ config: { streak: 3, minPlayers: 2, reward: 'none' } })).status).toBe( + 200 + ); + invalidateTriggers(w.server.id); + await post(w.server.id, [ev(A, B)]); + expect(await rowsOf(id)).toHaveLength(0); + await post(w.server.id, [ev(A, C), ev(A, B)]); + const [set] = await rowsOf(id); + expect((set.params as { message: string }).message).toBe( + 'BOUNTY on p901: 3 kills without dying. Who ends the run?' + ); + // B on a run of three too: one bounty at a time + await post(w.server.id, [ev(B, D), ev(B, D), ev(B, D)]); + expect(await rowsOf(id)).toHaveLength(1); + // a rename is a save: the bounty on A is called off + expect((await patch({ name: 'Wanted' })).status).toBe(200); + expect(await stateOf(id)).toBeNull(); + invalidateTriggers(w.server.id); + await post(w.server.id, [ev(C, A)]); + expect(await rowsOf(id)).toHaveLength(1); + }); + + test('a worker restart keeps the hunt; a leave and a match end lapse it', async () => { + const w = await seedWorld(env); + await bountiesHook(w); + posts.length = 0; + const m = await memoryOf(w); + await look(m, A, B, C, D); + const id = await rule(w, { streak: 3, minPlayers: 2, reward: 'none' }); + await post(w.server.id, [ev(A, B), ev(A, C), ev(A, B)]); + // restarted: the runs are gone, the bounty is read back from the rule's row + forgetBounties(); + invalidateTriggers(w.server.id); + await post(w.server.id, [ev(C, A)]); + expect((await rowsOf(id)).map((r) => r.action)).toEqual(['broadcast', BOUNTY_CLAIM]); + // B marked, then gone: a look while they are within the leave grace keeps it + await post(w.server.id, [ev(B, A), ev(B, D), ev(B, A)]); + expect((await stateOf(id))?.open?.steamId).toBe(B); + await look(m, A, C, D); + expect((await stateOf(id))?.open?.steamId).toBe(B); + m.presence.open.get(B)!.lastSeen = Date.now() - LEAVE_GRACE_MS - 1000; + await look(m, A, C, D); + const lapse = (await rowsOf(id)).at(-1)!; + expect([lapse.action, lapse.target, lapse.okMessage]).toEqual([ + BOUNTY_LAPSE, + B, + 'The bounty on p902 lapsed: they left the server (a run of 3).' + ]); + expect((await stateOf(id))?.open).toBeNull(); + // A marked, then the match ends + await look(m, A, B, C, D); + await post(w.server.id, [ev(A, B), ev(A, C), ev(A, B)]); + expect((await stateOf(id))?.open?.steamId).toBe(A); + m.lastMatch = { map: 'Elsewhere', scores: [], matchSeconds: null }; + await look(m, A, B, C, D); + expect((await rowsOf(id)).at(-1)!.okMessage).toBe( + 'The bounty on p901 lapsed: the match ended (a run of 3).' + ); + // the runs started over with the match: two more kills mark nobody + await post(w.server.id, [ev(A, B), ev(A, C)]); + expect((await stateOf(id))?.open).toBeNull(); + const [done] = await deliver(lapse.id); + expect(done.state).toBe('delivered'); + const cards = await postsSoon(6); + expect(cards.map((c) => c.title)).toEqual([ + 'Bounty set', + 'Bounty claimed', + 'Bounty set', + 'Bounty lapsed', + 'Bounty set', + 'Bounty lapsed' + ]); + expect(cards[3].description).toContain('**p902** left the server on a run of 3'); + expect(cards[5].description).toContain('The match ended with **p901** on a run of 3'); + }); + + test('a bounty read back after a restart is not claimed in a later match: it lapses', async () => { + const w = await seedWorld(env); + const m = await memoryOf(w); + // the look opens the match the kills are stamped with + await look(m, A, B, C, D); + const id = await rule(w, { streak: 3, minPlayers: 2 }); + await post(w.server.id, [ev(A, B), ev(A, C), ev(A, B)]); + const [open] = await env.db + .select({ id: matches.id }) + .from(matches) + .where(and(eq(matches.serverId, w.server.id), isNull(matches.endedAt))); + expect((await stateOf(id))?.open).toMatchObject({ steamId: A, match: `m${open.id}` }); + // the worker restarts; meanwhile the match ends and the next one opens + forgetBounties(); + invalidateTriggers(w.server.id); + await env.db.update(matches).set({ endedAt: new Date() }).where(eq(matches.id, open.id)); + await env.db + .insert(matches) + .values({ serverId: w.server.id, startedAt: new Date(), map: 'Kavkazi' }); + await post(w.server.id, [ev(B, A)]); + const rows = await rowsOf(id); + expect(rows.map((r) => r.action)).toEqual(['broadcast', BOUNTY_LAPSE]); + expect(rows[1].okMessage).toBe('The bounty on p901 lapsed: the match ended (a run of 3).'); + expect((await stateOf(id))?.open).toBeNull(); + // the runs started over with it: B's kill there is one, not a claim's leftover + await post(w.server.id, [ev(B, C), ev(B, D)]); + expect(await rowsOf(id)).toHaveLength(2); + }); + + test('the first look after the server was out of reach lapses it as such, not as a leave', async () => { + const w = await seedWorld(env); + const m = await memoryOf(w); + await look(m, A, B, C, D); + const id = await rule(w, { streak: 3, minPlayers: 2, reward: 'none' }); + await post(w.server.id, [ev(A, B), ev(A, C), ev(A, B)]); + expect((await stateOf(id))?.open?.steamId).toBe(A); + // out of reach for a few looks: the worker closes every session and forgets the match + await closeAllSessions(env.db, m.presence); + m.failures = OFFLINE_AFTER_FAILURES; + m.lastMatch = null; + await look(m, A, B, C, D); + const lapse = (await rowsOf(id)).at(-1)!; + expect([lapse.action, lapse.okMessage]).toEqual([ + BOUNTY_LAPSE, + 'The bounty on p901 lapsed: the server was out of reach (a run of 3).' + ]); + expect((await stateOf(id))?.open).toBeNull(); + }); + + test("the rule acts on its own server's kills only", async () => { + const w = await seedWorld(env); + const m = await memoryOf(w); + await look(m, A, B, C, D); + const id = await rule(w, { streak: 3, minPlayers: 0 }); + await post(w.otherServer.id, [ev(A, B), ev(A, C), ev(A, B)]); + expect(await rowsOf(id)).toHaveLength(0); + }); + + test('the dry run replays the day: bounties set with enough on, claimed, lapsed at a match end and at a leave', async () => { + const w = await seedWorld(env); + const now = Date.now(); + const t = (minutes: number) => new Date(now - 6 * 3600_000 + minutes * 60_000); + const [m1] = await env.db + .insert(matches) + .values({ serverId: w.server.id, startedAt: t(-10), endedAt: t(30), map: 'Kavkazi' }) + .returning({ id: matches.id }); + const [m2] = await env.db + .insert(matches) + .values({ serverId: w.server.id, startedAt: t(30), map: 'Kavkazi' }) + .returning({ id: matches.id }); + await env.db.insert(samples).values([ + { serverId: w.server.id, ts: t(-5), ok: true, playerCount: 4 }, + { serverId: w.server.id, ts: t(4), ok: true, playerCount: 40 } + ]); + let n = 0; + const row = ( + minute: number, + match: number, + killer: string | null, + victim: string, + teamKill = false + ) => ({ + ts: t(minute), + serverId: w.server.id, + eventId: `dry-${++n}`, + instanceId: 'i', + matchId: 'boot', + matchRow: match, + eventTime: n, + map: 'Kavkazi', + killerSteamId: killer, + killerName: killer ? name(killer) : null, + killerFaction: killer ? SIDE[killer] : null, + victimSteamId: victim, + victimName: name(victim), + victimFaction: SIDE[victim], + cause: 'Id.Item.AK74M', + distanceM: 40, + headshot: false, + suicide: false, + teamKill, + tags: [] + }); + await env.db.insert(kills).values([ + // four on: A's run of three marks nobody + row(1, m1.id, A, B), + row(2, m1.id, A, C), + row(3, m1.id, A, B), + // forty on: marked at the next kill, a teammate's kill does not claim, B's does + row(5, m1.id, A, C), + row(6, m1.id, D, A, true), + row(7, m1.id, B, A), + // C marked, then the match ends + row(10, m1.id, C, A), + row(11, m1.id, C, D), + row(12, m1.id, C, A), + row(31, m2.id, A, B), + // D marked, then leaves + row(40, m2.id, D, B), + row(41, m2.id, D, C), + row(42, m2.id, D, B) + ]); + await env.db.insert(playerSessions).values({ + serverId: w.server.id, + steamId: D, + name: name(D), + joinedAt: t(0), + lastSeen: t(43), + leftAt: t(43) + }); + const config = { streak: 3, minPlayers: 20, slotDays: 1 }; + const r = await dryRun( + env, + (await env.db.select().from(servers).where(eq(servers.id, w.server.id)))[0], + 'bounty', + config + ); + expect(r.fires).toBe(3); + expect(r.items.map((i) => i.text)).toEqual([ + 'bounty on p901 (4 kills, 40 on): BOUNTY on p901: 4 kills without dying. Kill them for a reserved slot for 1 day.', + 'claimed by p902: p901 after a run of 4, a reserved slot for 1 day', + 'bounty on p903 (3 kills, 40 on): BOUNTY on p903: 3 kills without dying. Kill them for a reserved slot for 1 day.', + 'lapsed: the match ended, p903 on a run of 3', + 'bounty on p904 (3 kills, 40 on): BOUNTY on p904: 3 kills without dying. Kill them for a reserved slot for 1 day.', + 'lapsed: p904 left (a run of 3)' + ]); + expect(r.notes).toContain( + "3 bounties set, 1 claimed, 2 lapsed. Runs start over at each match, and nobody is marked while the server's samples show fewer than 20 on." + ); + }); +}); From 1620f189c0c45936d3f4844fd84d510d90bb5772 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 00:09:51 +0100 Subject: [PATCH 059/102] Automation tab: the Bounty rule; org page: the Bounties box --- src/routes/(app)/orgs/[id]/+page.svelte | 9 +- .../server/[id]/automation/+page.server.ts | 4 +- .../(app)/server/[id]/automation/+page.svelte | 251 +++++++++++++++++- 3 files changed, 249 insertions(+), 15 deletions(-) diff --git a/src/routes/(app)/orgs/[id]/+page.svelte b/src/routes/(app)/orgs/[id]/+page.svelte index d2a5ecba..70596098 100644 --- a/src/routes/(app)/orgs/[id]/+page.svelte +++ b/src/routes/(app)/orgs/[id]/+page.svelte @@ -748,10 +748,11 @@

A webhook is one Discord channel, and each one carries what you tick for it: the audit trail - (bans, kicks, trigger actions, sign-ins), team kills from the kill feed, and live status - cards, one per server, showing the map and who is on. Add one webhook per channel; a - team-kill channel is simply a webhook with only that box ticked. In Discord, open the - channel's settings → Integrations → Webhooks, copy the URL and paste it here. + (bans, kicks, trigger actions, sign-ins), team kills from the kill feed, bounties set and + claimed by a Bounty rule, and live status cards, one per server, showing the map and who is + on. Add one webhook per channel; a team-kill or bounty channel is simply a webhook with only + that box ticked. In Discord, open the channel's settings → Integrations → Webhooks, copy the + URL and paste it here.

{#each data.webhooks as w (w.id)}
diff --git a/src/routes/(app)/server/[id]/automation/+page.server.ts b/src/routes/(app)/server/[id]/automation/+page.server.ts index 538fe8b6..95a003b3 100644 --- a/src/routes/(app)/server/[id]/automation/+page.server.ts +++ b/src/routes/(app)/server/[id]/automation/+page.server.ts @@ -11,8 +11,10 @@ import { listTriggers } from '$lib/server/triggers'; * layouts (SvelteKit's __data.json), so the layout's refusal protects nothing below it. Viewers * see the rules read-only. */ -export const load: PageServerLoad = async ({ locals, params }) => { +export const load: PageServerLoad = async ({ locals, params, depends }) => { const env = getEnv(); + // re-read on its own when a Bounty rule acts (its open bounty is on the row) + depends('warcon:triggers'); try { const { server } = await requireServerCap(env, locals, params.id, 'automation.manage'); // What the kinds need before they can run here, so the Add menu and the editor can say so. diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 6ab6ef95..2f6406a7 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -1,6 +1,6 @@ + + +
+
+

Add a rule

+

Pick what it does; you set it up next.

+
+ + +
+ + {#each shown as g (g.group)} +
+

{g.group}

+
+ {#each g.kinds as k (k.kind)} + {@const here = rules.filter((r) => r.kind === k.kind)} + {@const only = ONE_PER_SERVER.includes(k.kind) ? here[0] : undefined} + {@const why = only ? '' : lacks(k.kind)} + + {/each} +
+
+ {:else} +

No rule matches “{query.trim()}”.

+ {/each} + diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 2f6406a7..c6fbbc8e 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -24,7 +24,8 @@ import SortHeader from '$lib/components/SortHeader.svelte'; import { TableSort, matches } from '$lib/table.svelte'; import { watchLive } from '$lib/live'; - import { RULE_GROUPS, RULE_KINDS } from '$lib/rule-kinds'; + import { RULE_KINDS } from '$lib/rule-kinds'; + import RulePicker from '$lib/components/RulePicker.svelte'; import type { DryRunResult, MapSelection, @@ -126,11 +127,9 @@ ? 'warn' : 'err'; - // The kinds, grouped by what they act on for the Add menu ($lib/rule-kinds). `needs` is what a - // kind must have before it can run here, shown in the menu and at the top of its editor; '' when - // it can. + // The kinds, as the rule picker groups them ($lib/rule-kinds). `needs` is what a kind must have + // before it can run here, shown on its card and at the top of its editor; '' when it can. const KINDS = RULE_KINDS; - const GROUPS = RULE_GROUPS; /** The outbox action as the table shows it: a flag sends nothing to the game, so it reads as one. */ const actionLabel = (action: string) => action === 'name_flag' || action === 'kill_rate_flag' || action === 'kill_distance_flag' @@ -264,19 +263,23 @@ ].sort((a, b) => a.label.localeCompare(b.label)); const holds = (list: string[], cause: string) => list.some((c) => c.toLowerCase() === cause.toLowerCase()); - /** A kind that lacks what it needs stays in the menu, greyed, with the reason in a few words. */ + /** A kind that lacks what it needs stays in the picker, greyed, with the reason in a few words. */ const short = (kind: TriggerKind): string => - kind === 'team_kill' || - kind === 'kill_rate' || - kind === 'kill_distance' || - kind === 'name_change' || - (kind === 'bounty' && !data.feed) - ? 'needs the kill feed' - : kind === 'bounty' - ? 'needs Chat' - : kind === 'risk_kick' - ? 'needs a Steam key' - : ''; + !needs(kind) + ? '' + : kind === 'team_kill' || + kind === 'kill_rate' || + kind === 'kill_distance' || + kind === 'name_change' || + (kind === 'bounty' && !data.feed) + ? 'Needs the kill feed' + : kind === 'bounty' + ? 'Needs Chat' + : kind === 'risk_kick' + ? 'Needs a Steam key' + : kind === 'seed_reward' + ? 'Needs Reserved slots' + : ''; /** A Bounty rule's texts until they are written: a slot is named, an announcement-only rule asks. */ const bountyTexts = (reward: 'slot' | 'none') => reward === 'slot' @@ -297,7 +300,14 @@ for (const k of ['setMessage', 'claimMessage', 'whisper'] as const) if (f[k] === from[k]) f[k] = to[k]; }; - let addOpen = $state(false); + /** The Add rule picker is open; `fromPicker`: the editor came from it, so it offers the way back. */ + let picking = $state(false); + let fromPicker = $state(false); + function pick(kind: TriggerKind, t?: TriggerView) { + picking = false; + open(kind, t); + fromPicker = true; + } // The status lines count up on their own: a minute clock, only while the page is open. let now = $state(Date.now()); @@ -503,6 +513,7 @@ /** The editor for a new rule of a kind, an existing rule, or a copy of one (`copy`). */ function open(kind: TriggerKind, t?: TriggerView, copy = false) { + fromPicker = false; const c = (t?.config ?? {}) as Record; const s = (k: string, d: string) => (typeof c[k] === 'string' ? (c[k] as string) : d); const n = (k: string, d: number) => (typeof c[k] === 'number' ? (c[k] as number) : d); @@ -1055,11 +1066,6 @@ } - (addOpen = false)} - onkeydown={(e) => e.key === 'Escape' && (addOpen = false)} -/> -

Rules act on {data.server.demo ? 'the demo server' : 'this server'} as things happen: a join, a kill, a quiet hour. Every action is recorded below and in the audit trail as @@ -1092,50 +1098,9 @@

{#if admin} -
- - {#if addOpen} - - - {/if} -
+ {/if} @@ -1279,11 +1244,11 @@ >+ Scheduled broadcast -

- Or add any rule: {KINDS.filter((k) => k.kind !== 'welcome' && k.kind !== 'broadcast') - .map((k) => k.label) - .join(' · ')}. -

+ {:else if onlyFailing}

No rule is failing.

{:else} @@ -1374,11 +1339,24 @@ {#each r.notes as n (n)}

{n}

{/each} {/snippet} +{#if picking} + (picking = false)} /> +{/if} + {#if form} {@const f = form} { + form = null; + picking = true; + } + } + : undefined} onclose={() => (form = null)} >
Date: Fri, 9 Oct 2026 01:06:53 +0100 Subject: [PATCH 063/102] README: the rule picker --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index e7f071a3..a0b464f2 100644 --- a/README.md +++ b/README.md @@ -595,6 +595,11 @@ its row), and for a Bounty _Chat_, with _Reserved slots_ or _Org reserved slots_ gives a slot. A custom role or API key with _Automation_ alone can read the rules and delete them. +**Add rule** opens a picker of every kind, grouped by when it acts (Messages, On join, In play, +Seeding and rewards, Server), with a search over the names and descriptions; picking one opens its +editor. A server holds one Seeding reward, Team balance, AFK protection and Bounty rule at most, so +once it has one, picking that kind opens the rule it has. + | Trigger | Does | | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Welcome whisper | Whispers a message to each joiner (optionally only on their first visit), which can tell them their all-time stats, on the server or across the organisation (see [Placeholders](#placeholders)). | From 24b526575ee86b8c26b59eb1ae6bcc782922869e Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 01:39:34 +0100 Subject: [PATCH 064/102] Servers: one row per RCON address A second add or move onto a host and port already on the panel is a 409 that names a server only in the caller's org. The org's server limit is counted in the add's transaction under the org row's lock. --- README.md | 6 ++ src/lib/server/lists.ts | 11 ++ src/lib/server/orgs.ts | 9 +- src/lib/server/servers.ts | 84 ++++++++++++--- src/test/server-target.test.ts | 185 +++++++++++++++++++++++++++++++++ 5 files changed, 281 insertions(+), 14 deletions(-) create mode 100644 src/test/server-target.test.ts diff --git a/README.md b/README.md index a0b464f2..d98bb2e2 100644 --- a/README.md +++ b/README.md @@ -1400,6 +1400,12 @@ rather than fetched. Link-local addresses (`169.254.0.0/16`, `fe80::/10`) are re Refused targets are recorded on the audit page. The raw action is limited to `/v1/` paths on the server's own port, and the connectivity test and raw action are rate limited per user. +A game server is added to the panel once: a host and port already on it, in any organisation and +over either scheme, is refused (the demo target aside). The refusal names the server holding the +address only when it is in your own organisation. If someone else added your server, change its +RCON password and ask the site owner to remove their copy. To give another group a hand in running +it, invite them to the organisation that holds it, with the role they need on that server. + The ini comments say a non-loopback `BindAddress` expects TLS and `PasswordHash=`; the official web console connects over plain `http` regardless, and so can Warcon. diff --git a/src/lib/server/lists.ts b/src/lib/server/lists.ts index 3cdb0227..612480be 100644 --- a/src/lib/server/lists.ts +++ b/src/lib/server/lists.ts @@ -25,6 +25,7 @@ import type { Db, Tx } from './db'; import { listEntries, lists, + organizations, serverBans, serverListState, serverListSync, @@ -88,6 +89,16 @@ export async function ensureOrgLists( .onConflictDoNothing(); } +/** + * Holds the org's row to the end of the transaction, so adding a server and handing lists to the + * org's servers take turns and neither misses the other's write. Readers are not held up. + */ +export async function lockOrg(tx: DbLike, orgId: string): Promise { + await tx.execute( + sql`SELECT 1 FROM ${organizations} WHERE ${organizations.id} = ${orgId} FOR NO KEY UPDATE` + ); +} + /** * Subscribes a server to every list of its org and gives it a ban and a reserved-slot list of * its own (createServer runs this in its transaction; serverListOf repairs older servers). diff --git a/src/lib/server/orgs.ts b/src/lib/server/orgs.ts index 8049e944..def64c46 100644 --- a/src/lib/server/orgs.ts +++ b/src/lib/server/orgs.ts @@ -80,11 +80,16 @@ export const suspendedProblem = (org: Pick): string | nul org.suspendedAt ? 'This organisation is suspended. Contact the site owner.' : null; /** Org owners may add a server while the org is active and under its limit; the site owner always may. */ -export async function assertCanAddServer(env: Env, org: OrgRow, actor: SessionUser): Promise { +export async function assertCanAddServer( + env: Env, + org: OrgRow, + actor: SessionUser, + db: DbOrTx = env.db +): Promise { if (actor.role === 'owner') return; const suspended = suspendedProblem(org); if (suspended) throw new ApiError(403, suspended, 'suspended'); - const [row] = await env.db.select({ n: count() }).from(servers).where(eq(servers.orgId, org.id)); + const [row] = await db.select({ n: count() }).from(servers).where(eq(servers.orgId, org.id)); const limit = serverLimitFor(env, org); if ((row?.n ?? 0) >= limit) throw new ApiError( diff --git a/src/lib/server/servers.ts b/src/lib/server/servers.ts index 8e1bf3e8..9da51abb 100644 --- a/src/lib/server/servers.ts +++ b/src/lib/server/servers.ts @@ -1,5 +1,5 @@ // Server records: validation, CRUD helpers and the reachability test. -import { asc, eq } from 'drizzle-orm'; +import { and, asc, eq, ne, sql } from 'drizzle-orm'; import { forgetCatalog } from './catalog-cache'; import type { Features } from '$lib/types'; import type { Env } from './env'; @@ -11,10 +11,11 @@ import { assertReachableTarget, normaliseHost } from './hostpolicy'; import { getOrg, type OrgRow, type ServerRow, type SessionUser } from './access'; import { gateway } from './gateway'; import { GameError, WardogsClient } from './rcon'; +import type { Tx } from './db'; import { orgMembers, orgRoles, serverGrants, servers, user } from './db/schema'; import { rolesOf } from './roles'; import { assertCanAddServer } from './orgs'; -import { ensureServerLists } from './lists'; +import { ensureServerLists, lockOrg } from './lists'; import { allowed, FEATURE_LABELS, NOT_ALLOWED, type PublicFeature } from '$lib/features'; export interface TargetFields { @@ -124,7 +125,10 @@ async function auditRefusedTarget( target: string, err: unknown ): Promise { - if (err instanceof ApiError && (err.code === 'blocked_host' || err.code === 'unresolvable')) + if ( + err instanceof ApiError && + (err.code === 'blocked_host' || err.code === 'unresolvable' || err.code === 'duplicate_target') + ) await writeAudit(env, req, { actor, server, @@ -139,6 +143,47 @@ async function auditRefusedTarget( throw err; } +/** + * One server row per RCON address in the whole panel, whatever the scheme (the demo target aside): + * two rows for one game double its pollers and its rules, and each row's list sync overwrites what + * the other wrote to its config document. Runs in the writer's transaction, under a lock on the + * address, so two adds of one address take turns. The refusal names a server only when it is in + * the caller's own org; otherwise it says only that the address is taken. + */ +async function assertFreeTarget( + env: Env, + tx: Tx, + orgId: string, + host: string, + port: number, + exceptId: string | null +): Promise { + if (isDemoServer(env, { host })) return; + const lower = host.toLowerCase(); + await tx.execute( + sql`SELECT pg_advisory_xact_lock(hashtextextended(${`server-target:${lower}:${port}`}, 0))` + ); + const [other] = await tx + .select({ name: servers.name, orgId: servers.orgId }) + .from(servers) + .where( + and( + sql`lower(${servers.host}) = ${lower}`, + eq(servers.port, port), + exceptId ? ne(servers.id, exceptId) : undefined + ) + ) + .limit(1); + if (!other) return; + throw new ApiError( + 409, + other.orgId === orgId + ? `${other.name} already uses this address.` + : 'This RCON address is already on this panel. If the server is yours, ask the site owner.', + 'duplicate_target' + ); +} + export async function createServer( env: Env, req: Request, @@ -148,9 +193,8 @@ export async function createServer( ): Promise { const password = typeof body.password === 'string' ? body.password : ''; if (!password) throw new ApiError(400, "password (the server's RCON password) is required."); - await assertCanAddServer(env, org, actor); const orgId = org.id; - const t = await validateTarget(env, actor, body).catch((err) => + const refused = (err: unknown) => auditRefusedTarget( env, req, @@ -160,12 +204,17 @@ export async function createServer( orgId, `${str(body.host, 253)}:${str(body.port, 5)}`, err - ) - ); + ); + const t = await validateTarget(env, actor, body).catch(refused); const pub = publicSwitches(org, body); const id = newId(); - // One transaction: a server must never exist without its subscription to the org's lists. + // One transaction: a server must never exist without its subscription to the org's lists. The + // org row's lock makes adds to one org take turns, so two at once cannot both pass its limit, + // and a list given to chosen servers meanwhile is not handed out without the new one in view. await env.db.transaction(async (tx) => { + await lockOrg(tx, orgId); + await assertCanAddServer(env, org, actor, tx); + await assertFreeTarget(env, tx, orgId, t.host!, t.port!, null).catch(refused); await tx.insert(servers).values({ id, orgId, @@ -220,7 +269,7 @@ export async function updateServer( 'Changing the host, port or scheme needs the RCON password again.', 'password_required' ); - const t = await validateTarget(env, actor, body, server).catch((err) => + const refused = (err: unknown) => auditRefusedTarget( env, req, @@ -230,8 +279,8 @@ export async function updateServer( server.orgId, `${str(body.host, 253) || server.host}:${str(body.port, 5) || server.port}`, err - ) - ); + ); + const t = await validateTarget(env, actor, body, server).catch(refused); const set: Partial = { ...t }; if (PUBLIC_SWITCH_KEYS.some((k) => body[k] !== undefined)) { const org = await getOrg(env, server.orgId); @@ -242,7 +291,18 @@ export async function updateServer( set.passwordEnc = encryptSecret(env, body.password); if (!Object.keys(set).length) throw new ApiError(400, 'Nothing to update.'); set.updatedAt = new Date(); - await env.db.update(servers).set(set).where(eq(servers.id, server.id)); + await env.db.transaction(async (tx) => { + if (moved) + await assertFreeTarget( + env, + tx, + server.orgId, + t.host ?? server.host, + t.port ?? server.port, + server.id + ).catch(refused); + await tx.update(servers).set(set).where(eq(servers.id, server.id)); + }); await writeAudit(env, req, { actor, server: { id: server.id, name: t.name || server.name }, diff --git a/src/test/server-target.test.ts b/src/test/server-target.test.ts new file mode 100644 index 00000000..3da6aeb6 --- /dev/null +++ b/src/test/server-target.test.ts @@ -0,0 +1,185 @@ +// One server row per RCON address: a second add of an address already on the panel is refused, +// naming no other organisation, and the limit on an org's servers holds when two adds race. +import { beforeAll, describe, expect, test } from 'bun:test'; +import { and, eq, sql } from 'drizzle-orm'; +import { randomInt } from 'node:crypto'; +import type { Env } from '$lib/server/env'; +import { encryptSecret } from '$lib/server/crypto'; +import { auditLog, organizations, servers } from '$lib/server/db/schema'; +import { POST as createRoute } from '../routes/api/servers/+server'; +import { PATCH as updateRoute } from '../routes/api/servers/[id]/+server'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, type World } from './world'; + +describe.skipIf(!hasTestDb)('one server row per RCON address', () => { + let env: Env; + let w: World; + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + // room for every add in this file; the limit has a test of its own below + for (const id of [w.org.id, w.otherOrg.id]) + await env.db.update(organizations).set({ serverLimit: 1000 }).where(eq(organizations.id, id)); + }); + + /** A public address no other test uses. */ + const address = () => `198.20.${randomInt(1, 255)}.${randomInt(1, 255)}`; + + const add = (who: 'owner' | 'outsider', orgId: string, body: Record) => + callApi(createRoute, w.users[who], { + method: 'POST', + body: { orgId, name: 'Game', scheme: 'http', password: 'rcon-secret', ...body } + }); + + const rowsAt = async (host: string, port: number) => + ( + await env.db + .select({ id: servers.id }) + .from(servers) + .where(and(sql`lower(${servers.host}) = ${host.toLowerCase()}`, eq(servers.port, port))) + ).length; + + const deniedRows = (orgId: string, host: string) => + env.db + .select({ action: auditLog.action, message: auditLog.message }) + .from(auditLog) + .where( + and( + eq(auditLog.orgId, orgId), + eq(auditLog.outcome, 'denied'), + sql`${auditLog.target} LIKE ${'%' + host + '%'}` + ) + ) + .orderBy(auditLog.id); + + test('another org adding the address is refused, naming no org or server', async () => { + const host = address(); + expect((await add('owner', w.org.id, { name: 'First', host, port: 7779 })).status).toBe(201); + for (const body of [ + { host, port: 7779 }, + { host: ` ${host} `, port: 7779 }, + { host, port: 7779, scheme: 'https' } + ]) { + const r = await add('outsider', w.otherOrg.id, body); + expect([r.status, r.code]).toEqual([409, 'duplicate_target']); + expect(r.message).not.toContain('First'); + expect(r.message).not.toContain(w.org.name); + } + expect(await rowsAt(host, 7779)).toBe(1); + const denied = await deniedRows(w.otherOrg.id, host); + expect(denied.map((d) => d.action)).toEqual(Array(3).fill('server.create')); + // nothing about the refusal lands in the org that holds the address + expect(await deniedRows(w.org.id, host)).toHaveLength(0); + }); + + test('the same org adding it again is told which of its servers has it', async () => { + const host = address(); + await add('owner', w.org.id, { name: 'Alpha', host, port: 7779 }); + const r = await add('owner', w.org.id, { name: 'Beta', host, port: 7779 }); + expect([r.status, r.code]).toEqual([409, 'duplicate_target']); + expect(r.message).toBe('Alpha already uses this address.'); + }); + + test('another port on the same host is a different server', async () => { + const host = address(); + expect((await add('owner', w.org.id, { host, port: 7779 })).status).toBe(201); + expect((await add('outsider', w.otherOrg.id, { host, port: 7780 })).status).toBe(201); + }); + + test('the demo target may be added by every org, more than once', async () => { + const port = randomInt(1000, 60000); + expect((await add('owner', w.org.id, { host: 'demo', port })).status).toBe(201); + expect((await add('owner', w.org.id, { host: 'demo', port })).status).toBe(201); + expect((await add('outsider', w.otherOrg.id, { host: 'demo', port })).status).toBe(201); + }); + + test('moving a server onto a taken address is refused and changes nothing', async () => { + const host = address(); + await add('owner', w.org.id, { host, port: 7779 }); + const before = ( + await env.db + .select({ host: servers.host, port: servers.port }) + .from(servers) + .where(eq(servers.id, w.otherOrgServer.id)) + )[0]; + const r = await callApi(updateRoute, w.users.outsider, { + method: 'PATCH', + params: { id: w.otherOrgServer.id }, + body: { host, port: 7779, password: 'rcon-secret' } + }); + expect([r.status, r.code]).toEqual([409, 'duplicate_target']); + expect(r.message).not.toContain(w.org.name); + const after = ( + await env.db + .select({ host: servers.host, port: servers.port }) + .from(servers) + .where(eq(servers.id, w.otherOrgServer.id)) + )[0]; + expect(after).toEqual(before); + const denied = await deniedRows(w.otherOrg.id, host); + expect(denied.map((d) => d.action)).toEqual(['server.update']); + }); + + test('a pair already on the panel can still be renamed', async () => { + const host = address(); + const ids = [`s_pair_a_${randomInt(1, 1e9)}`, `s_pair_b_${randomInt(1, 1e9)}`]; + for (const [i, id] of ids.entries()) + await env.db.insert(servers).values({ + id, + orgId: i ? w.otherOrg.id : w.org.id, + name: `Pair ${i}`, + host, + port: 7779, + passwordEnc: encryptSecret(env, 'rcon-secret') + }); + const r = await callApi(updateRoute, w.users.outsider, { + method: 'PATCH', + params: { id: ids[1] }, + body: { name: 'Renamed' } + }); + expect(r.status).toBe(200); + }); + + test('two adds of one address at once leave one row', async () => { + for (let round = 0; round < 5; round++) { + const host = address(); + const done = await Promise.all([ + add('owner', w.org.id, { host, port: 7779 }), + add('outsider', w.otherOrg.id, { host, port: 7779 }) + ]); + expect(done.map((d) => d.status).sort()).toEqual([201, 409]); + expect(await rowsAt(host, 7779)).toBe(1); + } + }); + + test('two adds at once at the limit leave one', async () => { + const world = await seedWorld(env); + for (let round = 0; round < 5; round++) { + const [{ n }] = await env.db + .select({ n: sql`count(*)::int` }) + .from(servers) + .where(eq(servers.orgId, world.org.id)); + await env.db + .update(organizations) + .set({ serverLimit: n + 1 }) + .where(eq(organizations.id, world.org.id)); + const done = await Promise.all( + [address(), address()].map((host) => + callApi(createRoute, world.users.owner, { + method: 'POST', + body: { orgId: world.org.id, name: 'Racer', host, port: 7779, password: 'rcon-secret' } + }) + ) + ); + expect(done.map((d) => d.status).sort()).toEqual([201, 403]); + const [{ m }] = await env.db + .select({ m: sql`count(*)::int` }) + .from(servers) + .where(eq(servers.orgId, world.org.id)); + expect(m).toBe(n + 1); + } + }); +}); From 6319991fd53858c81d9cce545c99f62338d028de Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 01:43:23 +0100 Subject: [PATCH 065/102] List sync: store fixed phrases, never the game's error text A slot's stored error, the server's last sync error, the sync's audit row and the API answer now say what kind of failure it was; the game's own words go to the log. --- src/lib/server/lists-sync.ts | 49 ++++++++++--- src/test/list-sync-errors.test.ts | 114 ++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 9 deletions(-) create mode 100644 src/test/list-sync-errors.test.ts diff --git a/src/lib/server/lists-sync.ts b/src/lib/server/lists-sync.ts index 5bb7230d..e61621a3 100644 --- a/src/lib/server/lists-sync.ts +++ b/src/lib/server/lists-sync.ts @@ -12,7 +12,7 @@ import { and, eq, gt, inArray, isNotNull, isNull, lte, notInArray, or, sql } from 'drizzle-orm'; import type { Env } from './env'; import { banUid, renderBanMessage } from '$lib/ban-message'; -import { publicMessage } from './http'; +import { ApiError, forLog } from './http'; import { writeAudit } from './audit'; import { ACTIONS } from './actions'; import { withServer, type Priority } from './dispatcher'; @@ -366,9 +366,40 @@ export interface ReconcileOptions { lane: Priority | 'held'; } +/** + * What the sync stores, records and answers for a failure: a fixed phrase chosen by its status and + * code. The game's own words, and the panel's (a refused address names the host and what it + * resolved to), go to the log only. + */ +export function syncPhrase(err: unknown): string { + if (!(err instanceof ApiError)) { + console.warn('[warcon] list sync:', forLog(err)); + return 'The sync failed.'; + } + const code = err.code ?? ''; + if (code === 'unreachable') return 'Could not reach the server.'; + if (code === 'rate_limited') return 'The server asked the panel to slow down.'; + if (code === 'blocked_host' || code === 'unresolvable') + return "The panel no longer accepts the server's address."; + if (code === 'no_route' || err.status === 405) return 'This server build does not serve it.'; + if (code === 'config_readonly') return "The server's config document is read-only."; + if (code === 'revision_conflict') + return 'The config document kept changing during the write; it is tried again.'; + if (code === 'bad_response') return 'The server did not answer as expected.'; + if (err.status === 401 || err.status === 403) return 'The server refused the RCON password.'; + if (err.status >= 500) return 'The server failed to answer.'; + return `Refused by the server (${err.status}${/^[a-z_]{1,40}$/.test(code) ? `, ${code}` : ''}).`; +} + const failure = (err: unknown) => { const g = err instanceof GameError ? err : null; - return { status: g?.status ?? 500, code: g?.code, message: publicMessage(err, 'Failed.') }; + return { + status: g?.status ?? 500, + code: g?.code, + // read by the checks for "already there" and "already gone" only, never stored + message: g?.message ?? '', + phrase: syncPhrase(err) + }; }; /** Brings one server in line with its lists. Never throws for game-side trouble; records it instead. */ @@ -465,7 +496,7 @@ async function run( } } } catch (err) { - const message = publicMessage(err, 'Could not reach the server.'); + const message = syncPhrase(err); await bookkeep(env, server.id, { syncedAt: syncRow?.syncedAt ?? null, lastError: message }); return { ...base, error: message }; } @@ -593,9 +624,9 @@ async function execute( out.removed.push(r); dropObserved(r.kind, r.steamId); } else if (isUnreachable(f)) { - out.aborted = f.message; + out.aborted = f.phrase; return out; - } else out.failedRemoves.push({ ...r, error: `Could not remove: ${f.message}` }); + } else out.failedRemoves.push({ ...r, error: `Could not remove: ${f.phrase}` }); } } for (const a of plan.adds) { @@ -616,9 +647,9 @@ async function execute( out.added.push(a); addObserved(a.kind, a.steamId, a.reason); } else if (isUnreachable(f)) { - out.aborted = f.message; + out.aborted = f.phrase; return out; - } else out.failedAdds.push({ ...a, error: f.message }); + } else out.failedAdds.push({ ...a, error: `Could not add: ${f.phrase}` }); } } return out; @@ -761,7 +792,7 @@ export async function kickBanned( if (isGone(f)) continue; if (isUnreachable(f)) return; b.retryAt = now.getTime() + KICK_RETRY_MS; - error = f.message; + error = f.phrase; } await writeAudit(env, null, { actorName: 'ban list', @@ -830,7 +861,7 @@ export async function fanOut(env: Env, org: OrgRow): Promise { }).catch((err): SyncResult => ({ ...pending, pending: false, - error: publicMessage(err, 'Sync failed.') + error: syncPhrase(err) })); const timer = new Promise((r) => setTimeout(() => r(pending), FANOUT_WAIT_MS)); return Promise.race([work, timer]); diff --git a/src/test/list-sync-errors.test.ts b/src/test/list-sync-errors.test.ts new file mode 100644 index 00000000..5721c63e --- /dev/null +++ b/src/test/list-sync-errors.test.ts @@ -0,0 +1,114 @@ +// What the list sync keeps of a failure is a fixed phrase for its kind: the game's own words never +// reach a slot's stored error, the server's last sync error, the audit trail or the state route +// every viewer of the server reads. +import { beforeAll, describe, expect, test } from 'bun:test'; +import { eq } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { getOrg, getServer } from '$lib/server/access'; +import { auditLog, listEntries, serverListState, serverListSync } from '$lib/server/db/schema'; +import { newId } from '$lib/server/http'; +import { listOf } from '$lib/server/lists'; +import { reconcileServer } from '$lib/server/lists-sync'; +import { GameError, type WardogsClient } from '$lib/server/rcon'; +import type { Features } from '$lib/types'; +import { GET as stateRoute } from '../routes/api/servers/[id]/lists/state/+server'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, type World } from './world'; + +const PLAYER = '76561198000000501'; +/** what a game might put in its refusal: an address, a token, anything */ +const GAME_TEXT = 'listener on 198.20.4.4 refused bearer tok_live_abc'; + +const FEATURES: Features = { + changeTeam: true, + configDocument: true, + reservedSlots: true, + rotationEdit: true, + rotationSave: true, + liveSettings: true, + serverId: true +}; + +/** A game that lists nothing and refuses every change with its own text. */ +function refusingGame(status: number, code: string): WardogsClient { + const json = async (method: string, path: string) => { + if (method === 'GET' && path === '/v1/bans') return { bans: [] }; + if (method === 'GET' && path === '/v1/reserved-slots') return { reservedSlots: [] }; + throw new GameError(status, GAME_TEXT, code); + }; + return { serverId: 'fake', json } as unknown as WardogsClient; +} + +describe.skipIf(!hasTestDb)('list sync errors', () => { + let env: Env; + let w: World; + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + const list = await listOf(env, w.org.id, 'reserve'); + await env.db + .insert(listEntries) + .values({ id: newId(), listId: list.id, steamId: PLAYER, addedByName: 'owner' }); + }); + + const sync = async (client: WardogsClient) => { + const server = (await getServer(env, w.server.id))!; + const org = (await getOrg(env, w.org.id))!; + await env.db.delete(serverListState).where(eq(serverListState.serverId, server.id)); + return reconcileServer(env, server, org, { + features: FEATURES, + reason: 'poll', + waitMs: 0, + client, + lane: 'held' + }); + }; + + const stored = async () => { + const state = await env.db + .select({ error: serverListState.error }) + .from(serverListState) + .where(eq(serverListState.serverId, w.server.id)); + const [row] = await env.db + .select({ lastError: serverListSync.lastError }) + .from(serverListSync) + .where(eq(serverListSync.serverId, w.server.id)); + const audit = await env.db + .select({ message: auditLog.message, detail: auditLog.detail }) + .from(auditLog) + .where(eq(auditLog.serverId, w.server.id)); + return { state: state.map((s) => s.error), lastError: row?.lastError ?? '', audit }; + }; + + test('a refused add is stored as a fixed phrase', async () => { + const result = await sync(refusingGame(400, 'odd_refusal')); + expect(result.failed).toBe(1); + const s = await stored(); + expect(s.state).toEqual(['Could not add: Refused by the server (400, odd_refusal).']); + expect(JSON.stringify(s)).not.toContain(GAME_TEXT); + }); + + test('a code that is not a plain word is left out of the phrase', async () => { + await sync(refusingGame(400, 'Bad Thing: 198.20.4.4')); + const s = await stored(); + expect(s.state).toEqual(['Could not add: Refused by the server (400).']); + expect(JSON.stringify(s)).not.toContain('198.20.4.4'); + }); + + test('a server that stops answering is stored as a fixed phrase, and so shown', async () => { + const result = await sync(refusingGame(503, '')); + expect(result.error).toBe('The server failed to answer.'); + const s = await stored(); + expect(s.lastError).toBe('The server failed to answer.'); + expect(JSON.stringify(s)).not.toContain(GAME_TEXT); + const shown = await callApi(stateRoute, w.users.viewer, { params: { id: w.server.id } }); + expect(shown.status).toBe(200); + expect(JSON.stringify(shown.body)).not.toContain(GAME_TEXT); + expect((shown.body as { sync: { lastError: string } }).sync.lastError).toBe( + 'The server failed to answer.' + ); + }); +}); From f401f6ab7692ad78a4b95f37b995b59fe7124f43 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 01:56:18 +0100 Subject: [PATCH 066/102] Mock game: a server restart, adds at once and the body limit restartMock re-reads the running reserved list from the document; MOCK_LIVE_ADDS=now applies adds at once under MOCK_LIVE_BUILD; a body over 64 KB is a 413. --- src/lib/server/mockgame.ts | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/lib/server/mockgame.ts b/src/lib/server/mockgame.ts index 78e81719..9ab4227c 100644 --- a/src/lib/server/mockgame.ts +++ b/src/lib/server/mockgame.ts @@ -135,6 +135,11 @@ const LIVE_BUILD_MISSING = new Set([ 'PATCH /v1/settings' ]); const liveBuild = () => /^(1|true|yes)$/i.test(process.env.MOCK_LIVE_BUILD || ''); +// With MOCK_LIVE_ADDS=now as well, a slot added to the document is reserved at once while one taken +// out stays until a restart: what a live server was seen doing once (2026-09-15). Unset, both wait. +const liveAddsNow = () => liveBuild() && /^now$/i.test(process.env.MOCK_LIVE_ADDS || ''); +/** The listener's limit on a request body, which it reports under limits.maxBodyBytes. */ +const MAX_BODY_BYTES = 65536; // With MOCK_PREMATCH=true a demo match waits at nil-all while fewer are on than the document's // MinimumRequiredPlayers (60), as the game's pre-match does, and a new demo server starts there: // AFK protection can be watched at work, and lowering the minimum starts the match. @@ -519,6 +524,15 @@ function demoServerId(key: string): string { return `${h.slice(0, 8)}-${h.slice(8, 12)}-4${h.slice(13, 16)}-a${h.slice(17, 20)}-${h.slice(20, 32)}`; } +/** + * The game process restarting (not a match restart): under MOCK_LIVE_BUILD the running reserved + * list is read again from the document, as a live server does at start. For tests. + */ +export function restartMock(key: string): void { + const s = stateFor(key); + s.reserved = reservedFromText(s.configText).filter((id) => /^\d{17}$/.test(id)); +} + function stateFor(key: string): State { let s = states.get(key); if (!s) { @@ -756,6 +770,8 @@ export function mockHandle( { 'retry-after': '2' } ); } + if (body !== undefined && Buffer.byteLength(body, 'utf8') > MAX_BODY_BYTES) + return fail(413, 'Request body too large.', 'payload_too_large'); const s = stateFor(key); const [path, query = ''] = rawPath.split('?'); const qs = new URLSearchParams(query); @@ -780,7 +796,7 @@ export function mockHandle( apiVersion: '1', build: liveBuild() ? '++Wardogs+Live-CL-501228' : '++Wardogs+Demo-CL-501228', auth: { scheme: 'bearer', header: 'Authorization' }, - limits: { maxBodyBytes: 65536, maxRequestsPerMinutePerIp: 600 }, + limits: { maxBodyBytes: MAX_BODY_BYTES, maxRequestsPerMinutePerIp: 600 }, config: { writable: true, document: '/v1/config' }, routes: servedRoutes() }); @@ -1126,7 +1142,10 @@ export function mockHandle( // ...except on the live build, which loads the list at start: the document changes, the // running list does not, until a restart (as seen on a real CL-501228 server). if (hasReservedKey(text)) { - if (!liveBuild()) s.reserved = reservedFromText(text).filter((id) => /^\d{17}$/.test(id)); + const ids = reservedFromText(text).filter((id) => /^\d{17}$/.test(id)); + if (!liveBuild()) s.reserved = ids; + else if (liveAddsNow()) + s.reserved = [...s.reserved, ...ids.filter((id) => !s.reserved.includes(id))]; s.configText = text; } else s.configText = reservedIntoText(text, s.reserved); s.configRevision++; From 54f57c5f3e14ff2db73fdc7890cc8ac2cba875cd Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 01:56:18 +0100 Subject: [PATCH 067/102] List sync: plan against the config document, one write per run server_reserved keeps configured and live flags (migration 0045). Adds are owned before the write and removals dropped after it; a server's changes go in one revision-checked document write within the 64 KB body limit. --- README.md | 16 +- drizzle/0047_reserved_flags.sql | 2 + drizzle/meta/0047_snapshot.json | 5476 +++++++++++++++++++++++++++++ drizzle/meta/_journal.json | 7 + src/lib/server/actions.ts | 4 +- src/lib/server/db/schema.ts | 10 +- src/lib/server/lists-plan.test.ts | 10 +- src/lib/server/lists-plan.ts | 22 +- src/lib/server/lists-sync.ts | 295 +- src/lib/server/lists.ts | 37 +- src/lib/server/observe.ts | 2 +- src/lib/server/players.ts | 3 +- src/lib/server/rcon-run.ts | 12 +- src/test/ban-enforce.test.ts | 2 +- src/test/reserved-sync.test.ts | 334 ++ 15 files changed, 6136 insertions(+), 96 deletions(-) create mode 100644 drizzle/0047_reserved_flags.sql create mode 100644 drizzle/meta/0047_snapshot.json create mode 100644 src/test/reserved-sync.test.ts diff --git a/README.md b/README.md index d98bb2e2..da9d2112 100644 --- a/README.md +++ b/README.md @@ -529,7 +529,7 @@ and ban list editors who are not owners see them on the Ban list tab without cha already placed keep their reasons. Each entry shows where it stands on every server: **applied** by the panel, **pending** the next -sync, **failed** (hover for the server's answer), or **local**. Local means the player was already +sync, **failed** (hover for the reason), or **local**. Local means the player was already banned (or reserved) on that server by someone working outside the panel. The panel never removes what it did not add, so removing an org entry lifts it only where the panel applied it, and a local ban stays until an owner imports it into the org list or unbans it on that server. @@ -573,8 +573,18 @@ every poll, where the poller re-applies anything missing. A reserved slot is a q the game takes the list at any length, and `MaxReservedSlots` only sets how many player slots are held back for the people on it (a 100-slot server with 2 held back reports 98 to the public; the panel shows the split). Live builds have no reserved-slot routes, -so on those the panel writes `DefaultReservedPlayerIds` in the config document instead (one -revision-checked apply per change), as the official console does. Every run that changes something, or fails, +so on those the panel writes `DefaultReservedPlayerIds` in the config document instead, as the +official console does: every change a server needs goes in one revision-checked write, and if +someone else saves the document meanwhile the panel reads it again and makes its changes to theirs. +Those builds read the list at start, so a slot taken out stays until the server's next restart +(the Reserved slots tab badges it _leaves at restart_); a slot given back before then is written +back and stays. The panel plans against the document, not the running list, and counts a slot as +applied once the document holds it. The listener takes a request of 64 KB at most, roughly a +thousand reserved players on top of a typical file: a slot that would not fit waits, marked +failed with "The server's config document is full", and goes in when there is room. Removals +always go in; a server's own slots go in before the organisation's, and members' slots last. A +failure is shown and recorded as a short reason of the panel's (unreachable, refused by the server +with its status, read-only document), never the game's own words. Every run that changes something, or fails, is in the audit trail under `system` as `lists.sync`, and reaches Discord webhooks that mirror bans. **Sync now** on a list page pushes everything on demand. diff --git a/drizzle/0047_reserved_flags.sql b/drizzle/0047_reserved_flags.sql new file mode 100644 index 00000000..6e48e788 --- /dev/null +++ b/drizzle/0047_reserved_flags.sql @@ -0,0 +1,2 @@ +ALTER TABLE "server_reserved" ADD COLUMN "configured" boolean DEFAULT true NOT NULL;--> statement-breakpoint +ALTER TABLE "server_reserved" ADD COLUMN "live" boolean DEFAULT true NOT NULL; \ No newline at end of file diff --git a/drizzle/meta/0047_snapshot.json b/drizzle/meta/0047_snapshot.json new file mode 100644 index 00000000..b370601f --- /dev/null +++ b/drizzle/meta/0047_snapshot.json @@ -0,0 +1,5476 @@ +{ + "id": "4d388648-a3de-42ad-84f9-e8c201183130", + "prevId": "6427a701-9864-4f1b-b168-651c3d19ec4c", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_server_ended_idx": { + "name": "matches_server_ended_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ended_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_ban_reasons": { + "name": "org_ban_reasons", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "reasons": { + "name": "reasons", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "org_ban_reasons_org_id_organizations_id_fk": { + "name": "org_ban_reasons_org_id_organizations_id_fk", + "tableFrom": "org_ban_reasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "board_opens": { + "name": "board_opens", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'official'" + }, + "board_hidden": { + "name": "board_hidden", + "type": "text[]", + "primaryKey": false, + "notNull": true, + "default": "'{}'::text[]" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_aliases": { + "name": "player_aliases", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "holder": { + "name": "holder", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "first_seen": { + "name": "first_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "player_aliases_steam_idx": { + "name": "player_aliases_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_aliases_server_id_steam_id_name_pk": { + "name": "player_aliases_server_id_steam_id_name_pk", + "columns": [ + "server_id", + "steam_id", + "name" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_days": { + "name": "player_days", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "day": { + "name": "day", + "type": "date", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "crossings": { + "name": "crossings", + "type": "timestamp with time zone[]", + "primaryKey": false, + "notNull": false + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_days_server_id_day_steam_id_pk": { + "name": "player_days_server_id_day_steam_id_pk", + "columns": [ + "server_id", + "day", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_totals": { + "name": "player_totals", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_totals_server_id_steam_id_pk": { + "name": "player_totals_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.seasons": { + "name": "seasons", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "starts_at": { + "name": "starts_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "seasons_org_start_uidx": { + "name": "seasons_org_start_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "starts_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "seasons_org_id_organizations_id_fk": { + "name": "seasons_org_id_organizations_id_fk", + "tableFrom": "seasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "configured": { + "name": "configured", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "live": { + "name": "live", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "trigger_kinds": { + "name": "trigger_kinds", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 6c450ef7..b8669ba8 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -330,6 +330,13 @@ "when": 1791741280439, "tag": "0046_webhook_trigger_kinds", "breakpoints": true + }, + { + "idx": 47, + "version": "7", + "when": 1791741401878, + "tag": "0047_reserved_flags", + "breakpoints": true } ] } \ No newline at end of file diff --git a/src/lib/server/actions.ts b/src/lib/server/actions.ts index ef701745..e24511e3 100644 --- a/src/lib/server/actions.ts +++ b/src/lib/server/actions.ts @@ -115,7 +115,7 @@ async function getStatus(client: WardogsClient, raw = false) { } // `etag`: live builds send the revision as a header too (CL-501228+), a fallback for the body's. -const configResult = (status: number, body: any, etag = '') => ({ +export const configResult = (status: number, body: any, etag = '') => ({ ok: status >= 200 && status < 300 && body.ok !== false, status, conflict: status === 412, @@ -266,7 +266,7 @@ async function reservedViaConfig( * at start, so a slot added or removed through the document reads back unchanged here until the * server restarts (seen on a real server 2026-09-15). */ -async function liveReservedIds(c: WardogsClient): Promise { +export async function liveReservedIds(c: WardogsClient): Promise { try { return ((await c.json('GET', '/v1/reserved-slots')).reservedSlots || []) as string[]; } catch (err) { diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 661a3d75..3f174628 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -1080,7 +1080,11 @@ export const serverLists = pgTable( ] ); -/** The poller's copy of each game server's reserved slots; sibling of server_bans. */ +/** + * The poller's copy of each game server's reserved slots; sibling of server_bans. A row stands for + * an id in the config document, in the running list, or both: the live builds read the document + * at start, so between a write and the next restart the two differ. + */ export const serverReserved = pgTable( 'server_reserved', { @@ -1088,6 +1092,10 @@ export const serverReserved = pgTable( .notNull() .references(() => servers.id, { onDelete: 'cascade' }), steamId: text('steam_id').notNull(), + /** in the config document (the running list, on a build without one): what the sync plans against */ + configured: boolean('configured').notNull().default(true), + /** in the running server's list: whom it holds a slot for now */ + live: boolean('live').notNull().default(true), seenAt: ts('seen_at').notNull().defaultNow() }, (t) => [primaryKey({ columns: [t.serverId, t.steamId] })] diff --git a/src/lib/server/lists-plan.test.ts b/src/lib/server/lists-plan.test.ts index 198523ef..83f558b4 100644 --- a/src/lib/server/lists-plan.test.ts +++ b/src/lib/server/lists-plan.test.ts @@ -69,14 +69,16 @@ const input = (p: Partial = {}): PlanInput => ({ }); const ban = (steamId: string, reason = '') => ({ steamId, reason, listId: 'L' }); -const slot = (steamId: string, member = false) => ({ steamId, listId: 'L', member }); +const slot = (steamId: string, member = false) => ({ steamId, listId: 'L', member, priority: 1 }); describe('planSync', () => { const want = (...ids: string[]) => ({ bans: [], reserved: ids.map((id) => slot(id)) }); test('wanted and absent → add', () => { const p = planSync(input({ desired: want('1') })); - expect(p.adds).toEqual([{ kind: 'reserve', steamId: '1', listId: 'L', reason: '' }]); + expect(p.adds).toEqual([ + { kind: 'reserve', steamId: '1', listId: 'L', reason: '', priority: 1 } + ]); expect(p.removes).toEqual([]); }); @@ -187,8 +189,8 @@ describe('desiredOf', () => { { kind: 'ban', steamId: '3', reason: 'cheating', listId: 'bans', serverId: null } ]); expect(want.reserved).toEqual([ - { steamId: '1', listId: 'org', member: false }, - { steamId: '2', listId: 'srv', member: false } + { steamId: '1', listId: 'org', member: false, priority: 1 }, + { steamId: '2', listId: 'srv', member: false, priority: 0 } ]); expect(want.bans).toEqual([{ steamId: '3', reason: 'cheating', listId: 'bans' }]); }); diff --git a/src/lib/server/lists-plan.ts b/src/lib/server/lists-plan.ts index 92f96227..b9cfdb94 100644 --- a/src/lib/server/lists-plan.ts +++ b/src/lib/server/lists-plan.ts @@ -78,16 +78,30 @@ export function desiredOf(rows: DesiredEntry[]): { if (!bans.has(r.steamId)) bans.set(r.steamId, { steamId: r.steamId, reason: r.reason, listId: r.listId }); } else if (!reserved.has(r.steamId)) - reserved.set(r.steamId, { steamId: r.steamId, listId: r.listId, member: false }); + reserved.set(r.steamId, { + steamId: r.steamId, + listId: r.listId, + member: false, + priority: r.serverId === null ? PRIORITY.org : PRIORITY.server + }); } return { bans: [...bans.values()], reserved: [...reserved.values()] }; } +/** + * Which adds go in first when a server's config document has no room for them all (the listener + * takes a body of 64 KB at most): a server's own slots, then the org's list, then members' slots. + * Lower goes first. + */ +export const PRIORITY = { server: 0, org: 1, member: 3 } as const; + export interface DesiredReserve { steamId: string; listId: string; /** a slot the org hands its members, not an entry someone added */ member: boolean; + /** see PRIORITY */ + priority: number; } export interface StateLike { @@ -104,6 +118,7 @@ export interface PlanInput { /** how long a failed add or remove waits before it is tried again */ retryAfterMs: number; desired: { bans: DesiredBan[]; reserved: DesiredReserve[] }; + /** the reserved list the server will start with: its config document, where the build has one */ observed: { reserved: string[] }; state: StateLike[]; } @@ -113,6 +128,8 @@ export interface PlanAdd { steamId: string; listId: string; reason: string; + /** see PRIORITY */ + priority: number; } export interface PlanRef { @@ -189,7 +206,8 @@ export function planSync(i: PlanInput): SyncPlan { kind: 'reserve' as const, steamId: d.steamId, listId: d.listId, - reason: '' + reason: '', + priority: d.priority })), new Set(i.observed.reserved), byKind(i.state, 'reserve') diff --git a/src/lib/server/lists-sync.ts b/src/lib/server/lists-sync.ts index e61621a3..2f45a92d 100644 --- a/src/lib/server/lists-sync.ts +++ b/src/lib/server/lists-sync.ts @@ -14,9 +14,10 @@ import type { Env } from './env'; import { banUid, renderBanMessage } from '$lib/ban-message'; import { ApiError, forLog } from './http'; import { writeAudit } from './audit'; -import { ACTIONS } from './actions'; +import { ACTIONS, configResult, liveReservedIds, readConfig } from './actions'; import { withServer, type Priority } from './dispatcher'; -import { GameError, WardogsClient } from './rcon'; +import { classifyGameError, GameError, WardogsClient } from './rcon'; +import { RESERVED_KEY, reservedFromText, reservedIntoText } from '$lib/reserved-doc'; import { listEntries, lists, @@ -40,7 +41,9 @@ import { isUnreachable, planHasWork, planSync, + PRIORITY, type Kind, + type PlanAdd, type PlanInput, type PanelBan, type SyncPlan @@ -55,7 +58,13 @@ const FANOUT_WAIT_MS = 15_000; export interface Observed { bans: Ban[]; + /** the running server's reserved list: whom it holds a slot for now */ reserved: string[]; + /** + * The list in the config document, which the server takes up when it next starts (the running + * list, on a build that has no document or edits both at once). The sync plans against this. + */ + configured: string[]; } export interface SyncResult extends ListSyncServer { @@ -135,7 +144,12 @@ export async function desiredFor( const have = new Set(reserved.map((r) => r.steamId)); for (const m of await memberSlots(env, server.orgId)) if (!banned.has(m.steamId) && !have.has(m.steamId)) - reserved.push({ steamId: m.steamId, listId: reserveList.id, member: true }); + reserved.push({ + steamId: m.steamId, + listId: reserveList.id, + member: true, + priority: PRIORITY.member + }); } } return { bans, reserved }; @@ -217,7 +231,11 @@ async function snapshotObserved(env: Env, serverId: string): Promise { const [bans, reserved] = await Promise.all([ env.db.select().from(serverBans).where(eq(serverBans.serverId, serverId)), env.db - .select({ steamId: serverReserved.steamId }) + .select({ + steamId: serverReserved.steamId, + configured: serverReserved.configured, + live: serverReserved.live + }) .from(serverReserved) .where(eq(serverReserved.serverId, serverId)) ]); @@ -228,18 +246,38 @@ async function snapshotObserved(env: Env, serverId: string): Promise { bannedBy: b.bannedBy, bannedAtUtc: b.bannedAtUtc })), - reserved: reserved.map((r) => r.steamId) + reserved: reserved.filter((r) => r.live).map((r) => r.steamId), + configured: reserved.filter((r) => r.configured).map((r) => r.steamId) }; } -/** Reads the server's ban list and reserved slots, one request at a time (one in flight per server). */ -export async function liveObserved(client: WardogsClient): Promise { +const isSteamId = (id: string) => /^\d{17}$/.test(id); + +/** + * Reads the server's ban list and reserved slots, one request at a time (one in flight per + * server). On a build that takes reserved slots through its config document, the document is read + * too: the running list only catches up with it at the next restart, so a slot withdrawn and given + * back before then would read as already there. Only the reserved ids leave the document; its text + * (which carries the RCON password) is never kept. + */ +export async function liveObserved( + client: WardogsClient, + features: Features | null = null +): Promise { const bans = (await ACTIONS.bans.run(client, {})) as { bans: Ban[] }; - const reserved = (await ACTIONS.reserved.run(client, {})) as { reserved: string[] }; - return { - bans: bans.bans.filter((b) => /^\d{17}$/.test(b.steamId)), - reserved: reserved.reserved.filter((id) => /^\d{17}$/.test(id)) - }; + const reserved = ( + (await ACTIONS.reserved.run(client, {})) as { reserved: string[] } + ).reserved.filter(isSteamId); + let configured = reserved; + if (!features?.reservedSlots) { + try { + configured = reservedFromText((await readConfig(client)).text).filter(isSteamId); + } catch (err) { + // a build too old to serve the document keeps its list in the running server alone + if (!(err instanceof GameError && err.code === 'no_route')) throw err; + } + } + return { bans: bans.bans.filter((b) => isSteamId(b.steamId)), reserved, configured }; } /** Rewrites the poller's copies of a server's ban list and reserved slots. */ @@ -280,23 +318,31 @@ export async function writeSnapshot( seenAt: ts } }); + const live = new Set(observed.reserved); + const configured = new Set(observed.configured); + const ids = [...new Set([...live, ...configured])]; await tx .delete(serverReserved) .where( - observed.reserved.length - ? and( - eq(serverReserved.serverId, serverId), - notInArray(serverReserved.steamId, observed.reserved) - ) + ids.length + ? and(eq(serverReserved.serverId, serverId), notInArray(serverReserved.steamId, ids)) : eq(serverReserved.serverId, serverId) ); - if (observed.reserved.length) + if (ids.length) await tx .insert(serverReserved) - .values(observed.reserved.map((steamId) => ({ serverId, steamId, seenAt: ts }))) + .values( + ids.map((steamId) => ({ + serverId, + steamId, + configured: configured.has(steamId), + live: live.has(steamId), + seenAt: ts + })) + ) .onConflictDoUpdate({ target: [serverReserved.serverId, serverReserved.steamId], - set: { seenAt: ts } + set: { configured: sql`excluded.configured`, live: sql`excluded.live`, seenAt: ts } }); }); } @@ -306,7 +352,9 @@ export async function writeSnapshot( * copies in server_bans and server_reserved are brought in line at once, rather than at the * worker's next re-read (five minutes by default), so no page keeps showing a slot the server no * longer has, or misses one it just got. The worker's own re-read still follows and is the - * authority; this only closes the gap. + * authority; this only closes the gap. A slot written to the config document of a build that reads + * it at start (`pendingRestart`) is in the document now and in the running list at the restart, + * or the other way about for one taken out. */ export async function noteLocalEdit( env: Env, @@ -314,9 +362,9 @@ export async function noteLocalEdit( kind: Kind, op: 'add' | 'remove', steamId: string, - reason = '', - ts = new Date() + opts: { reason?: string; pendingRestart?: boolean; ts?: Date } = {} ): Promise { + const { reason = '', pendingRestart = false, ts = new Date() } = opts; if (kind === 'ban') { if (op === 'remove') { await env.db @@ -333,7 +381,9 @@ export async function noteLocalEdit( }); return; } - if (op === 'remove') { + const configured = op === 'add'; + const live = op === 'add' ? !pendingRestart : pendingRestart; + if (!configured && !live) { await env.db .delete(serverReserved) .where(and(eq(serverReserved.serverId, serverId), eq(serverReserved.steamId, steamId))); @@ -341,10 +391,10 @@ export async function noteLocalEdit( } await env.db .insert(serverReserved) - .values({ serverId, steamId, seenAt: ts }) + .values({ serverId, steamId, configured, live, seenAt: ts }) .onConflictDoUpdate({ target: [serverReserved.serverId, serverReserved.steamId], - set: { seenAt: ts } + set: { configured, live, seenAt: ts } }); } @@ -452,7 +502,7 @@ async function run( now, retryAfterMs: RETRY_AFTER_MS, desired, - observed: { reserved: observed.reserved }, + observed: { reserved: observed.configured }, state }); @@ -474,15 +524,15 @@ async function run( try { client ??= await WardogsClient.forServer(env, server); if (!fresh) { - observed = await liveObserved(client); + observed = await liveObserved(client, opts.features ?? null); fresh = true; await writeSnapshot(env, server.id, observed, now); } plan = planWith(observed); // Live builds since CL-499480 have no reserved-slot routes and answer those calls 404, which - // would otherwise read as "already gone"; there the slots go through the config document - // (see reservedViaConfig in actions.ts). Ask the build once before touching reserved slots. - if ([...plan.adds, ...plan.removes].some((x) => x.kind === 'reserve')) { + // would otherwise read as "already gone"; there the slots go through the config document. + // Ask the build once before touching reserved slots. + if (planHasWork(plan)) { try { const features = opts.features ?? @@ -501,6 +551,7 @@ async function run( return { ...base, error: message }; } + await claim(env, server.id, plan.adds, now); const outcome = await execute(client, plan, observed, reserve); await record(env, server.id, plan, outcome, now, { syncedAt: now, @@ -576,7 +627,7 @@ interface ReserveMode { viaConfig: boolean; } -/** Removes, then adds, one call at a time; stops at the first sign the server is gone. */ +/** Every reserved-slot change the plan holds, the way this build takes them. */ async function execute( client: WardogsClient, plan: SyncPlan, @@ -589,40 +640,46 @@ async function execute( failedAdds: [], failedRemoves: [], aborted: null, - observed: { bans: [...before.bans], reserved: [...before.reserved] } + observed: { + bans: before.bans, + reserved: [...before.reserved], + configured: [...before.configured] + } }; - const dropObserved = (kind: Kind, steamId: string) => { - if (kind === 'ban') out.observed.bans = out.observed.bans.filter((b) => b.steamId !== steamId); - else out.observed.reserved = out.observed.reserved.filter((id) => id !== steamId); + if (!planHasWork(plan)) return out; + if (!reserve.writable) { + for (const r of plan.removes) + out.failedRemoves.push({ ...r, error: `Could not remove: ${NO_RESERVED_ROUTES}` }); + for (const a of plan.adds) + out.failedAdds.push({ ...a, error: `Could not add: ${NO_RESERVED_ROUTES}` }); + return out; + } + return reserve.viaConfig ? throughDocument(client, plan, out) : oneByOne(client, plan, out); +} + +/** + * On a build with the live routes: removes, then adds, one call at a time, each changing the + * running list and the document together; stops at the first sign the server is gone. + */ +async function oneByOne(client: WardogsClient, plan: SyncPlan, out: Outcome): Promise { + const lists = () => [out.observed.reserved, out.observed.configured]; + const drop = (steamId: string) => { + out.observed.reserved = out.observed.reserved.filter((id) => id !== steamId); + out.observed.configured = out.observed.configured.filter((id) => id !== steamId); }; - const addObserved = (kind: Kind, steamId: string, reason: string) => { - if (kind === 'ban') { - if (!out.observed.bans.some((b) => b.steamId === steamId)) - out.observed.bans.push({ - steamId, - reason, - bannedBy: 'Warcon', - bannedAtUtc: new Date().toISOString() - }); - } else if (!out.observed.reserved.includes(steamId)) out.observed.reserved.push(steamId); + const put = (steamId: string) => { + for (const l of lists()) if (!l.includes(steamId)) l.push(steamId); }; for (const r of plan.removes) { - if (r.kind === 'reserve' && !reserve.writable) { - out.failedRemoves.push({ ...r, error: `Could not remove: ${NO_RESERVED_ROUTES}` }); - continue; - } try { - await ACTIONS.reservedRemove.run(client, { - steamId: r.steamId, - viaConfig: reserve.viaConfig - }); + await ACTIONS.reservedRemove.run(client, { steamId: r.steamId, viaConfig: false }); out.removed.push(r); - dropObserved(r.kind, r.steamId); + drop(r.steamId); } catch (err) { const f = failure(err); if (isGone(f)) { out.removed.push(r); - dropObserved(r.kind, r.steamId); + drop(r.steamId); } else if (isUnreachable(f)) { out.aborted = f.phrase; return out; @@ -630,22 +687,15 @@ async function execute( } } for (const a of plan.adds) { - if (a.kind === 'reserve' && !reserve.writable) { - out.failedAdds.push({ ...a, error: `Could not add: ${NO_RESERVED_ROUTES}` }); - continue; - } try { - await ACTIONS.reservedAdd.run(client, { - steamId: a.steamId, - viaConfig: reserve.viaConfig - }); + await ACTIONS.reservedAdd.run(client, { steamId: a.steamId, viaConfig: false }); out.added.push(a); - addObserved(a.kind, a.steamId, a.reason); + put(a.steamId); } catch (err) { const f = failure(err); if (isAlreadyApplied(f)) { out.added.push(a); - addObserved(a.kind, a.steamId, a.reason); + put(a.steamId); } else if (isUnreachable(f)) { out.aborted = f.phrase; return out; @@ -655,6 +705,96 @@ async function execute( return out; } +/** + * The listener refuses a request body over 64 KB (`limits.maxBodyBytes` on every build seen), and + * the whole document goes in one; this much of it is left for the reserved list to grow into. + */ +const DOCUMENT_BUDGET_BYTES = 65_536 - 2048; +const DOCUMENT_FULL = "The server's config document is full."; + +const bytes = (text: string): number => Buffer.byteLength(text, 'utf8'); + +/** + * The adds that fit, in the order given: the document with `kept` must stay within the budget. + * Each add is one more `.DefaultReservedPlayerIds=` line. + */ +export function fitting(text: string, kept: string[], adds: string[]): string[] { + const eol = text.includes('\r\n') ? 2 : 1; + let size = bytes(reservedIntoText(text, kept)); + const placed: string[] = []; + for (const id of adds) { + const cost = bytes(`.${RESERVED_KEY}=${id}`) + eol; + if (size + cost > DOCUMENT_BUDGET_BYTES) break; + size += cost; + placed.push(id); + } + return placed; +} + +/** + * On a build that takes reserved slots through its config document: every change for the server in + * one write. One read, one PUT against the revision read, one look at the running list. On a + * revision conflict the document is read again and the same changes made to what it now holds (an + * add already there and a removal already gone change nothing), so the other writer's edit stays; a + * second conflict fails the run's changes. Removals always go in; adds go in by priority while the + * document stays within the budget, and the rest wait as failed until there is room. The document's + * text never leaves this function and no error of the game's is kept (see syncPhrase). + */ +async function throughDocument( + client: WardogsClient, + plan: SyncPlan, + out: Outcome +): Promise { + const adds = [...plan.adds].sort((a, b) => a.priority - b.priority); + const removing = new Set(plan.removes.map((r) => r.steamId)); + try { + for (let attempt = 0; ; attempt++) { + const doc = await readConfig(client); + if (!doc.writable) throw new GameError(400, 'The document is read-only.', 'config_readonly'); + const before = reservedFromText(doc.text); + const kept = before.filter((id) => !removing.has(id)); + const fresh = adds.map((a) => a.steamId).filter((id) => !kept.includes(id)); + const ids = [...kept, ...fitting(doc.text, kept, fresh)]; + const changed = ids.length !== before.length || ids.some((id, i) => id !== before[i]); + if (changed) { + const { status, body, etag } = await client.configCall( + 'PUT', + '/v1/config', + reservedIntoText(doc.text, ids), + doc.revision + ); + const r = configResult(status, body, etag); + if (r.conflict) { + if (attempt === 0) continue; + throw new GameError(412, 'The document kept changing.', 'revision_conflict'); + } + if (!r.ok) throw classifyGameError('PUT', '/v1/config', status, '', body); + } + const placed = new Set(ids); + out.removed.push(...plan.removes); + for (const a of adds) + if (placed.has(a.steamId)) out.added.push(a); + else out.failedAdds.push({ ...a, error: `Could not add: ${DOCUMENT_FULL}` }); + out.observed.configured = ids.filter(isSteamId); + if (changed) { + const live = await liveReservedIds(client).catch(() => null); + if (live) out.observed.reserved = live.filter(isSteamId); + } + return out; + } + } catch (err) { + const f = failure(err); + if (isUnreachable(f)) { + out.aborted = f.phrase; + return out; + } + for (const r of plan.removes) + out.failedRemoves.push({ ...r, error: `Could not remove: ${f.phrase}` }); + for (const a of adds) out.failedAdds.push({ ...a, error: `Could not add: ${f.phrase}` }); + return out; + } +} + interface Bookkeeping { syncedAt: Date | null; lastError: string; @@ -667,6 +807,29 @@ async function bookkeep(env: Env, serverId: string, b: Bookkeeping): Promise { + if (!adds.length) return; + await env.db.transaction(async (tx) => { + for (const a of adds) + await upsertState(tx, { + serverId, + kind: a.kind, + steamId: a.steamId, + sourceListId: a.listId, + state: 'applied', + error: '', + attemptedAt: now, + updatedAt: now + }); + }); +} + /** One transaction: state rows for what happened, the snapshot as it now stands, the sync row. */ async function record( env: Env, diff --git a/src/lib/server/lists.ts b/src/lib/server/lists.ts index 612480be..75c8d6cc 100644 --- a/src/lib/server/lists.ts +++ b/src/lib/server/lists.ts @@ -221,8 +221,10 @@ type Standing = { state: ListEntryState; error: string; managed: boolean }; /** * Where each SteamID stands on each server. A reserved slot: a state row means Warcon put it - * there (applied or failed); otherwise present on the server means local, absent means pending. - * A ban is applied everywhere: the panel enforces it, nothing is placed on the server. + * there (applied or failed; applied but not yet in the server's config document is pending); + * otherwise in the document means local, absent means pending. A slot the panel withdrew that the + * running server keeps until its restart is neither. A ban is applied everywhere: the panel + * enforces it, nothing is placed on the server. */ export async function standings( env: Env, @@ -245,7 +247,11 @@ export async function standings( .select({ serverId: serverReserved.serverId, steamId: serverReserved.steamId }) .from(serverReserved) .where( - and(inArray(serverReserved.serverId, serverIds), inArray(serverReserved.steamId, steamIds)) + and( + inArray(serverReserved.serverId, serverIds), + inArray(serverReserved.steamId, steamIds), + eq(serverReserved.configured, true) + ) ); const [seen, state] = await Promise.all([ observed, @@ -260,13 +266,22 @@ export async function standings( ) ) ]); + const configured = new Set(seen.map((r) => `${r.serverId}:${r.steamId}`)); for (const r of seen) out.get(r.serverId)?.set(r.steamId, { state: 'local', error: '', managed: false }); for (const r of state) - out.get(r.serverId)?.set(r.steamId, { state: r.state, error: r.error, managed: true }); + out.get(r.serverId)?.set(r.steamId, { + state: placedState(r.state, configured.has(`${r.serverId}:${r.steamId}`)), + error: r.error, + managed: true + }); return out; } +/** A slot the panel claimed is applied once the server's document holds it; till then it is pending. */ +const placedState = (state: 'applied' | 'failed', inDocument: boolean): ListEntryState => + state === 'applied' && !inDocument ? 'pending' : state; + const standingOf = ( s: Map | undefined, steamId: string @@ -868,7 +883,12 @@ export async function importCandidates(env: Env, org: OrgRow): Promise [s.id, s.name])); const [bans, reserved, state, listRows] = await Promise.all([ env.db.select().from(serverBans).where(inArray(serverBans.serverId, serverIds)), - env.db.select().from(serverReserved).where(inArray(serverReserved.serverId, serverIds)), + // what the servers' documents hold: a slot the panel withdrew that a server keeps running + // until its restart is not one to adopt + env.db + .select() + .from(serverReserved) + .where(and(inArray(serverReserved.serverId, serverIds), eq(serverReserved.configured, true))), env.db.select().from(serverListState).where(inArray(serverListState.serverId, serverIds)), orgLists(env, org.id) ]); @@ -1119,7 +1139,7 @@ export async function serverListsState( env.db .select({ steamId: serverReserved.steamId }) .from(serverReserved) - .where(eq(serverReserved.serverId, server.id)), + .where(and(eq(serverReserved.serverId, server.id), eq(serverReserved.configured, true))), env.db.select().from(serverListState).where(eq(serverListState.serverId, server.id)), env.db.select().from(serverListSync).where(eq(serverListSync.serverId, server.id)).limit(1), listsRoleFor(env, user, server.orgId) @@ -1164,8 +1184,11 @@ export async function serverListsState( expiresAt: null }); for (const b of bans) out.bans[b.steamId] = ban('local', false); + const inDocument = new Set(reserved.map((r) => r.steamId)); for (const r of reserved) out.reserved[r.steamId] = slot('local', false); - for (const s of state) if (s.kind === 'reserve') out.reserved[s.steamId] = slot(s.state, true); + for (const s of state) + if (s.kind === 'reserve') + out.reserved[s.steamId] = slot(placedState(s.state, inDocument.has(s.steamId)), true); // wanted but not yet on the server const org = (await getOrg(env, server.orgId)) ?? { membersReserved: false, diff --git a/src/lib/server/observe.ts b/src/lib/server/observe.ts index ef858c59..2d37653f 100644 --- a/src/lib/server/observe.ts +++ b/src/lib/server/observe.ts @@ -915,7 +915,7 @@ async function keepLists( let observed: Observed | undefined; if (started - m.listsAt >= s.listsSnapshotMs) { m.listsAt = started; - observed = await liveObserved(client); + observed = await liveObserved(client, m.identity.features); m.reserved = new Set(observed.reserved); m.reservedAt = started; await writeSnapshot(env, m.server.id, observed, ts); diff --git a/src/lib/server/players.ts b/src/lib/server/players.ts index d40cf16b..dcde6675 100644 --- a/src/lib/server/players.ts +++ b/src/lib/server/players.ts @@ -651,7 +651,8 @@ async function seedProgress( // behind it, when a list this server takes has one (the latest end of them, none if any has none). env.db.execute<{ held: boolean; endless: boolean; until: Date | null }>(sql` SELECT EXISTS (SELECT 1 FROM server_reserved r - WHERE r.server_id = ${server.id} AND r.steam_id = ${steamId}) AS held, + WHERE r.server_id = ${server.id} AND r.steam_id = ${steamId} + AND r.live) AS held, bool_or(e.expires_at IS NULL) AS endless, MAX(e.expires_at) AS until FROM server_lists sl JOIN lists l ON l.id = sl.list_id AND l.kind = 'reserve' diff --git a/src/lib/server/rcon-run.ts b/src/lib/server/rcon-run.ts index 05d78fd3..9cf410ef 100644 --- a/src/lib/server/rcon-run.ts +++ b/src/lib/server/rcon-run.ts @@ -119,14 +119,10 @@ export async function runAction( // edit also rewrites the mirror here, so the change shows before the worker's re-read lands. const listEdit = LIST_EDITS[name]; if (listEdit && /^\d{17}$/.test(target)) { - await noteLocalEdit( - env, - server.id, - listEdit.kind, - listEdit.op, - target, - typeof params?.reason === 'string' ? params.reason.slice(0, 200) : '' - ).catch((err) => console.error('[warcon] list mirror', err)); + await noteLocalEdit(env, server.id, listEdit.kind, listEdit.op, target, { + reason: typeof params?.reason === 'string' ? params.reason.slice(0, 200) : '', + pendingRestart: !!(result as { pendingRestart?: unknown } | null)?.pendingRestart + }).catch((err) => console.error('[warcon] list mirror', err)); } if (def.mutating) gateway().observeSoon(server.id, { lists: !!listEdit }); // A new document may change MaxReservedSlots, which the worker otherwise re-reads hourly. diff --git a/src/test/ban-enforce.test.ts b/src/test/ban-enforce.test.ts index 2fba3d48..e13085f4 100644 --- a/src/test/ban-enforce.test.ts +++ b/src/test/ban-enforce.test.ts @@ -87,7 +87,7 @@ describe.skipIf(!hasTestDb)('bans enforced by the panel', () => { waitMs: 0, lane: 'held', client: t.client, - observed: { bans: [], reserved: [] } + observed: { bans: [], reserved: [], configured: [] } }); expect(t.sent).toEqual([]); expect(result.bans?.map((b) => b.steamId)).toEqual([STEAM]); diff --git a/src/test/reserved-sync.test.ts b/src/test/reserved-sync.test.ts new file mode 100644 index 00000000..f467e8cf --- /dev/null +++ b/src/test/reserved-sync.test.ts @@ -0,0 +1,334 @@ +// The reserved-slot sync on a build that takes slots through its config document and reads it at +// start (MOCK_LIVE_BUILD): it plans against the document, so a slot switched off and on again +// before a restart is not lost; it owns what it adds before it writes; and every change for a +// server goes in one write that fits the listener's body limit. +import { afterAll, beforeAll, describe, expect, test } from 'bun:test'; +import { and, eq, isNull } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { getOrg, getServer } from '$lib/server/access'; +import { readConfig } from '$lib/server/actions'; +import { encryptSecret } from '$lib/server/crypto'; +import { listEntries, serverListState, servers } from '$lib/server/db/schema'; +import { newId } from '$lib/server/http'; +import { + ensureServerLists, + importCandidates, + listOf, + serverListOf, + serverListsState, + standings +} from '$lib/server/lists'; +import { liveObserved, reconcileServer, writeSnapshot } from '$lib/server/lists-sync'; +import { restartMock } from '$lib/server/mockgame'; +import { GameError, WardogsClient } from '$lib/server/rcon'; +import { reservedFromText, reservedIntoText } from '$lib/reserved-doc'; +import type { ListRow } from '$lib/server/db/schema'; +import { hasTestDb, testEnv } from './db'; +import { stubGateway } from './call'; +import { seedWorld, type World } from './world'; + +const A = '76561198000000601'; +const B = '76561198000000602'; +const C = '76561198000000603'; +const BUDGET = 65_536 - 2048; + +interface Hooks { + /** runs before each PUT of the document reaches the game */ + beforePut?: () => Promise; + /** answers a PUT in the game's place */ + answer?: () => { status: number; body: unknown; etag: string }; + /** the PUT reaches the game, then its answer is lost */ + loseAnswer?: boolean; +} + +describe.skipIf(!hasTestDb)('reserved slots through the config document', () => { + let env: Env; + const before = { build: process.env.MOCK_LIVE_BUILD, adds: process.env.MOCK_LIVE_ADDS }; + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + process.env.MOCK_LIVE_BUILD = 'true'; + }); + afterAll(() => { + for (const [k, v] of [ + ['MOCK_LIVE_BUILD', before.build], + ['MOCK_LIVE_ADDS', before.adds] + ] as const) + if (v === undefined) delete process.env[k]; + else process.env[k] = v; + }); + + /** A fresh org with a server on the mock game, and a client to it that counts its writes. */ + async function setup(hooks: Hooks = {}) { + const w: World = await seedWorld(env); + const id = `s_doc_${newId().slice(0, 10)}`; + await env.db.insert(servers).values({ + id, + orgId: w.org.id, + name: 'Doc', + host: 'demo', + port: 1, + passwordEnc: encryptSecret(env, 'demo') + }); + const orgList = await listOf(env, w.org.id, 'reserve'); + await ensureServerLists(env.db, id, w.org.id); + const own = await serverListOf(env, { id, orgId: w.org.id }, 'reserve'); + const server = (await getServer(env, id))!; + const client = await WardogsClient.forServer(env, server); + const puts = { n: 0 }; + const put = client.configCall.bind(client); + client.configCall = async (method, path, text, revision) => { + if (method === 'PUT') { + puts.n++; + await hooks.beforePut?.(); + if (hooks.answer) return hooks.answer(); + const r = await put(method, path, text, revision); + if (hooks.loseAnswer) throw new GameError(502, 'lost', 'unreachable'); + return r; + } + return put(method, path, text, revision); + }; + const sync = async () => + reconcileServer(env, (await getServer(env, id))!, (await getOrg(env, w.org.id))!, { + reason: 'api', + waitMs: 0, + lane: 'held', + client + }); + const doc = async () => reservedFromText((await readConfig(client)).text); + const running = async () => + ((await client.json('GET', '/v1/reserved-slots')) as { reservedSlots: string[] }) + .reservedSlots; + const give = (steamId: string, list: ListRow = orgList) => + env.db + .insert(listEntries) + .values({ id: newId(), listId: list.id, steamId, addedByName: 'owner' }); + const withdraw = (steamId: string, list: ListRow = orgList) => + env.db + .update(listEntries) + .set({ removedAt: new Date(), removedByName: 'owner', removal: 'manual' }) + .where( + and( + eq(listEntries.listId, list.id), + eq(listEntries.steamId, steamId), + isNull(listEntries.removedAt) + ) + ); + const stateOf = async (steamId: string) => + ( + await env.db + .select({ state: serverListState.state, error: serverListState.error }) + .from(serverListState) + .where(and(eq(serverListState.serverId, id), eq(serverListState.steamId, steamId))) + )[0] ?? null; + const standingOf = async (steamId: string) => + (await standings(env, 'reserve', [id], [steamId])).get(id)?.get(steamId)?.state ?? 'pending'; + return { + w, + id, + server, + client, + orgList, + own, + puts, + sync, + doc, + running, + give, + withdraw, + stateOf, + standingOf, + restart: () => restartMock(id) + }; + } + + test('a slot given and withdrawn before a restart leaves the document as it was', async () => { + delete process.env.MOCK_LIVE_ADDS; + const t = await setup(); + await t.give(A); + await t.sync(); + expect(await t.doc()).toContain(A); + expect(await t.running()).not.toContain(A); + expect(await t.standingOf(A)).toBe('applied'); + + await t.withdraw(A); + await t.sync(); + expect(await t.doc()).not.toContain(A); + expect(await t.stateOf(A)).toBeNull(); + t.restart(); + expect(await t.running()).not.toContain(A); + }); + + test('a slot withdrawn and given back before a restart stays', async () => { + delete process.env.MOCK_LIVE_ADDS; + const t = await setup(); + await t.give(A); + await t.sync(); + t.restart(); + expect(await t.running()).toContain(A); + + await t.withdraw(A); + await t.sync(); + expect(await t.doc()).not.toContain(A); + expect(await t.running()).toContain(A); + + await t.give(A); + await t.sync(); + expect(await t.doc()).toContain(A); + expect(await t.stateOf(A)).toMatchObject({ state: 'applied' }); + t.restart(); + expect(await t.running()).toContain(A); + }); + + test('a write whose answer was lost is still the panel’s, and the panel can take it back', async () => { + process.env.MOCK_LIVE_ADDS = 'now'; + const hooks: Hooks = { loseAnswer: true }; + const t = await setup(hooks); + await t.give(A); + const lost = await t.sync(); + expect(lost.error).toBe('Could not reach the server.'); + expect(await t.doc()).toContain(A); + expect(await t.running()).toContain(A); + + hooks.loseAnswer = false; + await t.sync(); + expect(await t.standingOf(A)).toBe('applied'); + expect(await t.stateOf(A)).toMatchObject({ state: 'applied' }); + + await t.withdraw(A); + await t.sync(); + expect(await t.doc()).not.toContain(A); + }); + + test('an id put in the document outside the panel is never removed', async () => { + delete process.env.MOCK_LIVE_ADDS; + const t = await setup(); + const d = await readConfig(t.client); + await t.client.configCall( + 'PUT', + '/v1/config', + reservedIntoText(d.text, [...reservedFromText(d.text), B]), + d.revision + ); + await t.give(A); + await t.sync(); + await t.withdraw(A); + await t.sync(); + expect(await t.doc()).toContain(B); + expect(await t.standingOf(B)).toBe('local'); + }); + + test('a slot the panel withdrew that the server still runs is neither local nor offered for import', async () => { + delete process.env.MOCK_LIVE_ADDS; + const t = await setup(); + await t.give(A); + await t.sync(); + t.restart(); + await t.withdraw(A); + await t.sync(); + expect(await t.running()).toContain(A); + expect(await t.doc()).not.toContain(A); + // the worker's next look at the server's lists + await writeSnapshot(env, t.id, await liveObserved(t.client)); + + const org = (await getOrg(env, t.w.org.id))!; + expect((await importCandidates(env, org)).map((c) => c.steamId)).not.toContain(A); + const owner = t.w.users.owner!; + const view = await serverListsState(env, t.server, owner, { + caps: new Set(['server.view']) + } as never); + expect(view.reserved[A]?.state).not.toBe('local'); + }); + + test('thirty slots given at once are one write', async () => { + delete process.env.MOCK_LIVE_ADDS; + const t = await setup(); + const ids = Array.from( + { length: 30 }, + (_, i) => `765611980000007${String(i).padStart(2, '0')}` + ); + for (const id of ids) await t.give(id); + const r = await t.sync(); + expect(r.added).toBe(30); + expect(t.puts.n).toBe(1); + const doc = await t.doc(); + for (const id of ids) expect(doc).toContain(id); + }); + + test('a conflict during the write keeps the other writer’s edit', async () => { + delete process.env.MOCK_LIVE_ADDS; + const hooks: Hooks = {}; + const t = await setup(hooks); + let edited = false; + hooks.beforePut = async () => { + if (edited) return; + edited = true; + // someone else saves the document between the panel's read and its write + const other = await WardogsClient.forServer(env, t.server); + const d = await readConfig(other); + await other.configCall( + 'PUT', + '/v1/config', + reservedIntoText(d.text, [...reservedFromText(d.text), C]), + d.revision + ); + }; + await t.give(A); + await t.sync(); + const doc = await t.doc(); + expect(doc).toContain(A); + expect(doc).toContain(C); + expect(await t.stateOf(A)).toMatchObject({ state: 'applied' }); + }); + + test('a full document holds adds back, the org list’s before the server’s own, and lets removals through', async () => { + delete process.env.MOCK_LIVE_ADDS; + const t = await setup(); + await t.give(A); + await t.sync(); + // fill the document to 20 bytes under the budget: room for the line A leaves and no more + const d = await readConfig(t.client); + const pad = BUDGET - 20 - Buffer.byteLength(d.text, 'utf8') - 4; + await t.client.configCall( + 'PUT', + '/v1/config', + `${d.text.replace(/\n?$/, '\n')}; ${'x'.repeat(pad)}\n`, + d.revision + ); + await t.withdraw(A); + await t.give(B); + await t.give(C, t.own); + const r = await t.sync(); + expect(r.removed).toBe(1); + const doc = await t.doc(); + expect(doc).not.toContain(A); + expect(doc).toContain(C); + expect(doc).not.toContain(B); + expect(await t.stateOf(B)).toEqual({ + state: 'failed', + error: "Could not add: The server's config document is full." + }); + }); + + test("a refused write keeps a fixed phrase, never the game's words", async () => { + delete process.env.MOCK_LIVE_ADDS; + const t = await setup({ + answer: () => ({ + status: 400, + body: { + ok: false, + error: { code: 'invalid', message: 'line 9: RCONPassword=hunter2 is not valid' } + }, + etag: '' + }) + }); + await t.give(A); + const r = await t.sync(); + expect(r.failed).toBe(1); + expect(await t.stateOf(A)).toEqual({ + state: 'failed', + error: 'Could not add: Refused by the server (400, invalid).' + }); + }); +}); From ff793da681683abf8a7826beb36414980a01e868 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 02:13:09 +0100 Subject: [PATCH 068/102] Lists: a default list per kind, and groups with a window and servers Migration 0046 marks each org's lists as its defaults and gives other org reserve lists a window, a choice of servers and an archive date. The sync, members' slots and every writer of the org list keep to the default; a group reaches its servers only while on. --- drizzle/0048_slot_groups.sql | 14 + drizzle/meta/0048_snapshot.json | 5543 +++++++++++++++++++++++++++++ drizzle/meta/_journal.json | 7 + src/lib/server/db/schema.ts | 41 +- src/lib/server/lists-plan.test.ts | 59 +- src/lib/server/lists-plan.ts | 51 +- src/lib/server/lists-sync.ts | 45 +- src/lib/server/lists.ts | 183 +- src/lib/server/players.ts | 4 +- src/lib/types.ts | 27 + 10 files changed, 5914 insertions(+), 60 deletions(-) create mode 100644 drizzle/0048_slot_groups.sql create mode 100644 drizzle/meta/0048_snapshot.json diff --git a/drizzle/0048_slot_groups.sql b/drizzle/0048_slot_groups.sql new file mode 100644 index 00000000..ab8e7296 --- /dev/null +++ b/drizzle/0048_slot_groups.sql @@ -0,0 +1,14 @@ +-- Migration 0048 preserves existing organisation lists as each kind's default. +DROP INDEX "lists_org_kind_name_uidx";--> statement-breakpoint +ALTER TABLE "lists" ADD COLUMN "is_default" boolean DEFAULT false NOT NULL;--> statement-breakpoint +ALTER TABLE "lists" ADD COLUMN "on_from" timestamp with time zone;--> statement-breakpoint +ALTER TABLE "lists" ADD COLUMN "on_until" timestamp with time zone;--> statement-breakpoint +ALTER TABLE "lists" ADD COLUMN "every_server" boolean DEFAULT true NOT NULL;--> statement-breakpoint +ALTER TABLE "lists" ADD COLUMN "archived_at" timestamp with time zone;--> statement-breakpoint +-- the org lists there are, one per kind (checked on the hosted panel 2026-10-09), are its defaults +UPDATE "lists" SET "is_default" = true WHERE "server_id" IS NULL;--> statement-breakpoint +CREATE UNIQUE INDEX "lists_org_default_uidx" ON "lists" USING btree ("org_id","kind") WHERE "lists"."is_default";--> statement-breakpoint +CREATE UNIQUE INDEX "lists_org_kind_name_uidx" ON "lists" USING btree ("org_id","kind",lower("name")) WHERE "lists"."server_id" is null and "lists"."archived_at" is null;--> statement-breakpoint +ALTER TABLE "lists" ADD CONSTRAINT "lists_group_kind" CHECK ("lists"."server_id" is not null or "lists"."is_default" or "lists"."kind" = 'reserve');--> statement-breakpoint +ALTER TABLE "lists" ADD CONSTRAINT "lists_group_shape" CHECK (("lists"."server_id" is null and not "lists"."is_default") or ("lists"."on_from" is null and "lists"."on_until" is null and "lists"."every_server" and "lists"."archived_at" is null));--> statement-breakpoint +ALTER TABLE "lists" ADD CONSTRAINT "lists_window" CHECK ("lists"."on_from" is null or "lists"."on_until" is null or "lists"."on_from" < "lists"."on_until"); diff --git a/drizzle/meta/0048_snapshot.json b/drizzle/meta/0048_snapshot.json new file mode 100644 index 00000000..a25a37bc --- /dev/null +++ b/drizzle/meta/0048_snapshot.json @@ -0,0 +1,5543 @@ +{ + "id": "9adec4e5-faee-4465-bc35-3b2e1123ba07", + "prevId": "4d388648-a3de-42ad-84f9-e8c201183130", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "is_default": { + "name": "is_default", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "on_from": { + "name": "on_from", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "on_until": { + "name": "on_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "every_server": { + "name": "every_server", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "archived_at": { + "name": "archived_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null and \"lists\".\"archived_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_org_default_uidx": { + "name": "lists_org_default_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"is_default\"", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": { + "lists_group_kind": { + "name": "lists_group_kind", + "value": "\"lists\".\"server_id\" is not null or \"lists\".\"is_default\" or \"lists\".\"kind\" = 'reserve'" + }, + "lists_group_shape": { + "name": "lists_group_shape", + "value": "(\"lists\".\"server_id\" is null and not \"lists\".\"is_default\") or (\"lists\".\"on_from\" is null and \"lists\".\"on_until\" is null and \"lists\".\"every_server\" and \"lists\".\"archived_at\" is null)" + }, + "lists_window": { + "name": "lists_window", + "value": "\"lists\".\"on_from\" is null or \"lists\".\"on_until\" is null or \"lists\".\"on_from\" < \"lists\".\"on_until\"" + } + }, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_server_ended_idx": { + "name": "matches_server_ended_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ended_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_ban_reasons": { + "name": "org_ban_reasons", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "reasons": { + "name": "reasons", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "org_ban_reasons_org_id_organizations_id_fk": { + "name": "org_ban_reasons_org_id_organizations_id_fk", + "tableFrom": "org_ban_reasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "board_opens": { + "name": "board_opens", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'official'" + }, + "board_hidden": { + "name": "board_hidden", + "type": "text[]", + "primaryKey": false, + "notNull": true, + "default": "'{}'::text[]" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_aliases": { + "name": "player_aliases", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "holder": { + "name": "holder", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "first_seen": { + "name": "first_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "player_aliases_steam_idx": { + "name": "player_aliases_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_aliases_server_id_steam_id_name_pk": { + "name": "player_aliases_server_id_steam_id_name_pk", + "columns": [ + "server_id", + "steam_id", + "name" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_days": { + "name": "player_days", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "day": { + "name": "day", + "type": "date", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "crossings": { + "name": "crossings", + "type": "timestamp with time zone[]", + "primaryKey": false, + "notNull": false + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_days_server_id_day_steam_id_pk": { + "name": "player_days_server_id_day_steam_id_pk", + "columns": [ + "server_id", + "day", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_totals": { + "name": "player_totals", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_totals_server_id_steam_id_pk": { + "name": "player_totals_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.seasons": { + "name": "seasons", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "starts_at": { + "name": "starts_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "seasons_org_start_uidx": { + "name": "seasons_org_start_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "starts_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "seasons_org_id_organizations_id_fk": { + "name": "seasons_org_id_organizations_id_fk", + "tableFrom": "seasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "configured": { + "name": "configured", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "live": { + "name": "live", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "trigger_kinds": { + "name": "trigger_kinds", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index b8669ba8..7ff92ccd 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -337,6 +337,13 @@ "when": 1791741401878, "tag": "0047_reserved_flags", "breakpoints": true + }, + { + "idx": 48, + "version": "7", + "when": 1791741444587, + "tag": "0048_slot_groups", + "breakpoints": true } ] } \ No newline at end of file diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 3f174628..d914d170 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -5,6 +5,7 @@ import { bigint, bigserial, boolean, + check, customType, date, index, @@ -1000,8 +1001,11 @@ export const jsonWebhookPosts = pgTable( // ---- Organisation lists: bans and reserved slots kept in the panel and pushed to every server -- /** - * A ban list or reserved-slot list an org owns. Servers subscribe through server_lists: every org - * list to every org server, and a server's own list (server_id set) to that server alone. + * A ban list or reserved-slot list an org owns. Servers subscribe through server_lists. Each org + * has one default list per kind (is_default), which every org server takes; a server's own list + * (server_id set) goes to that server alone. Any other org list is a reserved-slot group: on + * between on_from and on_until, on every server or the ones its server_lists rows name, archived + * rather than deleted. */ export const lists = pgTable( 'lists', @@ -1014,6 +1018,16 @@ export const lists = pgTable( serverId: text('server_id').references(() => servers.id, { onDelete: 'cascade' }), kind: text('kind', { enum: ['ban', 'reserve'] }).notNull(), name: text('name').notNull().default('Default'), + /** the org's own list of its kind, which members' slots, rules and import write to */ + isDefault: boolean('is_default').notNull().default(false), + /** a group: on from here (null: since it was switched on) */ + onFrom: ts('on_from'), + /** a group: off from here (null: until switched off); a group that was never on has its creation time */ + onUntil: ts('on_until'), + /** a group: every server of the org, now and later; else the servers in server_lists */ + everyServer: boolean('every_server').notNull().default(true), + /** a group taken away: off for good, its entries and servers kept for the history */ + archivedAt: ts('archived_at'), /** reserved for sharing between orgs; unused for now */ shareToken: text('share_token').unique(), createdBy: text('created_by'), @@ -1022,11 +1036,28 @@ export const lists = pgTable( }, (t) => [ uniqueIndex('lists_org_kind_name_uidx') - .on(t.orgId, t.kind, t.name) - .where(sql`${t.serverId} is null`), + .on(t.orgId, t.kind, sql`lower(${t.name})`) + .where(sql`${t.serverId} is null and ${t.archivedAt} is null`), + uniqueIndex('lists_org_default_uidx') + .on(t.orgId, t.kind) + .where(sql`${t.isDefault}`), uniqueIndex('lists_server_kind_uidx') .on(t.serverId, t.kind) - .where(sql`${t.serverId} is not null`) + .where(sql`${t.serverId} is not null`), + // an org list that is not the default is a reserved-slot group + check( + 'lists_group_kind', + sql`${t.serverId} is not null or ${t.isDefault} or ${t.kind} = 'reserve'` + ), + // only a group has a window, a choice of servers or an archive date + check( + 'lists_group_shape', + sql`(${t.serverId} is null and not ${t.isDefault}) or (${t.onFrom} is null and ${t.onUntil} is null and ${t.everyServer} and ${t.archivedAt} is null)` + ), + check( + 'lists_window', + sql`${t.onFrom} is null or ${t.onUntil} is null or ${t.onFrom} < ${t.onUntil}` + ) ] ); diff --git a/src/lib/server/lists-plan.test.ts b/src/lib/server/lists-plan.test.ts index 83f558b4..c186741b 100644 --- a/src/lib/server/lists-plan.test.ts +++ b/src/lib/server/lists-plan.test.ts @@ -4,8 +4,10 @@ import { desiredOf, isAlreadyApplied, isGone, + isListOn, isUnreachable, planSync, + type DesiredEntry, type PlanInput, type StateLike } from './lists-plan'; @@ -183,15 +185,62 @@ test('isUnreachable: outages and rate limiting both stop the run; ordinary refus describe('desiredOf', () => { test("a player on the org list and the server's own list is wanted once, from the org list", () => { const want = desiredOf([ - { kind: 'reserve', steamId: '1', reason: 'donor here', listId: 'srv', serverId: 's1' }, - { kind: 'reserve', steamId: '1', reason: 'donor', listId: 'org', serverId: null }, - { kind: 'reserve', steamId: '2', reason: '', listId: 'srv', serverId: 's1' }, - { kind: 'ban', steamId: '3', reason: 'cheating', listId: 'bans', serverId: null } + entry('1', 'srv', { serverId: 's1', reason: 'donor here' }), + entry('1', 'org', { isDefault: true, reason: 'donor' }), + entry('2', 'srv', { serverId: 's1' }), + { ...entry('3', 'bans', { isDefault: true, reason: 'cheating' }), kind: 'ban' } ]); + // attributed to the org list, and as pressing as the server's own entry expect(want.reserved).toEqual([ - { steamId: '1', listId: 'org', member: false, priority: 1 }, + { steamId: '1', listId: 'org', member: false, priority: 0 }, { steamId: '2', listId: 'srv', member: false, priority: 0 } ]); expect(want.bans).toEqual([{ steamId: '3', reason: 'cheating', listId: 'bans' }]); }); + + test('a player in groups is attributed to the default list, else the first group by name', () => { + const want = desiredOf([ + entry('1', 'g-zulu', { listName: 'Zulu' }), + entry('1', 'g-alpha', { listName: 'Alpha' }), + entry('2', 'g-zulu', { listName: 'Zulu' }), + entry('2', 'org', { isDefault: true }), + entry('3', 'srv', { serverId: 's1' }), + entry('3', 'g-zulu', { listName: 'Zulu' }) + ]); + expect(want.reserved).toEqual([ + { steamId: '2', listId: 'org', member: false, priority: 1 }, + { steamId: '1', listId: 'g-alpha', member: false, priority: 2 }, + { steamId: '3', listId: 'g-zulu', member: false, priority: 0 } + ]); + }); +}); + +const entry = ( + steamId: string, + listId: string, + p: Partial> = {} +): DesiredEntry => ({ + kind: 'reserve', + steamId, + reason: '', + listId, + serverId: null, + isDefault: false, + listName: p.isDefault ? 'Default' : p.serverId ? 'Server' : 'Group', + ...p +}); + +describe('isListOn', () => { + const off = { archivedAt: null, onFrom: null, onUntil: null }; + test('a list with no window is on, an archived one never', () => { + expect(isListOn(off, now)).toBe(true); + expect(isListOn({ ...off, archivedAt: ago(1) }, now)).toBe(false); + }); + test('a window holds from its start, up to and not at its end', () => { + expect(isListOn({ ...off, onFrom: now }, now)).toBe(true); + expect(isListOn({ ...off, onFrom: new Date(now.getTime() + 1) }, now)).toBe(false); + expect(isListOn({ ...off, onUntil: now }, now)).toBe(false); + expect(isListOn({ ...off, onUntil: new Date(now.getTime() + 1) }, now)).toBe(true); + expect(isListOn({ ...off, onFrom: ago(10), onUntil: ago(5) }, now)).toBe(false); + }); }); diff --git a/src/lib/server/lists-plan.ts b/src/lib/server/lists-plan.ts index b9cfdb94..433aa16b 100644 --- a/src/lib/server/lists-plan.ts +++ b/src/lib/server/lists-plan.ts @@ -57,12 +57,33 @@ export interface DesiredEntry { listId: string; /** the list's server, when the list belongs to one server; null for an org list */ serverId: string | null; + /** the org's default list of the kind; an org list that is not is a reserved-slot group */ + isDefault: boolean; + /** the list's name, which orders groups */ + listName: string; } +/** + * Whether a list is on at `now`. The default lists and the servers' own are always on; a group is + * on inside its window and never once archived. This and listOnAt (lists-sync.ts) are the only + * judges of it. + */ +export const isListOn = ( + l: { archivedAt: Date | null; onFrom: Date | null; onUntil: Date | null }, + now: Date +): boolean => + !l.archivedAt && + (!l.onFrom || l.onFrom.getTime() <= now.getTime()) && + (!l.onUntil || now.getTime() < l.onUntil.getTime()); + +/** The default list first, then the groups by name, then the server's own. */ +const attribution = (r: DesiredEntry): number => (r.serverId !== null ? 2 : r.isDefault ? 0 : 1); + /** * The bans and reserved slots a server's lists want on it, one per player and kind: a player on - * both the org list and the server's own list is wanted once, from the org list, so removing the - * org entry leaves the server's entry in force (the next sync re-attributes the slot to it). + * several lists is wanted once, from the org's default list, else the first group by name, else + * the server's own, so taking them off one list leaves the others in force (the next sync + * re-attributes the slot, which is no game call). */ export function desiredOf(rows: DesiredEntry[]): { bans: DesiredBan[]; @@ -71,29 +92,33 @@ export function desiredOf(rows: DesiredEntry[]): { const bans = new Map(); const reserved = new Map(); const ordered = [...rows].sort( - (a, b) => Number(a.serverId !== null) - Number(b.serverId !== null) + (a, b) => + attribution(a) - attribution(b) || + a.listName.localeCompare(b.listName) || + a.listId.localeCompare(b.listId) ); for (const r of ordered) { if (r.kind === 'ban') { if (!bans.has(r.steamId)) bans.set(r.steamId, { steamId: r.steamId, reason: r.reason, listId: r.listId }); - } else if (!reserved.has(r.steamId)) - reserved.set(r.steamId, { - steamId: r.steamId, - listId: r.listId, - member: false, - priority: r.serverId === null ? PRIORITY.org : PRIORITY.server - }); + continue; + } + // a slot goes in as early as the most pressing list that wants it + const priority = + r.serverId !== null ? PRIORITY.server : r.isDefault ? PRIORITY.org : PRIORITY.group; + const held = reserved.get(r.steamId); + if (held) held.priority = Math.min(held.priority, priority); + else reserved.set(r.steamId, { steamId: r.steamId, listId: r.listId, member: false, priority }); } return { bans: [...bans.values()], reserved: [...reserved.values()] }; } /** * Which adds go in first when a server's config document has no room for them all (the listener - * takes a body of 64 KB at most): a server's own slots, then the org's list, then members' slots. - * Lower goes first. + * takes a body of 64 KB at most): a server's own slots, then the org's default list, then its + * groups, then members' slots. Lower goes first. */ -export const PRIORITY = { server: 0, org: 1, member: 3 } as const; +export const PRIORITY = { server: 0, org: 1, group: 2, member: 3 } as const; export interface DesiredReserve { steamId: string; diff --git a/src/lib/server/lists-sync.ts b/src/lib/server/lists-sync.ts index 2f45a92d..6f24846e 100644 --- a/src/lib/server/lists-sync.ts +++ b/src/lib/server/lists-sync.ts @@ -110,7 +110,22 @@ export async function withServerLock( // ---- desired and observed ---------------------------------------------------------------------- -/** What the lists this server subscribes to want on it right now. */ +/** + * isListOn (lists-plan.ts) as a condition on `lists`, with `now` the caller's clock (the worker's, + * as for an entry's expiry: the database is on another box). + */ +export const listOnAt = (now: Date) => + and( + isNull(lists.archivedAt), + or(isNull(lists.onFrom), lte(lists.onFrom, now)), + or(isNull(lists.onUntil), gt(lists.onUntil, now)) + ); + +/** + * What the lists this server subscribes to want on it right now: the default lists, its own, and + * the groups given to it that are on at `now`. A group's window needs nothing written when it + * opens or closes: the per-minute sync reads it here. + */ export async function desiredFor( env: Env, server: Pick, @@ -118,25 +133,41 @@ export async function desiredFor( now = new Date() ): Promise { const rows = await env.db - .select({ e: listEntries, kind: lists.kind, listServerId: lists.serverId }) + .select({ + e: listEntries, + kind: lists.kind, + listServerId: lists.serverId, + isDefault: lists.isDefault, + listName: lists.name + }) .from(serverLists) .innerJoin(lists, eq(lists.id, serverLists.listId)) .innerJoin(listEntries, eq(listEntries.listId, lists.id)) - .where(and(eq(serverLists.serverId, server.id), isNull(listEntries.removedAt))); + .where(and(eq(serverLists.serverId, server.id), isNull(listEntries.removedAt), listOnAt(now))); const active = activeEntries( - rows.map((r) => ({ ...r.e, kind: r.kind, serverId: r.listServerId })), + rows.map((r) => ({ + ...r.e, + kind: r.kind, + serverId: r.listServerId, + isDefault: r.isDefault, + listName: r.listName + })), now ); const { bans, reserved } = desiredOf(active); if (org.membersReserved) { - // Members who set a SteamID get a slot from the org's reserve list, unless the org has - // banned them. + // Members who set a SteamID get a slot from the org's default reserve list, unless the org + // has banned them. const [reserveList] = await env.db .select({ id: lists.id }) .from(serverLists) .innerJoin(lists, eq(lists.id, serverLists.listId)) .where( - and(eq(serverLists.serverId, server.id), eq(lists.kind, 'reserve'), isNull(lists.serverId)) + and( + eq(serverLists.serverId, server.id), + eq(lists.kind, 'reserve'), + eq(lists.isDefault, true) + ) ) .limit(1); if (reserveList) { diff --git a/src/lib/server/lists.ts b/src/lib/server/lists.ts index 75c8d6cc..550bba80 100644 --- a/src/lib/server/lists.ts +++ b/src/lib/server/lists.ts @@ -5,9 +5,9 @@ // or remove on a game server) is in lists-sync.ts. // // Entries are never hard-deleted: removal stamps removed_at so history and the audit trail stay -// intact, and re-adding inserts a fresh row. Every org has exactly one list per kind and every -// server one of each of its own; the lists table and server_lists join exist so a -// later "subscribe to another org's list" is new rows, not a schema change. +// intact, and re-adding inserts a fresh row. Every org has exactly one default list per kind and +// every server one of each of its own; an org's other reserved-slot lists are its groups +// (slot-groups.ts), which reach the servers they are given to while they are switched on. import { and, asc, count, desc, eq, gt, inArray, isNull, or, sql } from 'drizzle-orm'; import type { Env } from './env'; import { ApiError, newId, str } from './http'; @@ -41,6 +41,7 @@ import { noteContainsProtectedWord } from './trigger-rules'; import { banReasonsFor } from './ban-reasons'; import { requireSteamId } from './steam'; import { desiredFor, memberSlots, summaryOf } from './lists-sync'; +import { isListOn } from './lists-plan'; import { latestNames } from './sessions'; import { gateway } from './gateway'; import type { @@ -55,7 +56,8 @@ import type { BanState, PlayerBanView, ReservedSlotState, - ServerListsState + ServerListsState, + SlotGroupView } from '$lib/types'; export { fanOut, reconcileServer } from './lists-sync'; @@ -77,7 +79,7 @@ const iso = (v: Date | null | undefined): string | null => (v ? v.toISOString() // ---- records ----------------------------------------------------------------------------------- -/** Every org has one list per kind. Created with the org; this also repairs anything older. */ +/** Every org has one default list per kind. Created with the org; this also repairs anything older. */ export async function ensureOrgLists( db: DbLike, orgId: string, @@ -85,7 +87,7 @@ export async function ensureOrgLists( ): Promise { await db .insert(lists) - .values(LIST_KINDS.map((kind) => ({ id: newId(), orgId, kind, createdBy }))) + .values(LIST_KINDS.map((kind) => ({ id: newId(), orgId, kind, isDefault: true, createdBy }))) .onConflictDoNothing(); } @@ -100,8 +102,9 @@ export async function lockOrg(tx: DbLike, orgId: string): Promise { } /** - * Subscribes a server to every list of its org and gives it a ban and a reserved-slot list of - * its own (createServer runs this in its transaction; serverListOf repairs older servers). + * Subscribes a server to its org's default lists and to the groups for every server, and gives + * it a ban and a reserved-slot list of its own (createServer runs this in its transaction; + * serverListOf repairs older servers). A group of chosen servers is not touched. */ export async function ensureServerLists( db: DbLike, @@ -111,7 +114,14 @@ export async function ensureServerLists( const rows = await db .select({ id: lists.id }) .from(lists) - .where(and(eq(lists.orgId, orgId), isNull(lists.serverId))); + .where( + and( + eq(lists.orgId, orgId), + isNull(lists.serverId), + isNull(lists.archivedAt), + or(eq(lists.isDefault, true), eq(lists.everyServer, true)) + ) + ); if (rows.length) await db .insert(serverLists) @@ -144,14 +154,14 @@ async function ensureServerOwnList( return row; } -/** The org's own lists, one per kind; the servers' lists are not among them. */ +/** The org's default lists, one per kind; neither its groups nor the servers' lists are among them. */ export async function orgLists(env: Env, orgId: string): Promise { const load = () => env.db .select() .from(lists) - .where(and(eq(lists.orgId, orgId), isNull(lists.serverId))) - .orderBy(asc(lists.kind), asc(lists.name)); + .where(and(eq(lists.orgId, orgId), eq(lists.isDefault, true))) + .orderBy(asc(lists.kind)); let rows = await load(); if (LIST_KINDS.some((k) => !rows.some((l) => l.kind === k))) { await ensureOrgLists(env.db, orgId); @@ -180,7 +190,7 @@ export async function serverListOf( return ensureServerOwnList(env.db, server.id, server.orgId, kind); } -interface ServerRef { +export interface ServerRef { id: string; name: string; } @@ -367,11 +377,90 @@ export async function orgListsView(env: Env, org: OrgRow, role: ListsRole): Prom lastError: y?.lastError ?? '' }; }), - lists: rows.map((l) => ({ id: l.id, kind: l.kind, name: l.name, entryCount: n.get(l.id) ?? 0 })) + lists: rows.map((l) => ({ + id: l.id, + kind: l.kind, + name: l.name, + entryCount: n.get(l.id) ?? 0 + })), + groups: role.kinds.includes('reserve') ? await slotGroupsView(env, org.id, srv) : [] }; } -/** The entries of one org list with names and where each stands on every org server. */ +/** The org's reserved-slot groups not archived, by name; for those who edit reserved slots. */ +export async function slotGroupsView( + env: Env, + orgId: string, + srv: ServerRef[], + now = new Date() +): Promise { + const groups = await env.db + .select() + .from(lists) + .where( + and( + eq(lists.orgId, orgId), + isNull(lists.serverId), + eq(lists.isDefault, false), + isNull(lists.archivedAt) + ) + ) + .orderBy(sql`lower(${lists.name})`); + if (!groups.length) return []; + const ids = groups.map((g) => g.id); + const [counts, subs, leaving] = await Promise.all([ + env.db + .select({ listId: listEntries.listId, n: count() }) + .from(listEntries) + .where(and(inArray(listEntries.listId, ids), isNull(listEntries.removedAt))) + .groupBy(listEntries.listId), + env.db + .select({ listId: serverLists.listId, serverId: serverLists.serverId }) + .from(serverLists) + .where(inArray(serverLists.listId, ids)), + // out of a server's document and still held by the running server, until it restarts + env.db + .select({ + listId: listEntries.listId, + n: sql`count(distinct ${listEntries.steamId})::int` + }) + .from(listEntries) + .innerJoin(serverLists, eq(serverLists.listId, listEntries.listId)) + .innerJoin( + serverReserved, + and( + eq(serverReserved.serverId, serverLists.serverId), + eq(serverReserved.steamId, listEntries.steamId) + ) + ) + .where( + and( + inArray(listEntries.listId, ids), + isNull(listEntries.removedAt), + eq(serverReserved.live, true), + eq(serverReserved.configured, false) + ) + ) + .groupBy(listEntries.listId) + ]); + const n = new Map(counts.map((c) => [c.listId, c.n])); + const out = new Map(leaving.map((c) => [c.listId, c.n])); + const given = new Set(subs.map((s) => `${s.listId}:${s.serverId}`)); + return groups.map((g) => ({ + id: g.id, + name: g.name, + on: isListOn(g, now), + onFrom: iso(g.onFrom), + onUntil: iso(g.onUntil), + everyServer: g.everyServer, + servers: g.everyServer ? srv : srv.filter((s) => given.has(`${g.id}:${s.id}`)), + entryCount: n.get(g.id) ?? 0, + leaving: out.get(g.id) ?? 0, + createdAt: g.createdAt.toISOString() + })); +} + +/** The entries of one of the org's default lists with names and where each stands on every org server. */ export async function entriesView( env: Env, org: OrgRow, @@ -379,6 +468,24 @@ export async function entriesView( opts: { includeRemoved?: boolean } = {} ): Promise { const list = await listOf(env, org.id, kind); + return rosterOf(env, org, list, await orgServerRefs(env, org.id), { + includeRemoved: opts.includeRemoved, + members: kind === 'reserve' && org.membersReserved && !opts.includeRemoved + }); +} + +/** + * The entries of a list with names and where each stands on the servers given; with `members`, + * the slots the org hands its members too (they ride on its default reserve list). + */ +export async function rosterOf( + env: Env, + org: OrgRow, + list: ListRow, + srv: ServerRef[], + opts: { includeRemoved?: boolean; members?: boolean } = {} +): Promise { + const kind = list.kind; const rows = await env.db .select() .from(listEntries) @@ -391,13 +498,11 @@ export async function entriesView( .limit(2000); // Members-reserved: slots the org hands its members are shown like entries, but come from // the membership rather than a row someone added. - const members = - kind === 'reserve' && org.membersReserved && !opts.includeRemoved - ? (await memberSlots(env, org.id)).filter( - (m) => !rows.some((r) => !r.removedAt && r.steamId === m.steamId) - ) - : []; - const srv = await orgServerRefs(env, org.id); + const members = opts.members + ? (await memberSlots(env, org.id)).filter( + (m) => !rows.some((r) => !r.removedAt && r.steamId === m.steamId) + ) + : []; const ids = [ ...new Set([ ...rows.filter((r) => !r.removedAt).map((r) => r.steamId), @@ -456,7 +561,7 @@ export function parseExpiry(v: unknown, now = Date.now()): Date | null { return d; } -async function touch(db: DbLike, listId: string): Promise { +export async function touch(db: DbLike, listId: string): Promise { await db.update(lists).set({ updatedAt: new Date() }).where(eq(lists.id, listId)); } @@ -469,7 +574,7 @@ interface NewEntry { } /** Inserts an active entry; optionally soft-removes an active duplicate before inserting. */ -async function insertEntry( +export async function insertEntry( env: Env, list: ListRow, entry: NewEntry, @@ -890,7 +995,11 @@ export async function importCandidates(env: Env, org: OrgRow): Promise ({ @@ -1240,11 +1350,27 @@ export async function serverListsState( s.member = d.member; } // what the page shows for each slot: the player's name, and the note, expiry and list the - // entry is on (the org's, or this server's own; an org entry wins when a player is on both) + // entry is on (the org's, a group of the org's, or this server's own; see desiredOf for which + // one a player on several shows) const slotIds = Object.keys(out.reserved); if (slotIds.length) { const listIds = [...new Set(desired.reserved.map((d) => d.listId))]; const own = await serverListOf(env, server, 'reserve'); + // Who holds a slot is View; what staff wrote about it, and the group it comes from, are for + // those who manage slots here or edit the org's reserved slots. + const slotStaff = orgSlots || access.caps.has('slots.manage'); + const groupName = new Map( + slotStaff && listIds.length + ? ( + await env.db + .select({ id: lists.id, name: lists.name }) + .from(lists) + .where( + and(inArray(lists.id, listIds), isNull(lists.serverId), eq(lists.isDefault, false)) + ) + ).map((l) => [l.id, l.name]) + : [] + ); const [names, entries] = await Promise.all([ namesFor( env, @@ -1274,9 +1400,8 @@ export async function serverListsState( for (const e of entries) { if (sourceOf.get(e.steamId) !== e.listId) continue; const s = out.reserved[e.steamId]; - // Who holds a slot is View; what staff wrote about it is for those who manage slots here - // or edit the org's reserved-slot list. - s.note = orgSlots || access.caps.has('slots.manage') ? e.reason : ''; + s.note = slotStaff ? e.reason : ''; + s.group = groupName.get(e.listId) ?? null; s.expiresAt = iso(e.expiresAt); if (e.listId === own.id) s.scope = 'server'; } diff --git a/src/lib/server/players.ts b/src/lib/server/players.ts index dcde6675..5264d301 100644 --- a/src/lib/server/players.ts +++ b/src/lib/server/players.ts @@ -655,7 +655,9 @@ async function seedProgress( AND r.live) AS held, bool_or(e.expires_at IS NULL) AS endless, MAX(e.expires_at) AS until FROM server_lists sl - JOIN lists l ON l.id = sl.list_id AND l.kind = 'reserve' + JOIN lists l ON l.id = sl.list_id AND l.kind = 'reserve' AND l.archived_at IS NULL + AND (l.on_from IS NULL OR l.on_from <= ${now}) + AND (l.on_until IS NULL OR l.on_until > ${now}) JOIN list_entries e ON e.list_id = l.id AND e.steam_id = ${steamId} AND e.removed_at IS NULL AND (e.expires_at IS NULL OR e.expires_at > ${now}) WHERE sl.server_id = ${server.id}`) diff --git a/src/lib/types.ts b/src/lib/types.ts index 163bade8..5d23bb89 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -728,7 +728,32 @@ export interface OrgListsView { /** why the last run could not reach or finish on the server */ lastError: string; }[]; + /** the org's default lists of the kinds the reader edits */ lists: ListView[]; + /** the org's reserved-slot groups; empty unless the reader edits reserved slots */ + groups: SlotGroupView[]; +} + +/** + * A reserved-slot group: a list of the org's beside its default one, on in a window (switched on + * and off by hand or set ahead), on every server or chosen ones. + */ +export interface SlotGroupView { + id: string; + name: string; + /** on right now */ + on: boolean; + /** when the window opens; null when it is open since it was switched on, or there is none */ + onFrom: string | null; + /** when it closes, or closed; null while on until switched off */ + onUntil: string | null; + /** on every server of the org, now and later; else the servers chosen */ + everyServer: boolean; + servers: { id: string; name: string }[]; + entryCount: number; + /** its players whose slot was taken out of a server's document and that server keeps until it restarts */ + leaving: number; + createdAt: string; } export interface ImportCandidate { @@ -765,6 +790,8 @@ export interface ReservedSlotState { member: boolean; /** the list a managed slot comes from: the organisation's, or this server's own */ scope: 'org' | 'server'; + /** the organisation's group the slot comes from, for staff (as the note); null otherwise */ + group: string | null; /** when the panel lifts the slot; null for a permanent one (or one not managed) */ expiresAt: string | null; } From 26b5fb8164c754bb3e2d3e1ce2f8743848361605 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 02:13:13 +0100 Subject: [PATCH 069/102] Reserved-slot groups: make, switch, rescope and fill them Routes under /api/orgs/:id/slot-groups, each behind requireListsRole(reserve) and a lookup of the group within that org; API matrix lines; audit actions list.group.*. --- src/lib/server/slot-groups.ts | 540 ++++++++++++++++++ src/lib/server/webhook-delivery.ts | 4 + .../api/orgs/[id]/slot-groups/+server.ts | 19 + .../[id]/slot-groups/[groupId]/+server.ts | 28 + .../slot-groups/[groupId]/entries/+server.ts | 30 + .../[groupId]/entries/[steamId]/+server.ts | 36 ++ .../slot-groups/[groupId]/switch/+server.ts | 20 + src/test/api-matrix.test.ts | 11 + src/test/slot-group-ids.test.ts | 115 ++++ src/test/slot-groups.test.ts | 445 +++++++++++++++ 10 files changed, 1248 insertions(+) create mode 100644 src/lib/server/slot-groups.ts create mode 100644 src/routes/api/orgs/[id]/slot-groups/+server.ts create mode 100644 src/routes/api/orgs/[id]/slot-groups/[groupId]/+server.ts create mode 100644 src/routes/api/orgs/[id]/slot-groups/[groupId]/entries/+server.ts create mode 100644 src/routes/api/orgs/[id]/slot-groups/[groupId]/entries/[steamId]/+server.ts create mode 100644 src/routes/api/orgs/[id]/slot-groups/[groupId]/switch/+server.ts create mode 100644 src/test/slot-group-ids.test.ts create mode 100644 src/test/slot-groups.test.ts diff --git a/src/lib/server/slot-groups.ts b/src/lib/server/slot-groups.ts new file mode 100644 index 00000000..a397a0f6 --- /dev/null +++ b/src/lib/server/slot-groups.ts @@ -0,0 +1,540 @@ +// Reserved-slot groups: an organisation's reserved-slot lists beside its default one, each on in a +// window set by hand or ahead of time, on every server or chosen ones. A group is a row of `lists` +// (an org list that is not the default), so its entries, their history and the sync work as for +// any list; this module owns what is a group's own: its name, its window, its servers and its +// archive. Whether a group is on is isListOn / listOnAt and nothing else, judged by each server's +// sync every minute, so nothing is written when a window opens or closes. +// +// Every function here takes a group already found with groupOf, under the org the caller was +// checked against: a group of another org, the default list, a server's own list, a ban list or an +// archived group is never reached. +import { and, eq, inArray, isNull, sql } from 'drizzle-orm'; +import type { Env } from './env'; +import { ApiError, newId, str } from './http'; +import { writeAudit } from './audit'; +import type { OrgRow, SessionUser } from './access'; +import type { Tx } from './db'; +import { listEntries, lists, serverLists, servers, type ListRow } from './db/schema'; +import { + insertEntry, + lockOrg, + orgServerRefs, + parseExpiry, + rosterOf, + slotGroupsView, + touch, + type ServerRef +} from './lists'; +import { isListOn } from './lists-plan'; +import { requireSteamId } from './steam'; +import { gateway } from './gateway'; +import type { ListEntryView, ListSyncSummary, SlotGroupView } from '$lib/types'; + +const NAME_MAX = 40; +/** A window may be set up to a year ahead, and must last past the next minute. */ +const AHEAD_MAX_MS = 366 * 86400_000; +const AHEAD_MIN_MS = 60_000; +/** How many servers one request may name. */ +const SERVERS_MAX = 1000; + +const iso = (d: Date | null): string | null => (d ? d.toISOString() : null); + +function groupName(v: unknown): string { + const name = str(v, NAME_MAX).trim(); + if (!name) throw new ApiError(400, 'Give the group a name.'); + return name; +} + +/** + * One of the org's groups, by id. Anything else under that id (another org's group, the default + * list, a server's own list, a ban list, an archived group) is "Group not found.", before anything + * is read from it or written to it. + */ +export async function groupOf(env: Env, org: OrgRow, groupId: unknown): Promise { + const id = str(groupId, 64); + const [row] = id + ? await env.db + .select() + .from(lists) + .where( + and( + eq(lists.id, id), + eq(lists.orgId, org.id), + isNull(lists.serverId), + eq(lists.kind, 'reserve'), + eq(lists.isDefault, false), + isNull(lists.archivedAt) + ) + ) + .limit(1) + : []; + if (!row) throw new ApiError(404, 'Group not found.', 'not_found'); + return row; +} + +/** A write to a group taken away since it was looked up changed nothing: the group is gone. */ +async function stillThere(write: Promise<{ id: string }[]>): Promise { + if (!(await write).length) throw new ApiError(404, 'Group not found.', 'not_found'); +} + +/** The org's groups as their editors see them. */ +export async function groupsView(env: Env, org: OrgRow): Promise { + return slotGroupsView(env, org.id, await orgServerRefs(env, org.id)); +} + +async function viewOf(env: Env, org: OrgRow, groupId: string): Promise { + return (await groupsView(env, org)).find((g) => g.id === groupId)!; +} + +/** The servers a group reaches: every server of the org when it is for every server. */ +async function groupServers(env: Env, group: ListRow): Promise { + const all = await orgServerRefs(env, group.orgId); + if (group.everyServer) return all; + const given = await env.db + .select({ serverId: serverLists.serverId }) + .from(serverLists) + .where(eq(serverLists.listId, group.id)); + const ids = new Set(given.map((g) => g.serverId)); + return all.filter((s) => ids.has(s.id)); +} + +type ServerChoice = { every: true } | { every: false; ids: string[] }; + +/** `servers`: "every", or a list of the org's server ids. Read under the org's lock. */ +async function serverChoice(tx: Tx, orgId: string, v: unknown): Promise { + if (v === 'every') return { every: true }; + if (!Array.isArray(v)) + throw new ApiError(400, 'servers must be "every" or a list of server ids.'); + const ids = [...new Set(v.slice(0, SERVERS_MAX).map((x) => str(x, 64)))].filter(Boolean); + if (!ids.length) throw new ApiError(400, 'Choose at least one server, or every server.'); + const found = await tx + .select({ id: servers.id }) + .from(servers) + .where(and(eq(servers.orgId, orgId), inArray(servers.id, ids))); + // no id is echoed: one that is not this org's is not to be told apart from one that is no one's + if (found.length !== ids.length) + throw new ApiError(400, 'One of those servers is not in this organisation.'); + return { every: false, ids }; +} + +/** Gives the group to the servers chosen (to every server of the org, for every server). */ +async function setServers(tx: Tx, groupId: string, orgId: string, c: ServerChoice): Promise { + await tx.delete(serverLists).where(eq(serverLists.listId, groupId)); + const ids = c.every + ? (await tx.select({ id: servers.id }).from(servers).where(eq(servers.orgId, orgId))).map( + (s) => s.id + ) + : c.ids; + if (ids.length) + await tx + .insert(serverLists) + .values(ids.map((serverId) => ({ serverId, listId: groupId }))) + .onConflictDoNothing(); +} + +/** Refuses a name another of the org's lists has (in any case): the default list's too. */ +async function assertNameFree(tx: Tx, orgId: string, name: string, exceptId?: string) { + const [taken] = await tx + .select({ id: lists.id }) + .from(lists) + .where( + and( + eq(lists.orgId, orgId), + isNull(lists.serverId), + isNull(lists.archivedAt), + sql`lower(${lists.name}) = lower(${name})`, + exceptId ? sql`${lists.id} <> ${exceptId}` : undefined + ) + ) + .limit(1); + if (taken) throw new ApiError(409, `The name "${name}" is taken.`, 'duplicate'); +} + +/** A new group, off until it is switched on, on every server unless servers are chosen. */ +export async function createGroup( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + body: Record +): Promise<{ group: SlotGroupView }> { + const name = groupName(body.name); + const id = newId(); + const now = new Date(); + const choice = await env.db.transaction(async (tx) => { + await lockOrg(tx, org.id); + const choice = await serverChoice(tx, org.id, body.servers ?? 'every'); + await assertNameFree(tx, org.id, name); + await tx.insert(lists).values({ + id, + orgId: org.id, + kind: 'reserve', + name, + isDefault: false, + onUntil: now, + everyServer: choice.every, + createdBy: actor.id, + createdAt: now, + updatedAt: now + }); + await setServers(tx, id, org.id, choice); + return choice; + }); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'list.group.create', + target: name, + outcome: 'ok', + message: `Reserved-slot group ${name} made in ${org.name}`, + detail: { + orgId: org.id, + groupId: id, + group: name, + servers: choice.every ? 'every' : choice.ids + } + }); + return { group: await viewOf(env, org, id) }; +} + +/** Renames a group or changes its servers; a change of servers takes effect on them at once. */ +export async function updateGroup( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + group: ListRow, + body: Record +): Promise<{ group: SlotGroupView; sync: ListSyncSummary }> { + const name = body.name !== undefined ? groupName(body.name) : null; + if (name === null && body.servers === undefined) + throw new ApiError(400, 'Nothing to change: send name, servers or both.'); + const c = await env.db.transaction(async (tx) => { + await lockOrg(tx, org.id); + if (name !== null) await assertNameFree(tx, org.id, name, group.id); + const choice = body.servers !== undefined ? await serverChoice(tx, org.id, body.servers) : null; + await stillThere( + tx + .update(lists) + .set({ + ...(name !== null ? { name } : {}), + ...(choice ? { everyServer: choice.every } : {}), + updatedAt: new Date() + }) + .where(and(eq(lists.id, group.id), isNull(lists.archivedAt))) + .returning({ id: lists.id }) + ); + if (choice) await setServers(tx, group.id, org.id, choice); + return choice; + }); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'list.group.update', + target: name ?? group.name, + outcome: 'ok', + message: + `Reserved-slot group ${group.name}` + + (name !== null && name !== group.name ? ` renamed ${name}` : '') + + (c ? ` given to ${c.every ? 'every server' : `${c.ids.length} server(s)`}` : ''), + detail: { + orgId: org.id, + groupId: group.id, + group: name ?? group.name, + ...(c ? { servers: c.every ? 'every' : c.ids } : {}) + } + }); + // a group that is on reaches other servers now; a rename changes nothing on a server + const sync = + c && isListOn(group, new Date()) + ? await gateway().syncOrg(env, org) + : ({ servers: [] } as ListSyncSummary); + return { group: await viewOf(env, org, group.id), sync }; +} + +/** + * Takes a group away: it is off for good and its name is free again, while its entries, its + * servers and their history stay. Its slots come off the servers as for a switch off. + */ +export async function archiveGroup( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + group: ListRow +): Promise<{ sync: ListSyncSummary }> { + const now = new Date(); + await stillThere( + env.db + .update(lists) + .set({ archivedAt: now, updatedAt: now }) + .where(and(eq(lists.id, group.id), isNull(lists.archivedAt))) + .returning({ id: lists.id }) + ); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'list.group.archive', + target: group.name, + outcome: 'ok', + message: `Reserved-slot group ${group.name} removed from ${org.name}`, + detail: { orgId: org.id, groupId: group.id, group: group.name } + }); + const sync = isListOn(group, now) + ? await gateway().syncOrg(env, org) + : ({ servers: [] } as ListSyncSummary); + return { sync }; +} + +/** A time a window is set to, as the browser sent it (UTC). */ +function instant(v: unknown, what: string, now: number): Date { + const d = new Date(str(v, 40)); + if (Number.isNaN(d.getTime())) throw new ApiError(400, `${what} must be an ISO 8601 timestamp.`); + if (d.getTime() > now + AHEAD_MAX_MS) + throw new ApiError(400, `${what} must be within a year from now.`); + return d; +} + +const blank = (v: unknown) => v === undefined || v === null || v === ''; + +/** + * Switches a group on or off, or sets the window it is on in: + * `{ on: false }` ends it now; `{ on: true, until }` starts it now, until then or (null) until + * switched off; `{ on: true, from, until }` sets a window ahead. Each starts a new window in place + * of the one there was. The servers it reaches change at once when it goes on or off now; a window + * ahead opens and closes by itself, at each server's next sync after the time. + */ +export async function switchGroup( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + group: ListRow, + body: Record +): Promise<{ group: SlotGroupView; sync: ListSyncSummary }> { + if (typeof body.on !== 'boolean') throw new ApiError(400, 'on must be true or false.'); + const now = new Date(); + const t = now.getTime(); + let onFrom: Date | null = null; + let onUntil: Date | null = now; + if (body.on) { + onUntil = blank(body.until) ? null : instant(body.until, 'until', t); + onFrom = blank(body.from) ? null : instant(body.from, 'from', t); + if (onUntil && onUntil.getTime() < t + AHEAD_MIN_MS) + throw new ApiError(400, 'The end must be at least a minute from now.'); + if (onFrom && !onUntil) throw new ApiError(400, 'A window that opens later needs an end too.'); + if (onFrom && onUntil && onFrom.getTime() >= onUntil.getTime()) + throw new ApiError(400, 'The start must be before the end.'); + // a start already past is a window open now + if (onFrom && onFrom.getTime() <= t) onFrom = null; + } + await stillThere( + env.db + .update(lists) + .set({ onFrom, onUntil, updatedAt: now }) + .where(and(eq(lists.id, group.id), isNull(lists.archivedAt))) + .returning({ id: lists.id }) + ); + const message = !body.on + ? `${group.name} switched off` + : onFrom + ? `${group.name} on from ${onFrom.toISOString()} until ${onUntil!.toISOString()}` + : onUntil + ? `${group.name} on until ${onUntil.toISOString()}` + : `${group.name} switched on`; + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'list.group.switch', + target: group.name, + outcome: 'ok', + message, + detail: { + orgId: org.id, + groupId: group.id, + group: group.name, + on: body.on, + from: iso(onFrom), + until: iso(onUntil) + } + }); + const was = isListOn(group, now); + const is = isListOn({ archivedAt: null, onFrom, onUntil }, now); + const sync = + was !== is ? await gateway().syncOrg(env, org) : ({ servers: [] } as ListSyncSummary); + return { group: await viewOf(env, org, group.id), sync }; +} + +// ---- a group's players --------------------------------------------------------------------------- + +/** A group's entries, with where each stands on the servers the group reaches. */ +export async function groupEntriesView( + env: Env, + org: OrgRow, + group: ListRow, + opts: { includeRemoved?: boolean } = {} +): Promise { + return rosterOf(env, org, group, await groupServers(env, group), opts); +} + +/** While a group is on, a change to its players reaches its servers at once; while off, never. */ +const syncIfOn = async (env: Env, org: OrgRow, group: ListRow): Promise => + isListOn(group, new Date()) ? gateway().syncOrg(env, org) : { servers: [] }; + +export async function addGroupEntry( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + group: ListRow, + body: Record +): Promise<{ entry: ListEntryView; sync: ListSyncSummary }> { + const steamId = requireSteamId(body.steamId); + const reason = str(body.reason, 200); + const expiresAt = parseExpiry(body.expiresAt); + const { id, added } = await insertEntry(env, group, { + steamId, + reason, + expiresAt, + addedBy: actor.id, + addedByName: actor.username + }); + if (!added) throw new ApiError(409, `${steamId} is already in ${group.name}.`, 'duplicate'); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'list.add', + target: steamId, + outcome: 'ok', + message: + `Reserved slot in ${group.name} across ${org.name}` + + (reason ? `: ${reason}` : '') + + (expiresAt ? ` (until ${expiresAt.toISOString()})` : ''), + detail: { + orgId: org.id, + org: org.name, + kind: 'reserve', + listId: group.id, + groupId: group.id, + group: group.name, + reason, + expiresAt: iso(expiresAt) + } + }); + const sync = await syncIfOn(env, org, group); + const entry = (await groupEntriesView(env, org, group)).find((e) => e.id === id)!; + return { entry, sync }; +} + +export async function removeGroupEntry( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + group: ListRow, + steamIdIn: unknown +): Promise<{ sync: ListSyncSummary }> { + const steamId = requireSteamId(steamIdIn); + const [row] = await env.db + .update(listEntries) + .set({ + removedAt: new Date(), + removedBy: actor.id, + removedByName: actor.username, + removal: 'manual' + }) + .where( + and( + eq(listEntries.listId, group.id), + eq(listEntries.steamId, steamId), + isNull(listEntries.removedAt) + ) + ) + .returning({ id: listEntries.id }); + if (!row) throw new ApiError(404, `${steamId} is not in ${group.name}.`, 'not_found'); + await touch(env.db, group.id); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'list.remove', + target: steamId, + outcome: 'ok', + message: `Reserved slot in ${group.name} withdrawn across ${org.name}`, + detail: { + orgId: org.id, + org: org.name, + kind: 'reserve', + listId: group.id, + groupId: group.id, + group: group.name, + entryId: row.id + } + }); + return { sync: await syncIfOn(env, org, group) }; +} + +/** Changes the note or the expiry of a group's entry; nothing is sent to a server. */ +export async function updateGroupEntry( + env: Env, + req: Request, + actor: SessionUser, + org: OrgRow, + group: ListRow, + steamIdIn: unknown, + body: Record +): Promise<{ entry: { steamId: string; reason: string; expiresAt: string | null } }> { + const steamId = requireSteamId(steamIdIn); + const set: { reason?: string; expiresAt?: Date | null } = {}; + if ('reason' in body) set.reason = str(body.reason, 200); + if ('expiresAt' in body) set.expiresAt = parseExpiry(body.expiresAt); + if (!('reason' in set) && !('expiresAt' in set)) + throw new ApiError(400, 'Nothing to change: send reason, expiresAt or both.'); + const [row] = await env.db + .update(listEntries) + .set(set) + .where( + and( + eq(listEntries.listId, group.id), + eq(listEntries.steamId, steamId), + isNull(listEntries.removedAt) + ) + ) + .returning({ + id: listEntries.id, + reason: listEntries.reason, + expiresAt: listEntries.expiresAt + }); + if (!row) throw new ApiError(404, `${steamId} is not in ${group.name}.`, 'not_found'); + await touch(env.db, group.id); + await writeAudit(env, req, { + actor, + orgId: org.id, + category: 'org', + action: 'list.update', + target: steamId, + outcome: 'ok', + message: + `Reserved slot in ${group.name} changed across ${org.name}` + + ('expiresAt' in set + ? set.expiresAt + ? ` (until ${set.expiresAt.toISOString()})` + : ' (permanent)' + : ''), + detail: { + kind: 'reserve', + listId: group.id, + groupId: group.id, + group: group.name, + entryId: row.id, + ...('reason' in set ? { reason: set.reason } : {}), + ...('expiresAt' in set ? { expiresAt: iso(set.expiresAt ?? null) } : {}) + } + }); + return { entry: { steamId, reason: row.reason, expiresAt: iso(row.expiresAt) } }; +} diff --git a/src/lib/server/webhook-delivery.ts b/src/lib/server/webhook-delivery.ts index 002ab580..37c13367 100644 --- a/src/lib/server/webhook-delivery.ts +++ b/src/lib/server/webhook-delivery.ts @@ -167,6 +167,10 @@ const ACTION_TITLES: Record = { 'list.update': 'Org list · changed', 'list.import': 'Org list · imported from a server', 'list.expire': 'Org list · expired', + 'list.group.create': 'Reserved-slot group · made', + 'list.group.update': 'Reserved-slot group · changed', + 'list.group.switch': 'Reserved-slot group · switched', + 'list.group.archive': 'Reserved-slot group · removed', 'lists.sync': 'Org list · sync', 'ban.enforce': 'Ban · banned player removed', login: 'Sign-in', diff --git a/src/routes/api/orgs/[id]/slot-groups/+server.ts b/src/routes/api/orgs/[id]/slot-groups/+server.ts new file mode 100644 index 00000000..c38ca0c1 --- /dev/null +++ b/src/routes/api/orgs/[id]/slot-groups/+server.ts @@ -0,0 +1,19 @@ +import { getEnv } from '$lib/server/env'; +import { apiJson, param, readJson, route } from '$lib/server/http'; +import { requireListsRole } from '$lib/server/access'; +import { createGroup, groupsView } from '$lib/server/slot-groups'; + +/** The org's reserved-slot groups, for those who edit its reserved slots. */ +export const GET = route(async (event) => { + const env = getEnv(); + const { org } = await requireListsRole(env, event.locals, param(event, 'id'), 'reserve'); + return apiJson({ ok: true, groups: await groupsView(env, org) }); +}); + +/** A new group: `{ name, servers: "every" | [serverId] }`, off until switched on. */ +export const POST = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireListsRole(env, event.locals, param(event, 'id'), 'reserve'); + const result = await createGroup(env, event.request, user, org, await readJson(event.request)); + return apiJson({ ok: true, ...result }, 201); +}); diff --git a/src/routes/api/orgs/[id]/slot-groups/[groupId]/+server.ts b/src/routes/api/orgs/[id]/slot-groups/[groupId]/+server.ts new file mode 100644 index 00000000..3fa0906c --- /dev/null +++ b/src/routes/api/orgs/[id]/slot-groups/[groupId]/+server.ts @@ -0,0 +1,28 @@ +import { getEnv } from '$lib/server/env'; +import { apiJson, param, readJson, route } from '$lib/server/http'; +import { requireListsRole } from '$lib/server/access'; +import { archiveGroup, groupOf, updateGroup } from '$lib/server/slot-groups'; + +/** Renames a group or changes its servers: `{ name?, servers?: "every" | [serverId] }`. */ +export const PATCH = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireListsRole(env, event.locals, param(event, 'id'), 'reserve'); + const group = await groupOf(env, org, param(event, 'groupId')); + const result = await updateGroup( + env, + event.request, + user, + org, + group, + await readJson(event.request) + ); + return apiJson({ ok: true, ...result }); +}); + +/** Takes a group away: off for good, its entries and history kept. */ +export const DELETE = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireListsRole(env, event.locals, param(event, 'id'), 'reserve'); + const group = await groupOf(env, org, param(event, 'groupId')); + return apiJson({ ok: true, ...(await archiveGroup(env, event.request, user, org, group)) }); +}); diff --git a/src/routes/api/orgs/[id]/slot-groups/[groupId]/entries/+server.ts b/src/routes/api/orgs/[id]/slot-groups/[groupId]/entries/+server.ts new file mode 100644 index 00000000..73f7d082 --- /dev/null +++ b/src/routes/api/orgs/[id]/slot-groups/[groupId]/entries/+server.ts @@ -0,0 +1,30 @@ +import { getEnv } from '$lib/server/env'; +import { apiJson, param, readJson, route } from '$lib/server/http'; +import { requireListsRole } from '$lib/server/access'; +import { addGroupEntry, groupEntriesView, groupOf } from '$lib/server/slot-groups'; + +export const GET = route(async (event) => { + const env = getEnv(); + const { org } = await requireListsRole(env, event.locals, param(event, 'id'), 'reserve'); + const group = await groupOf(env, org, param(event, 'groupId')); + const includeRemoved = event.url.searchParams.get('includeRemoved') === '1'; + return apiJson({ + ok: true, + entries: await groupEntriesView(env, org, group, { includeRemoved }) + }); +}); + +export const POST = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireListsRole(env, event.locals, param(event, 'id'), 'reserve'); + const group = await groupOf(env, org, param(event, 'groupId')); + const result = await addGroupEntry( + env, + event.request, + user, + org, + group, + await readJson(event.request) + ); + return apiJson({ ok: true, ...result }, 201); +}); diff --git a/src/routes/api/orgs/[id]/slot-groups/[groupId]/entries/[steamId]/+server.ts b/src/routes/api/orgs/[id]/slot-groups/[groupId]/entries/[steamId]/+server.ts new file mode 100644 index 00000000..5e05d580 --- /dev/null +++ b/src/routes/api/orgs/[id]/slot-groups/[groupId]/entries/[steamId]/+server.ts @@ -0,0 +1,36 @@ +import { getEnv } from '$lib/server/env'; +import { apiJson, param, readJson, route } from '$lib/server/http'; +import { requireListsRole } from '$lib/server/access'; +import { groupOf, removeGroupEntry, updateGroupEntry } from '$lib/server/slot-groups'; + +/** Changes the note or the expiry of a player's entry in the group. */ +export const PATCH = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireListsRole(env, event.locals, param(event, 'id'), 'reserve'); + const group = await groupOf(env, org, param(event, 'groupId')); + const result = await updateGroupEntry( + env, + event.request, + user, + org, + group, + param(event, 'steamId'), + await readJson(event.request) + ); + return apiJson({ ok: true, ...result }); +}); + +export const DELETE = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireListsRole(env, event.locals, param(event, 'id'), 'reserve'); + const group = await groupOf(env, org, param(event, 'groupId')); + const result = await removeGroupEntry( + env, + event.request, + user, + org, + group, + param(event, 'steamId') + ); + return apiJson({ ok: true, ...result }); +}); diff --git a/src/routes/api/orgs/[id]/slot-groups/[groupId]/switch/+server.ts b/src/routes/api/orgs/[id]/slot-groups/[groupId]/switch/+server.ts new file mode 100644 index 00000000..1e8a8af9 --- /dev/null +++ b/src/routes/api/orgs/[id]/slot-groups/[groupId]/switch/+server.ts @@ -0,0 +1,20 @@ +import { getEnv } from '$lib/server/env'; +import { apiJson, param, readJson, route } from '$lib/server/http'; +import { requireListsRole } from '$lib/server/access'; +import { groupOf, switchGroup } from '$lib/server/slot-groups'; + +/** `{ on: false }`, `{ on: true, until: ISO | null }` or `{ on: true, from: ISO, until: ISO }`. */ +export const PUT = route(async (event) => { + const env = getEnv(); + const { org, user } = await requireListsRole(env, event.locals, param(event, 'id'), 'reserve'); + const group = await groupOf(env, org, param(event, 'groupId')); + const result = await switchGroup( + env, + event.request, + user, + org, + group, + await readJson(event.request) + ); + return apiJson({ ok: true, ...result }); +}); diff --git a/src/test/api-matrix.test.ts b/src/test/api-matrix.test.ts index 99b7065a..c1b982e7 100644 --- a/src/test/api-matrix.test.ts +++ b/src/test/api-matrix.test.ts @@ -110,6 +110,17 @@ const MATRIX: Record = { 'POST api/orgs/[id]/lists/import': 'listsOwner', 'POST api/orgs/[id]/lists/sync': 'lists', 'GET api/orgs/[id]/players': 'lists', + // its reserved-slot groups: whoever edits its reserved slots. "Group not found." is not one of + // the hidden answers, so a group looked up before the role check fails these lines. + 'GET api/orgs/[id]/slot-groups': 'lists:reserve', + 'POST api/orgs/[id]/slot-groups': 'lists:reserve', + 'PATCH api/orgs/[id]/slot-groups/[groupId]': 'lists:reserve', + 'DELETE api/orgs/[id]/slot-groups/[groupId]': 'lists:reserve', + 'PUT api/orgs/[id]/slot-groups/[groupId]/switch': 'lists:reserve', + 'GET api/orgs/[id]/slot-groups/[groupId]/entries': 'lists:reserve', + 'POST api/orgs/[id]/slot-groups/[groupId]/entries': 'lists:reserve', + 'PATCH api/orgs/[id]/slot-groups/[groupId]/entries/[steamId]': 'lists:reserve', + 'DELETE api/orgs/[id]/slot-groups/[groupId]/entries/[steamId]': 'lists:reserve', // a server: run by its org's owners 'GET api/servers': 'user', diff --git a/src/test/slot-group-ids.test.ts b/src/test/slot-group-ids.test.ts new file mode 100644 index 00000000..cf059657 --- /dev/null +++ b/src/test/slot-group-ids.test.ts @@ -0,0 +1,115 @@ +// Every route under a group id finds the group with the org it was checked against: another org's +// group, the org's default list, a server's own list, a ban list or an archived group is "Group not +// found." to every one of them, and nothing is written. +import { beforeAll, describe, expect, test } from 'bun:test'; +import { join } from 'node:path'; +import { eq } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { auditLog, listEntries, lists, serverLists } from '$lib/server/db/schema'; +import { newId } from '$lib/server/http'; +import { listOf, serverListOf } from '$lib/server/lists'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, type World } from './world'; + +const ROUTES = join(import.meta.dir, '..', 'routes', 'api', 'orgs', '[id]', 'slot-groups'); +const PLAYER = '76561198000000801'; + +/** Each route under [groupId], with a body that would change something were the group found. */ +const CALLS: { path: string; method: string; body: Record }[] = [ + { path: '[groupId]', method: 'PATCH', body: { name: 'Taken over', servers: 'every' } }, + { path: '[groupId]', method: 'DELETE', body: {} }, + { path: '[groupId]/switch', method: 'PUT', body: { on: true } }, + { path: '[groupId]/entries', method: 'GET', body: {} }, + { path: '[groupId]/entries', method: 'POST', body: { steamId: PLAYER } }, + { path: '[groupId]/entries/[steamId]', method: 'PATCH', body: { reason: 'changed' } }, + { path: '[groupId]/entries/[steamId]', method: 'DELETE', body: {} } +]; + +describe.skipIf(!hasTestDb)('a group id', () => { + let env: Env; + let w: World; + const targets: Record = {}; + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + const group = async (orgId: string, name: string, archived = false) => { + const id = newId(); + await env.db.insert(lists).values({ + id, + orgId, + kind: 'reserve', + name, + onUntil: new Date(), + archivedAt: archived ? new Date() : null + }); + await env.db.insert(listEntries).values({ + id: newId(), + listId: id, + steamId: PLAYER, + reason: 'kept', + addedByName: 'owner' + }); + return id; + }; + await listOf(env, w.org.id, 'reserve'); + await listOf(env, w.otherOrg.id, 'reserve'); + targets["another org's group"] = await group(w.otherOrg.id, 'Theirs'); + targets['an archived group'] = await group(w.org.id, 'Old', true); + targets['the default list'] = (await listOf(env, w.org.id, 'reserve')).id; + targets['the ban list'] = (await listOf(env, w.org.id, 'ban')).id; + targets["a server's own list"] = ( + await serverListOf(env, { id: w.server.id, orgId: w.org.id }, 'reserve') + ).id; + for (const id of [targets['the default list'], targets["a server's own list"]]) + await env.db + .insert(listEntries) + .values({ id: newId(), listId: id, steamId: PLAYER, addedByName: 'owner' }); + }); + + const snapshot = async () => ({ + lists: await env.db.select().from(lists), + entries: await env.db.select().from(listEntries), + given: await env.db.select().from(serverLists) + }); + + for (const call of CALLS) + test(`${call.method} ${call.path} reaches no list but the org's own groups`, async () => { + const mod = await import(join(ROUTES, call.path, '+server.ts')); + const before = await snapshot(); + const audits = (await env.db.select({ id: auditLog.id }).from(auditLog)).length; + for (const [what, groupId] of Object.entries(targets)) { + const r = await callApi(mod[call.method], w.users.owner, { + method: call.method, + params: { id: w.org.id, groupId, steamId: PLAYER }, + body: call.body + }); + expect({ what, status: r.status, message: r.message }).toEqual({ + what, + status: 404, + message: 'Group not found.' + }); + } + expect(await snapshot()).toEqual(before); + expect((await env.db.select({ id: auditLog.id }).from(auditLog)).length).toBe(audits); + }); + + test('nor does a group of this org reached through another org', async () => { + const mine = newId(); + await env.db + .insert(lists) + .values({ id: mine, orgId: w.org.id, kind: 'reserve', name: 'Mine', onUntil: new Date() }); + const mod = await import(join(ROUTES, '[groupId]', 'switch', '+server.ts')); + const r = await callApi(mod.PUT, w.users.outsider, { + method: 'PUT', + params: { id: w.otherOrg.id, groupId: mine }, + body: { on: true } + }); + expect([r.status, r.message]).toEqual([404, 'Group not found.']); + const [row] = await env.db.select().from(lists).where(eq(lists.id, mine)); + expect(row.onFrom).toBeNull(); + expect(row.onUntil).not.toBeNull(); + }); +}); diff --git a/src/test/slot-groups.test.ts b/src/test/slot-groups.test.ts new file mode 100644 index 00000000..a81f02a9 --- /dev/null +++ b/src/test/slot-groups.test.ts @@ -0,0 +1,445 @@ +// Reserved-slot groups: an org's reserved-slot lists beside the default one, switched on and off +// or set to a window, on every server or chosen ones. What reaches a server, when, through the +// config document of a build that reads it at start (MOCK_LIVE_BUILD); that the default list keeps +// everything written to "the org's list"; and who sees a group at all. +import { afterAll, beforeAll, describe, expect, test } from 'bun:test'; +import { join } from 'node:path'; +import { and, eq, isNull } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import type { SessionUser } from '$lib/server/access'; +import { getOrg, getServer } from '$lib/server/access'; +import { readConfig } from '$lib/server/actions'; +import { encryptSecret } from '$lib/server/crypto'; +import { + auditLog, + listEntries, + lists, + organizations, + serverLists, + servers, + type ListRow +} from '$lib/server/db/schema'; +import { newId } from '$lib/server/http'; +import { createServer } from '$lib/server/servers'; +import { + ensureServerLists, + entriesView, + grantEntry, + importCandidates, + listOf, + orgListsView, + serverListsState +} from '$lib/server/lists'; +import { desiredFor, reconcileServer } from '$lib/server/lists-sync'; +import { restartMock } from '$lib/server/mockgame'; +import { archiveGroup, switchGroup, updateGroup } from '$lib/server/slot-groups'; +import { WardogsClient } from '$lib/server/rcon'; +import { reservedFromText } from '$lib/reserved-doc'; +import { hasTestDb, testEnv } from './db'; +import { callApi, callLoad, stubGateway, type CallInput } from './call'; +import { seedWorld, type World } from './world'; + +const ROUTES = join(import.meta.dir, '..', 'routes'); +const A = '76561198000000701'; +const B = '76561198000000702'; +const C = '76561198000000703'; +const HOUR = 3600_000; + +describe.skipIf(!hasTestDb)('reserved-slot groups', () => { + let env: Env; + const before = process.env.MOCK_LIVE_BUILD; + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + process.env.MOCK_LIVE_BUILD = 'true'; + delete process.env.MOCK_LIVE_ADDS; + }); + afterAll(() => { + if (before === undefined) delete process.env.MOCK_LIVE_BUILD; + else process.env.MOCK_LIVE_BUILD = before; + }); + + const api = async ( + who: SessionUser | null, + method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE', + path: string, + input: CallInput = {} + ) => { + const mod = await import(join(ROUTES, 'api', path, '+server.ts')); + return callApi(mod[method], who, { method, ...input }); + }; + + /** A server of the org on the mock game, with a client to it. */ + async function demoServer(w: World, name = 'Doc') { + const id = `s_grp_${newId().slice(0, 10)}`; + await env.db.insert(servers).values({ + id, + orgId: w.org.id, + name, + host: 'demo', + port: 1, + passwordEnc: encryptSecret(env, 'demo') + }); + await ensureServerLists(env.db, id, w.org.id); + const server = (await getServer(env, id))!; + const client = await WardogsClient.forServer(env, server); + return { + id, + client, + sync: async () => + reconcileServer(env, (await getServer(env, id))!, (await getOrg(env, w.org.id))!, { + reason: 'api', + waitMs: 0, + lane: 'held', + client + }), + doc: async () => reservedFromText((await readConfig(client)).text), + restart: () => restartMock(id) + }; + } + + /** A fresh org whose default lists exist, and a group made through its route. */ + async function world() { + const w = await seedWorld(env); + await listOf(env, w.org.id, 'reserve'); + return w; + } + + const make = async (w: World, body: Record, who = w.users.owner) => { + const r = await api(who, 'POST', 'orgs/[id]/slot-groups', { + params: { id: w.org.id }, + body + }); + expect(r.status).toBe(201); + return (r.body as { group: { id: string } }).group.id; + }; + const groupRow = async (id: string) => + (await env.db.select().from(lists).where(eq(lists.id, id)))[0] as ListRow; + const switchIt = ( + w: World, + groupId: string, + body: Record, + who = w.users.owner + ) => + api(who, 'PUT', 'orgs/[id]/slot-groups/[groupId]/switch', { + params: { id: w.org.id, groupId }, + body + }); + const addTo = (w: World, groupId: string, steamId: string, who = w.users.owner) => + api(who, 'POST', 'orgs/[id]/slot-groups/[groupId]/entries', { + params: { id: w.org.id, groupId }, + body: { steamId } + }); + const wanted = async (w: World, serverId: string, now = new Date()) => + ( + await desiredFor(env, { id: serverId, orgId: w.org.id }, (await getOrg(env, w.org.id))!, now) + ).reserved.map((r) => r.steamId); + + test('a group named before "Default" captures nothing written to the org list', async () => { + const w = await world(); + const groupId = await make(w, { name: 'Admins' }); + await switchIt(w, groupId, { on: true }); + const def = await listOf(env, w.org.id, 'reserve'); + expect(def.id).not.toBe(groupId); + expect(def.isDefault).toBe(true); + + // an edit of the org list, a rule's grant and an import all land on the default list + const add = await api(w.users.owner, 'POST', 'orgs/[id]/lists/[kind]/entries', { + params: { id: w.org.id, kind: 'reserve' }, + body: { steamId: A } + }); + expect(add.status).toBe(201); + await grantEntry(env, await listOf(env, w.org.id, 'reserve'), { + steamId: B, + reason: 'seeded', + expiresAt: null, + addedByName: 'Seeding reward' + }); + const onList = async (listId: string) => + ( + await env.db + .select({ steamId: listEntries.steamId }) + .from(listEntries) + .where(and(eq(listEntries.listId, listId), isNull(listEntries.removedAt))) + ).map((e) => e.steamId); + expect((await onList(def.id)).sort()).toEqual([A, B]); + expect(await onList(groupId)).toEqual([]); + + // members' slots ride on the default list, and the pages count it, not the group + await env.db + .update(organizations) + .set({ membersReserved: true }) + .where(eq(organizations.id, w.org.id)); + const org = (await getOrg(env, w.org.id))!; + const view = await orgListsView(env, org, { owner: true, kinds: ['ban', 'reserve'] }); + expect(view.lists.map((l) => l.id)).not.toContain(groupId); + expect(view.lists.find((l) => l.kind === 'reserve')!.id).toBe(def.id); + expect(view.groups.map((g) => g.id)).toEqual([groupId]); + expect((await entriesView(env, org, 'reserve')).map((e) => e.steamId).sort()).toEqual([A, B]); + }); + + test('switched off, a group comes out of the document; on again before a restart, it goes back', async () => { + const w = await world(); + const s = await demoServer(w); + const groupId = await make(w, { name: 'Clan event' }); + await addTo(w, groupId, A); + await s.sync(); + expect(await s.doc()).not.toContain(A); + + expect((await switchIt(w, groupId, { on: true })).status).toBe(200); + await s.sync(); + expect(await s.doc()).toContain(A); + s.restart(); + + await switchIt(w, groupId, { on: false }); + await s.sync(); + expect(await s.doc()).not.toContain(A); + + await switchIt(w, groupId, { on: true }); + await s.sync(); + expect(await s.doc()).toContain(A); + }); + + test('a window not yet open and one ended both read off; inside it, on', async () => { + const w = await world(); + const s = await demoServer(w); + const groupId = await make(w, { name: 'Tournament' }); + await addTo(w, groupId, A); + const now = Date.now(); + const from = new Date(now + 2 * HOUR); + const until = new Date(now + 4 * HOUR); + const r = await switchIt(w, groupId, { + on: true, + from: from.toISOString(), + until: until.toISOString() + }); + expect(r.status).toBe(200); + expect((r.body as { group: { on: boolean } }).group.on).toBe(false); + expect(await wanted(w, s.id, new Date(now))).not.toContain(A); + expect(await wanted(w, s.id, new Date(now + 3 * HOUR))).toContain(A); + expect(await wanted(w, s.id, until)).not.toContain(A); + expect(await wanted(w, s.id, new Date(now + 5 * HOUR))).not.toContain(A); + }); + + test('a window is checked: an end ahead, a start before it, within a year', async () => { + const w = await world(); + const groupId = await make(w, { name: 'Checked' }); + const at = (ms: number) => new Date(Date.now() + ms).toISOString(); + for (const body of [ + { on: 'yes' }, + { on: true, until: at(10_000) }, + { on: true, until: 'soon' }, + { on: true, from: at(HOUR) }, + { on: true, from: at(3 * HOUR), until: at(2 * HOUR) }, + { on: true, until: at(400 * 86400_000) } + ]) { + const r = await switchIt(w, groupId, body); + expect({ body, status: r.status }).toEqual({ body, status: 400 }); + } + expect((await groupRow(groupId)).onFrom).toBeNull(); + }); + + test('a group for chosen servers reaches only those; for every server, a new server too', async () => { + const w = await world(); + const one = await demoServer(w, 'One'); + const two = await demoServer(w, 'Two'); + const chosen = await make(w, { name: 'Chosen', servers: [one.id] }); + const every = await make(w, { name: 'Everyone' }); + await switchIt(w, chosen, { on: true }); + await switchIt(w, every, { on: true }); + await addTo(w, chosen, A); + await addTo(w, every, B); + expect((await wanted(w, one.id)).sort()).toEqual([A, B]); + expect(await wanted(w, two.id)).toEqual([B]); + + // a server added later through the panel takes the every-server group, not the chosen one + await env.db + .update(organizations) + .set({ serverLimit: 100 }) + .where(eq(organizations.id, w.org.id)); + const org = (await getOrg(env, w.org.id))!; + const third = await createServer( + env, + new Request('http://localhost/api'), + w.users.owner!, + org, + { + name: 'Three', + host: 'demo', + port: 3, + password: 'demo' + } + ); + expect(await wanted(w, third)).toEqual([B]); + + // rescoped to the second server alone + const r = await api(w.users.owner, 'PATCH', 'orgs/[id]/slot-groups/[groupId]', { + params: { id: w.org.id, groupId: chosen }, + body: { servers: [two.id] } + }); + expect(r.status).toBe(200); + expect(await wanted(w, one.id)).toEqual([B]); + expect((await wanted(w, two.id)).sort()).toEqual([A, B]); + + // a server of another org is refused, naming none + const other = await api(w.users.owner, 'PATCH', 'orgs/[id]/slot-groups/[groupId]', { + params: { id: w.org.id, groupId: chosen }, + body: { servers: [w.otherOrgServer.id] } + }); + expect(other.status).toBe(400); + expect(other.message).not.toContain(w.otherOrgServer.id); + const given = await env.db + .select({ serverId: serverLists.serverId }) + .from(serverLists) + .where(eq(serverLists.listId, chosen)); + expect(given.map((g) => g.serverId)).toEqual([two.id]); + }); + + test('names are unique in the org in any case, "Default" included', async () => { + const w = await world(); + await make(w, { name: 'Clan' }); + for (const name of ['clan', 'CLAN', 'default', 'Default']) { + const r = await api(w.users.owner, 'POST', 'orgs/[id]/slot-groups', { + params: { id: w.org.id }, + body: { name } + }); + expect({ name, status: r.status }).toEqual({ name, status: 409 }); + } + }); + + test('archiving takes the slots off and keeps the group, its servers and its entries', async () => { + const w = await world(); + const s = await demoServer(w); + const groupId = await make(w, { name: 'Gone soon', servers: [s.id] }); + await switchIt(w, groupId, { on: true }); + await addTo(w, groupId, A); + await s.sync(); + expect(await s.doc()).toContain(A); + + const r = await api(w.users.owner, 'DELETE', 'orgs/[id]/slot-groups/[groupId]', { + params: { id: w.org.id, groupId } + }); + expect(r.status).toBe(200); + await s.sync(); + expect(await s.doc()).not.toContain(A); + const row = await groupRow(groupId); + expect(row.archivedAt).not.toBeNull(); + const kept = await env.db + .select({ steamId: listEntries.steamId }) + .from(listEntries) + .where(and(eq(listEntries.listId, groupId), isNull(listEntries.removedAt))); + expect(kept.map((k) => k.steamId)).toEqual([A]); + const given = await env.db.select().from(serverLists).where(eq(serverLists.listId, groupId)); + expect(given).toHaveLength(1); + // gone from every view, its name free, and its id no longer answers + const org = (await getOrg(env, w.org.id))!; + expect((await orgListsView(env, org, { owner: true, kinds: ['reserve'] })).groups).toEqual([]); + await make(w, { name: 'Gone soon' }); + const again = await switchIt(w, groupId, { on: true }); + expect([again.status, again.message]).toEqual([404, 'Group not found.']); + }); + + test('a group taken away while another request held it is not switched, changed or taken again', async () => { + const w = await world(); + const groupId = await make(w, { name: 'Raced' }); + const seen = await groupRow(groupId); + const org = (await getOrg(env, w.org.id))!; + const req = new Request('http://localhost/api'); + await archiveGroup(env, req, w.users.owner!, org, seen); + const audits = async () => + (await env.db.select({ id: auditLog.id }).from(auditLog).where(eq(auditLog.target, 'Raced'))) + .length; + const before = await audits(); + for (const late of [ + () => switchGroup(env, req, w.users.owner!, org, seen, { on: true }), + () => updateGroup(env, req, w.users.owner!, org, seen, { name: 'Renamed late' }), + () => archiveGroup(env, req, w.users.owner!, org, seen) + ]) + await expect(late()).rejects.toThrow('Group not found.'); + const row = await groupRow(groupId); + expect([row.name, row.onFrom, row.onUntil?.getTime()]).toEqual([ + 'Raced', + null, + seen.onUntil?.getTime() + ]); + expect(await audits()).toBe(before); + }); + + test('a player in a group is not offered for import, switched on or not', async () => { + const w = await world(); + const s = await demoServer(w); + const groupId = await make(w, { name: 'Held' }); + await switchIt(w, groupId, { on: true }); + await addTo(w, groupId, C); + await s.sync(); + await switchIt(w, groupId, { on: false }); + const org = (await getOrg(env, w.org.id))!; + expect((await importCandidates(env, org)).map((c) => c.steamId)).not.toContain(C); + }); + + test("a group's name is staff's: not for viewers, nor for the ban list's editors", async () => { + const w = await world(); + const groupId = await make(w, { name: 'Secret clan' }); + await switchIt(w, groupId, { on: true }); + await addTo(w, groupId, A); + const server = (await getServer(env, w.server.id))!; + const state = async (who: SessionUser, caps: string[]) => + JSON.stringify(await serverListsState(env, server, who, { caps: new Set(caps) } as never)); + // the slot shows as the org's; only staff see whose group it is + expect(await state(w.users.viewer!, ['server.view'])).not.toContain('Secret clan'); + expect(await state(w.users.orgSlots!, ['server.view', 'lists.reserve'])).toContain( + 'Secret clan' + ); + + for (const who of ['viewer', 'orgBans', 'keyBans'] as const) { + const route = await api(w.users[who], 'GET', 'servers/[id]/lists/state', { + params: { id: w.server.id } + }); + expect({ who, leak: JSON.stringify(route.body).includes('Secret clan') }).toEqual({ + who, + leak: false + }); + } + for (const who of ['orgBans', 'keyBans'] as const) { + const lists = await api(w.users[who], 'GET', 'orgs/[id]/lists', { + params: { id: w.org.id } + }); + expect(lists.status).toBe(200); + expect(JSON.stringify(lists.body)).not.toContain('Secret clan'); + const groups = await api(w.users[who], 'GET', 'orgs/[id]/slot-groups', { + params: { id: w.org.id } + }); + expect(groups.status).toBe(403); + } + const { load: slotsLoad } = await import( + join(ROUTES, '(app)', 'server', '[id]', 'slots', '+page.server.ts') + ); + const { load: orgLayout } = await import( + join(ROUTES, '(app)', 'orgs', '[id]', '+layout.server.ts') + ); + for (const who of ['viewer', 'orgBans'] as const) { + const page = await callLoad(slotsLoad, w.users[who], { params: { id: w.server.id } }); + expect({ who, leak: JSON.stringify(page.body).includes('Secret clan') }).toEqual({ + who, + leak: false + }); + } + const layout = await callLoad(orgLayout, w.users.orgBans, { params: { id: w.org.id } }); + expect(layout.status).toBe(200); + expect(JSON.stringify(layout.body)).not.toContain('Secret clan'); + }); + + test('an org-wide key with Org reserved slots makes, switches and fills a group', async () => { + const w = await world(); + const keyed = w.users.keyAll!; + const groupId = await make(w, { name: 'By key' }, keyed); + expect((await switchIt(w, groupId, { on: true }, keyed)).status).toBe(200); + expect((await addTo(w, groupId, A, keyed)).status).toBe(201); + // a key held to some servers cannot open the groups at all + const held = await api(w.users.keyElsewhere, 'GET', 'orgs/[id]/slot-groups', { + params: { id: w.org.id } + }); + expect(held.status).toBe(404); + }); +}); From a176e98e093462d35b94b27864a54feed82b649d Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 02:13:13 +0100 Subject: [PATCH 070/102] README: reserved-slot groups --- README.md | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index da9d2112..56b1bf87 100644 --- a/README.md +++ b/README.md @@ -582,12 +582,50 @@ back and stays. The panel plans against the document, not the running list, and applied once the document holds it. The listener takes a request of 64 KB at most, roughly a thousand reserved players on top of a typical file: a slot that would not fit waits, marked failed with "The server's config document is full", and goes in when there is room. Removals -always go in; a server's own slots go in before the organisation's, and members' slots last. A +always go in; a server's own slots go in before the organisation's, then its groups', and members' +slots last. A failure is shown and recorded as a short reason of the panel's (unreachable, refused by the server with its status, read-only document), never the game's own words. Every run that changes something, or fails, is in the audit trail under `system` as `lists.sync`, and reaches Discord webhooks that mirror bans. **Sync now** on a list page pushes everything on demand. +#### Reserved-slot groups + +Beside its reserved-slot list an organisation can keep **groups**: more reserved-slot lists, each +kept on its own, for a clan, a team of streamers or an event, and switched on and off. A group has +a name, its players (each with a note and an expiry, as on the org list), and the servers it is +for: every server of the organisation (servers added later too) or the ones chosen. While it is +**on**, its players get a slot on those servers as if they were on the org list; while **off**, +the group has no effect on any server. A group is switched on until it is switched off, or for +some hours, or until a time, or set ahead to be on from one time until another (up to a year +ahead); setting it again replaces the window it had. A window opens and closes by itself, picked +up by each server's sync within the minute, and nothing is written when it does. A new group +starts off, so its players can be filled in before an event. Taking a group away switches it off +for good and frees its name; its players and history stay in the audit trail. + +Groups live on the organisation's **Reserved slots** tab, in a strip above it: the organisation's +own list, then each group with its number of players and a mark for on (green), set for later (a +clock) or off, and **+ New group** (a name, and every server or the ones ticked). A group's tab is +laid out like the organisation's list, with its players, where they stand on its servers and the +form to add one, under a bar that says whether it is on and where: **Switch off**, **Switch on…** +or **Switch on now** (for a window set ahead), **Change…** (off, on until switched off, for 2 +hours to 7 days, until a time, or later from one time until another, in your local time), +**Servers…**, **Rename** and **Remove**. While a group is off its players' servers read _group +off_. On a server's Reserved slots tab a group's slot reads _org_, followed by the group's name for +those who may read its note. + +A player on the org list and in a group, or in two groups, holds one slot, which stays while any +of them wants it. On the live builds, which read the reserved list at start, a group switched off +leaves its slots running until each server's next restart; the group says how many are still +running. Groups are for the people who edit the org's reserved slots (owners, roles with _Org +reserved slots_ on any of its servers, and keys over every server that carry it), who make, +rename, rescope, switch and take them away. Everyone else who can open a server sees a group's +slot as one of the organisation's; whose group it is shows only where a slot's note does. Members' +slots, the Seeding reward, the Bounty rule, import and a Kill distance watch's bans keep to the +organisation's own lists. Each change is in the audit trail (`list.group.create`, `.update`, +`.switch`, `.archive`, and `list.add` / `list.remove` / `list.update` naming the group) and reaches +Discord webhooks that mirror bans. + ### Automation (triggers) The **Automation** tab on each server holds rules the poller evaluates on every sample. Admins @@ -1271,6 +1309,23 @@ one who is not on it a 404. An add or a removal is applied at once, and its answ how it went (`ok`, `added`, `removed`, `failed`, `error`): for the server's own list on that server, for an org list once per server under `sync.servers`. +[Reserved-slot groups](#reserved-slot-groups) take the same _Org reserved slots_ on a key over every +server; a key held to some servers cannot open them: + +| Route | Does | +| ------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `GET /api/orgs/:orgId/slot-groups` | the groups: `id`, `name`, `on`, `onFrom`, `onUntil`, `everyServer`, `servers`, `entryCount`, `leaving` (slots a server keeps until its restart) | +| `POST /api/orgs/:orgId/slot-groups` | a new group, off: `{"name": "Clan event", "servers": "every"}` or `"servers": ["", …]`; a name the org has (in any case) is a 409 `duplicate` | +| `PATCH /api/orgs/:orgId/slot-groups/:groupId` | `name`, `servers` or both | +| `DELETE /api/orgs/:orgId/slot-groups/:groupId` | takes the group away: off for good, its entries and history kept | +| `PUT /api/orgs/:orgId/slot-groups/:groupId/switch` | `{"on": false}`; `{"on": true}`, with `"until"` to end it then; `{"on": true, "from": …, "until": …}` for a window ahead | +| `GET`, `POST /api/orgs/:orgId/slot-groups/:groupId/entries` | its players, as the org list's entries (`?includeRemoved=1`), and an add as for the org list | +| `PATCH`, `DELETE /api/orgs/:orgId/slot-groups/:groupId/entries/:steamId` | as for the org list | + +`GET /api/orgs/:orgId/lists` answers the groups as `groups` beside `lists`, which holds the +organisation's default lists only. A group id that is not one of the organisation's groups not +yet taken away is a 404 `Group not found.` + The panel enforces its bans itself: it removes a banned player from every server the list covers the moment it sees them, with the organisation's ban message, whether or not they were on when the ban was placed (see [Organisation ban and reserved lists](#organisation-ban-and-reserved-lists)). @@ -1606,6 +1661,9 @@ GET /api/public/servers/:id .../leaderboard (same query as above, page 20 at GET /api/orgs/:id/lists the org lists the caller edits (kinds), with counts, and the caller's role on them; for ban list editors, the ban message and quick reasons GET/POST /api/orgs/:id/lists/:kind/entries {steamId,reason,expiresAt} PATCH {reason,expiresAt} / DELETE .../entries/:steamId (kind = ban | reserve, needing Org ban list or Org reserved slots; ?includeRemoved=1) POST /api/orgs/:id/lists/sync push the lists to every org server now +GET/POST /api/orgs/:id/slot-groups {name,servers} reserved-slot groups (Org reserved slots) PATCH {name,servers} / DELETE (take away) .../slot-groups/:groupId +PUT /api/orgs/:id/slot-groups/:groupId/switch {on,from,until} switch a group on or off, or set its window +GET/POST /api/orgs/:id/slot-groups/:groupId/entries a group's players PATCH {reason,expiresAt} / DELETE .../entries/:steamId GET /api/orgs/:id/lists/import server entries not on the org list POST {entries:[{kind,steamId,reason}]} adopts them (owner) GET /api/servers/:id/players/seen?q=&since=&flag=&sort=&dir=&offset=&limit= everyone who has played on this server, by name, alias, kill-feed name or SteamID (View; 60 a minute) GET /api/servers/:id/lists/state which bans / reserved slots here come from the org lists or this server's own POST .../lists/sync From 4de0fc3228d9682be65ac191c8bcf0dfd0d02ffb Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 02:54:59 +0100 Subject: [PATCH 071/102] Reserved slots: a tab per group, with its controls and dialogs Org Reserved slots gains a strip of its list and each group; a group's tab (load: requireListsRole(reserve), then the group within the org) has switch, window, servers, rename and remove. A server's tab shows staff the group a slot comes from. --- src/lib/lists.ts | 47 +++- src/routes/(app)/orgs/[id]/+layout.svelte | 7 +- src/routes/(app)/orgs/[id]/GroupBar.svelte | 134 ++++++++++ src/routes/(app)/orgs/[id]/GroupDialog.svelte | 147 +++++++++++ .../(app)/orgs/[id]/GroupSwitchDialog.svelte | 177 +++++++++++++ src/routes/(app)/orgs/[id]/ReserveTabs.svelte | 71 ++++++ .../(app)/orgs/[id]/ReservedPage.svelte | 236 ++++++++++++------ .../[id]/reserved/[groupId]/+page.server.ts | 24 ++ .../orgs/[id]/reserved/[groupId]/+page.svelte | 14 ++ .../(app)/server/[id]/slots/+page.svelte | 7 +- src/test/load-matrix.test.ts | 2 + 11 files changed, 789 insertions(+), 77 deletions(-) create mode 100644 src/routes/(app)/orgs/[id]/GroupBar.svelte create mode 100644 src/routes/(app)/orgs/[id]/GroupDialog.svelte create mode 100644 src/routes/(app)/orgs/[id]/GroupSwitchDialog.svelte create mode 100644 src/routes/(app)/orgs/[id]/ReserveTabs.svelte create mode 100644 src/routes/(app)/orgs/[id]/reserved/[groupId]/+page.server.ts create mode 100644 src/routes/(app)/orgs/[id]/reserved/[groupId]/+page.svelte diff --git a/src/lib/lists.ts b/src/lib/lists.ts index b45ec276..80307b34 100644 --- a/src/lib/lists.ts +++ b/src/lib/lists.ts @@ -1,6 +1,6 @@ // Browser-side helpers for the organisation ban and reserved-slot lists. import type { Tone } from './components/Badge.svelte'; -import type { ListEntryState, ListKind, ListSyncSummary } from './types'; +import type { ListEntryState, ListKind, ListSyncSummary, SlotGroupView } from './types'; export const KIND_TITLE: Record = { ban: 'Ban list', reserve: 'Reserved slots' }; @@ -36,6 +36,51 @@ export function expiryIso(choice: string, custom: string): string | null { return days > 0 ? new Date(Date.now() + days * 86400_000).toISOString() : null; } +const DAY_MS = 86400_000; +const pad = (n: number) => String(n).padStart(2, '0'); + +/** + * A time near now, in the reader's local time and as few words as it takes: "21:30" today, + * "Sat 20:00" within the week either side, "12 Oct 20:00" further off. + */ +export function whenShort(iso: string, now = new Date()): string { + const d = new Date(iso); + const clock = `${pad(d.getHours())}:${pad(d.getMinutes())}`; + if (d.toDateString() === now.toDateString()) return clock; + if (Math.abs(d.getTime() - now.getTime()) < 6 * DAY_MS) + return `${d.toLocaleDateString('en-GB', { weekday: 'short' })} ${clock}`; + return `${d.toLocaleDateString('en-GB', { day: 'numeric', month: 'short' })} ${clock}`; +} + +/** An ISO time as a datetime-local input holds it: the reader's local time, to the minute. */ +export function localInput(iso: string | null): string { + if (!iso) return ''; + const d = new Date(iso); + return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`; +} + +/** What a reserved-slot group's state reads as, and how it is shown. */ +export function groupState( + g: Pick, + now = new Date() +): { kind: 'on' | 'later' | 'off'; text: string; tone: Tone } { + if (g.on) + return { + kind: 'on', + text: g.onUntil ? `On until ${whenShort(g.onUntil, now)}` : 'On', + tone: 'ok' + }; + if (g.onFrom && g.onUntil && new Date(g.onFrom).getTime() > now.getTime()) + return { + kind: 'later', + text: `${whenShort(g.onFrom, now)} – ${whenShort(g.onUntil, now)}`, + tone: 'info' + }; + // a group that was never switched on reads as off since it was made: just "Off" + const never = !g.onUntil || Math.abs(Date.parse(g.onUntil) - Date.parse(g.createdAt)) < 5000; + return { kind: 'off', text: never ? 'Off' : `Off since ${whenShort(g.onUntil!, now)}`, tone: '' }; +} + /** One line for a toast: where a list change landed. */ export function describeSync(sync: ListSyncSummary, done: string): string { const s = sync.servers; diff --git a/src/routes/(app)/orgs/[id]/+layout.svelte b/src/routes/(app)/orgs/[id]/+layout.svelte index 790b1b6d..84103f86 100644 --- a/src/routes/(app)/orgs/[id]/+layout.svelte +++ b/src/routes/(app)/orgs/[id]/+layout.svelte @@ -88,7 +88,12 @@ diff --git a/src/routes/(app)/orgs/[id]/GroupBar.svelte b/src/routes/(app)/orgs/[id]/GroupBar.svelte new file mode 100644 index 00000000..137e7013 --- /dev/null +++ b/src/routes/(app)/orgs/[id]/GroupBar.svelte @@ -0,0 +1,134 @@ + + +
+
+ {shown.text} + {shown.kind === 'off' ? 'for' : 'on'} {where}{#if group.leaving}, {group.leaving} slot{group.leaving === 1 ? '' : 's'} running until restart{/if} +
+
+ {#if shown.kind === 'on'} + + + {:else if shown.kind === 'later'} + + + {:else} + + {/if} + + + + +
+
+ +{#if switching} + (switching = false)} /> +{/if} +{#if editing} + (editing = null)} /> +{/if} diff --git a/src/routes/(app)/orgs/[id]/GroupDialog.svelte b/src/routes/(app)/orgs/[id]/GroupDialog.svelte new file mode 100644 index 00000000..c45d8d22 --- /dev/null +++ b/src/routes/(app)/orgs/[id]/GroupDialog.svelte @@ -0,0 +1,147 @@ + + + + { + e.preventDefault(); + void save(); + }} + > + {#if mode !== 'servers'} + + {/if} + {#if mode !== 'rename'} +
+ Servers + + +
+ {#each servers as s (s.id)} + + {:else} + {org.name} has no servers yet. + {/each} +
+
+ {/if} + {#if mode === 'create'} +

+ A new group starts off: add its players, then switch it on, now or for a time ahead. +

+ {:else if mode === 'servers' && group?.on} +

+ The group is on: servers taken out lose its slots (live servers keep them until their next + restart), servers added get them at once. +

+ {/if} +
+ + +
+ + diff --git a/src/routes/(app)/orgs/[id]/GroupSwitchDialog.svelte b/src/routes/(app)/orgs/[id]/GroupSwitchDialog.svelte new file mode 100644 index 00000000..9e471a6d --- /dev/null +++ b/src/routes/(app)/orgs/[id]/GroupSwitchDialog.svelte @@ -0,0 +1,177 @@ + + + + {group.name} · {group.everyServer ? 'every server' : where} +

When is it on?

+
{ + e.preventDefault(); + void save(); + }} + > +
+ When the group is on + + + + +
+ +
+ +
+ + +
+
+
+
+

+ Times are your local time, up to a year ahead. A window opens and closes by itself within a + minute. Saving replaces the window the group had. +

+
+ + +
+ + diff --git a/src/routes/(app)/orgs/[id]/ReserveTabs.svelte b/src/routes/(app)/orgs/[id]/ReserveTabs.svelte new file mode 100644 index 00000000..9f8efb7e --- /dev/null +++ b/src/routes/(app)/orgs/[id]/ReserveTabs.svelte @@ -0,0 +1,71 @@ + + + + +{#if making} + (making = false)} /> +{/if} diff --git a/src/routes/(app)/orgs/[id]/ReservedPage.svelte b/src/routes/(app)/orgs/[id]/ReservedPage.svelte index e131027c..9936241b 100644 --- a/src/routes/(app)/orgs/[id]/ReservedPage.svelte +++ b/src/routes/(app)/orgs/[id]/ReservedPage.svelte @@ -1,7 +1,8 @@ + +{#if group}{/if} +
- On the list + {group ? `In ${group.name}` : 'On the list'}
{entries.length} {/if}
-
- {picked} reserved by hand - {#if lists.membersReserved || members}{members} members{/if} -
-

- Anyone on the list skips the join queue on every server in {org.name}. The list has no length - limit; each server's MaxReservedSlots only sets how many player slots it holds back. -

+ {#if group} +

+ While {group.name} is on, everyone here skips the join queue on {where}. Off, the group has + no effect on any server. +

+ {:else} +
+ {picked} reserved by hand + {#if lists.membersReserved || members}{members} members{/if} +
+

+ Anyone on the list skips the join queue on every server in {org.name}. The list has no + length limit; each server's MaxReservedSlots only sets how many player slots it holds back. +

+ {/if}
- On the servers + {group ? 'On its servers' : 'On the servers'} @@ -285,20 +334,28 @@
- {s.applied} of {entries.length} - {#if s.pending}{s.pending} pending{/if} + {#if groupOff} + group off + {:else} + {s.applied} of {entries.length} + {#if s.pending}{s.pending} pending{/if} + {/if}
{:else}

- {org.name} has no servers yet, so there is nothing to push the list to. Entries are kept and applied - when a server is added. + {#if group} + {group.name} is for no server. Choose its servers with Servers… above. + {:else} + {org.name} has no servers yet, so there is nothing to push the list to. Entries are kept and + applied when a server is added. + {/if}

{/each}
- Reserve a slot everywhere + {group ? 'Add a player' : 'Reserve a slot everywhere'}
{ @@ -317,7 +374,7 @@ bind:value={newId} /> {group ? 'Add' : 'Reserve'}
{#if previewId && preview} @@ -329,7 +386,7 @@ class="input" type="text" maxlength="200" - placeholder="Note, e.g. donor, clan member (optional)" + placeholder={group ? 'Note (optional)' : 'Note, e.g. donor, clan member (optional)'} bind:value={newReason} />
@@ -353,11 +410,16 @@

- Handed out on every server in {org.name}, now and when one is added later. A slot with an - expiry is withdrawn by the panel when the time comes. To reserve a slot on one server only, - use that server's Reserved slots tab. + {#if group} + While the group is on, a player added here gets the slot at once; while it is off, when it + is next switched on. A player with an expiry leaves the group when the time comes. + {:else} + Handed out on every server in {org.name}, now and when one is added later. A slot with an + expiry is withdrawn by the panel when the time comes. To reserve a slot on one server only, + use that server's Reserved slots tab. + {/if}

- {#if owner} + {#if owner && !group} PlayerSteamID64 - Source + {#if !group}Source{/if} NoteAddedExpires @@ -451,13 +514,15 @@ {/if} - + {#if !group} + + {/if} @@ -479,32 +544,40 @@ {/if} {:else} @@ -512,14 +585,29 @@
WhenByActionServerResult
WhenByActionServerDetails
{fmtTime(a.ts)} {a.actorName || '—'}{ACTION_LABEL[a.action] || a.action}{actionLabel(a)} {a.serverName} - {a.message || a.outcome} + + {#if a.outcome !== 'ok'}{a.message || a.outcome}{#if said && said !== a.message}{' '}· {said}{/if} + {:else}{said}{#if length}{said ? ' · ' : ''}{length}{/if}{/if}
{e.steamId} - {#if e.member} - member - {:else} - list - {/if} - + {#if e.member} + member + {:else} + list + {/if} + {#if e.reason}{e.reason}{:else}—{/if} - - {#each e.servers as s (s.serverId)} - - {s.serverName} - - {/each} - + {#if groupOff} + group off + {:else} + + {#each e.servers as s (s.serverId)} + + {s.serverName} + + {/each} + + {/if} {#if !e.member} remove(e, r.name)}>{group ? 'Remove' : 'Withdraw'} {/if}
Nobody matches that filter.
-

- list slots were reserved here and can be withdrawn; member slots follow membership and go when the member leaves or the switch above is turned off. Server - badges: applied by the panel, pending the next - sync, failed (hover for why), local already on that server - but added outside the panel, so the panel never removes it. -

+ {#if group} +

+ Server badges as on the organisation's list: applied by the panel, + pending the next sync, failed (hover for + why), local already on that server but added outside the panel. +

+ {:else} +

+ list slots were reserved here and can be withdrawn; member slots follow membership and go when the member leaves or the switch above is turned off. Server + badges: applied by the panel, pending the + next sync, failed (hover for why), local already on that + server but added outside the panel, so the panel never removes it. +

+ {/if} + {:else if group} +
+ Nobody is in {group.name} yet. + Add players above. They skip the queue on {where} while the group is on. +
{:else}
Nobody holds a reserved slot yet. diff --git a/src/routes/(app)/orgs/[id]/reserved/[groupId]/+page.server.ts b/src/routes/(app)/orgs/[id]/reserved/[groupId]/+page.server.ts new file mode 100644 index 00000000..59e81d8c --- /dev/null +++ b/src/routes/(app)/orgs/[id]/reserved/[groupId]/+page.server.ts @@ -0,0 +1,24 @@ +import { error } from '@sveltejs/kit'; +import type { PageServerLoad } from './$types'; +import { getEnv } from '$lib/server/env'; +import { requireListsRole } from '$lib/server/access'; +import { normalizeError } from '$lib/server/http'; +import { groupEntriesView, groupOf, groupsView } from '$lib/server/slot-groups'; + +/** One of the org's reserved-slot groups: for those who edit its reserved slots, found within it. */ +export const load: PageServerLoad = async ({ locals, params }) => { + const env = getEnv(); + try { + const { org } = await requireListsRole(env, locals, params.id, 'reserve'); + const group = await groupOf(env, org, params.groupId); + const [entries, groups] = await Promise.all([ + groupEntriesView(env, org, group), + groupsView(env, org) + ]); + return { entries, group: groups.find((g) => g.id === group.id)! }; + } catch (err) { + const known = normalizeError(err); + if (!known) throw err; + error(known.status, known.message); + } +}; diff --git a/src/routes/(app)/orgs/[id]/reserved/[groupId]/+page.svelte b/src/routes/(app)/orgs/[id]/reserved/[groupId]/+page.svelte new file mode 100644 index 00000000..e016efce --- /dev/null +++ b/src/routes/(app)/orgs/[id]/reserved/[groupId]/+page.svelte @@ -0,0 +1,14 @@ + + + diff --git a/src/routes/(app)/server/[id]/slots/+page.svelte b/src/routes/(app)/server/[id]/slots/+page.svelte index 294b68ba..cca077be 100644 --- a/src/routes/(app)/server/[id]/slots/+page.svelte +++ b/src/routes/(app)/server/[id]/slots/+page.svelte @@ -490,7 +490,12 @@ ? '' : ` · ${s.src.state}`} - {:else} + + {#if s.src.group}{s.src.group}{/if} + {:else if s.pending !== 'leaves'} + local {/if} {#if s.pending === 'leaves'} diff --git a/src/test/load-matrix.test.ts b/src/test/load-matrix.test.ts index 3d8957c9..f13d4511 100644 --- a/src/test/load-matrix.test.ts +++ b/src/test/load-matrix.test.ts @@ -40,6 +40,8 @@ const MATRIX: Record = { 'orgs/[id]/seasons/+page.server.ts': 'orgOwner', 'orgs/[id]/bans/+page.server.ts': 'lists:ban', 'orgs/[id]/reserved/+page.server.ts': 'lists:reserve', + // "Group not found." is not a hidden answer: a group looked up before the role check fails it + 'orgs/[id]/reserved/[groupId]/+page.server.ts': 'lists:reserve', 'orgs/[id]/players/+page.server.ts': 'lists', 'server/[id]/+layout.server.ts': 'cap:server.view', 'server/[id]/automation/+page.server.ts': 'cap:automation.manage', From 80b0f23fa3fe69bfbf923fcd548a00210fbb037d Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 17:55:25 +0100 Subject: [PATCH 072/102] Rotation: shuffle with the maps, and each map's zones, in turn --- src/lib/rotation-doc.test.ts | 192 +++++++++++++++++++++++++++ src/lib/rotation-doc.ts | 250 +++++++++++++++++++++++++++++++++++ 2 files changed, 442 insertions(+) diff --git a/src/lib/rotation-doc.test.ts b/src/lib/rotation-doc.test.ts index 4a21b970..fe5baee5 100644 --- a/src/lib/rotation-doc.test.ts +++ b/src/lib/rotation-doc.test.ts @@ -2,11 +2,18 @@ import { test, expect } from 'bun:test'; import { formatRotationEntry, parseRotationEntry, + alignRotation, + entryKey, + keepApart, + mapsInOrder, setModifierOnAll, + shuffleFor, + shuffleRotation, rotationFromText, rotationIntoText } from './rotation-doc'; import { getArray, parseIni, setArrayInText } from './config-doc'; +import type { MapSelection } from './types'; // A slice of the TLR server's document (live build CL-499480), as GET /v1/config returns it. const TEXT = [ @@ -140,3 +147,188 @@ test('setModifierOnAll takes a modifier off every entry, in any case, and keeps skipped: 1 }); }); + +// A rotation of `counts[m]` entries on map m, with `zones` control zones each, told apart by lighting. +const MAPS = ['Kavkazi', 'Europe', 'NorthAmerica', 'Mars']; +const rotationOf = (counts: number[], zones = 1): MapSelection[] => + counts.flatMap((c, m) => + Array.from({ length: c }, (_, i) => ({ + map: MAPS[m], + experiences: [], + lighting: `L${Math.floor(i / zones)}`, + zoneAlternator: zones > 1 ? `Zone${i % zones}` : '' + })) + ); +const repeats = (list: MapSelection[]) => + list.filter((e, i) => i > 0 && e.map.toLowerCase() === list[i - 1].map.toLowerCase()).length; +const initials = (list: MapSelection[]) => list.map((e) => e.map[0]).join(''); +const seeded = (seed: number) => () => (seed = (seed * 1103515245 + 12345) % 2 ** 31) / 2 ** 31; + +test('shuffleRotation keeps every entry and the maps apart wherever the counts allow it', () => { + const random = seeded(1); + const each = (counts: number[]) => { + const entries = rotationOf(counts); + const n = entries.length; + const top = Math.max(...counts); + for (const maps of [[], MAPS.slice(0, counts.length).reverse()]) { + const out = shuffleRotation(entries, maps, random); + expect(new Set(out)).toEqual(new Set(entries)); + expect(out).toHaveLength(n); + // No repeat at all unless one map has more than half; then no more than it must. + expect(repeats(out)).toBe(Math.max(0, 2 * top - n - 1)); + // Coming round again, last and then first are different maps whenever they can be. + if (n >= 2 && 2 * top <= n) expect(out[n - 1].map).not.toBe(out[0].map); + } + }; + for (let a = 1; a <= 7; a++) { + each([a]); + for (let b = 1; b <= 7; b++) { + each([a, b]); + for (let c = 1; c <= 7; c++) each([a, b, c]); + } + } + each([3, 2, 2, 1]); + each([5, 1, 1, 1]); + expect(shuffleRotation([])).toEqual([]); +}); + +test('shuffleRotation plays the maps in the order given, round after round', () => { + // Fewer entries on one map: whole rounds until it runs out, then the other two in turn. + const out = shuffleRotation(rotationOf([32, 32, 24]), ['Europe', 'Kavkazi', 'NorthAmerica']); + expect(initials(out)).toBe('EKN'.repeat(24) + 'EK'.repeat(8)); + // A map the order leaves out follows those it names; no order is the order the rotation has. + expect(initials(shuffleRotation(rotationOf([2, 2, 2]), ['NorthAmerica']))).toBe('NKENKE'); + expect(initials(shuffleRotation(rotationOf([2, 2, 2]), []))).toBe('KENKEN'); + // Rounds stop where going on would put a map twice in a row later: the rest is spread instead. + const uneven = shuffleRotation(rotationOf([40, 30, 18]), ['Kavkazi', 'Europe', 'NorthAmerica']); + expect(initials(uneven).startsWith('KEN'.repeat(8))).toBe(true); + expect(initials(uneven).startsWith('KEN'.repeat(9))).toBe(false); + expect(repeats(uneven)).toBe(0); +}); + +test("shuffleRotation takes each map's control zones in turn, its times of day in a new order", () => { + const out = shuffleRotation(rotationOf([32, 32, 24], 4), [], seeded(2)); + for (const map of MAPS.slice(0, 3)) { + const own = out.filter((e) => e.map === map); + const zones = own.map((e) => e.zoneAlternator); + expect(zones.filter((z, i) => i > 0 && z === zones[i - 1])).toEqual([]); + // a whole round of zones before any comes again + expect(new Set(zones.slice(0, 4)).size).toBe(4); + expect(zones.slice(4, 8)).toEqual(zones.slice(0, 4)); + } + const lightings = out.filter((e) => e.map === 'Kavkazi').map((e) => e.lighting); + expect(lightings).not.toEqual([...lightings].sort()); +}); + +test('shuffleRotation plays a map with over half the entries in even runs between the others', () => { + const out = shuffleRotation(rotationOf([10, 2, 2]), [], seeded(3)); + expect(out.map((e) => (e.map === 'Kavkazi' ? 'K' : '-')).join('')).toBe('KK-KK-KK-KK-KK'); + expect(repeats(out)).toBe(5); +}); + +test('shuffleRotation tells maps apart in any letter case', () => { + const entries = [ + { map: 'Kavkazi', experiences: [], lighting: 'A', zoneAlternator: '' }, + { map: 'kavkazi', experiences: [], lighting: 'B', zoneAlternator: '' }, + { map: 'Europe', experiences: [], lighting: 'C', zoneAlternator: '' } + ]; + for (let seed = 1; seed < 20; seed++) { + const out = shuffleRotation(entries, ['EUROPE'], seeded(seed)); + expect(out.map((e) => e.lighting[0] && e.map.toLowerCase())).toEqual([ + 'kavkazi', + 'europe', + 'kavkazi' + ]); + } + expect(mapsInOrder(entries)).toEqual(['Kavkazi', 'Europe']); +}); + +test('alignRotation puts the map that follows the one on where the server takes its next entry', () => { + const list = shuffleRotation(rotationOf([3, 3, 3]), ['Europe', 'Kavkazi', 'NorthAmerica']); + expect(initials(list)).toBe('EKNEKNEKN'); + // On Europe, next from the top of the new order (a restart): Kavkazi first. + expect(initials(alignRotation(list, 'Europe', [0]))).toBe('KNEKNEKNE'); + // From the entry after place 4 (a pointer that keeps its place): Kavkazi there. + expect(initials(alignRotation(list, 'Europe', [5]))[5]).toBe('K'); + // Two places that cannot both hold Kavkazi: the first listed gets it, then the second does as well + // as the turn allows (after Kavkazi at the top, Northamerica: at least not Europe). + const both = initials(alignRotation(list, 'Europe', [0, 1])); + expect(both.slice(0, 2)).toBe('KN'); + // The other way round, the second place cannot avoid Europe: in turn, it comes just before. + expect(initials(alignRotation(list, 'Europe', [1, 0])).slice(0, 2)).toBe('EK'); + // Turned by less than one round, so the rounds stay whole; nothing is lost or doubled. + const turned = alignRotation(list, 'NorthAmerica', [0]); + expect(new Set(turned)).toEqual(new Set(list)); + expect(repeats(turned)).toBe(0); + expect(turned[turned.length - 1].map).not.toBe(turned[0].map); + // A map not in the rotation: anything but it will do, so the list may stay as it is. + expect(initials(alignRotation(list, 'Mars', [0], () => 0))).toBe('EKNEKNEKN'); + // A list that comes round onto its own map is not turned. + const wraps = rotationOf([3, 1, 1]); + const odd = shuffleRotation(wraps, [], seeded(4)); + expect(alignRotation(odd, 'Kavkazi', [0])).toBe(odd); +}); + +test('shuffleFor starts on the map after the one on and puts the entry on last', () => { + const order = ['Europe', 'Kavkazi', 'NorthAmerica']; + for (const [counts, zones] of [ + [[12, 12, 12], 4], + [[32, 32, 24], 4], + [[5, 7, 6], 1] + ] as [number[], number][]) { + const entries = rotationOf(counts, zones); + for (const on of [entries[0], entries[counts[0]], entries[entries.length - 1]]) { + const out = shuffleFor(entries, order, on, seeded(5)); + expect(new Set(out)).toEqual(new Set(entries)); + expect(repeats(out)).toBe(0); + expect(out[0].map).not.toBe(out[out.length - 1].map); + // a server that stays on its entry, or goes to the top, goes on to the map after it + expect(out[out.length - 1]).toBe(on); + const turn = order.filter((m) => counts[MAPS.indexOf(m)] > 0); + expect(out[0].map).toBe(turn[(turn.indexOf(on.map) + 1) % turn.length]); + } + } + // An entry the rotation does not hold: only the turn starts after its map. + const entries = rotationOf([3, 3, 3]); + const other = { map: 'Kavkazi', experiences: [], lighting: 'Elsewhere', zoneAlternator: '' }; + expect(initials(shuffleFor(entries, ['Europe', 'Kavkazi', 'NorthAmerica'], other))).toBe( + 'NEKNEKNEK' + ); + expect(initials(shuffleFor(entries, ['Europe', 'Kavkazi', 'NorthAmerica'], null))).toBe( + 'EKNEKNEKN' + ); + expect(entryKey(other)).toBe(entryKey({ ...other, map: 'KAVKAZI', zoneAlternator: 'None' })); +}); + +test('keepApart ends on another key than the one asked, where the counts allow it', () => { + const items = [...'aaaabbbbcccc'].map((k, i) => ({ k, i })); + for (let seed = 1; seed < 30; seed++) { + const out = keepApart(items, (x) => x.k, { + order: ['a', 'b', 'c'], + last: 'c', + random: seeded(seed) + }); + expect(out.map((x) => x.k).join('')).not.toMatch(/(.)\1/); + expect(out[out.length - 1].k).not.toBe('c'); + } + // Twelve of one key and eleven of another can only alternate from it to it: asked to end on + // another, it still keeps them apart. + const tight = [...('a'.repeat(12) + 'b'.repeat(11))].map((k, i) => ({ k, i })); + const out = keepApart(tight, (x) => x.k, { order: ['b', 'a'], last: 'a' }); + expect(out.map((x) => x.k).join('')).toBe('ab'.repeat(11) + 'a'); +}); + +test('shuffleFor does not start on the map on when it has half the entries, nor its zone', () => { + const order = ['Europe', 'Kavkazi', 'NorthAmerica']; + const entries = rotationOf([16, 8, 8], 4); + for (let seed = 1; seed < 40; seed++) { + const on = entries[(seed * 7) % 16]; + const out = shuffleFor(entries, order, on, seeded(seed)); + // Kavkazi has half: after it in the turn comes NorthAmerica + expect(out[0].map).toBe('NorthAmerica'); + expect(out[out.length - 1]).toBe(on); + expect(repeats(out)).toBe(0); + const next = out.find((e) => e.map === on.map && e !== on)!; + expect(next.zoneAlternator).not.toBe(on.zoneAlternator); + } +}); diff --git a/src/lib/rotation-doc.ts b/src/lib/rotation-doc.ts index 8465c29d..e8cbaa87 100644 --- a/src/lib/rotation-doc.ts +++ b/src/lib/rotation-doc.ts @@ -68,6 +68,256 @@ export function setModifierOnAll( return { entries: next, changed, skipped }; } +function shuffled(list: T[], random: () => number): T[] { + const out = list.slice(); + for (let i = out.length - 1; i > 0; i--) { + const j = Math.floor(random() * (i + 1)); + [out[i], out[j]] = [out[j], out[i]]; + } + return out; +} + +/** + * The piles dealt out one item at a time so that items of one pile stand apart. The piles take + * turns in the order given, a whole round at a time, for as many rounds as leave the rest able to + * stand apart; the rest follows in a smooth round robin over what is left of each pile, the earlier + * pile first on a tie (and the list starts on the first pile that can start it). No pile plays + * twice in a row wherever the counts allow it, and the list ends + * on another pile than `endNot`, or, without one, than the pile it starts with, so it comes round + * cleanly. A pile of more than half the items cannot be kept apart: it goes in runs as even as they + * can be, with one other item between each. + */ +function deal(piles: T[][], endNot = -1): T[] { + const counts = piles.map((p) => p.length); + const n = counts.reduce((a, b) => a + b, 0); + if (!n) return []; + const top = Math.max(...counts); + if (2 * top > n + 1) { + const big = counts.indexOf(top); + const rest = deal(piles.filter((_, i) => i !== big)); + const runs = rest.length + 1; + const out: T[] = []; + for (let i = 0, from = 0; i < runs; i++) { + const to = Math.round(((i + 1) * top) / runs); + out.push(...piles[big].slice(from, to)); + from = to; + if (i < rest.length) out.push(rest[i]); + } + return out; + } + const k = piles.length; + let left = counts.slice(); + // With `slots` still to fill after pile `prev`, the last of them not pile `end`: can every pile's + // remaining items stay apart? + const fits = (slots: number, prev: number, end: number) => + left.every((have, m) => { + if (!have) return true; + const free = slots - (m === prev ? 1 : 0) - (m === end ? 1 : 0); + return free > 0 && have <= Math.ceil(free / 2); + }); + if (endNot >= 0 && !fits(n, -1, endNot)) endNot = -1; + // Coming round onto the first pile again only where the counts leave room for it. + const round = 2 * top <= n; + const endFor = (first: number) => (endNot >= 0 ? endNot : round ? first : -1); + let rounds = Math.min(...counts); + for (; rounds > 0; rounds--) { + left = counts.map((c) => c - rounds); + // rounds that use up every item end on the last pile, which must be allowed to end it + const rest = n - k * rounds; + if (rest ? fits(rest, k - 1, endFor(0)) : k - 1 !== endFor(0)) break; + } + left = counts.map((c) => c - rounds); + const out: T[] = []; + for (let r = 0; r < rounds; r++) for (let m = 0; m < k; m++) out.push(piles[m][r]); + const rest = n - k * rounds; + const weight = left.slice(); + const credit = piles.map(() => 0); + let first = rounds ? 0 : -1; + let last = rounds ? k - 1 : -1; + for (let t = 0; t < rest; t++) { + for (let m = 0; m < k; m++) credit[m] += weight[m]; + let pick = -1; + for (let m = 0; m < k; m++) { + if (!left[m] || m === last) continue; + left[m]--; + const ok = fits(rest - t - 1, m, endFor(first < 0 ? m : first)); + left[m]++; + if (ok && (pick < 0 || (first >= 0 && credit[m] > credit[pick]))) pick = m; + } + credit[pick] -= rest; + out.push(piles[pick][counts[pick] - left[pick]--]); + if (first < 0) first = pick; + last = pick; + } + return out; +} + +/** + * `items` in an order that keeps those of one key apart (see `deal`), each key's own items in the + * order `within` gives them, a shuffle by default. The keys take turns in `order`; a key it leaves + * out follows the ones it names, in the order it first appears. Without `order`, a random order. + * `last`: a key the order should not end on. + */ +export function keepApart( + items: T[], + keyOf: (item: T) => string, + opts: { + order?: string[]; + within?: (items: T[]) => T[]; + last?: string; + random?: () => number; + } = {} +): T[] { + const random = opts.random ?? Math.random; + const byKey = new Map(); + for (const item of items) { + const k = keyOf(item); + const pile = byKey.get(k); + if (pile) pile.push(item); + else byKey.set(k, [item]); + } + const keys = opts.order + ? [...new Set([...opts.order.filter((k) => byKey.has(k)), ...byKey.keys()])] + : shuffled([...byKey.keys()], random); + const within = opts.within ?? ((list: T[]) => shuffled(list, random)); + const piles = keys.map((k) => within(byKey.get(k)!)); + return deal(piles, opts.last === undefined ? -1 : keys.indexOf(opts.last)); +} + +const mapKey = (e: MapSelection) => e.map.toLowerCase(); +const zoneKey = (e: MapSelection) => (e.zoneAlternator || '').toLowerCase(); + +/** One rotation entry as text, the same whichever of the server and the document gives it. */ +export function entryKey(e: MapSelection): string { + const v = (x: string | undefined) => (!x || /^none$/i.test(x) ? '' : x.toLowerCase()); + const exps = e.experiences.map((x) => x.toLowerCase()).sort(); + return [v(e.map), exps.join('+'), v(e.lighting), v(e.zoneAlternator)].join('|'); +} + +/** The maps of a rotation in the order it first has them, spelled as they first are. */ +export function mapsInOrder(entries: MapSelection[]): string[] { + const seen = new Map(); + for (const e of entries) if (!seen.has(mapKey(e))) seen.set(mapKey(e), e.map); + return [...seen.values()]; +} + +/** + * The maps of a rotation in the order they take turns: those `maps` names first, in its order, then + * the rotation's others in the order it first has them; spelled as the rotation has them. + */ +export function turnOf(entries: MapSelection[], maps: string[]): string[] { + const spelled = new Map(mapsInOrder(entries).map((m) => [m.toLowerCase(), m])); + return [...new Set([...maps.map((m) => m.toLowerCase()), ...spelled.keys()])] + .filter((m) => spelled.has(m)) + .map((m) => spelled.get(m)!); +} + +/** + * The rotation in a new order. The maps take turns in `maps` (one it leaves out follows, in the + * order the rotation first has it), and among each map's own entries its control zones take turns, + * its times of day in a new order (`zones` can order a map's entries instead). `endNot`: a map the + * order should not end on. Where the counts cannot be kept apart, see `deal`. + */ +export function shuffleRotation( + entries: MapSelection[], + maps: string[] = [], + random: () => number = Math.random, + opts: { endNot?: string; zones?: (own: MapSelection[]) => MapSelection[] } = {} +): MapSelection[] { + return keepApart(entries, mapKey, { + order: maps.map((m) => m.toLowerCase()), + within: opts.zones ?? ((own) => keepApart(own, zoneKey, { random })), + last: opts.endNot?.toLowerCase(), + random + }); +} + +/** How often a map comes twice in a row: within the list, then once more when it comes round. */ +const repeatsIn = (list: MapSelection[]) => { + const within = list.filter((e, i) => i > 0 && mapKey(e) === mapKey(list[i - 1])).length; + const round = list.length > 1 && mapKey(list[0]) === mapKey(list[list.length - 1]) ? 1 : 0; + return within * 2 + round; +}; + +/** + * The rotation in a new order (`shuffleRotation`) for a server playing `on` when it is written. The + * turn starts with the map after the one on, and the entry on goes last: a server that stays on + * the entry it is playing then goes on from the top of the new order, as one that starts from the + * top does (a restart), and either way the map after the one on comes next. The map on's control + * zones likewise start after the zone on, so its next turn is on another. Where the counts do not + * allow that, or the rotation does not hold the entry, the plain shuffle with that turn. + */ +export function shuffleFor( + entries: MapSelection[], + maps: string[], + on: MapSelection | null, + random: () => number = Math.random +): MapSelection[] { + const turn = turnOf(entries, maps).map((m) => m.toLowerCase()); + const at = on ? turn.indexOf(mapKey(on)) : -1; + const after = at < 0 ? turn : [...turn.slice(at + 1), ...turn.slice(0, at + 1)]; + // The map on's entries: its zones in turn from the one after the zone on, so its next turn is + // on another zone, and ending on another too (the entry on follows them) unless that costs the + // next turn, which comes first: the end only shows when the whole list comes round. + const zones = (own: MapSelection[]) => { + if (!on || mapKey(own[0]) !== mapKey(on)) return keepApart(own, zoneKey, { random }); + const keys = shuffled([...new Set(own.map(zoneKey))], random); + const z = keys.indexOf(zoneKey(on)); + const order = z < 0 ? keys : [...keys.slice(z + 1), ...keys.slice(0, z + 1)]; + const both = keepApart(own, zoneKey, { order, last: zoneKey(on), random }); + if (z < 0 || zoneKey(both[0]) !== zoneKey(on)) return both; + const next = keepApart(own, zoneKey, { order, random }); + return zoneKey(next[0]) !== zoneKey(on) ? next : both; + }; + const plain = shuffleRotation(entries, after, random, { zones }); + const i = on ? entries.findIndex((e) => entryKey(e) === entryKey(on)) : -1; + if (i < 0) return plain; + const rest = [...entries.slice(0, i), ...entries.slice(i + 1)]; + const last = [ + ...shuffleRotation(rest, after, random, { endNot: entries[i].map, zones }), + entries[i] + ]; + return repeatsIn(last) <= repeatsIn(plain) ? last : plain; +} + +/** + * A shuffled rotation turned round by fewer places than it has maps, so its whole rounds stay at + * the top, to suit the map on when it is written. `after` lists where the server may take its next + * entry from once the order changes, the likeliest first: each should hold the map that follows + * `playing` in the turn, or at least another map. Among the turns that do best, one at random. A + * list that comes round onto its own map is left as it is: turning it would put a map twice in a + * row. + */ +export function alignRotation( + list: MapSelection[], + playing: string, + after: number[], + random: () => number = Math.random +): MapSelection[] { + const n = list.length; + if (n < 2 || mapKey(list[0]) === mapKey(list[n - 1])) return list; + const turn = [...new Set(list.map(mapKey))]; + const now = playing.toLowerCase(); + const at = turn.indexOf(now); + const next = at < 0 ? null : turn[(at + 1) % turn.length]; + const score = (r: number) => + after.map((p) => { + const m = mapKey(list[(((p + r) % n) + n) % n]); + return m === next ? 2 : m === now ? 0 : 1; + }); + let best: number[] = []; + let top: number[] = []; + for (let r = 0; r < Math.min(turn.length, n); r++) { + const s = score(r); + const i = s.findIndex((v, j) => v !== top[j]); + const better = !best.length || (i >= 0 && s[i] > top[i]); + if (better) [best, top] = [[r], s]; + else if (i < 0) best.push(r); + } + const r = best[Math.floor(random() * best.length)]; + return r ? [...list.slice(r), ...list.slice(0, r)] : list; +} + export function rotationFromText(text: string): RotationDoc { const doc = parseIni(text); const enabled = getScalar(doc, S_ROTATION, 'bEnabled'); From c88dbe1c90a5f29f9b80d60a25b259ff24da7114 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 17:55:25 +0100 Subject: [PATCH 073/102] Rotation shuffle rule: a new rotation order once a run - Shuffles when saved or switched on again, in the last round before the 24-hour restart, and after a restart it did not see coming - Saving needs Config & settings as well as Automation; no migration, no new route, action or load - Refusals are stored as fixed phrases; the mock's rotation pointer is settable for tests (MOCK_ROTATION_POINTER) --- docs/wardogs-api.md | 5 +- src/lib/rule-kinds.ts | 13 +- src/lib/server/db/schema.ts | 3 +- src/lib/server/mockgame.ts | 24 +- src/lib/server/outbox.ts | 11 +- src/lib/server/rotation-shuffle.test.ts | 457 ++++++++++++++++++++++++ src/lib/server/rotation-shuffle.ts | 222 ++++++++++++ src/lib/server/trigger-rules.ts | 12 +- src/lib/server/triggers.ts | 98 ++++- src/lib/server/webhook-delivery.ts | 1 + src/lib/types.ts | 3 +- src/test/access.test.ts | 6 +- src/test/rotation-shuffle.test.ts | 68 ++++ 13 files changed, 904 insertions(+), 19 deletions(-) create mode 100644 src/lib/server/rotation-shuffle.test.ts create mode 100644 src/lib/server/rotation-shuffle.ts create mode 100644 src/test/rotation-shuffle.test.ts diff --git a/docs/wardogs-api.md b/docs/wardogs-api.md index 99f5194d..8c9fed07 100644 --- a/docs/wardogs-api.md +++ b/docs/wardogs-api.md @@ -100,7 +100,10 @@ into `server_live`, so the header, the Discord status cards and the list sync sh Servers → Test reads them fresh and drops the caches. Set `MOCK_LIVE_BUILD=true` to make the demo servers behave like this build (routes, pinned `ServerName`/`Port`, the live build string), and `MOCK_RATE_LIMIT_EVERY=N` to have the demo answer every Nth request with a 429 and `Retry-After: 2` -so the worker's hold can be watched. The +so the worker's hold can be watched. Where a live build's rotation pointer goes when the document +rewrites the rotation mid-match has not been seen: the demo keeps it on the entry being played, +`MOCK_ROTATION_POINTER=index` keeps its place instead and `=top` goes to the top of the list at the +next map change (the Rotation shuffle rule reads the rotation back to tell which). The authoritative list for any server is its own `routes` array; Warcon shows it under Servers, Test, "Routes this build serves". diff --git a/src/lib/rule-kinds.ts b/src/lib/rule-kinds.ts index ef8e559a..d7486a15 100644 --- a/src/lib/rule-kinds.ts +++ b/src/lib/rule-kinds.ts @@ -116,20 +116,27 @@ export const RULE_KINDS: { kind: TriggerKind; group: RuleGroup; label: string; b group: 'Server', label: 'Empty-server map reset', blurb: 'Put an empty server back on a chosen map after a while.' + }, + { + kind: 'rotation_shuffle', + group: 'Server', + label: 'Rotation shuffle', + blurb: 'A new rotation order every day, the maps in turn so none plays twice in a row.' } ]; /** * Kinds a server holds one rule of (createTrigger refuses a second): seed time is one count per * server, two Team balance rules would move players back and forth, two AFK protection rules would - * kill everyone twice a round, two Bounty rules would mark two players at once. The picker opens the - * one a server has. + * kill everyone twice a round, two Bounty rules would mark two players at once, two Rotation shuffle + * rules would each undo the other's order. The picker opens the one a server has. */ export const ONE_PER_SERVER: TriggerKind[] = [ 'seed_reward', 'two_teams', 'afk_protection', - 'bounty' + 'bounty', + 'rotation_shuffle' ]; /** diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index d914d170..369178ac 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -847,7 +847,8 @@ export const triggers = pgTable( 'kill_distance', 'afk_protection', 'name_change', - 'bounty' + 'bounty', + 'rotation_shuffle' ] }).notNull(), name: text('name').notNull(), diff --git a/src/lib/server/mockgame.ts b/src/lib/server/mockgame.ts index 9ab4227c..63e647f3 100644 --- a/src/lib/server/mockgame.ts +++ b/src/lib/server/mockgame.ts @@ -145,6 +145,13 @@ const MAX_BODY_BYTES = 65536; // AFK protection can be watched at work, and lowering the minimum starts the match. const prematch = () => /^(1|true|yes)$/i.test(process.env.MOCK_PREMATCH || ''); const PREMATCH_MINIMUM = 60; +// Where the rotation's pointer goes when the document rewrites it, which no live build has been +// seen doing: by default it stays on the entry now playing; MOCK_ROTATION_POINTER=index keeps the +// place it had, =top goes to the top of the list at the next map change. +const rotationPointer = () => + /^(index|top)$/i.test(process.env.MOCK_ROTATION_POINTER || '') + ? (process.env.MOCK_ROTATION_POINTER as string).toLowerCase() + : 'entry'; const prematchMinimum = (text: string): number => { const n = Number( getScalar( @@ -1159,11 +1166,13 @@ export function mockHandle( s.sponsorUrl = img[1].trim().replace(/^"|"$/g, ''); } // Like the live build: the rotation section is "rebuilt immediately; used from the next - // map change". The entry now playing keeps its place by identity, or the pointer resets. + // map change". The entry now playing keeps its place by identity, or the pointer resets + // (see MOCK_ROTATION_POINTER for the other ways a build might do it). const rot = rotationFromText(text); s.rotation.enabled = rot.enabled; s.rotation.mode = rot.mode; - const playing = s.rotation.entries[s.rotation.nowIndex]; + const was = s.rotation.nowIndex; + const playing = s.rotation.entries[was]; s.rotation.entries = rot.entries.map((e) => ({ ...e, denied: e.experiences.some((id) => !EXPERIENCES.some((x) => x.id === id)) @@ -1173,10 +1182,19 @@ export function mockHandle( (e) => e.map === playing.map && e.lighting === playing.lighting && + (e.zoneAlternator || '') === (playing.zoneAlternator || '') && e.experiences.join('+') === playing.experiences.join('+') ) : -1; - s.rotation.nowIndex = keep >= 0 ? keep : 0; + const pointer = rotationPointer(); + s.rotation.nowIndex = + pointer === 'top' + ? Math.max(0, s.rotation.entries.length - 1) + : pointer === 'index' + ? Math.min(Math.max(was, 0), Math.max(0, s.rotation.entries.length - 1)) + : keep >= 0 + ? keep + : 0; s.rotation.nextIndex = s.rotation.entries.length ? (s.rotation.nowIndex + 1) % s.rotation.entries.length : -1; diff --git a/src/lib/server/outbox.ts b/src/lib/server/outbox.ts index 1cb44b69..69f9574a 100644 --- a/src/lib/server/outbox.ts +++ b/src/lib/server/outbox.ts @@ -37,6 +37,7 @@ import { BOUNTY_CLAIM, BOUNTY_LAPSE, BOUNTY_REWARD } from './bounty'; import { writeAudit } from './audit'; import { PANEL_BAN, type PanelBanParams } from './rule-ban'; import { killAndTell, RULE_KILL, RULE_KILL_MAX_AGE_MS } from './rule-kill'; +import { ROTATION_SHUFFLE, shuffleOnServer } from './rotation-shuffle'; import { queueEvent } from './json-webhook-queue'; import { seedRewardGranted } from './json-webhook-events'; import { @@ -528,7 +529,7 @@ async function deliverOne(env: Env, row: OutboxRow): Promise<'held' | 'refused' env, row, 'delivered', - ((row.action === RULE_KILL || !OWN_WORDS.has(row.action)) && messageOf(result)) || + ((OWN_RESULT.has(row.action) || !OWN_WORDS.has(row.action)) && messageOf(result)) || row.okMessage ); // Done, but a later step was refused for sending too fast (a rule kill's whisper): hold the @@ -845,9 +846,12 @@ const retryAfterOf = (r: unknown): number => * A rule's whisper, kick or kill carries what it tells one player, their stats across the * organisation among it: what became of it is told in the panel's own words, never the game's, * which staff of this server read (Recent actions, the audit trail, Discord) and which might repeat - * the text. A kill says in its own fixed words whether the player was killed and told. + * the text. A kill says in its own fixed words whether the player was killed and told. A rotation + * shuffle writes the config document, whose refusals can quote the file. */ -const OWN_WORDS = new Set(['whisper', 'kick', RULE_KILL]); +const OWN_WORDS = new Set(['whisper', 'kick', RULE_KILL, ROTATION_SHUFFLE]); +/** Of those, the ones whose result is the panel's own account (names, counts), kept as it is. */ +const OWN_RESULT = new Set([RULE_KILL, ROTATION_SHUFFLE]); /** Why the game refused a whisper or kick, as a fixed phrase: its status and its code. */ function refusal(err: unknown): string { @@ -949,6 +953,7 @@ async function execute(client: WardogsClient, row: OutboxRow): Promise const params = (row.params as Record) ?? {}; if (row.action === AFK_ROUND) return afkRound(client, params, memoryOf(row.serverId)); if (row.action === RULE_KILL) return killAndTell(client, params); + if (row.action === ROTATION_SHUFFLE) return shuffleOnServer(client, params); if (row.action === 'empty_reset') { let rotationOn = false; try { diff --git a/src/lib/server/rotation-shuffle.test.ts b/src/lib/server/rotation-shuffle.test.ts new file mode 100644 index 00000000..69eb3fcb --- /dev/null +++ b/src/lib/server/rotation-shuffle.test.ts @@ -0,0 +1,457 @@ +// The Rotation shuffle rule: when it shuffles (shuffleStep), and the shuffle itself against the mock +// game's config document, whichever way the game moves its pointer when the rotation is rewritten. +import { afterEach, describe, expect, test } from 'bun:test'; +import type { Env } from './env'; +import { WardogsClient, GameError } from './rcon'; +import { ApiError } from './http'; +import { readConfig } from './actions'; +import { + shuffleOnServer, + shuffleStep, + rotationShuffleState, + validateRotationShuffle, + type RotationShuffleState +} from './rotation-shuffle'; +import { rotationFromText, rotationIntoText } from '../rotation-doc'; +import type { MapSelection } from '../types'; +import { evaluateTriggers, type TickContext } from './triggers'; +import type { TriggerRow } from './db/schema'; + +const H = 3600_000; +const START = Date.UTC(2026, 9, 9, 4, 0, 0); + +describe('shuffleStep', () => { + const look = (startedAt: number, restartDue = false) => ({ startedAt, restartDue }); + + test('a new rule shuffles at once; nothing while the start is unknown', () => { + expect(shuffleStep(null, look(0))).toBeNull(); + expect(shuffleStep(null, look(START))).toEqual({ + state: { boot: START, forNext: false, spentBy: 0 }, + when: 'now' + }); + // Saved in the last round: that shuffle is the one the next run starts on. + expect(shuffleStep(null, look(START, true))).toEqual({ + state: { boot: START, forNext: true, spentBy: 0 }, + when: 'before-restart' + }); + }); + + test('once a run: in the last round before the restart, and the run after starts on it', () => { + let s: RotationShuffleState = { boot: START, forNext: false, spentBy: 0 }; + // Same run, a few seconds of drift in the start: nothing. + expect(shuffleStep(s, look(START + 4_000))).toBeNull(); + // The restart is due: shuffle for the next run, once. + const due = shuffleStep(s, look(START, true))!; + expect(due.when).toBe('before-restart'); + s = due.state; + expect(shuffleStep(s, look(START, true))).toBeNull(); + // The next run comes up on that order: only noted, no shuffle. + const next = START + 24 * H + 20 * 60_000; + const up = shuffleStep(s, look(next))!; + expect(up).toEqual({ state: { ...s, spentBy: next }, when: null }); + s = up.state; + expect(shuffleStep(s, look(next + 30_000))).toBeNull(); + // Its own last round shuffles again. + expect(shuffleStep(s, look(next, true))?.when).toBe('before-restart'); + }); + + test('after a restart no shuffle was made for: a crash, a set restart time, or a second one', () => { + const made: RotationShuffleState = { boot: START, forNext: false, spentBy: 0 }; + expect(shuffleStep(made, look(START + 6 * H))).toEqual({ + state: { boot: START + 6 * H, forNext: false, spentBy: 0 }, + when: 'after-restart' + }); + // Prepared for, and spent by one run; another restart before its own last round. + const spent: RotationShuffleState = { boot: START, forNext: true, spentBy: START + 24 * H }; + expect(shuffleStep(spent, look(START + 30 * H))?.when).toBe('after-restart'); + // One the rule could not see coming falls in the restart window of the new run: before. + expect(shuffleStep(made, look(START + 30 * H, true))?.when).toBe('before-restart'); + }); + + test('reads back only a state it wrote', () => { + expect(rotationShuffleState(null)).toBeNull(); + expect(rotationShuffleState({ enabledAt: 5 })).toBeNull(); + expect(rotationShuffleState({ boot: START, forNext: true, spentBy: 'x' })).toEqual({ + boot: START, + forNext: true, + spentBy: 0 + }); + }); +}); + +test('the rule queues one shuffle a run, saying what it is for, and keeps its state on the row', async () => { + const row = { + id: 'rule-1', + serverId: 'server-1', + orgId: 'org-1', + kind: 'rotation_shuffle', + name: 'Rotation shuffle', + enabled: true, + config: { maps: ['Europe', 'Kavkazi'] }, + state: null, + lastFiredAt: null, + lastResult: '' + } as unknown as TriggerRow; + const look = (startedAt: number, at: number) => + evaluateTriggers( + {} as Env, + { + server: { id: 'server-1', name: 'Test' }, + status: { map: 'Kavkazi', rotationNow: 4, playerCount: 40, scores: [] }, + players: [], + startedAt, + ts: new Date(at) + } as unknown as TickContext, + [row] + ); + let out = await look(START, START + H); + expect(out.intents).toHaveLength(1); + expect(out.intents[0]).toMatchObject({ + action: 'rotation_shuffle', + params: { maps: ['Europe', 'Kavkazi'], when: 'now', playing: 'Kavkazi', now: 4 }, + steamId: null + }); + expect(out.updates).toEqual([ + { + id: 'rule-1', + lastFiredAt: new Date(START + H), + lastResult: 'Shuffling now.', + state: { boot: START, forNext: false, spentBy: 0 } + } + ]); + // The rest of the run, a few seconds of drift in the start: nothing. + out = await look(START + 3_000, START + 5 * H); + expect(out).toEqual({ intents: [], updates: [] }); + // The 24-hour restart is due: once, for the run after it. + out = await look(START, START + 24 * H + 60_000); + expect(out.intents.map((i) => i.params.when)).toEqual(['before-restart']); + expect(out.updates[0].lastResult).toBe('Shuffling for after the restart.'); + expect((await look(START, START + 24 * H + 120_000)).intents).toEqual([]); + // The run that comes up on it is only noted. + out = await look(START + 24 * H + 600_000, START + 25 * H); + expect(out.intents).toEqual([]); + expect(out.updates[0].state).toMatchObject({ spentBy: START + 24 * H + 600_000 }); + // Unknown uptime: nothing at all. + expect(await look(0, START + 26 * H)).toEqual({ intents: [], updates: [] }); + // Saved again (the state starts over): another shuffle, which the outbox must not take for the + // first one. + const first = (await look(START, START + H)).intents; + row.state = null; + const again = (await look(START, START + H + 60_000)).intents; + expect(again.map((i) => i.params.when)).toEqual(['now']); + expect(again[0].dedupeKey).not.toBe(first[0]?.dedupeKey ?? ''); + row.state = null; + const one = await look(START, START + H); + row.state = null; + const two = await look(START, START + 2 * H); + expect(one.intents[0].dedupeKey).not.toBe(two.intents[0].dedupeKey); + // Saved in the last round, after that round's own shuffle: it counts as one for after the + // restart, and is still not taken for the first. + row.state = null; + await look(START, START + H); + const due = await look(START, START + 24 * H + 60_000); + row.state = null; + const saved = await look(START, START + 24 * H + 120_000); + expect(saved.intents.map((i) => i.params.when)).toEqual(['before-restart']); + expect(saved.intents[0].dedupeKey).not.toBe(due.intents[0].dedupeKey); +}); + +test('validateRotationShuffle keeps map ids once each, in order', () => { + expect( + validateRotationShuffle({ + maps: ['Europe', 'kavkazi', 'EUROPE', '', '', 'NorthAmerica', 7] + }) + ).toEqual({ maps: ['Europe', 'kavkazi', 'NorthAmerica', '7'] }); + expect(validateRotationShuffle(null)).toEqual({ maps: [] }); + expect(validateRotationShuffle({ maps: 'Europe' })).toEqual({ maps: [] }); +}); + +// ---- the shuffle against the mock game ---- + +const EXP: Record = { + Europe: 'Madrid_KOTH_01', + Kavkazi: 'Bakurani_KOTH_01', + NorthAmerica: 'Detroit_KOTH_01' +}; +const LIGHTS = ['DayStartClear', 'DayEarlyClear', 'DayClear', 'DayEndClear']; +/** a whole rotation grouped by map, as an admin writes one: every map, zone and time of day */ +const grouped = (zones: Record): MapSelection[] => + Object.entries(zones).flatMap(([map, own]) => + own.flatMap((z) => + LIGHTS.map((lighting) => ({ + map, + experiences: [EXP[map]], + lighting, + zoneAlternator: `ZoneAlternator.${map}.${z}` + })) + ) + ); +/** as many entries on each map: the turn holds all the way round */ +const EVEN = grouped({ + Europe: ['A', 'B', 'C', 'D'], + Kavkazi: ['A', 'B', 'C', 'D'], + NorthAmerica: ['A', 'B', 'C', 'D'] +}); +/** one map with fewer: whole rounds until it runs out, then the other two in turn */ +const UNEVEN = grouped({ + Europe: ['A', 'B', 'C', 'D'], + Kavkazi: ['A', 'B', 'C', 'D'], + NorthAmerica: ['A', 'B', 'C'] +}); +const ORDER = ['Europe', 'Kavkazi', 'NorthAmerica']; +const after = (map: string) => ORDER[(ORDER.indexOf(map) + 1) % ORDER.length]; + +let n = 0; +const clientFor = () => + new WardogsClient( + {} as Env, + { id: `shuffle-${++n}`, host: 'demo', port: 1, scheme: 'http' }, + 'demo', + `shuffle-test-${Date.now()}-${n}` + ); +async function setRotation(client: WardogsClient, entries: MapSelection[], mode = 'random') { + const doc = await readConfig(client); + const text = rotationIntoText(doc.text, { + enabled: true, + mode: mode as 'random' | 'ordered', + entries + }); + const { status } = await client.configCall('PUT', '/v1/config', text, doc.revision); + expect(status).toBe(200); +} +const live = (client: WardogsClient) => + client.json('GET', '/v1/rotation') as Promise<{ + mode: string; + entries: (MapSelection & { status: string })[]; + }>; +const docRotation = async (client: WardogsClient) => + rotationFromText((await readConfig(client)).text); +const repeats = (list: MapSelection[]) => + list.filter((e, i) => i > 0 && e.map === list[i - 1].map).length; + +describe('shuffleOnServer on the mock game', () => { + const was = process.env.MOCK_ROTATION_POINTER; + afterEach(() => { + if (was === undefined) delete process.env.MOCK_ROTATION_POINTER; + else process.env.MOCK_ROTATION_POINTER = was; + }); + + /** a server some way into its old order: `matches` map changes after the rotation was set */ + async function playing(entries: MapSelection[], matches: number) { + const client = clientFor(); + await setRotation(client, entries); + for (let i = 0; i < matches; i++) await client.json('POST', '/v1/match/end'); + return { client, on: (await live(client)).entries.find((e) => e.status === 'now')! }; + } + const nextOn = async (client: WardogsClient) => + (await live(client)).entries.find((e) => e.status === 'next')!; + + for (const pointer of ['entry', 'index', 'top']) { + test(`the maps in turn, and the next map follows the one on (pointer: ${pointer})`, async () => { + process.env.MOCK_ROTATION_POINTER = pointer; + for (let matches = 0; matches < 48; matches += 5) { + const { client, on } = await playing(EVEN, matches); + const { message } = await shuffleOnServer(client, { maps: ORDER, when: 'now' }); + const r = await docRotation(client); + expect(r.mode).toBe('ordered'); + expect(new Set(r.entries.map((e) => JSON.stringify(e)))).toEqual( + new Set(EVEN.map((e) => JSON.stringify(e))) + ); + expect(repeats(r.entries)).toBe(0); + // whole rounds in the rule's order, turned by under a round to follow the map on + const maps = r.entries.map((e) => e.map); + expect(maps.every((m, i) => i === 0 || m === after(maps[i - 1]))).toBe(true); + const next = await nextOn(client); + expect(next.map).toBe(after(on.map)); + expect(message).toContain( + `Shuffled ${EVEN.length} entries: Ozeti, Bakurani, Zestafona in turn` + ); + expect(message).toContain( + `${['Ozeti', 'Bakurani', 'Zestafona'][ORDER.indexOf(next.map)]} next` + ); + } + }); + test(`a map with fewer entries: never the one on next (pointer: ${pointer})`, async () => { + process.env.MOCK_ROTATION_POINTER = pointer; + for (let matches = 0; matches < 44; matches += 3) { + const { client, on } = await playing(UNEVEN, matches); + await shuffleOnServer(client, { maps: ORDER, when: 'now' }); + expect(repeats((await docRotation(client)).entries)).toBe(0); + expect((await nextOn(client)).map).not.toBe(on.map); + } + }); + } + + test('turns the order once more when the server does not have the map after the one on next', async () => { + // The rotation set while the server keeps its entry: it is on the top one (Ozeti). Then it keeps + // its place in the list instead, where the new order (Ozeti last, Bakurani first) has Zestafona. + const { client, on } = await playing(EVEN, 0); + expect(on.map).toBe('Europe'); + process.env.MOCK_ROTATION_POINTER = 'index'; + const raw = client.raw.bind(client); + let puts = 0; + client.raw = async (method, path, body, headers) => { + if (method === 'PUT' && path === '/v1/config') puts++; + return raw(method, path, body, headers); + }; + const { message } = await shuffleOnServer(client, { maps: ORDER, when: 'now' }); + expect(puts).toBe(2); + expect((await nextOn(client)).map).toBe('Kavkazi'); + expect(message).toEndWith('; Bakurani next.'); + expect(repeats((await docRotation(client)).entries)).toBe(0); + }); + + test('before the restart, the top of the order is the map after the one on', async () => { + for (let round = 0; round < 6; round++) { + const { client, on } = await playing(UNEVEN, round * 7); + const { message } = await shuffleOnServer(client, { + maps: ORDER, + when: 'before-restart' + }); + const r = await docRotation(client); + expect(r.entries[0].map).toBe(after(on.map)); + expect(repeats(r.entries)).toBe(0); + expect(message).toMatch(/starting on (Ozeti|Bakurani|Zestafona) after the restart\.$/); + } + }); + + test('leaves a rotation that is off, or too short, as it is', async () => { + const client = clientFor(); + const doc = await readConfig(client); + const off = rotationIntoText(doc.text, { enabled: false, mode: 'random', entries: UNEVEN }); + await client.configCall('PUT', '/v1/config', off, doc.revision); + expect((await shuffleOnServer(client, { maps: ORDER, when: 'now' })).message).toBe( + 'Nothing shuffled: the rotation is switched off on this server.' + ); + expect((await docRotation(client)).entries).toEqual(UNEVEN); + await setRotation(client, UNEVEN.slice(0, 1)); + expect((await shuffleOnServer(client, { maps: ORDER, when: 'now' })).message).toBe( + 'Nothing to shuffle: the rotation has fewer than two entries.' + ); + }); + + test("names the turn in the rule's order, the rotation's other maps after", async () => { + const { client } = await playing(EVEN, 4); + const { message } = await shuffleOnServer(client, { maps: ['NorthAmerica'], when: 'now' }); + expect(message).toStartWith( + `Shuffled ${EVEN.length} entries: Zestafona, Ozeti, Bakurani in turn` + ); + }); + + test('a map with half the entries on: the server does not come back up on it', async () => { + const half = grouped({ + Europe: ['A', 'B', 'C', 'D'], + Kavkazi: ['A', 'B'], + NorthAmerica: ['A', 'B'] + }); + for (let matches = 0; matches < 32; matches += 3) { + const { client, on } = await playing(half, matches); + await shuffleOnServer(client, { maps: ORDER, when: 'before-restart' }); + const r = await docRotation(client); + expect([on.map, r.entries[0].map === on.map]).toEqual([on.map, false]); + expect(repeats(r.entries)).toBe(0); + } + }); + + test('the map on comes round next on another control zone', async () => { + for (let matches = 0; matches < 48; matches += 5) { + const { client, on } = await playing(EVEN, matches); + await shuffleOnServer(client, { maps: ORDER, when: 'now' }); + const r = await docRotation(client); + const own = r.entries.find((e) => e.map === on.map)!; + expect(own.zoneAlternator).not.toBe(on.zoneAlternator); + } + }); + + test('a refused second turn is told, the shuffle stands; too fast holds the server', async () => { + process.env.MOCK_ROTATION_POINTER = 'entry'; + for (const answer of [429, 500]) { + const { client } = await playing(EVEN, 0); + process.env.MOCK_ROTATION_POINTER = 'index'; + const raw = client.raw.bind(client); + let puts = 0; + client.raw = async (method, path, body, headers) => { + if (method === 'PUT' && path === '/v1/config' && ++puts === 2) + return { + status: answer, + statusText: '', + headers: answer === 429 ? { 'retry-after': '3' } : {}, + text: JSON.stringify({ + ok: false, + error: { code: answer === 429 ? 'rate_limited' : 'oops', message: 'x' } + }) + }; + return raw(method, path, body, headers); + }; + const out = await shuffleOnServer(client, { maps: ORDER, when: 'now' }); + expect(puts).toBe(2); + expect((await docRotation(client)).mode).toBe('ordered'); + if (answer === 429) { + expect(out.message).toEndWith('turning it once more was refused for sending too fast.'); + expect(out.retryAfterMs).toBeGreaterThan(0); + } else expect(out.message).toEndWith('It could not be turned once more.'); + process.env.MOCK_ROTATION_POINTER = 'entry'; + } + }); + + test('a document the server refuses is told by its status and code, never its words', async () => { + const { client } = await playing(EVEN, 0); + const raw = client.raw.bind(client); + client.raw = async (method, path, body, headers) => + method === 'PUT' && path === '/v1/config' + ? { + status: 400, + statusText: 'Bad Request', + headers: {}, + text: JSON.stringify({ + ok: false, + error: { code: 'invalid', message: 'Password=hunter2 is not allowed here' }, + errors: [{ line: 3, message: 'Password=hunter2' }] + }) + } + : raw(method, path, body, headers); + const err = await shuffleOnServer(client, { maps: ORDER, when: 'now' }).catch((e) => e); + expect(err).toBeInstanceOf(GameError); + expect([err.status, err.code, err.message, err.body]).toEqual([ + 400, + 'invalid', + 'The server did not take the new rotation.', + null + ]); + }); + + test('a read-only document is refused in the panel’s words; a conflict is tried once more', async () => { + const client = clientFor(); + await setRotation(client, UNEVEN); + const raw = client.raw.bind(client); + let puts = 0; + let conflicts = 1; + let writable = false; + client.raw = async (method, path, body, headers) => { + const res = await raw(method, path, body, headers); + if (method === 'GET' && path === '/v1/config' && !writable) + return { ...res, text: JSON.stringify({ ...JSON.parse(res.text), writable: false }) }; + if (method === 'PUT' && path === '/v1/config' && puts++ < conflicts) + return { + ...res, + status: 412, + text: JSON.stringify({ ok: false, error: { code: 'revision_mismatch', message: 'x' } }) + }; + return res; + }; + const refused = await shuffleOnServer(client, { maps: ORDER, when: 'now' }).catch((e) => e); + expect(refused).toBeInstanceOf(ApiError); + expect(refused.message).toContain('read-only'); + writable = true; + puts = 0; + expect((await shuffleOnServer(client, { maps: ORDER, when: 'now' })).message).toContain( + `Shuffled ${UNEVEN.length} entries` + ); + expect(puts).toBe(2); + puts = 0; + conflicts = 2; + const twice = await shuffleOnServer(client, { maps: ORDER, when: 'now' }).catch((e) => e); + expect(twice).toBeInstanceOf(GameError); + expect(twice.code).toBe('revision_conflict'); + }); +}); diff --git a/src/lib/server/rotation-shuffle.ts b/src/lib/server/rotation-shuffle.ts new file mode 100644 index 00000000..a44b53f6 --- /dev/null +++ b/src/lib/server/rotation-shuffle.ts @@ -0,0 +1,222 @@ +// The Rotation shuffle rule. An Ordered rotation of every map, time of day and control zone starts +// from the top at each game start, so a server plays the same few entries every day; a Random one +// can put a map on several times in a row. Live builds change the rotation only through the config +// document, so the rule writes it in a new order once a run: in the last round before the 24-hour +// restart where it can see that coming, so the server comes back up on it, otherwise right after the +// restart; and once when the rule is saved. The maps take turns in the rule's order and each map's +// control zones take turns ($lib/rotation-doc). Where a server goes next once its order changes has +// not been seen, so the new order starts with the map after the one on and puts the entry on last +// (a server that stays on its entry, or goes back to the top, then goes on from the top), is read +// back, and is turned once more if the server does not have the map after the one on next. +import { ApiError, str } from './http'; +import { ACTIONS, configResult, readConfig } from './actions'; +import { classifyGameError, GameError, type WardogsClient } from './rcon'; +import { + alignRotation, + entryKey, + rotationFromText, + rotationIntoText, + shuffleFor, + turnOf, + type RotationDoc +} from '../rotation-doc'; +import { mapName } from '../format'; +import type { MapSelection } from '../types'; + +/** The outbox action that shuffles a server's rotation (not in ACTIONS). */ +export const ROTATION_SHUFFLE = 'rotation_shuffle'; + +export interface RotationShuffleConfig { + /** map ids in the order they take turns; a map the rotation has and this leaves out follows */ + maps: string[]; +} + +const MAP_ID = /^[A-Za-z0-9_.-]{1,100}$/; + +export function validateRotationShuffle(raw: unknown): RotationShuffleConfig { + const c = (raw && typeof raw === 'object' ? raw : {}) as Record; + const maps: string[] = []; + for (const m of Array.isArray(c.maps) ? c.maps : []) { + const id = str(m, 100); + if (MAP_ID.test(id) && !maps.some((x) => x.toLowerCase() === id.toLowerCase())) maps.push(id); + } + return { maps: maps.slice(0, 20) }; +} + +export interface RotationShuffleState { + /** when the game started (ms) in the run the last shuffle was made in */ + boot: number; + /** made in that run's last round, for the next run to start on */ + forNext: boolean; + /** when the run that came up on that order started; 0 until one has */ + spentBy: number; +} + +/** A state the rule wrote, or null for anything else (a rule switched on again has none). */ +export function rotationShuffleState(v: unknown): RotationShuffleState | null { + if (!v || typeof v !== 'object') return null; + const s = v as Record; + const n = (x: unknown) => (typeof x === 'number' && Number.isFinite(x) ? x : 0); + if (!n(s.boot)) return null; + return { boot: n(s.boot), forNext: s.forNext === true, spentBy: n(s.spentBy) }; +} + +export type ShuffleWhen = 'now' | 'before-restart' | 'after-restart'; + +/** The start is worked out from the uptime at each look, so it moves by the look's latency. */ +const SAME_RUN_MS = 60_000; + +/** + * One look at the server: whether to shuffle, and the state to keep (null: nothing changes). A rule + * with no state (new, or switched on again) shuffles at once. After that, once a run: when the + * 24-hour restart is due (the round on is the last), for the next run to start on; or after a + * restart that no shuffle was made for (one the rule could not see coming, or a second one in a + * row), for the rest of that run. Nothing while the start is unknown. + */ +export function shuffleStep( + prev: RotationShuffleState | null, + look: { startedAt: number; restartDue: boolean } +): { state: RotationShuffleState; when: ShuffleWhen | null } | null { + const start = look.startedAt; + if (!start) return null; + const same = (t: number) => Math.abs(t - start) <= SAME_RUN_MS; + const made = (when: ShuffleWhen) => ({ + state: { boot: start, forNext: look.restartDue, spentBy: 0 }, + when: look.restartDue ? ('before-restart' as const) : when + }); + if (!prev) return made('now'); + if (same(prev.boot)) return look.restartDue && !prev.forNext ? made('before-restart') : null; + // A later run. One that came up on the order made for it keeps it until its own restart. + if (prev.forNext && (!prev.spentBy || same(prev.spentBy))) { + if (look.restartDue) return made('before-restart'); + return prev.spentBy ? null : { state: { ...prev, spentBy: start }, when: null }; + } + return made('after-restart'); +} + +interface LiveRotation { + enabled: boolean; + nowIndex: number; + nextIndex: number; + entries: MapSelection[]; +} + +const readLive = (client: WardogsClient) => + ACTIONS.rotation.run(client, {}) as Promise; + +/** + * The rotation in the config document rewritten by `order` (given the rotation the document holds; + * null leaves it as it is), against the revision read, once more on a revision conflict. Only the + * rotation's keys change, and the mode becomes Ordered. The document's text never leaves here. + */ +async function rewrite( + client: WardogsClient, + order: (rotation: RotationDoc) => MapSelection[] | null +): Promise { + for (let attempt = 0; ; attempt++) { + const doc = await readConfig(client); + if (!doc.writable) + throw new ApiError( + 409, + 'The config document is read-only on this server, so its rotation cannot be changed from the panel.' + ); + const rotation = rotationFromText(doc.text); + const entries = order(rotation); + if (!entries) return null; + const text = rotationIntoText(doc.text, { ...rotation, mode: 'ordered', entries }); + const { status, body, etag } = await client.configCall('PUT', '/v1/config', text, doc.revision); + const r = configResult(status, body, etag); + if (r.ok) return entries; + if (r.conflict && !attempt) continue; + // Kept to its status and code: a refused document's own words can quote the file. + const e = r.conflict + ? new GameError(412, '', 'revision_conflict') + : classifyGameError('PUT', '/v1/config', status, '', body); + const refused = new GameError(e.status, 'The server did not take the new rotation.', e.code); + refused.retryAfterMs = e.retryAfterMs; + throw refused; + } +} + +/** What the server says comes next, when it plays `written` (null when it shows another order). */ +async function nextOf(client: WardogsClient, written: MapSelection[]) { + const back = await readLive(client).catch(() => null); + if ( + !back || + back.entries.length !== written.length || + back.entries.some((e, i) => entryKey(e) !== entryKey(written[i])) + ) + return null; + return { index: back.nextIndex, entry: back.entries[back.nextIndex] ?? null }; +} + +/** + * The shuffle, at delivery: the rotation in the document put in a new order (maps in the rule's + * turn, each map's zones in turn) for the entry on. Before the restart, the server comes back up on + * the top of it; otherwise what the server has next is read back, and set right once if it is not + * the map after the one on. The result names counts and maps only. + */ +export async function shuffleOnServer( + client: WardogsClient, + params: Record +): Promise<{ message: string; retryAfterMs?: number }> { + const before = params.when === 'before-restart'; + const { maps } = validateRotationShuffle(params); + const live = await readLive(client); + const now = live.nowIndex >= 0 ? live.nowIndex : -1; + const playing = live.entries[now]?.map || str(params.playing, 100); + const on: MapSelection | null = + live.entries[now] ?? + (playing ? { map: playing, experiences: [], lighting: '', zoneAlternator: '' } : null); + let skipped = ''; + let turn: string[] = []; + const written = await rewrite(client, ({ enabled, entries }) => { + skipped = !enabled + ? 'Nothing shuffled: the rotation is switched off on this server.' + : entries.length < 2 + ? 'Nothing to shuffle: the rotation has fewer than two entries.' + : ''; + turn = turnOf(entries, maps); + return skipped ? null : shuffleFor(entries, maps, on); + }); + if (!written) return { message: skipped }; + const head = `Shuffled ${written.length} entries: ${turn.map(mapName).join(', ')} in turn`; + if (before) + return { message: `${head}, starting on ${mapName(written[0].map)} after the restart.` }; + const same = (a: string, b: string) => !!a && !!b && a.toLowerCase() === b.toLowerCase(); + const at = turn.findIndex((m) => same(m, playing)); + const follows = at < 0 ? '' : turn[(at + 1) % turn.length]; + const right = (map: string) => (follows ? same(map, follows) : !same(map, playing)); + let next = await nextOf(client, written); + let unturned = ''; + if (next?.entry && !right(next.entry.map)) { + // The server took its next entry from somewhere else (it keeps its place in the list, say): + // turn the order for that place, unless no turn puts a better map there. The shuffle has + // landed either way, so a refusal here is told, not thrown. + const place = next.index; + const first = next.entry.map; + try { + const fixed = await rewrite(client, ({ entries }) => { + const turned = entries.length < 2 ? entries : alignRotation(entries, playing, [place]); + return turned[place] && entries[place] && same(turned[place].map, entries[place].map) + ? null + : turned; + }); + if (fixed) next = await nextOf(client, fixed); + } catch (err) { + if (err instanceof GameError && err.code === 'rate_limited') + return { + message: `${head}; ${mapName(first)} next: turning it once more was refused for sending too fast.`, + retryAfterMs: err.retryAfterMs || 5_000 + }; + unturned = ' It could not be turned once more.'; + } + } + if (!next) return { message: `${head}. The server did not show the new order back.` }; + if (!next.entry) return { message: `${head}.` }; + return { + message: same(next.entry.map, playing) + ? `${head}. The server still puts ${mapName(playing)} on next.${unturned}` + : `${head}; ${mapName(next.entry.map)} next.${unturned}` + }; +} diff --git a/src/lib/server/trigger-rules.ts b/src/lib/server/trigger-rules.ts index 2f8b899f..54b1a71c 100644 --- a/src/lib/server/trigger-rules.ts +++ b/src/lib/server/trigger-rules.ts @@ -10,6 +10,7 @@ import { validateTwoTeams, type TwoTeamsConfig } from './two-teams'; import { validateAfkProtection, type AfkProtectionConfig } from './afk-protection'; import { validateNameChange, type NameChangeConfig } from './name-change'; import { validateBounty, type BountyConfig } from './bounty'; +import { validateRotationShuffle, type RotationShuffleConfig } from './rotation-shuffle'; import { causeTags } from './cause-tags'; import { RESTART_AFTER_HOURS, restartWindow } from '$lib/uptime'; import { MAX_CHAT } from '$lib/chat'; @@ -36,7 +37,8 @@ export const TRIGGER_KINDS: TriggerKind[] = [ 'kill_distance', 'afk_protection', 'name_change', - 'bounty' + 'bounty', + 'rotation_shuffle' ]; export const TRIGGER_LABELS: Record = { welcome: 'Welcome whisper', @@ -55,7 +57,8 @@ export const TRIGGER_LABELS: Record = { kill_distance: 'Kill distance watch', afk_protection: 'AFK protection', name_change: 'Name change watch', - bounty: 'Bounty' + bounty: 'Bounty', + rotation_shuffle: 'Rotation shuffle' }; export interface WelcomeConfig { @@ -230,7 +233,8 @@ export type TriggerConfig = | KillDistanceConfig | AfkProtectionConfig | NameChangeConfig - | BountyConfig; + | BountyConfig + | RotationShuffleConfig; /** A kick reason: not chat, so not held to the game's chat cap. */ export const MAX_REASON = 200; @@ -427,6 +431,8 @@ export function validateConfig(kind: TriggerKind, raw: unknown): TriggerConfig { return validateNameChange(c); case 'bounty': return validateBounty(c); + case 'rotation_shuffle': + return validateRotationShuffle(c); } } diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index 29db1ae5..32d7fe3c 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -182,6 +182,13 @@ import { type OpenBounty } from './bounty'; import { fmtUptime, RESTART_AFTER_HOURS, restartWindow } from '$lib/uptime'; +import { + ROTATION_SHUFFLE, + rotationShuffleState, + shuffleStep, + type RotationShuffleConfig, + type ShuffleWhen +} from './rotation-shuffle'; import { DEFAULT_SCORE_CAP } from '$lib/match'; import { mapName } from '$lib/format'; import { statsIn, usesStats } from '$lib/placeholders'; @@ -282,7 +289,8 @@ const RULE_NEEDS: Record< kill_rate: ['players.kick', 'flags players'], two_teams: ['players.move', 'moves players between teams'], afk_protection: ['players.kill', 'kills players'], - name_change: ['players.kick', 'flags or kicks players'] + name_change: ['players.kick', 'flags or kicks players'], + rotation_shuffle: ['config.apply', 'rewrites the rotation in the config document'] }; /** What a reserved slot a rule hands out needs: one here, or on the organisation's list. */ @@ -426,6 +434,9 @@ export async function updateTrigger( set.state = null; // Any save of a Bounty rule calls off its open bounty: the worker starts it over (bounty.ts). if (row.kind === 'bounty') set.state = null; + // A Rotation shuffle rule's settings saved (its order may have changed): it shuffles once more, + // as it does when switched on again (below). + if (row.kind === 'rotation_shuffle' && body.config !== undefined) set.state = null; // Switched on again, a Team balance rule starts over in the worker (its memory is keyed on this): // who switched sides while it was off is unknown, so whoever is on then counts as placed. Whether // it was off is the row's at the write, not the read above, so a switch-off landing between them @@ -436,7 +447,9 @@ export async function updateTrigger( const switchOn = row.kind === 'two_teams' && set.enabled === true ? sql`CASE WHEN ${triggers.enabled} THEN ${triggers.state} ELSE (${JSON.stringify({ enabledAt: Date.now() })}::text)::jsonb END` - : row.kind === 'afk_protection' && set.enabled === true + : (row.kind === 'afk_protection' || + (row.kind === 'rotation_shuffle' && set.state === undefined)) && + set.enabled === true ? sql`CASE WHEN ${triggers.enabled} THEN ${triggers.state} ELSE NULL END` : undefined; requireRuleCaps(row.kind, set.config ?? row.config, server, access); @@ -811,6 +824,9 @@ export async function evaluateTriggers( // Kills move it on as they arrive (feed-events.ts); a look ends it. evalBounty(env, ctx, row, row.config as BountyConfig, out); break; + case 'rotation_shuffle': + evalRotationShuffle(ctx, row, row.config as RotationShuffleConfig, out); + break; } } catch (err) { const message = err instanceof Error ? err.message : String(err); @@ -1416,6 +1432,58 @@ function evalRestartNotice( }); } +const SHUFFLE_WHEN: Record = { + now: 'now', + 'before-restart': 'for after the restart', + 'after-restart': 'after the restart' +}; + +/** Once a run, and once when saved: see shuffleStep. The shuffle itself is the delivery's. */ +function evalRotationShuffle( + ctx: TickContext, + row: TriggerRow, + cfg: RotationShuffleConfig, + out: Evaluation +) { + const now = ctx.ts.getTime(); + const w = ctx.startedAt + ? restartWindow(new Date(ctx.startedAt).toISOString(), RESTART_AFTER_HOURS, now) + : null; + const prev = rotationShuffleState(row.state); + const step = shuffleStep(prev, { startedAt: ctx.startedAt, restartDue: !!w?.due }); + if (!step) return; + row.state = step.state; + if (!step.when) { + out.updates.push({ id: row.id, state: step.state }); + return; + } + out.intents.push({ + trigger: row, + action: ROTATION_SHUFFLE, + params: { + maps: cfg.maps, + when: step.when, + playing: ctx.status.map, + now: ctx.status.rotationNow + }, + target: 'rotation', + okMessage: 'Rotation shuffled.', + detail: { when: step.when, startedAt: new Date(ctx.startedAt).toISOString() }, + steamId: null, + // once a run before or after a restart; one on saving (no state yet, whenever in the run it + // comes), every time it is saved + dedupeKey: key(row, step.when, step.state.boot, prev ? 0 : ctx.ts.getTime()) + }); + // Marked now, with the state, so a slow delivery cannot shuffle twice. + row.lastFiredAt = ctx.ts; + out.updates.push({ + id: row.id, + lastFiredAt: ctx.ts, + lastResult: `Shuffling ${SHUFFLE_WHEN[step.when]}.`, + state: step.state + }); +} + /** * When each AFK protection rule's server was first seen empty, in worker memory, counted only over * looks the rule itself took: a restart, an outage or the rule starting over (switched on again) @@ -2648,6 +2716,32 @@ export async function dryRun( ); return result; } + if (kind === 'rotation_shuffle') { + const c = cfg as RotationShuffleConfig; + const [live] = await env.db + .select({ startedAt: serverLive.startedAt }) + .from(serverLive) + .where(eq(serverLive.serverId, server.id)) + .limit(1); + const w = live?.startedAt + ? restartWindow(live.startedAt.toISOString(), RESTART_AFTER_HOURS, to.getTime()) + : null; + if (!w || !live?.startedAt) + result.notes.push( + 'The worker has not read this server’s uptime yet (GET /v1/health), so there is nothing to project.' + ); + else { + const dueAt = new Date(live.startedAt.getTime() + RESTART_AFTER_HOURS * 3600_000); + push(w.due ? to : dueAt, 'shuffle in the last round, for after the restart'); + result.notes.push( + `Up ${fmtUptime(w.upMs)}; ${w.due ? 'the 24-hour restart comes when this round ends' : `the 24-hour restart is due in ${fmtUptime(w.untilDueMs ?? 0)}`}. A restart that comes first (a set restart time, a crash, one from the host's panel) is followed by a shuffle once the server is back.` + ); + } + result.notes.push( + `Maps in turn: ${c.maps.length ? `${c.maps.map(mapName).join(', ')}, then any other in the order the rotation has it` : 'in the order the rotation has them'}; each map's control zones in turn as well. Saving the rule shuffles once straight away.` + ); + return result; + } if (kind === 'restart_notice') { const c = cfg as RestartNoticeConfig; const [live] = await env.db diff --git a/src/lib/server/webhook-delivery.ts b/src/lib/server/webhook-delivery.ts index 37c13367..d246a136 100644 --- a/src/lib/server/webhook-delivery.ts +++ b/src/lib/server/webhook-delivery.ts @@ -160,6 +160,7 @@ const ACTION_TITLES: Record = { 'trigger.afk_protection': 'Trigger · AFK protection', 'trigger.name_change': 'Trigger · name change watch', 'trigger.bounty': 'Trigger · bounty', + 'trigger.rotation_shuffle': 'Trigger · rotation shuffle', 'player.note': 'Player note', 'player.watch': 'Watchlist', 'list.add': 'Org list · added', diff --git a/src/lib/types.ts b/src/lib/types.ts index 5d23bb89..034ded1c 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -579,7 +579,8 @@ export type TriggerKind = | 'kill_distance' | 'afk_protection' | 'name_change' - | 'bounty'; + | 'bounty' + | 'rotation_shuffle'; export interface TriggerView { id: string; diff --git a/src/test/access.test.ts b/src/test/access.test.ts index 40708c07..c2d2efb1 100644 --- a/src/test/access.test.ts +++ b/src/test/access.test.ts @@ -538,7 +538,8 @@ describe.skipIf(!hasTestDb)('access', () => { ['name_change', { action: 'kick' }, 'players.kick'], ['seed_reward', { minutes: 60, scope: 'server' }, 'slots.manage'], ['seed_reward', { minutes: 60, scope: 'org' }, 'lists.reserve'], - ['bounty', { reward: 'none' }, 'chat.send'] + ['bounty', { reward: 'none' }, 'chat.send'], + ['rotation_shuffle', { maps: ['Europe', 'Kavkazi'] }, 'config.apply'] ]; for (const [kind, config, cap] of rules) { await holds([]); @@ -1297,7 +1298,8 @@ describe.skipIf(!hasTestDb)('access', () => { seed_reward: { minutes: 60, scope: 'server' }, two_teams: { closedFaction: 'Lonestar' }, afk_protection: {}, - bounty: {} + bounty: {}, + rotation_shuffle: {} }; const save = (kind: string, name: string, config: Record) => api(w, 'owner', 'POST api/servers/[id]/triggers', { diff --git a/src/test/rotation-shuffle.test.ts b/src/test/rotation-shuffle.test.ts new file mode 100644 index 00000000..edca4175 --- /dev/null +++ b/src/test/rotation-shuffle.test.ts @@ -0,0 +1,68 @@ +// A Rotation shuffle rule shuffles once more when its settings are saved or it is switched on again: +// both start it over (no state), so the worker's next look shuffles. A rename or a switch-off keeps +// where it stands, as does switching on a rule that was on. +import { beforeAll, describe, expect, test } from 'bun:test'; +import { join } from 'node:path'; +import { eq } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { triggers } from '$lib/server/db/schema'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, type World } from './world'; + +const ROUTES = join(import.meta.dir, '..', 'routes'); + +describe.skipIf(!hasTestDb)('Rotation shuffle rule state', () => { + let env: Env; + let w: World; + const route = async (method: string, path: string) => + (await import(join(ROUTES, path, '+server.ts')))[method]; + const STATE = { boot: 1_791_500_000_000, forNext: true, spentBy: 0 }; + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + }); + + test('saving the settings, or switching it on again, starts it over', async () => { + const made = await callApi(await route('POST', 'api/servers/[id]/triggers'), w.users.owner, { + method: 'POST', + params: { id: w.server.id }, + body: { kind: 'rotation_shuffle', name: 'Shuffle', enabled: true, config: { maps: [] } } + }); + expect(made.status).toBe(201); + const id = (made.body as { trigger: { id: string } }).trigger.id; + const patch = await route('PATCH', 'api/servers/[id]/triggers/[triggerId]'); + const save = (body: Record) => + callApi(patch, w.users.owner, { + method: 'PATCH', + params: { id: w.server.id, triggerId: id }, + body + }); + const state = async () => + (await env.db.select({ state: triggers.state }).from(triggers).where(eq(triggers.id, id)))[0] + .state; + const shuffled = () => env.db.update(triggers).set({ state: STATE }).where(eq(triggers.id, id)); + + await shuffled(); + expect((await save({ name: 'Daily shuffle' })).status).toBe(200); + expect(await state()).toEqual(STATE); + expect((await save({ enabled: true })).status).toBe(200); + expect(await state()).toEqual(STATE); + expect((await save({ config: { maps: ['Europe', 'Kavkazi'] } })).status).toBe(200); + expect(await state()).toBeNull(); + + await shuffled(); + expect((await save({ enabled: false })).status).toBe(200); + expect(await state()).toEqual(STATE); + expect((await save({ enabled: true })).status).toBe(200); + expect(await state()).toBeNull(); + // The editor sends everything at once: a save of a rule that is on starts it over too. + await shuffled(); + expect( + (await save({ name: 'Daily shuffle', enabled: true, config: { maps: ['Kavkazi'] } })).status + ).toBe(200); + expect(await state()).toBeNull(); + }); +}); From f753299cdbaffbad96c79d185279e6eec43a39df Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 17:55:25 +0100 Subject: [PATCH 074/102] Automation tab: Rotation shuffle rule; Map rotation: Shuffle --- .../(app)/server/[id]/automation/+page.svelte | 140 ++++++++++++++++-- .../(app)/server/[id]/rotation/+page.svelte | 42 ++++++ 2 files changed, 173 insertions(+), 9 deletions(-) diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index c6fbbc8e..27c33d37 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -148,7 +148,9 @@ ? 'lapsed' : action === 'bounty_reward' ? 'reserved slot' - : action; + : action === 'rotation_shuffle' + ? 'shuffle' + : action; const label = (kind: TriggerKind) => KINDS.find((k) => k.kind === kind)?.label ?? kind; const blurb = (kind: TriggerKind) => KINDS.find((k) => k.kind === kind)?.blurb ?? ''; /** Why a kind cannot run on this server yet, or '' when it can. */ @@ -175,6 +177,10 @@ : !canChat ? 'Saving needs the Chat capability as well as Automation: the bounty is announced to the server.' : ''; + case 'rotation_shuffle': + return canConfig + ? '' + : 'Saving needs the Config & settings capability as well as Automation: the rule rewrites the rotation in the config document.'; default: return ''; } @@ -193,6 +199,8 @@ let canChat = $derived(can(data.server.caps, 'chat.send')); let canKill = $derived(can(data.server.caps, 'players.kill')); let canBanHere = $derived(can(data.server.caps, 'bans.manage')); + /** a Rotation shuffle rule rewrites the rotation in the config document */ + let canConfig = $derived(can(data.server.caps, 'config.apply')); let canBanOrg = $derived(can(data.server.caps, 'lists.ban')); /** Charges that are placed and set off from anywhere: how far away the killer was says nothing. */ const PLACED = new Set([ @@ -279,7 +287,9 @@ ? 'Needs a Steam key' : kind === 'seed_reward' ? 'Needs Reserved slots' - : ''; + : kind === 'rotation_shuffle' + ? 'Needs Config & settings' + : ''; /** A Bounty rule's texts until they are written: a slot is named, an announcement-only rule asks. */ const bountyTexts = (reward: 'slot' | 'none') => reward === 'slot' @@ -451,6 +461,8 @@ setMessage: string; claimMessage: string; whisper: string; + /** a Rotation shuffle rule's map ids, in the order they take turns */ + mapOrder: string[]; } /** WARDOGS' factions, offered for Team balance; a name the game adds later can still be typed. */ const FACTIONS = ['Lonestar', 'Valkyra', 'Manticore']; @@ -511,6 +523,26 @@ } }); + /** A Rotation shuffle rule's turn: the maps it names, then the game's other maps. */ + function mapTurn(named: unknown): string[] { + const seen = new Set(); + const out: string[] = []; + for (const id of [ + ...(Array.isArray(named) ? (named as string[]) : []), + ...data.catalog.maps.map((m) => m.id) + ]) + if (!seen.has(id.toLowerCase())) { + seen.add(id.toLowerCase()); + out.push(id); + } + return out; + } + function moveMap(f: Form, i: number, by: -1 | 1) { + const list = f.mapOrder.slice(); + [list[i], list[i + by]] = [list[i + by], list[i]]; + f.mapOrder = list; + } + /** The editor for a new rule of a kind, an existing rule, or a copy of one (`copy`). */ function open(kind: TriggerKind, t?: TriggerView, copy = false) { fromPicker = false; @@ -658,7 +690,8 @@ bountyReward, setMessage: s('setMessage', bountyTexts(bountyReward).setMessage), claimMessage: s('claimMessage', bountyTexts(bountyReward).claimMessage), - whisper: s('whisper', bountyTexts(bountyReward).whisper) + whisper: s('whisper', bountyTexts(bountyReward).whisper), + mapOrder: mapTurn(c.maps) }; dry = null; pendingSel = @@ -675,11 +708,13 @@ const dryLabel = (kind: TriggerKind) => kind === 'restart_notice' ? 'Preview next cycle' - : kind === 'name_filter' - ? 'Dry run, past players' - : kind === 'ping_kick' - ? 'Check dry-run limits' - : 'Dry run, last 24 h'; + : kind === 'rotation_shuffle' + ? 'Preview next shuffle' + : kind === 'name_filter' + ? 'Dry run, past players' + : kind === 'ping_kick' + ? 'Check dry-run limits' + : 'Dry run, last 24 h'; const lines = (text: string) => text .split(/[\n,]/) @@ -837,6 +872,8 @@ claimMessage: f.claimMessage, whisper: f.whisper }; + case 'rotation_shuffle': + return { maps: f.mapOrder }; } } @@ -1062,6 +1099,10 @@ } case 'seed_reward': return `${c.minutes} min with ${c.lowAt} or fewer on${c.untilFull === false ? '' : `, staying until ${typeof c.fullAt === 'number' ? `${c.fullAt}+ on` : 'it fills'}`}, within ${c.windowDays} day${c.windowDays === 1 ? '' : 's'} · slot ${c.scope === 'server' ? 'here' : 'on every server'} for ${c.slotDays} day${c.slotDays === 1 ? '' : 's'}${c.replaceExisting ? ` · replaces an existing slot${c.protectedNoteWord ? ` except notes containing “${c.protectedNoteWord}”` : ''}` : ''}${c.message ? ' · with a whisper' : ''}`; + case 'rotation_shuffle': { + const maps = Array.isArray(c.maps) ? (c.maps as string[]) : []; + return `${maps.length ? maps.map((m) => mapLabel(data.catalog, m)).join(', ') : 'The maps'} in turn · zones in turn · a new order every day`; + } } } @@ -1285,7 +1326,11 @@ {#snippet dryResult(r: DryRunResult, title: string)}
{r.kind === 'restart_notice' ? 'Next cycle' : 'Dry run'} · {title}{r.kind === 'restart_notice' + ? 'Next cycle' + : r.kind === 'rotation_shuffle' + ? 'Next shuffle' + : 'Dry run'} · {title} {#if r.kind === 'restart_notice'} + {:else if r.kind === 'rotation_shuffle'} + {r.fires} shuffle{r.fires === 1 + ? '' + : 's'} before the next restart {:else if r.kind === 'name_filter'} Everyone who has played here: would have matched + {:else if f.kind === 'rotation_shuffle'} +
+ Map order +
    + {#each f.mapOrder as m, i (m)} + {@const name = mapLabel(data.catalog, m)} +
  1. + {i + 1} + {name} + + + + +
    2. + {/each} +
+

+ Every match a different map, in this order. Each map's control zones take turns too, + and its times of day come in a new order every day. +

+
+
+ When +

+ Once when you save it, then once a day: in the last round before the 24-hour restart, + so the server comes back up on a new order, or straight after a restart it could not + see coming. +

+
+

+ The rotation is set to Ordered, since a Random one would play the entries in any order. + Only the rotation in the config document is written, as Apply on the Map rotation tab + does. The new order is turned so the map that follows the one on comes next. One rule + per server. +

{:else if f.kind === 'restart_notice'}
Heads-up, before the window opens diff --git a/src/routes/(app)/server/[id]/rotation/+page.svelte b/src/routes/(app)/server/[id]/rotation/+page.svelte index 9a202573..da8d6c26 100644 --- a/src/routes/(app)/server/[id]/rotation/+page.svelte +++ b/src/routes/(app)/server/[id]/rotation/+page.svelte @@ -5,9 +5,11 @@ import { toast } from '$lib/toast.svelte'; import { confirmDialog } from '$lib/confirm.svelte'; import { + mapsInOrder, rotationFromText, rotationIntoText, setModifierOnAll, + shuffleFor, type RotationDoc } from '$lib/rotation-doc'; import Badge from '$lib/components/Badge.svelte'; @@ -29,7 +31,9 @@ let matchControl = $derived(can(data.server.caps, 'match.control')); let rotationSave = $derived(can(data.server.caps, 'rotation.save')); let configApply = $derived(can(data.server.caps, 'config.apply')); + let automation = $derived(can(data.server.caps, 'automation.manage')); let configHref = $derived(`/server/${encodeURIComponent(id)}/config`); + let automationHref = $derived(`/server/${encodeURIComponent(id)}/automation`); // Live build CL-499480 serves none of the rotation edit routes. On such a build this tab edits // the rotation section of the config document instead: the same table and buttons, staged @@ -247,6 +251,27 @@ : ` Left on ${n(out.skipped)}: nothing else is set on ${one ? 'it' : 'them'}.`; toast(msg, out.changed ? 'ok' : 'err'); } + // The staged entries in a new order: the maps in turn, in the order the rotation first has them, + // each map's control zones in turn, starting with the map after the one on and the entry on last + // (see shuffleFor). Played in order, so the mode goes to Ordered. + function shuffle() { + const on = rotation?.entries[rotation.nowIndex] ?? null; + staged.entries = shuffleFor(staged.entries, mapsInOrder(staged.entries), on); + selected = -1; + const twice = staged.entries.filter( + (e, i) => i > 0 && e.map.toLowerCase() === staged.entries[i - 1].map.toLowerCase() + ).length; + const was = staged.mode; + staged.mode = 'ordered'; + toast( + `Shuffled ${staged.entries.length} entries: ${ + twice + ? 'one map has over half of them, so it still comes twice in a row in places' + : 'no map plays twice in a row' + }.${was === 'random' ? ' Set to Ordered, so the server plays them in this order.' : ''}`, + twice ? '' : 'ok' + ); + } function discard() { staged = clone(base); selected = -1; @@ -386,6 +411,16 @@
{/if} {#if viaDoc} +
+ Order +
+ +
+
From fad13d32720e97dd159457fb437294609f6454d6 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 17:55:25 +0100 Subject: [PATCH 075/102] README: rotation shuffle --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 56b1bf87..00e24b56 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,11 @@ What is in the box: - **A modifier on every map**: the Map rotation tab adds Infantry Only or Hardcore to every rotation entry whose map offers it, or takes it off them all, in one apply. It is there where the rotation is edited through the config document (every live build so far), so it needs Config & settings. +- **A new rotation order every day**: the Map rotation tab's **Shuffle** deals the entries out with + the maps in turn, so no map plays twice in a row, and each map's control zones in turn too; a + [Rotation shuffle](#automation-triggers) rule does it once a day, so a server does not start on + the same entries after every restart. Both write the rotation through the config document, so + they need Config & settings. - **Group whispers**: one message to everyone on a faction, from the Overview's message box, or to the players ticked on the Players tab. The game has no route for it, so Warcon whispers each of them in turn and says who got it. @@ -639,14 +644,15 @@ _Chat_ as well when it whispers), _Kill_ for AFK protection (with _Chat_ as well broadcasts) and for a Kill distance watch that kills (with _Chat_ as well, for the whisper that comes with it), for a Kill distance watch that bans _Bans_ (on this server) or _Org ban list_ (on every server), for the Seeding reward _Reserved slots_ or _Org reserved slots_ (see -its row), and for a Bounty _Chat_, with _Reserved slots_ or _Org reserved slots_ as well when it -gives a slot. A custom role or API key with _Automation_ alone can read the rules and +its row), for a Bounty _Chat_, with _Reserved slots_ or _Org reserved slots_ as well when it +gives a slot, and for the Rotation shuffle _Config & settings_, since it rewrites the rotation in +the config document. A custom role or API key with _Automation_ alone can read the rules and delete them. **Add rule** opens a picker of every kind, grouped by when it acts (Messages, On join, In play, Seeding and rewards, Server), with a search over the names and descriptions; picking one opens its -editor. A server holds one Seeding reward, Team balance, AFK protection and Bounty rule at most, so -once it has one, picking that kind opens the rule it has. +editor. A server holds one Seeding reward, Team balance, AFK protection, Bounty and Rotation shuffle +rule at most, so once it has one, picking that kind opens the rule it has. | Trigger | Does | | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | @@ -665,6 +671,7 @@ once it has one, picking that kind opens the rule it has. | Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier (a total, per server and per session, and the player's progress toward the reward for _Automation_ holders), the leaderboard's Seed time column and the dry run show it. | | AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | | Bounty | Puts a bounty on a player who gets N kills in a row without dying in one match (15 by default) while at least M players are on (20 by default), and announces it to the server. A run is the match page's Best streak: a kill of another player adds to it, a team kill or a suicide does not, and any death ends it. One bounty is open at a time; once it ends, the next goes to whoever is on a run of N or more, at their next kill. The first enemy to kill the marked player claims it: the claim can be announced and the claimer whispered, and they get a reserved slot for D days on this server or on every server in the organisation, or nothing but the announcement. A team kill, a suicide or the environment never ends a bounty, nor a kill between players whose sides the panel has not seen, so nobody clears their own or has a friend do it. It lapses when the marked player leaves (gone past the minute's leave grace, so the empty list of a map change is no leave), when the match ends, or when the panel has lost sight of the server for a few looks (its own 24-hour restart is one such time), and runs start over when the panel sees the match end. A claimer who already holds a slot on that list keeps whichever lasts longer. The open bounty shows on the rule's row and outlives a worker restart, which forgets the runs (one from a match that ended meanwhile lapses at the next kill of its player); saving the rule or switching it off calls it off. A **Bounties** box on a [Discord webhook](#discord-webhooks) posts a card when one is set, claimed or lapses, with names and never a SteamID, for a players' channel. Needs the [kill feed](#kill-feed), acted on as each kill arrives; like every feed rule it believes the feed, and a friend on the other side can claim a bounty. The dry run replays the day's kills against the player counts of the server's samples. One rule per server. | +| Rotation shuffle | Puts the rotation in a new order once a day. An Ordered rotation of every map, time of day and control zone starts from the top after each restart, so the server plays the same entries every day; a Random one can put a map on several times in a row. The maps take turns in the order the rule sets, every match a different map (Ozeti, Bakurani, Zestafona, Ozeti…); among each map's own entries its control zones take turns and its times of day come in a new order. Whole rounds of the maps run for as long as the rest can still be kept apart, so a map with fewer entries drops out only near the end of the list, and a map with more than half the entries plays in runs as even as they can be. The rule writes the rotation in the config document (its entries, and the mode set to Ordered; against the revision read, once more after a conflict) once when it is saved, then once a run: in the last round before the 24-hour restart (from the uptime the header shows), so the server comes back up on the new order starting with the map that follows the one on, or straight after a restart it could not see coming (a set restart time, a crash, one from the host's panel). Where a live server goes next when its rotation is rewritten mid-match has not been seen, so the new order is turned, by less than a round, to put the map that follows the one on wherever the server may take its next entry from; the server's rotation is then read back, and turned once more if it does not have that map next. The result names the maps and the next one, and a refusal is told in the panel's own words. A rotation that is switched off, or has fewer than two entries, is left alone, and a shuffle the server refuses is not sent again before the next one is due. Its preview shows when the next shuffle is due. One rule per server. | **Dry run** replays the last 24 hours of the server's own history (joins, player counts, empty stretches, cached Steam data) against a rule and lists what it would have done, so you can tune a From c3e7a8c4ee91e93c5faa8cd203d2c27df19fc2d2 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 18:00:45 +0100 Subject: [PATCH 076/102] Kill feed: STN_03.MainBarrel is the L81 mortar Its kills are the mortar's shells. A Kill distance rule on the Vehicles list's L81 mortar only ever saw roadkills, so it never acted on a mortar kill. --- src/lib/causes.test.ts | 1 + src/lib/causes.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/causes.test.ts b/src/lib/causes.test.ts index 3e43a688..11911a03 100644 --- a/src/lib/causes.test.ts +++ b/src/lib/causes.test.ts @@ -38,6 +38,7 @@ describe('causeLabel', () => { expect(causeLabel('Vehicle.Variant.Air.Rotary.Littlebird.Default')).toBe('MH-6'); expect(causeLabel('Vehicle.Variant.Land.Tracked.SpawnVehicle.Lonestar')).toBe('M113 APC'); expect(causeLabel('Vehicle.Variant.Stationary.Phalanx')).toBe('Vanguard CIWS'); + expect(causeLabel('Id.Vehicle.WeaponExtension.STN_03.MainBarrel')).toBe('L81 mortar'); expect(causeLabel('Id.Vehicle.WeaponExtension.WHL_02.SUV.RingTurret')).toBe('Kodiak M249'); expect(causeLabel('Id.Vehicle.WeaponExtension.ROT_02.30mmCannon')).toBe( 'Havoc 2A42 autocannon' diff --git a/src/lib/causes.ts b/src/lib/causes.ts index e787cf53..054affba 100644 --- a/src/lib/causes.ts +++ b/src/lib/causes.ts @@ -110,7 +110,8 @@ const LABELS: Record = { 'Id.Vehicle.WeaponExtension.WHL_07.MachineGun': 'Ural Defender M249', 'Id.Vehicle.WeaponExtension.STN_01.MistralAA': 'Talon 9K-SAM', 'Id.Vehicle.WeaponExtension.STN_02.MainCannon': 'STN 02 main cannon', - 'Id.Vehicle.WeaponExtension.STN_03.MainBarrel': 'STN 03 main gun', + // the mortar's shells; Vehicle.Variant.Stationary.Mortar is the mortar itself (a roadkill, its blast) + 'Id.Vehicle.WeaponExtension.STN_03.MainBarrel': 'L81 mortar', 'Id.Vehicle.WeaponExtension.STN_05.MainBarrel': 'STN 05 main gun' }; /** From 67ad0ed82d65106ae8eb876212836c328afb57d7 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 18:00:45 +0100 Subject: [PATCH 077/102] README: the L81 mortar's shells are under the vehicles' guns --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 00e24b56..8f11b3b0 100644 --- a/README.md +++ b/README.md @@ -665,7 +665,7 @@ rule at most, so once it has one, picking that kind opens the rule it has. | High ping kick | Kicks a player whose reported ping remains above a configurable limit for a configurable number of seconds. Normal or unavailable ping, leaving, or interrupted player-list polling resets the timer. Historical ping is not stored, so this rule cannot be replayed in a dry run. | | Team kill limit | Whispers a player from N team kills in one match, and kicks them at M; leaving and rejoining does not start the count over. Team kills by what the rule leaves out are not counted and still show as team kills everywhere else: barbed wire unless unticked (a player who runs into a teammate's wire is reported as killed by whoever built it), any other buildable or placed charge ticked, and vehicle crashes when ticked (when a vehicle blows up, a helicopter flown into the ground say, the game reports everyone aboard as killed by its driver or pilot; a teammate who blows a vehicle up with a charge, rocket or gun is still counted). Needs the [kill feed](#kill-feed); acted on as each kill arrives, not per poll. | | Kill rate watch | Flags a player, never kicks, when their kills with hand-held weapons in the last N minutes reach a count, or their share of headshots over those kills reaches a percentage once they have at least M; vehicles, their guns and buildables are not counted. The flag goes to the audit trail and the Discord mirror (the post opens the player's page in the panel), and the same player is flagged again only after a cooldown. Needs the [kill feed](#kill-feed), which has no position or aim, so a flag is a reason to look, not proof. The windows are kept in the worker's memory and start over when it restarts. | -| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. A kill that comes within a minute of the killer's own death is not counted: the player is dead, so it is a round already on its way, and the game credits a vehicle's shell that lands after the vehicle was destroyed to the gunner's own weapon, from wherever the gunner is by then (an M4 kill from 2,300 m). The audit trail notes each kill left out this way, with how long after the death it came; Discord is not told. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | +| Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret, the L81 mortar's shells), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside: the L81 mortar in this list is not its shells). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. A kill that comes within a minute of the killer's own death is not counted: the player is dead, so it is a round already on its way, and the game credits a vehicle's shell that lands after the vehicle was destroyed to the gunner's own weapon, from wherever the gunner is by then (an M4 kill from 2,300 m). The audit trail notes each kill left out this way, with how long after the death it came; Discord is not told. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | | Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap; when a new match is evened up, players whose clan is mostly on the other side move first, then those with the fewest clanmates beside them), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move, sent without the kill the Players tab's Move adds. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | | Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | | Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier (a total, per server and per session, and the player's progress toward the reward for _Automation_ holders), the leaderboard's Seed time column and the dry run show it. | From 28552806f0d36633028c0dfd5312f90a4d99f54c Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 18:06:55 +0100 Subject: [PATCH 078/102] Kill feed: name the Vanguard CIWS and the drone STN_02.MainCannon is the Vanguard CIWS; STN_05 is the drone, both its tags. --- src/lib/causes.test.ts | 5 +++-- src/lib/causes.ts | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/causes.test.ts b/src/lib/causes.test.ts index 11911a03..4ceab6bb 100644 --- a/src/lib/causes.test.ts +++ b/src/lib/causes.test.ts @@ -39,6 +39,9 @@ describe('causeLabel', () => { expect(causeLabel('Vehicle.Variant.Land.Tracked.SpawnVehicle.Lonestar')).toBe('M113 APC'); expect(causeLabel('Vehicle.Variant.Stationary.Phalanx')).toBe('Vanguard CIWS'); expect(causeLabel('Id.Vehicle.WeaponExtension.STN_03.MainBarrel')).toBe('L81 mortar'); + expect(causeLabel('Id.Vehicle.WeaponExtension.STN_02.MainCannon')).toBe('Vanguard CIWS'); + expect(causeLabel('Vehicle.Variant.Stationary.STN_05')).toBe('Drone'); + expect(causeLabel('Id.Vehicle.WeaponExtension.STN_05.MainBarrel')).toBe('Drone'); expect(causeLabel('Id.Vehicle.WeaponExtension.WHL_02.SUV.RingTurret')).toBe('Kodiak M249'); expect(causeLabel('Id.Vehicle.WeaponExtension.ROT_02.30mmCannon')).toBe( 'Havoc 2A42 autocannon' @@ -53,10 +56,8 @@ describe('causeLabel', () => { }); test('tags the game sends that have no name are listed in their own words', () => { - expect(causeLabel('Vehicle.Variant.Stationary.STN_05')).toBe('STN 05'); expect(causeLabel('ID.Item.RepairTool.Drill.Light')).toBe('Light drill'); expect(causeLabel('Vehicle.Variant.Land.Wheeled.Humvee.Default')).toBe('Humvee'); - expect(causeLabel('Id.Vehicle.WeaponExtension.STN_05.MainBarrel')).toBe('STN 05 main gun'); const listed = new Set(knownCauses().map((c) => c.cause.toLowerCase())); for (const tag of ['Id.Item.MMGL', 'Id.Item.Mosin', 'Vehicle.Variant.Stationary.STN_05']) expect([tag, listed.has(tag.toLowerCase())]).toEqual([tag, true]); diff --git a/src/lib/causes.ts b/src/lib/causes.ts index 054affba..ed7e15d6 100644 --- a/src/lib/causes.ts +++ b/src/lib/causes.ts @@ -92,7 +92,7 @@ const LABELS: Record = { 'Vehicle.Variant.Stationary.Phalanx': 'Vanguard CIWS', 'Vehicle.Variant.Stationary.Mortar': 'L81 mortar', 'Vehicle.Variant.Stationary.MistralAA': 'Talon 9K-SAM', - 'Vehicle.Variant.Stationary.STN_05': 'STN 05', + 'Vehicle.Variant.Stationary.STN_05': 'Drone', 'Vehicle.Variant.Stationary.Loudspeaker': 'Loudspeaker', // Vehicle weapons 'Id.Vehicle.WeaponExtension.ROT_02.30mmCannon': 'Havoc 2A42 autocannon', @@ -109,10 +109,10 @@ const LABELS: Record = { 'Id.Vehicle.WeaponExtension.WHL_05.RingMinigun': 'Humvee minigun', 'Id.Vehicle.WeaponExtension.WHL_07.MachineGun': 'Ural Defender M249', 'Id.Vehicle.WeaponExtension.STN_01.MistralAA': 'Talon 9K-SAM', - 'Id.Vehicle.WeaponExtension.STN_02.MainCannon': 'STN 02 main cannon', + 'Id.Vehicle.WeaponExtension.STN_02.MainCannon': 'Vanguard CIWS', // the mortar's shells; Vehicle.Variant.Stationary.Mortar is the mortar itself (a roadkill, its blast) 'Id.Vehicle.WeaponExtension.STN_03.MainBarrel': 'L81 mortar', - 'Id.Vehicle.WeaponExtension.STN_05.MainBarrel': 'STN 05 main gun' + 'Id.Vehicle.WeaponExtension.STN_05.MainBarrel': 'Drone' }; /** * What a Team kill limit leaves out of its count unless its settings say otherwise: a player who From ced8844da33e9a4a2f3bb8444c1a9f3c54c1a4a8 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:11:11 +0100 Subject: [PATCH 079/102] Rotation: disable Play next on builds without rotation edit routes --- src/lib/server/actions.test.ts | 27 +++++++++++++++++++ .../(app)/server/[id]/rotation/+page.svelte | 5 +++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/lib/server/actions.test.ts b/src/lib/server/actions.test.ts index 3984f4d9..cc67472e 100644 --- a/src/lib/server/actions.test.ts +++ b/src/lib/server/actions.test.ts @@ -955,3 +955,30 @@ test('the live build refuses 257 characters, and the broadcast action never send else process.env.MOCK_LIVE_BUILD = before; } }); + +// ---- next map on a live build ----------------------------------------------------------------- + +// The live builds read the rotation but serve none of its edit routes, so the panel disables Play +// next and Set as next map there (issue #50). The action itself has no other way to queue a map. +test('setNextMap on the live build answers 404 no_route and leaves the rotation as it was', async () => { + const { WardogsClient } = await import('./rcon'); + const before = process.env.MOCK_LIVE_BUILD; + process.env.MOCK_LIVE_BUILD = 'true'; + try { + const server = { id: 'next-live', host: 'demo', port: 1, scheme: 'http' as const }; + const client = new WardogsClient({} as any, server, 'demo', 'next-live'); + const rotation: any = await ACTIONS.rotation.run(client, {}); + expect(rotation.entries.length).toBeGreaterThan(2); + // one already in the rotation (moved up) and one that is not (added, then moved) + const picks = [rotation.entries.at(-1), { map: 'Europe', experiences: ['KOTH_Hardcore'] }]; + for (const sel of picks) { + const err: any = await ACTIONS.setNextMap.run(client, sel).catch((e) => e); + expect(err).toBeInstanceOf(GameError); + expect([err.status, err.code]).toEqual([404, 'no_route']); + } + expect(await ACTIONS.rotation.run(client, {})).toEqual(rotation); + } finally { + if (before === undefined) delete process.env.MOCK_LIVE_BUILD; + else process.env.MOCK_LIVE_BUILD = before; + } +}); diff --git a/src/routes/(app)/server/[id]/rotation/+page.svelte b/src/routes/(app)/server/[id]/rotation/+page.svelte index da8d6c26..e3e53b73 100644 --- a/src/routes/(app)/server/[id]/rotation/+page.svelte +++ b/src/routes/(app)/server/[id]/rotation/+page.svelte @@ -373,7 +373,10 @@ {#if !viaDoc} Date: Fri, 9 Oct 2026 19:12:37 +0100 Subject: [PATCH 080/102] List sync: keep one row per player when a ban list names one twice --- src/lib/server/lists-sync.ts | 6 +++-- src/test/list-sync-errors.test.ts | 40 +++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/lib/server/lists-sync.ts b/src/lib/server/lists-sync.ts index 6f24846e..517c4e9e 100644 --- a/src/lib/server/lists-sync.ts +++ b/src/lib/server/lists-sync.ts @@ -319,7 +319,9 @@ export async function writeSnapshot( ts = new Date() ): Promise { await env.db.transaction(async (tx) => { - const banIds = observed.bans.map((b) => b.steamId); + // one row per player: a ban list naming one twice would fail the upsert, and with it every sync + const bans = [...new Map(observed.bans.map((b) => [b.steamId, b])).values()]; + const banIds = bans.map((b) => b.steamId); await tx .delete(serverBans) .where( @@ -331,7 +333,7 @@ export async function writeSnapshot( await tx .insert(serverBans) .values( - observed.bans.map((b) => ({ + bans.map((b) => ({ serverId, steamId: b.steamId, reason: b.reason || '', diff --git a/src/test/list-sync-errors.test.ts b/src/test/list-sync-errors.test.ts index 5721c63e..c2622565 100644 --- a/src/test/list-sync-errors.test.ts +++ b/src/test/list-sync-errors.test.ts @@ -1,11 +1,17 @@ // What the list sync keeps of a failure is a fixed phrase for its kind: the game's own words never // reach a slot's stored error, the server's last sync error, the audit trail or the state route -// every viewer of the server reads. +// every viewer of the server reads. A game whose ban list names a player twice is no failure. import { beforeAll, describe, expect, test } from 'bun:test'; import { eq } from 'drizzle-orm'; import type { Env } from '$lib/server/env'; import { getOrg, getServer } from '$lib/server/access'; -import { auditLog, listEntries, serverListState, serverListSync } from '$lib/server/db/schema'; +import { + auditLog, + listEntries, + serverBans, + serverListState, + serverListSync +} from '$lib/server/db/schema'; import { newId } from '$lib/server/http'; import { listOf } from '$lib/server/lists'; import { reconcileServer } from '$lib/server/lists-sync'; @@ -17,6 +23,7 @@ import { callApi, stubGateway } from './call'; import { seedWorld, type World } from './world'; const PLAYER = '76561198000000501'; +const BANNED = '76561198000000502'; /** what a game might put in its refusal: an address, a token, anything */ const GAME_TEXT = 'listener on 198.20.4.4 refused bearer tok_live_abc'; @@ -40,6 +47,23 @@ function refusingGame(status: number, code: string): WardogsClient { return { serverId: 'fake', json } as unknown as WardogsClient; } +/** A game whose ban list holds one player twice, and that takes every reserved slot it is given. */ +function doubledBanGame(): WardogsClient { + const json = async (method: string, path: string) => { + if (method === 'GET' && path === '/v1/bans') + return { + bans: [ + { steamId: BANNED, reason: 'first' }, + { steamId: BANNED, reason: 'again' } + ] + }; + if (method === 'GET' && path === '/v1/reserved-slots') return { reservedSlots: [] }; + if (method === 'POST' && path === '/v1/reserved-slots') return { ok: true }; + throw new GameError(404, GAME_TEXT, 'not_found'); + }; + return { serverId: 'fake', json } as unknown as WardogsClient; +} + describe.skipIf(!hasTestDb)('list sync errors', () => { let env: Env; let w: World; @@ -111,4 +135,16 @@ describe.skipIf(!hasTestDb)('list sync errors', () => { 'The server failed to answer.' ); }); + + test('a ban list holding one player twice is kept as one row and stops nothing', async () => { + const result = await sync(doubledBanGame()); + expect(result.error).toBe(''); + expect(result.added).toBe(1); + const rows = await env.db + .select({ steamId: serverBans.steamId }) + .from(serverBans) + .where(eq(serverBans.serverId, w.server.id)); + expect(rows).toEqual([{ steamId: BANNED }]); + expect((await stored()).lastError).toBe(''); + }); }); From 4699767f139d66486982b30651f74ee27d960736 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:14:00 +0100 Subject: [PATCH 081/102] Sync toast: say why each server did not sync, not just unreachable --- src/lib/lists.test.ts | 76 +++++++++++++++++++++++++++++++++++++++++++ src/lib/lists.ts | 17 +++++++--- 2 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 src/lib/lists.test.ts diff --git a/src/lib/lists.test.ts b/src/lib/lists.test.ts new file mode 100644 index 00000000..d1626ba5 --- /dev/null +++ b/src/lib/lists.test.ts @@ -0,0 +1,76 @@ +import { describe, expect, test } from 'bun:test'; +import { describeSync } from './lists'; +import type { ListSyncServer } from './types'; + +const server = (serverName: string, over: Partial = {}): ListSyncServer => ({ + serverId: `s_${serverName.toLowerCase()}`, + serverName, + ok: true, + added: 1, + removed: 0, + failed: 0, + pending: false, + error: '', + ...over +}); + +describe('describeSync', () => { + test('no servers: they pick it up on the next poll', () => { + expect(describeSync({ servers: [] }, 'Banned.')).toBe( + 'Banned. Servers pick it up on the next poll.' + ); + }); + + test('applied everywhere', () => { + expect(describeSync({ servers: [server('Alpha'), server('Bravo')] }, 'Banned.')).toBe( + 'Banned. Applied on 2 of 2 servers.' + ); + }); + + test('each server that did not sync is named with its phrase, not as unreachable', () => { + const text = describeSync( + { + servers: [ + server('Alpha'), + server('Bravo', { ok: false, error: 'The server refused the RCON password.' }), + server('Charlie', { ok: false, error: 'Could not reach the server.' }), + server('Delta', { ok: false, error: 'The server refused the RCON password.' }) + ] + }, + 'Reserved a slot.' + ); + expect(text).toBe( + 'Reserved a slot. Applied on 1 of 4 servers.' + + ' Not synced on Bravo, Delta: The server refused the RCON password.' + + ' Not synced on Charlie: Could not reach the server.' + ); + expect(text).not.toContain('Unreachable'); + }); + + test('a run the server stopped answering part-way did not land', () => { + expect( + describeSync( + { servers: [server('Alpha', { error: 'The server failed to answer.' })] }, + 'Sync ran.' + ) + ).toBe('Sync ran. Applied on 0 of 1 server. Not synced on Alpha: The server failed to answer.'); + }); + + test('still syncing, refused entries, and a failure with no phrase', () => { + expect( + describeSync( + { + servers: [ + server('Alpha', { ok: false, pending: true, error: 'Sync already running.' }), + server('Bravo', { failed: 2 }), + server('Charlie', { ok: false }) + ] + }, + 'Banned.' + ) + ).toBe( + 'Banned. Applied on 0 of 3 servers. Still syncing: Alpha.' + + ' Not synced on Charlie: The sync failed. Refused by: Bravo (see the list page).' + ); + }); +}); diff --git a/src/lib/lists.ts b/src/lib/lists.ts index 80307b34..a5afc496 100644 --- a/src/lib/lists.ts +++ b/src/lib/lists.ts @@ -81,19 +81,28 @@ export function groupState( return { kind: 'off', text: never ? 'Off' : `Off since ${whenShort(g.onUntil!, now)}`, tone: '' }; } -/** One line for a toast: where a list change landed. */ +/** + * One line for a toast: where a list change landed, and why not where it did not, in the fixed + * phrase the sync answers (syncPhrase). A run the server stopped answering part-way is `ok` with + * its phrase in `error`: it did not land either. + */ export function describeSync(sync: ListSyncSummary, done: string): string { const s = sync.servers; if (!s.length) return `${done} Servers pick it up on the next poll.`; - const applied = s.filter((x) => x.ok && !x.failed).length; + const applied = s.filter((x) => x.ok && !x.failed && !x.error).length; const parts = [ `${done} Applied on ${applied} of ${s.length} server${s.length === 1 ? '' : 's'}.` ]; const pending = s.filter((x) => x.pending).map((x) => x.serverName); - const down = s.filter((x) => !x.ok && !x.pending).map((x) => x.serverName); + const why = new Map(); + for (const x of s) + if (!x.pending && (!x.ok || x.error)) { + const phrase = x.error || 'The sync failed.'; + why.set(phrase, [...(why.get(phrase) ?? []), x.serverName]); + } const failed = s.filter((x) => x.ok && x.failed).map((x) => x.serverName); if (pending.length) parts.push(`Still syncing: ${pending.join(', ')}.`); - if (down.length) parts.push(`Unreachable, will retry: ${down.join(', ')}.`); + for (const [phrase, names] of why) parts.push(`Not synced on ${names.join(', ')}: ${phrase}`); if (failed.length) parts.push(`Refused by: ${failed.join(', ')} (see the list page).`); return parts.join(' '); } From 68686b29388f2b95361c031e06a380db895aa029 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:15:19 +0100 Subject: [PATCH 082/102] Poller stages log a failed query without its parameters --- src/lib/server/failed-query-text.test.ts | 42 ++++++++++++++++++++++++ src/lib/server/observe.ts | 12 +++++-- 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 src/lib/server/failed-query-text.test.ts diff --git a/src/lib/server/failed-query-text.test.ts b/src/lib/server/failed-query-text.test.ts new file mode 100644 index 00000000..577f850b --- /dev/null +++ b/src/lib/server/failed-query-text.test.ts @@ -0,0 +1,42 @@ +// A failed query's message lists its parameters (Drizzle: "Failed query: \nparams: "). +// Nothing logs, stores or answers that text: the log gets it through forLog, without the +// parameters; a row or a client gets a fixed phrase. +import { expect, test } from 'bun:test'; +import { DrizzleQueryError } from 'drizzle-orm/errors'; +import { stage, type ServerMemory } from './observe'; + +const failedQuery = () => + new DrizzleQueryError( + 'insert into "player_names" ("steam_id", "name") values ($1, $2)', + ['76561190000000001', 'Quiet Fixture'], + new Error('deadlock detected') + ); + +/** Everything the console was handed while `fn` ran, as one text. */ +async function logged(fn: () => Promise): Promise { + const out: unknown[] = []; + const saved = { warn: console.warn, error: console.error, log: console.log }; + console.warn = console.error = console.log = (...args: unknown[]) => void out.push(...args); + try { + await fn(); + } finally { + Object.assign(console, saved); + } + return out + .map((a) => (a instanceof Error ? `${a.stack}\n${String(a.cause)}` : String(a))) + .join('\n'); +} + +test('a housekeeping stage that fails on a query logs it without the parameters', async () => { + const m = { server: { name: 'Fixture server' } } as unknown as ServerMemory; + const text = await logged(() => + stage('lists', m, async () => { + throw failedQuery(); + }) + ); + expect(text).not.toContain('76561190000000001'); + expect(text).not.toContain('Quiet Fixture'); + expect(text).toContain('lists Fixture server'); + expect(text).toContain('insert into "player_names"'); + expect(text).toContain('deadlock detected'); +}); diff --git a/src/lib/server/observe.ts b/src/lib/server/observe.ts index 2d37653f..9c1ea36b 100644 --- a/src/lib/server/observe.ts +++ b/src/lib/server/observe.ts @@ -8,7 +8,7 @@ // own: match bookkeeping, ban-list snapshot, org-list sync, Steam warm-up. import { and, desc, eq, isNull } from 'drizzle-orm'; import type { Env } from './env'; -import { publicMessage } from './http'; +import { forLog, publicMessage } from './http'; import type { OrgRow, ServerRow } from './access'; import { ACTIONS, readConfig } from './actions'; import { reservedSlotsHeld } from '../reserved-doc'; @@ -871,12 +871,18 @@ async function observationFailed( emit({ type: 'live', live: liveView(m) }); } -async function stage(name: string, m: ServerMemory, fn: () => Promise): Promise { +/** One part of the housekeeping after a look: a failure is logged, the next part runs. */ +export async function stage( + name: string, + m: ServerMemory, + fn: () => Promise +): Promise { try { await fn(); } catch (err) { if (err instanceof LostOwnership) throw err; - console.warn(`[warcon] ${name} ${m.server.name}:`, err instanceof Error ? err.message : err); + // a failed query's message lists its parameters (SteamIDs, names, ban reasons) + console.warn(`[warcon] ${name} ${m.server.name}:`, forLog(err)); } } From 4c90fe393d682615f180067ac59c9fc2c7bc8844 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:17:44 +0100 Subject: [PATCH 083/102] Outbox stores a fixed phrase when the panel itself fails a row --- src/lib/server/outbox.ts | 12 ++- src/test/delivery-failure-text.test.ts | 127 +++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 src/test/delivery-failure-text.test.ts diff --git a/src/lib/server/outbox.ts b/src/lib/server/outbox.ts index 69f9574a..2a447537 100644 --- a/src/lib/server/outbox.ts +++ b/src/lib/server/outbox.ts @@ -562,7 +562,12 @@ async function deliverOne(env: Env, row: OutboxRow): Promise<'held' | 'refused' else if (OWN_WORDS.has(row.action)) await finish(env, row, 'failed', refusal(err)); else if (err instanceof GameError || err instanceof ApiError) await finish(env, row, 'failed', err.message); - else await finish(env, row, 'failed', err instanceof Error ? err.message : String(err)); + else { + // the panel's own failure: the error goes to the log, a fixed phrase to the row (a failed + // query's message lists its parameters) + console.error('[warcon] delivery', forLog(err)); + await finish(env, row, 'failed', 'The panel failed while sending it.'); + } } finally { stats.inFlight--; } @@ -665,7 +670,10 @@ async function deliverSeedReward(env: Env, row: OutboxRow): Promise { ); } catch (err) { if (err instanceof LostOwnership) return; // the lease sweep marks it unknown - await finish(env, row, 'failed', err instanceof Error ? err.message : String(err)); + if (err instanceof ApiError) return await finish(env, row, 'failed', err.message); + // the error goes to the log, a fixed phrase to the row: a failed query lists its parameters + console.error('[warcon] seed reward', forLog(err)); + await finish(env, row, 'failed', 'Could not write the reserved slot.'); } finally { stats.inFlight--; } diff --git a/src/test/delivery-failure-text.test.ts b/src/test/delivery-failure-text.test.ts new file mode 100644 index 00000000..18c58728 --- /dev/null +++ b/src/test/delivery-failure-text.test.ts @@ -0,0 +1,127 @@ +// A row the panel itself fails on (a failed query, a bug: anything that is not the game's answer +// or the panel's own refusal) is stored with a fixed phrase, and the error goes to the log without +// a failed query's parameters. The outcome is read in Recent actions, the audit trail and Discord. +import { afterAll, beforeAll, describe, expect, spyOn, test } from 'bun:test'; +import { and, eq, sql } from 'drizzle-orm'; +import { DrizzleQueryError } from 'drizzle-orm/errors'; +import type { Env } from '$lib/server/env'; +import { auditLog, organizations, outbox, servers } from '$lib/server/db/schema'; +import { acquireOrRenew, releaseOwnership } from '$lib/server/leadership'; +import { forgetMemory, memoryFor } from '$lib/server/observe'; +import { startDelivery, stopDelivery, wakeDelivery } from '$lib/server/outbox'; +import { WardogsClient } from '$lib/server/rcon'; +import { hasTestDb, testEnv } from './db'; +import { seedWorld, type World } from './world'; + +const PLAYER = '76561198000000801'; +const REASON = 'Fixture reason text'; + +describe.skipIf(!hasTestDb)('an outbox row the panel fails on', () => { + let env: Env; + let w: World; + const logged: string[] = []; + const saved = console.error; + + beforeAll(async () => { + env = { ...(await testEnv()), STEAM_API_KEY: '' }; + w = await seedWorld(env); + expect(await acquireOrRenew(env, 'delivery-failure-text')).toBe(true); + const [server] = await env.db.select().from(servers).where(eq(servers.id, w.server.id)); + const [org] = await env.db.select().from(organizations).where(eq(organizations.id, w.org.id)); + memoryFor(server, org); + console.error = (...args: unknown[]) => + void logged.push(args.map((a) => (a instanceof Error ? a.stack : String(a))).join(' ')); + startDelivery(env); + }); + + afterAll(async () => { + console.error = saved; + stopDelivery(); + forgetMemory(w.server.id); + await releaseOwnership(env); + }); + + const rowOf = async (id: number) => + (await env.db.select().from(outbox).where(eq(outbox.id, id)))[0]; + /** The row once delivery is done with it. */ + const settled = async (id: number) => { + wakeDelivery(); + for (let i = 0; i < 100; i++) { + const row = await rowOf(id); + if (row.state !== 'pending' && row.state !== 'sending') return row; + await Bun.sleep(50); + } + return rowOf(id); + }; + const queue = async (action: string, params: Record) => + ( + await env.db + .insert(outbox) + .values({ + serverId: w.server.id, + triggerName: 'Fixture rule', + triggerKind: action === 'seed_reward' ? 'seed_reward' : 'broadcast', + action, + params, + target: PLAYER, + okMessage: 'Done.', + dedupeKey: `failure-${action}` + }) + .returning({ id: outbox.id }) + )[0].id; + + test('a game action that fails in the panel', async () => { + const spy = spyOn(WardogsClient, 'forServer').mockImplementation(async () => { + throw new DrizzleQueryError( + 'select "notes" from "players" where "steam_id" = $1', + [PLAYER, REASON], + new Error('canceling statement due to statement timeout') + ); + }); + try { + const id = await queue('broadcast', { message: 'Fixture broadcast' }); + const done = await settled(id); + expect([done.state, done.outcome]).toEqual(['failed', 'The panel failed while sending it.']); + const [audit] = await env.db + .select({ message: auditLog.message }) + .from(auditLog) + .where(and(eq(auditLog.serverId, w.server.id), eq(auditLog.action, 'trigger.broadcast'))); + expect(audit.message).toBe('The panel failed while sending it.'); + } finally { + spy.mockRestore(); + } + const text = logged.join('\n'); + expect(text).not.toContain(PLAYER); + expect(text).not.toContain(REASON); + expect(text).toContain('statement timeout'); + }); + + test('a Seeding reward whose slot cannot be written', async () => { + // The database refuses the slot: a real failed query, its parameters the player and the reason. + await env.db.execute(sql` + CREATE FUNCTION fixture_refuse() RETURNS trigger LANGUAGE plpgsql AS + $$ BEGIN RAISE EXCEPTION 'fixture refusal'; END $$`); + await env.db.execute(sql` + CREATE TRIGGER fixture_refuse BEFORE INSERT ON list_entries + FOR EACH ROW EXECUTE FUNCTION fixture_refuse()`); + try { + logged.length = 0; + const id = await queue('seed_reward', { + steamId: PLAYER, + name: 'Fixture seeder', + reason: REASON, + slotDays: 3, + scope: 'server' + }); + const done = await settled(id); + expect([done.state, done.outcome]).toEqual(['failed', 'Could not write the reserved slot.']); + } finally { + await env.db.execute(sql`DROP TRIGGER fixture_refuse ON list_entries`); + await env.db.execute(sql`DROP FUNCTION fixture_refuse()`); + } + const text = logged.join('\n'); + expect(text).not.toContain(PLAYER); + expect(text).not.toContain(REASON); + expect(text).toContain('fixture refusal'); + }); +}); From d7c42e43579c221e7c99449bf1e6aa7d9967e6a8 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:18:10 +0100 Subject: [PATCH 084/102] Worker relays its own failures as a fixed phrase --- src/lib/server/failed-query-text.test.ts | 13 +++++++++++++ src/lib/server/relay.ts | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/lib/server/failed-query-text.test.ts b/src/lib/server/failed-query-text.test.ts index 577f850b..811a7e65 100644 --- a/src/lib/server/failed-query-text.test.ts +++ b/src/lib/server/failed-query-text.test.ts @@ -4,6 +4,7 @@ import { expect, test } from 'bun:test'; import { DrizzleQueryError } from 'drizzle-orm/errors'; import { stage, type ServerMemory } from './observe'; +import { serializeError, type RelayError } from './relay'; const failedQuery = () => new DrizzleQueryError( @@ -40,3 +41,15 @@ test('a housekeeping stage that fails on a query logs it without the parameters' expect(text).toContain('insert into "player_names"'); expect(text).toContain('deadlock detected'); }); + +test('the worker sends the web a fixed phrase for its own failure, and logs it without the parameters', async () => { + let sent: RelayError | undefined; + const text = await logged(async () => { + sent = serializeError(failedQuery()); + }); + expect(JSON.stringify(sent)).not.toContain('76561190000000001'); + expect(JSON.stringify(sent)).not.toContain('Quiet Fixture'); + expect(sent).toEqual({ kind: 'other', status: 500, message: 'Internal error.' }); + expect(text).not.toContain('76561190000000001'); + expect(text).toContain('deadlock detected'); +}); diff --git a/src/lib/server/relay.ts b/src/lib/server/relay.ts index 7b409ab9..5361f679 100644 --- a/src/lib/server/relay.ts +++ b/src/lib/server/relay.ts @@ -2,7 +2,7 @@ // port, a shared bearer secret, and one server-sent event stream the web keeps open. The same // routes served by the worker (worker/runtime.ts) and called by gateway-remote.ts. import { GameError } from './rcon'; -import { ApiError } from './http'; +import { ApiError, forLog } from './http'; export const RELAY_PREFIX = '/relay'; @@ -26,5 +26,8 @@ export function serializeError(err: unknown): RelayError { }; if (err instanceof ApiError) return { kind: 'api', status: err.status, message: err.message, code: err.code }; - return { kind: 'other', status: 500, message: err instanceof Error ? err.message : String(err) }; + // The worker's own failure: the web shows this to whoever clicked, and a failed query's message + // lists its parameters, so the error stays in the worker's log and a fixed phrase crosses. + console.error('[warcon] relay', forLog(err)); + return { kind: 'other', status: 500, message: 'Internal error.' }; } From bee98cd390d189c2a6a4e5cd0b69e3ac92a086f2 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:19:04 +0100 Subject: [PATCH 085/102] Audit a game action the panel fails on with a fixed phrase --- src/lib/server/rcon-run.ts | 5 ++- src/test/action-failure-text.test.ts | 60 ++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 src/test/action-failure-text.test.ts diff --git a/src/lib/server/rcon-run.ts b/src/lib/server/rcon-run.ts index 9cf410ef..74d54b50 100644 --- a/src/lib/server/rcon-run.ts +++ b/src/lib/server/rcon-run.ts @@ -200,12 +200,13 @@ export async function runAction( }); throw err; } - const message = err instanceof Error ? err.message : String(err); + // The panel's own failure: the trail keeps a fixed phrase (a failed query's message lists its + // parameters); the error goes on to the route, which logs it without them. await writeAudit(env, req, { ...base, outcome: 'error', status: 500, - message, + message: 'Internal error.', detail: def.mutating ? detail : undefined, durationMs }); diff --git a/src/test/action-failure-text.test.ts b/src/test/action-failure-text.test.ts new file mode 100644 index 00000000..1df51ee1 --- /dev/null +++ b/src/test/action-failure-text.test.ts @@ -0,0 +1,60 @@ +// A game action the panel itself fails on (not the game's answer, not the panel's own refusal): +// the caller and the audit trail get a fixed phrase, never the error's message, which for a failed +// query lists its parameters. +import { beforeAll, describe, expect, test } from 'bun:test'; +import { and, eq } from 'drizzle-orm'; +import { DrizzleQueryError } from 'drizzle-orm/errors'; +import type { Env } from '$lib/server/env'; +import { auditLog } from '$lib/server/db/schema'; +import { gateway, setGateway } from '$lib/server/gateway'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, type World } from './world'; + +const PLAYER = '76561198000000811'; +const NOTE = 'Fixture note text'; + +describe.skipIf(!hasTestDb)('a game action the panel fails on', () => { + let env: Env; + let w: World; + + beforeAll(async () => { + env = await testEnv(); + w = await seedWorld(env); + }); + + test('answers and audits a fixed phrase', async () => { + stubGateway(); + setGateway({ + ...gateway(), + run: async () => { + throw new DrizzleQueryError( + 'update "players" set "note" = $1 where "steam_id" = $2', + [NOTE, PLAYER], + new Error('could not serialize access due to concurrent update') + ); + } + }); + const { POST } = await import('../routes/api/servers/[id]/rcon/[action]/+server'); + const quiet = console.error; + console.error = () => {}; + let answer; + try { + answer = await callApi(POST, w.users.owner, { + method: 'POST', + params: { id: w.server.id, action: 'broadcast' }, + body: { message: 'Fixture broadcast' } + }); + } finally { + console.error = quiet; + } + expect([answer.status, answer.message]).toEqual([500, 'Internal error.']); + const [row] = await env.db + .select({ message: auditLog.message, outcome: auditLog.outcome }) + .from(auditLog) + .where(and(eq(auditLog.serverId, w.server.id), eq(auditLog.action, 'rcon.broadcast'))); + expect(row.message).not.toContain(PLAYER); + expect(row.message).not.toContain(NOTE); + expect([row.outcome, row.message]).toEqual(['error', 'Internal error.']); + }); +}); From c497e5be382feb20c23e78d91cf1d0c977256231 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:20:00 +0100 Subject: [PATCH 086/102] A rule that fails its check records a fixed phrase --- src/lib/server/failed-query-text.test.ts | 39 ++++++++++++++++++++++++ src/lib/server/triggers.ts | 8 +++-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/lib/server/failed-query-text.test.ts b/src/lib/server/failed-query-text.test.ts index 811a7e65..13bf737e 100644 --- a/src/lib/server/failed-query-text.test.ts +++ b/src/lib/server/failed-query-text.test.ts @@ -5,6 +5,9 @@ import { expect, test } from 'bun:test'; import { DrizzleQueryError } from 'drizzle-orm/errors'; import { stage, type ServerMemory } from './observe'; import { serializeError, type RelayError } from './relay'; +import { evaluateTriggers, validateConfig, type Evaluation, type TickContext } from './triggers'; +import type { TriggerRow } from './db/schema'; +import type { Env } from './env'; const failedQuery = () => new DrizzleQueryError( @@ -53,3 +56,39 @@ test('the worker sends the web a fixed phrase for its own failure, and logs it w expect(text).not.toContain('76561190000000001'); expect(text).toContain('deadlock detected'); }); + +test('a rule whose check fails on a query records a fixed phrase, and the log has no parameters', async () => { + const row = { + id: 'rule-reset', + name: 'Fixture reset', + kind: 'empty_reset', + config: validateConfig('empty_reset', { map: 'Fixture map', afterMinutes: 10 }), + state: null, + lastFiredAt: null + } as unknown as TriggerRow; + const ctx = { + server: { id: 'srv', name: 'Fixture server' }, + status: { map: 'Other map', experiences: [], playerCount: 0 }, + players: [], + ts: new Date() + } as unknown as TickContext; + // the samples read fails + const env = { + db: { + select: () => { + throw failedQuery(); + } + } + } as unknown as Env; + let ev: Evaluation | undefined; + const text = await logged(async () => { + ev = await evaluateTriggers(env, ctx, [row]); + }); + expect(JSON.stringify(ev)).not.toContain('76561190000000001'); + expect(ev?.updates).toEqual([ + { id: 'rule-reset', lastResult: 'Error: the rule could not be checked.' } + ]); + expect(text).not.toContain('76561190000000001'); + expect(text).toContain('Fixture reset'); + expect(text).toContain('deadlock detected'); +}); diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index 32d7fe3c..83a700fd 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -829,9 +829,11 @@ export async function evaluateTriggers( break; } } catch (err) { - const message = err instanceof Error ? err.message : String(err); - console.error(`[warcon] trigger ${row.name}`, message); - out.updates.push({ id: row.id, lastResult: `Error: ${message}`.slice(0, 300) }); + // The rule shows a fixed phrase unless the panel refused in its own words; the error goes + // to the log (a failed query's message lists its parameters). + console.error(`[warcon] trigger ${row.name}`, forLog(err)); + const why = err instanceof ApiError ? err.message : 'the rule could not be checked.'; + out.updates.push({ id: row.id, lastResult: `Error: ${why}`.slice(0, 300) }); } } return out; From 9dcafd2f3aa263d324ff1c30e4d90b215fb51c46 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:20:53 +0100 Subject: [PATCH 087/102] Audit a failed passkey sign-in without the error's own text --- src/routes/api/passkeys/auth/+server.ts | 6 ++- src/test/passkey-failure-text.test.ts | 55 +++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 src/test/passkey-failure-text.test.ts diff --git a/src/routes/api/passkeys/auth/+server.ts b/src/routes/api/passkeys/auth/+server.ts index 406c81e1..04dd7652 100644 --- a/src/routes/api/passkeys/auth/+server.ts +++ b/src/routes/api/passkeys/auth/+server.ts @@ -1,7 +1,7 @@ // Step two of signing in with a passkey. Better Auth checks the assertion against the stored // credential and sets the session cookie; the login audit row comes from the session hook. import { getEnv } from '$lib/server/env'; -import { apiJson, ApiError, clientIp, readJson, route } from '$lib/server/http'; +import { apiJson, ApiError, clientIp, publicMessage, readJson, route } from '$lib/server/http'; import { assertRate } from '$lib/server/ratelimit'; import { writeAudit } from '$lib/server/audit'; import type { AuthenticationResponseJSON } from '@simplewebauthn/browser'; @@ -23,7 +23,9 @@ export const POST = route(async ({ locals, request }) => { action: 'login', outcome: 'denied', target: 'passkey', - message: err instanceof Error ? err.message : 'Passkey rejected' + // Better Auth's refusal in its words; anything else (a failed query lists its parameters) + // goes to the log and the row says only this + message: publicMessage(err, 'Passkey rejected') }); throw new ApiError(401, 'That passkey was not accepted.', 'passkey_rejected'); } diff --git a/src/test/passkey-failure-text.test.ts b/src/test/passkey-failure-text.test.ts new file mode 100644 index 00000000..a0b9781b --- /dev/null +++ b/src/test/passkey-failure-text.test.ts @@ -0,0 +1,55 @@ +// A passkey sign-in that fails for a reason other than Better Auth's refusal (a failed query, whose +// message lists its parameters) leaves a fixed phrase in the audit trail. +import { beforeAll, describe, expect, test } from 'bun:test'; +import { and, eq } from 'drizzle-orm'; +import { DrizzleQueryError } from 'drizzle-orm/errors'; +import type { RequestEvent } from '@sveltejs/kit'; +import type { Env } from '$lib/server/env'; +import { auditLog } from '$lib/server/db/schema'; +import { hasTestDb, testEnv } from './db'; +import { callApi } from './call'; + +const CREDENTIAL = 'fixture-credential-id'; +const USER = 'u_fixture_passkey'; + +describe.skipIf(!hasTestDb)('a passkey sign-in the panel fails on', () => { + let env: Env; + + beforeAll(async () => { + env = await testEnv(); + }); + + test('audits a fixed phrase', async () => { + const { POST } = await import('../routes/api/passkeys/auth/+server'); + const auth = { + api: { + verifyPasskeyAuthentication: async () => { + throw new DrizzleQueryError( + 'update "passkey" set "counter" = $1 where "id" = $2 and "user_id" = $3', + [7, CREDENTIAL, USER], + new Error('connection terminated unexpectedly') + ); + } + } + }; + const handler = (event: RequestEvent) => + POST({ ...event, locals: { ...event.locals, auth } } as never); + const quiet = console.error; + console.error = () => {}; + let answer; + try { + answer = await callApi(handler, null, { method: 'POST', body: { response: { id: 'x' } } }); + } finally { + console.error = quiet; + } + expect(answer.code).toBe('passkey_rejected'); + const rows = await env.db + .select({ message: auditLog.message }) + .from(auditLog) + .where(and(eq(auditLog.action, 'login'), eq(auditLog.target, 'passkey'))); + expect(rows.length).toBe(1); + expect(rows[0].message).not.toContain(CREDENTIAL); + expect(rows[0].message).not.toContain(USER); + expect(rows[0].message).toBe('Passkey rejected'); + }); +}); From 5f106ff1bfa528f4a0152370892ebb812a66718f Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:23:43 +0100 Subject: [PATCH 088/102] Log every caught error on the server through forLog --- src/lib/server/auth.ts | 8 +-- src/lib/server/enrolment.ts | 3 +- src/lib/server/events.ts | 3 +- src/lib/server/failed-query-text.test.ts | 79 +++++++++++++++++++++++ src/lib/server/gateway-remote.ts | 6 +- src/lib/server/lists-sync.ts | 8 +-- src/lib/server/metrics.ts | 3 +- src/lib/server/outbox.ts | 12 ++-- src/lib/server/poller.ts | 23 ++++--- src/lib/server/rcon-run.ts | 4 +- src/lib/server/signup.ts | 4 +- src/lib/server/steam.ts | 2 +- src/lib/server/webhook-delivery.ts | 13 ++-- src/lib/server/webhook-status.ts | 5 +- src/routes/auth/steam/callback/+server.ts | 6 +- src/routes/sign-out/+server.ts | 3 +- 16 files changed, 135 insertions(+), 47 deletions(-) diff --git a/src/lib/server/auth.ts b/src/lib/server/auth.ts index 48da8b24..0af824c8 100644 --- a/src/lib/server/auth.ts +++ b/src/lib/server/auth.ts @@ -21,7 +21,7 @@ import { getRequestEvent } from '$app/server'; import { writeAudit } from './audit'; import { auditSelfDelete, beforeSelfDelete, eraseUserTraces } from './erasure'; import { discordEnabled, type Env } from './env'; -import { ApiError, CLIENT_IP_HEADER } from './http'; +import { ApiError, CLIENT_IP_HEADER, forLog } from './http'; import { warconSessions } from './auth-plugin'; import { refreshAuthComplete, startGrace } from './enrolment'; import { refuseMemberBeforeOwner } from './users'; @@ -245,12 +245,12 @@ function build(env: Env) { action: 'login', outcome: 'ok', userAgent: session.userAgent ?? '' - }).catch((err) => console.error('audit login', err)); + }).catch((err) => console.error('audit login', forLog(err))); // The sign-in rules: start the grace clock on the first sign-in and re-check the // verdict, in case a method changed through a path that did not refresh it. await startGrace(env, session.userId); await refreshAuthComplete(env, session.userId).catch((err) => - console.error('enrolment refresh', err) + console.error('enrolment refresh', forLog(err)) ); } } @@ -260,7 +260,7 @@ function build(env: Env) { // Discord and Steam links land here through their callbacks. after: async (a) => { await refreshAuthComplete(env, a.userId).catch((err) => - console.error('enrolment refresh', err) + console.error('enrolment refresh', forLog(err)) ); } } diff --git a/src/lib/server/enrolment.ts b/src/lib/server/enrolment.ts index 2edbe109..0b1053e6 100644 --- a/src/lib/server/enrolment.ts +++ b/src/lib/server/enrolment.ts @@ -3,6 +3,7 @@ // refreshAuthComplete after anything that adds or removes a method. import { and, count, eq, isNull, or, sql } from 'drizzle-orm'; import type { Env } from './env'; +import { forLog } from './http'; import { account, orgMembers, orgRoles, passkey, serverGrants, user } from './db/schema'; import { AUTH_ENFORCE, settings } from './settings'; import type { Capability } from '$lib/capabilities'; @@ -67,7 +68,7 @@ export async function startGrace(env: Env, userId: string): Promise { .set({ authGraceStartedAt: new Date() }) .where(and(eq(user.id, userId), isNull(user.authGraceStartedAt))) .then(() => {}) - .catch((err) => console.error('enrolment grace', err)); + .catch((err) => console.error('enrolment grace', forLog(err))); } export const statusFor = (u: EnrolmentSubject): EnrolmentStatus => enrolmentStatus(u, settings()); diff --git a/src/lib/server/events.ts b/src/lib/server/events.ts index dd24a826..86a28f0a 100644 --- a/src/lib/server/events.ts +++ b/src/lib/server/events.ts @@ -2,6 +2,7 @@ // something; the web's SSE route fans it out to browsers. When web and worker run as separate // processes the web subscribes to the worker's relay stream and re-emits here. import type { KillView, LiveView } from '$lib/types'; +import { forLog } from './http'; export interface LiveEvent { type: 'live'; @@ -36,7 +37,7 @@ export function emit(e: WarconEvent): void { try { fn(e); } catch (err) { - console.error('[warcon] event listener', err); + console.error('[warcon] event listener', forLog(err)); } } } diff --git a/src/lib/server/failed-query-text.test.ts b/src/lib/server/failed-query-text.test.ts index 13bf737e..c37db6e9 100644 --- a/src/lib/server/failed-query-text.test.ts +++ b/src/lib/server/failed-query-text.test.ts @@ -3,6 +3,8 @@ // parameters; a row or a client gets a fixed phrase. import { expect, test } from 'bun:test'; import { DrizzleQueryError } from 'drizzle-orm/errors'; +import { readdirSync, readFileSync } from 'node:fs'; +import { join, relative } from 'node:path'; import { stage, type ServerMemory } from './observe'; import { serializeError, type RelayError } from './relay'; import { evaluateTriggers, validateConfig, type Evaluation, type TickContext } from './triggers'; @@ -92,3 +94,80 @@ test('a rule whose check fails on a query records a fixed phrase, and the log ha expect(text).toContain('Fixture reset'); expect(text).toContain('deadlock detected'); }); + +// ---- every console call on the server ---------------------------------------------------------- + +const SRC = join(import.meta.dir, '..', '..'); + +/** The worker, the hooks, every server module, endpoint and load: what runs on a box, not a browser. */ +function serverSources(dir: string): string[] { + return readdirSync(dir, { withFileTypes: true }).flatMap((e) => { + const path = join(dir, e.name); + if (e.isDirectory()) return serverSources(path); + if (e.name.endsWith('.test.ts') || !e.name.endsWith('.ts')) return []; + const rel = relative(SRC, path); + if (rel.startsWith('routes/')) + return /^\+(server|page\.server|layout\.server)\.ts$/.test(e.name) ? [path] : []; + return rel.startsWith('lib/server/') || rel.startsWith('worker/') || rel === 'hooks.server.ts' + ? [path] + : []; + }); +} + +/** Each console call in `text`: its line and its arguments, split at their top-level commas. */ +function consoleCalls(text: string): { line: number; args: string[] }[] { + const calls: { line: number; args: string[] }[] = []; + for (const m of text.matchAll(/console\.(log|info|warn|error|debug)\(/g)) { + const args: string[] = []; + let cur = ''; + let depth = 1; + let i = m.index + m[0].length; + while (i < text.length && depth > 0) { + const ch = text[i]; + if (ch === "'" || ch === '"' || ch === '`') { + // a string or a template whole: its commas and brackets are not the call's + let j = i + 1; + while (j < text.length && text[j] !== ch) j += text[j] === '\\' ? 2 : 1; + cur += text.slice(i, j + 1); + i = j + 1; + continue; + } + if ('([{'.includes(ch)) depth++; + else if (')]}'.includes(ch)) depth--; + if (depth === 0 || (depth === 1 && ch === ',')) { + args.push(cur.trim()); + cur = ''; + } else cur += ch; + i++; + } + calls.push({ line: text.slice(0, m.index).split('\n').length, args: args.filter(Boolean) }); + } + return calls; +} + +/** An argument that hands the console an error itself, its message or its stack. */ +const RAW_ERROR = + /^(err|e|error)$|\b(err|e|error)\.(message|stack)\b|String\((err|e|error)\)|\$\{(err|e|error)\b/; + +test('no console call on the server logs an error but through forLog or publicMessage', () => { + const files = serverSources(SRC); + expect(files.length).toBeGreaterThan(50); + const raw: string[] = []; + for (const file of files) + for (const call of consoleCalls(readFileSync(file, 'utf8'))) + for (const arg of call.args) + if (RAW_ERROR.test(arg)) raw.push(`${relative(SRC, file)}:${call.line}: ${arg}`); + expect(raw).toEqual([]); +}); + +test('the scan sees an error handed to the console however it is written', () => { + const flagged = (src: string) => + consoleCalls(src).flatMap((c) => c.args.filter((a) => RAW_ERROR.test(a))); + expect(flagged("console.error('[warcon] x', err);")).toEqual(['err']); + expect( + flagged('console.warn(`[warcon] ${name}:`, err instanceof Error ? err.message : err);') + ).toHaveLength(1); + expect(flagged("console.error('x', e.stack, `(${err})`)")).toHaveLength(2); + expect(flagged("console.error('[warcon] x', forLog(err));")).toEqual([]); + expect(flagged("console.warn('[warcon] x:', publicMessage(e), 'a, (b)');")).toEqual([]); +}); diff --git a/src/lib/server/gateway-remote.ts b/src/lib/server/gateway-remote.ts index 11857269..4784a919 100644 --- a/src/lib/server/gateway-remote.ts +++ b/src/lib/server/gateway-remote.ts @@ -3,7 +3,7 @@ // event bus so the SSE route and pages work exactly as in the single-process role. import type { Env } from './env'; import type { OrgRow, ServerRow } from './access'; -import { ApiError } from './http'; +import { ApiError, forLog } from './http'; import { GameError } from './rcon'; import { emit, subscribe, type WarconEvent } from './events'; import type { Gateway } from './gateway'; @@ -70,7 +70,7 @@ export async function call( }); } catch (err) { // The runtime's text can quote the relay's URL, which is for the log, not for whoever clicked. - console.error('[warcon] relay', err instanceof Error ? err.message : err); + console.error('[warcon] relay', forLog(err)); throw new ApiError(503, 'The worker is not reachable.', 'worker_unavailable'); } const data = (await res.json().catch(() => null)) as { @@ -136,7 +136,7 @@ function consumeEvents(env: Env): void { } } } catch (err) { - console.warn('[warcon] worker event stream:', err instanceof Error ? err.message : err); + console.warn('[warcon] worker event stream:', forLog(err)); } finally { clearTimeout(watchdog); } diff --git a/src/lib/server/lists-sync.ts b/src/lib/server/lists-sync.ts index 517c4e9e..b65e8ea6 100644 --- a/src/lib/server/lists-sync.ts +++ b/src/lib/server/lists-sync.ts @@ -253,7 +253,7 @@ export async function expireEntries(env: Env): Promise<{ lifted: number; orgIds: outcome: 'ok', message: `${ids.length} ${o.kind === 'ban' ? 'ban' : 'reserved slot'}${ids.length === 1 ? '' : 's'} expired in ${o.orgName}`, detail: { orgId: o.orgId, org: o.orgName, steamIds: ids } - }).catch((err) => console.error('[warcon] list.expire audit', err)); + }).catch((err) => console.error('[warcon] list.expire audit', forLog(err))); } return { lifted: rows.length, orgIds: [...new Set(owners.map((o) => o.orgId))] }; } @@ -616,7 +616,7 @@ async function run( removed: outcome.removed.map(refOf), failed: failedNow.map((f) => ({ kind: f.kind, steamId: f.steamId, error: f.error })) } - }).catch((err) => console.error('[warcon] lists.sync audit', err)); + }).catch((err) => console.error('[warcon] lists.sync audit', forLog(err))); } return { ...base, @@ -1001,7 +1001,7 @@ export async function kickBanned( status: error ? 502 : 200, message: error ? `Could not remove a banned player: ${error}` : 'Banned player removed', detail: { banId: banUid(entry.id) } - }).catch((err) => console.error('[warcon] ban.enforce audit', err)); + }).catch((err) => console.error('[warcon] ban.enforce audit', forLog(err))); } } @@ -1032,7 +1032,7 @@ async function liveEntry(env: Env, serverId: string, b: PanelBan, now: Date) { * reported as still syncing. */ export async function fanOut(env: Env, org: OrgRow): Promise { - await expireEntries(env).catch((err) => console.error('[warcon] list expiry', err)); + await expireEntries(env).catch((err) => console.error('[warcon] list expiry', forLog(err))); const rows = await env.db .select({ server: servers }) .from(servers) diff --git a/src/lib/server/metrics.ts b/src/lib/server/metrics.ts index dadba9ad..208f5eb4 100644 --- a/src/lib/server/metrics.ts +++ b/src/lib/server/metrics.ts @@ -9,6 +9,7 @@ import { collectDefaultMetrics, Counter, Gauge, Histogram, Registry } from 'prom-client'; import { buildInfo, type BuildInfo } from './build-info'; import { timingSafeEqualStr } from './crypto'; +import { forLog } from './http'; export const registry = new Registry(); collectDefaultMetrics({ register: registry }); @@ -245,7 +246,7 @@ export async function renderMetrics(): Promise { try { await fn(); } catch (err) { - console.warn('[warcon] metrics collector:', err instanceof Error ? err.message : err); + console.warn('[warcon] metrics collector:', forLog(err)); } }) ); diff --git a/src/lib/server/outbox.ts b/src/lib/server/outbox.ts index 2a447537..a49025c0 100644 --- a/src/lib/server/outbox.ts +++ b/src/lib/server/outbox.ts @@ -248,7 +248,7 @@ async function pass(): Promise { }); } } catch (err) { - if (!(err instanceof LostOwnership)) console.error('[warcon] delivery pass', err); + if (!(err instanceof LostOwnership)) console.error('[warcon] delivery pass', forLog(err)); } finally { loop.claiming = false; claimFinished(); @@ -263,7 +263,7 @@ async function pass(): Promise { async function deliverChain(env: Env, rows: OutboxRow[]): Promise { for (let i = 0; i < rows.length; i++) { const after = await deliverOne(env, rows[i]).catch((err) => { - console.error('[warcon] delivery', err); + console.error('[warcon] delivery', forLog(err)); }); if (after === 'held') return putBack(env, rows.slice(i), WAITING); if (after === 'refused') return putBack(env, rows.slice(i + 1), WAITING); @@ -285,7 +285,7 @@ async function putBack(env: Env, rows: OutboxRow[], why?: string): Promise ); } catch (err) { if (err instanceof LostOwnership) return; // the lease sweep marks them unknown - console.error('[warcon] outbox update', err); + console.error('[warcon] outbox update', forLog(err)); return; } for (const r of rows) emit({ type: 'outbox', serverId: r.serverId, id: r.id, state: 'pending' }); @@ -463,7 +463,7 @@ async function release(env: Env, row: OutboxRow): Promise { ); } catch (err) { if (err instanceof LostOwnership) return; // the lease sweep marks it unknown - console.error('[warcon] outbox update', err); + console.error('[warcon] outbox update', forLog(err)); } } @@ -1002,7 +1002,7 @@ async function finish(env: Env, row: OutboxRow, state: Outcome, outcome: string) ); } catch (err) { if (err instanceof LostOwnership) throw err; - console.error('[warcon] outbox update', err); + console.error('[warcon] outbox update', forLog(err)); } // A panel action (a grant, a ban, a flag) can be delivered before the roster is in memory: // audit it from the server row then. @@ -1023,7 +1023,7 @@ async function finish(env: Env, row: OutboxRow, state: Outcome, outcome: string) state, ...((row.detail as Record) ?? {}) } - ).catch((err) => console.error('[warcon] delivery audit', err)); + ).catch((err) => console.error('[warcon] delivery audit', forLog(err))); emit({ type: 'outbox', serverId: row.serverId, id: row.id, state }); } diff --git a/src/lib/server/poller.ts b/src/lib/server/poller.ts index 05617d04..22e4b648 100644 --- a/src/lib/server/poller.ts +++ b/src/lib/server/poller.ts @@ -41,7 +41,7 @@ import { liveView } from './live'; import { feedDemoKills, forgetKillDistance, forgetNameChange } from './feed-events'; import { forgetBounties } from './bounty'; import { startAliasFill } from './aliases'; -import { publicMessage } from './http'; +import { forLog, publicMessage } from './http'; import * as metrics from './metrics'; import type { LiveView } from '$lib/types'; @@ -128,7 +128,9 @@ export function startPoller(env: Env, label = 'worker'): void { // Lease renewal runs on its own timer so a slow roster or settings read never delays it. scheduler.renewTimer = setInterval( () => - void acquireOrRenew(env, label).catch((err) => console.error('[warcon] worker lease', err)), + void acquireOrRenew(env, label).catch((err) => + console.error('[warcon] worker lease', forLog(err)) + ), RENEW_MS ); globalThis.__warconRenew = scheduler.renewTimer; @@ -212,7 +214,8 @@ export async function observeNow(env: Env, serverId: string): Promise observeServer(env, mem, { status: true, players: true }) ).catch((err) => { - if (!(err instanceof LostOwnership)) console.error(`[warcon] observe ${mem.server.name}`, err); + if (!(err instanceof LostOwnership)) + console.error(`[warcon] observe ${mem.server.name}`, forLog(err)); }); return mem.observedAt ? liveView(mem) : null; } @@ -228,7 +231,7 @@ async function beat(env: Env): Promise { // The first acquisition; renewals then run on their own timer. s.renewAt = now; await acquireOrRenew(env, s.label).catch((err) => - console.error('[warcon] worker lease', err) + console.error('[warcon] worker lease', forLog(err)) ); } if (!isOwner()) return; @@ -245,7 +248,7 @@ async function beat(env: Env): Promise { startAliasFill(env); if (now - s.settingsAt >= SETTINGS_MS) { s.settingsAt = now; - await loadSettings(env).catch((err) => console.error('[warcon] settings', err)); + await loadSettings(env).catch((err) => console.error('[warcon] settings', forLog(err))); if (settingsVersion() !== s.settingsSeen) { s.settingsSeen = settingsVersion(); for (const m of allMemory()) if (m.inFlight === null) replan(m, now); @@ -256,7 +259,7 @@ async function beat(env: Env): Promise { if (now - s.rosterAt >= ROSTER_MS) await refreshRoster(env, s, now); launchDue(env, s, now); } catch (err) { - console.error('[warcon] scheduler beat', err); + console.error('[warcon] scheduler beat', forLog(err)); } finally { s.beating = false; } @@ -271,7 +274,7 @@ async function refreshRoster(env: Env, s: Scheduler, now: number): Promise .from(servers) .innerJoin(organizations, eq(organizations.id, servers.orgId)); } catch (err) { - console.error('[warcon] roster', err); + console.error('[warcon] roster', forLog(err)); return; } const present = new Set(); @@ -296,7 +299,7 @@ async function refreshRoster(env: Env, s: Scheduler, now: number): Promise if (now - s.expiryAt >= EXPIRY_MS) { s.expiryAt = now; const expired = await expireEntries(env).catch((err) => { - console.error('[warcon] list expiry', err); + console.error('[warcon] list expiry', forLog(err)); return { lifted: 0, orgIds: [] as string[] }; }); // A lifted ban comes off the servers on their next look, not at the next scheduled sync. @@ -352,7 +355,7 @@ function launchDue(env: Env, s: Scheduler, now: number): void { ) .catch((err) => { if (err instanceof LostOwnership) return; - console.error(`[warcon] observe ${m.server.name}`, err); + console.error(`[warcon] observe ${m.server.name}`, forLog(err)); }) .finally(() => { m.inFlight = null; @@ -371,7 +374,7 @@ async function housekeep(env: Env): Promise { try { await rollupSamples(env); } catch (err) { - console.error('[warcon] rollups failed', err); + console.error('[warcon] rollups failed', forLog(err)); } finally { housekeeping = false; } diff --git a/src/lib/server/rcon-run.ts b/src/lib/server/rcon-run.ts index 74d54b50..34941d4f 100644 --- a/src/lib/server/rcon-run.ts +++ b/src/lib/server/rcon-run.ts @@ -1,7 +1,7 @@ // The /api/servers/:id/rcon/:action handler: capability check, action dispatch, audit row. import type { RequestEvent } from '@sveltejs/kit'; import { flag, getEnv } from './env'; -import { ApiError, apiJson, readJson } from './http'; +import { ApiError, apiJson, forLog, readJson } from './http'; import { writeAudit } from './audit'; import { getServer, requireUser, serverAccessFor } from './access'; import { CAPABILITY_INFO } from '../capabilities'; @@ -122,7 +122,7 @@ export async function runAction( await noteLocalEdit(env, server.id, listEdit.kind, listEdit.op, target, { reason: typeof params?.reason === 'string' ? params.reason.slice(0, 200) : '', pendingRestart: !!(result as { pendingRestart?: unknown } | null)?.pendingRestart - }).catch((err) => console.error('[warcon] list mirror', err)); + }).catch((err) => console.error('[warcon] list mirror', forLog(err))); } if (def.mutating) gateway().observeSoon(server.id, { lists: !!listEdit }); // A new document may change MaxReservedSlots, which the worker otherwise re-reads hourly. diff --git a/src/lib/server/signup.ts b/src/lib/server/signup.ts index 348103cb..50d62014 100644 --- a/src/lib/server/signup.ts +++ b/src/lib/server/signup.ts @@ -3,7 +3,7 @@ import { fail, redirect, type RequestEvent } from '@sveltejs/kit'; import { count, eq } from 'drizzle-orm'; import { flag, maxOrgsPerUser, turnstileSiteKey, type Env } from './env'; -import { addressKey, ApiError, clientIp, normalizeError, str } from './http'; +import { addressKey, ApiError, clientIp, forLog, normalizeError, str } from './http'; import { writeAudit } from './audit'; import { keyForbidden, loginLockSeconds, noteLoginFailure, type SessionUser } from './access'; import { createUser, userCount, validatePassword, validateUsername } from './users'; @@ -60,7 +60,7 @@ export async function verifyTurnstile(env: Env, token: string, ip: string): Prom console.warn('turnstile rejected', data['error-codes']); return 'Verification failed. Reload the page and try again.'; } catch (err) { - console.error('turnstile siteverify', err instanceof Error ? err.message : err); + console.error('turnstile siteverify', forLog(err)); return 'Could not verify the challenge right now. Try again in a moment.'; } } diff --git a/src/lib/server/steam.ts b/src/lib/server/steam.ts index 47a76e9b..b7483c28 100644 --- a/src/lib/server/steam.ts +++ b/src/lib/server/steam.ts @@ -322,7 +322,7 @@ export async function getProfiles( for (const row of await fetchSteam(env, stale)) map.set(row.steamId, row); } catch (err) { if (opts.refresh) throw err; - console.warn('[warcon] steam lookup', err instanceof Error ? err.message : err); + console.warn('[warcon] steam lookup', forLog(err)); } // The friends lists are looked at behind the answer, so nothing that reads a profile waits on // a call per player; only a refresh someone asked for waits for them. diff --git a/src/lib/server/webhook-delivery.ts b/src/lib/server/webhook-delivery.ts index d246a136..078ab7ef 100644 --- a/src/lib/server/webhook-delivery.ts +++ b/src/lib/server/webhook-delivery.ts @@ -5,6 +5,7 @@ import { and, eq, inArray } from 'drizzle-orm'; import type { Env } from './env'; import { decryptSecret } from './crypto'; +import { forLog } from './http'; import { playerMarks, servers, webhooks, type AuditRow, type WebhookRow } from './db/schema'; import { OWNERS_ROWS } from './audit-rows'; import { escapeMarkdown } from './webhook-status-core'; @@ -330,7 +331,7 @@ export async function notifyBounty( for (const hook of hooks) enqueue(env, hook, embed); } } catch (err) { - console.error('[warcon] webhook bounties', err); + console.error('[warcon] webhook bounties', forLog(err)); } } @@ -406,7 +407,7 @@ function scheduleFlush(env: Env, hook: WebhookRow, q: Queue): void { q.chain = q.chain .then(() => flush(env, hook, q)) .catch((err) => { - console.error('[warcon] webhook flush', err); + console.error('[warcon] webhook flush', forLog(err)); }); } @@ -558,7 +559,7 @@ export async function recordResult(env: Env, id: string, result: PostResult): Pr }) .where(eq(webhooks.id, id)); } catch (err) { - console.error('[warcon] webhook status', err); + console.error('[warcon] webhook status', forLog(err)); } } @@ -603,7 +604,7 @@ export async function notifyWebhooks(env: Env, row: AuditRow): Promise { enqueue(env, hook, embed); } } catch (err) { - console.error('[warcon] webhook notify', err); + console.error('[warcon] webhook notify', forLog(err)); } } @@ -671,7 +672,7 @@ export async function notifyWatchedJoins( for (const hook of hooks) enqueue(env, hook, embed); } } catch (err) { - console.error('[warcon] webhook watched joins', err); + console.error('[warcon] webhook watched joins', forLog(err)); } } @@ -694,7 +695,7 @@ export async function notifyTeamKills( for (const hook of hooks) enqueue(env, hook, embed); } } catch (err) { - console.error('[warcon] webhook team kills', err); + console.error('[warcon] webhook team kills', forLog(err)); } } diff --git a/src/lib/server/webhook-status.ts b/src/lib/server/webhook-status.ts index b1cda13a..4b59e2af 100644 --- a/src/lib/server/webhook-status.ts +++ b/src/lib/server/webhook-status.ts @@ -6,6 +6,7 @@ // removed; a webhook Discord no longer knows shows as failing on the org page like the mirror. import { and, asc, eq, inArray } from 'drizzle-orm'; import type { Env } from './env'; +import { forLog } from './http'; import { organizations, servers, webhooks, type WebhookRow } from './db/schema'; import { isOwner } from './leadership'; import { memoryOf } from './observe'; @@ -81,7 +82,7 @@ async function tick(env: Env): Promise { try { await refreshStatusMessages(env); } catch (err) { - console.error('[warcon] status messages', err); + console.error('[warcon] status messages', forLog(err)); } finally { ticking = false; } @@ -118,7 +119,7 @@ export async function refreshStatusMessages(env: Env, now = Date.now()): Promise const only = hook.serverIds as string[] | null; const list = only && only.length ? all.filter((s) => only.includes(s.id)) : all; return refreshHook(env, hook, orgName, list, now).catch((err) => - console.error(`[warcon] status messages ${hook.label}`, err) + console.error(`[warcon] status messages ${hook.label}`, forLog(err)) ); }) ); diff --git a/src/routes/auth/steam/callback/+server.ts b/src/routes/auth/steam/callback/+server.ts index 19eeaf4a..73890192 100644 --- a/src/routes/auth/steam/callback/+server.ts +++ b/src/routes/auth/steam/callback/+server.ts @@ -7,7 +7,7 @@ import { getEnv } from '$lib/server/env'; import { freeUsername } from '$lib/server/auth'; import { account, user } from '$lib/server/db/schema'; import { writeAudit } from '$lib/server/audit'; -import { ApiError, normalizeError } from '$lib/server/http'; +import { ApiError, forLog, normalizeError } from '$lib/server/http'; import { verifySteamAssertion } from '$lib/server/steam-openid'; import { takeSteamState, steamCallbackUrl } from '$lib/server/steam-auth'; import { fetchSteam, steamEnabled } from '$lib/server/steam'; @@ -104,7 +104,7 @@ export const GET: RequestHandler = async (event) => { }); } catch (err) { const known = normalizeError(err); - console.error('steam sign-up', err instanceof Error ? err.stack : err); + console.error('steam sign-up', forLog(err)); redirect(303, withError(state.back, known?.code || 'steam_signup')); } await setSteamId(env, userId, steamId).catch(() => {}); @@ -127,7 +127,7 @@ export const GET: RequestHandler = async (event) => { await auth.api.signInUser({ body: { userId }, headers: request.headers }); } catch (err) { if (err instanceof ApiError) throw err; - console.error('steam sign-in', err instanceof Error ? err.stack : err); + console.error('steam sign-in', forLog(err)); redirect(303, withError(state.back, 'steam')); } redirect(303, state.next); diff --git a/src/routes/sign-out/+server.ts b/src/routes/sign-out/+server.ts index f7b234d0..05e02c19 100644 --- a/src/routes/sign-out/+server.ts +++ b/src/routes/sign-out/+server.ts @@ -2,6 +2,7 @@ import { redirect } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { getEnv } from '$lib/server/env'; import { writeAudit } from '$lib/server/audit'; +import { forLog } from '$lib/server/http'; export const POST: RequestHandler = async ({ request, locals }) => { const env = getEnv(); @@ -9,7 +10,7 @@ export const POST: RequestHandler = async ({ request, locals }) => { try { await locals.auth.api.signOut({ headers: request.headers }); } catch (err) { - console.warn('sign-out', err); + console.warn('sign-out', forLog(err)); } await writeAudit(env, request, { actor: locals.user, From 9bfd3bd803c74e0da19bfc2feffc48bb6d9852ab Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 19:25:27 +0100 Subject: [PATCH 089/102] Better Auth logs failed queries through forLog --- src/lib/server/auth.ts | 6 ++++++ src/lib/server/failed-query-text.test.ts | 23 +++++++++++++++++++++++ src/lib/server/http.ts | 9 +++++---- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/lib/server/auth.ts b/src/lib/server/auth.ts index 0af824c8..6631e536 100644 --- a/src/lib/server/auth.ts +++ b/src/lib/server/auth.ts @@ -146,6 +146,12 @@ function build(env: Env) { appName: env.APP_NAME || 'Warcon', baseURL: env.ORIGIN, secret: env.BETTER_AUTH_SECRET, + // Better Auth logs a failed endpoint's error as it is, and a failed query's message lists its + // parameters (a session token, a password hash): it goes through forLog like ours. + logger: { + log: (level, message, ...args) => + console[level]('[Better Auth]', forLog(message), ...args.map(forLog)) + }, database: drizzleAdapter(env.db, { provider: 'pg', schema: { diff --git a/src/lib/server/failed-query-text.test.ts b/src/lib/server/failed-query-text.test.ts index c37db6e9..b8b65d1e 100644 --- a/src/lib/server/failed-query-text.test.ts +++ b/src/lib/server/failed-query-text.test.ts @@ -95,6 +95,29 @@ test('a rule whose check fails on a query records a fixed phrase, and the log ha expect(text).toContain('deadlock detected'); }); +test("Better Auth's own log of a failed query leaves the parameters out", async () => { + const { initAuth } = await import('./auth'); + const auth = initAuth({ + ORIGIN: 'http://localhost:5173', + BETTER_AUTH_SECRET: 'fixture-secret-0123456789-fixture-secret', + db: {} + } as unknown as Env); + const { logger } = await auth.$context; + const failed = new DrizzleQueryError( + 'insert into "session" ("token", "user_id") values ($1, $2)', + ['fixture-session-token', 'u_fixture'], + new Error('could not extend file: No space left on device') + ); + const text = await logged(async () => { + // the two ways its endpoint error handler logs a failure + logger.error(failed.name, failed); + logger.error(failed.message); + }); + expect(text).not.toContain('fixture-session-token'); + expect(text).not.toContain('u_fixture'); + expect(text).toContain('No space left on device'); +}); + // ---- every console call on the server ---------------------------------------------------------- const SRC = join(import.meta.dir, '..', '..'); diff --git a/src/lib/server/http.ts b/src/lib/server/http.ts index 4550a2a1..f21f0fd0 100644 --- a/src/lib/server/http.ts +++ b/src/lib/server/http.ts @@ -32,17 +32,18 @@ export function normalizeError(err: unknown): ApiError | null { return null; } +const PARAMS = /\nparams: [\s\S]*?(?=\n\s+at |$)/; + /** * An error as it goes to the process log: its stack, and the cause's message. A failed query's * message lists its parameters, and for the servers table those are the stored RCON password (as * ciphertext) and the address, so the parameters are left out. */ export function forLog(err: unknown): unknown { + // a message passed on by itself (Better Auth logs some that way) is cut the same way + if (typeof err === 'string') return err.replace(PARAMS, '\nparams: (not logged)'); if (!(err instanceof Error)) return err; - const text = (err.stack || err.message).replace( - /\nparams: [\s\S]*?(?=\n\s+at |$)/, - '\nparams: (not logged)' - ); + const text = (err.stack || err.message).replace(PARAMS, '\nparams: (not logged)'); const cause = (err as { cause?: unknown }).cause; return cause instanceof Error ? `${text}\ncause: ${cause.message}` : text; } From df72f3eb9343f62f133c2dbcb174c7de4d4d2ef4 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 21:52:38 +0100 Subject: [PATCH 090/102] forLog cuts a failed query's parameters to the end of its message --- src/lib/server/http.test.ts | 22 ++++++++++++++++++++++ src/lib/server/http.ts | 17 ++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/lib/server/http.test.ts b/src/lib/server/http.test.ts index ac8ae6af..1bd8813e 100644 --- a/src/lib/server/http.test.ts +++ b/src/lib/server/http.test.ts @@ -46,3 +46,25 @@ test('a failed query is logged without its parameters: for the servers table the expect(logged).not.toContain('lines'); expect(forLog('plain')).toBe('plain'); }); + +test('a parameter with a line like a stack frame does not end the cut early', () => { + for (const note of [ + 'first line\n at the base, SECRET-REST-OF-PARAMS', + 'first line\n at fake (file.ts:1:1)\nSECRET-REST-OF-PARAMS' + ]) { + const failed = new DrizzleQueryError( + 'update "players" set "note" = $1', + [note], + new Error('canceling statement due to user request') + ); + for (const logged of [String(forLog(failed)), String(forLog(failed.message))]) { + expect(logged).not.toContain('SECRET-REST-OF-PARAMS'); + expect(logged).not.toContain('first line'); + expect(logged).toContain('update "players" set "note" = $1\nparams: (not logged)'); + } + const logged = String(forLog(failed)); + // the frames are still there, and the cause + expect(logged).toMatch(/\n\s+at .*http\.test\.ts/); + expect(logged).toContain('cause: canceling statement due to user request'); + } +}); diff --git a/src/lib/server/http.ts b/src/lib/server/http.ts index f21f0fd0..e3247245 100644 --- a/src/lib/server/http.ts +++ b/src/lib/server/http.ts @@ -32,7 +32,11 @@ export function normalizeError(err: unknown): ApiError | null { return null; } -const PARAMS = /\nparams: [\s\S]*?(?=\n\s+at |$)/; +/** A failed query's message ends with its parameters: cut from there to the end, whatever they hold. */ +function cutParams(text: string): string { + const at = text.indexOf('\nparams: '); + return at < 0 ? text : `${text.slice(0, at)}\nparams: (not logged)`; +} /** * An error as it goes to the process log: its stack, and the cause's message. A failed query's @@ -41,9 +45,16 @@ const PARAMS = /\nparams: [\s\S]*?(?=\n\s+at |$)/; */ export function forLog(err: unknown): unknown { // a message passed on by itself (Better Auth logs some that way) is cut the same way - if (typeof err === 'string') return err.replace(PARAMS, '\nparams: (not logged)'); + if (typeof err === 'string') return cutParams(err); if (!(err instanceof Error)) return err; - const text = (err.stack || err.message).replace(PARAMS, '\nparams: (not logged)'); + // A parameter can hold any text, a line like a stack frame among it: the message is cut on its + // own and the frames put back after it; a stack that does not start with the message is cut to + // its end, frames and all. + const head = `${err.name}: ${err.message}`; + const stack = err.stack ?? ''; + const text = stack.startsWith(head) + ? `${err.name}: ${cutParams(err.message)}${stack.slice(head.length)}` + : cutParams(stack || err.message); const cause = (err as { cause?: unknown }).cause; return cause instanceof Error ? `${text}\ncause: ${cause.message}` : text; } From 9fee47229369cbffc08af3a3b465cc686fa1ba2f Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 22:08:31 +0100 Subject: [PATCH 091/102] Recount 0032's match rows from the kill feed Migration 0047 counts 0032's rows from the feed where it saw the whole match, keeps each session's counters in the totals, and rebuilds them. --- drizzle/0049_match_players_from_feed.sql | 226 +++++++++ drizzle/meta/_journal.json | 9 +- src/test/match-feed-backfill.test.ts | 593 +++++++++++++++++++++++ 3 files changed, 827 insertions(+), 1 deletion(-) create mode 100644 drizzle/0049_match_players_from_feed.sql create mode 100644 src/test/match-feed-backfill.test.ts diff --git a/drizzle/0049_match_players_from_feed.sql b/drizzle/0049_match_players_from_feed.sql new file mode 100644 index 00000000..1b5db74d --- /dev/null +++ b/drizzle/0049_match_players_from_feed.sql @@ -0,0 +1,226 @@ +-- Migration 0049: kills and deaths from the feed for matches 0032 filled from sessions (issues #31, #18). +-- 0032 gave a session's counters to the last match it overlapped and zero to the earlier ones. +-- Until 66fa7a6 a session's counters were its last match's alone; after it they were the sum of +-- its matches, so a sum sat on one match. The feed's count is a match's own where the feed saw the +-- whole match, as the worker counts it (feedRecord in match-players.ts): a kill is a row the +-- player is the killer of that is neither a suicide nor a team kill, and every row the player is +-- the victim of is a death. Nothing is taken from a player's totals and nothing counted twice. +-- +-- 0032's matches ended before the first match with a row whose cash moved ended: 0032 never wrote +-- a change in cash and the worker writes one in nearly every match it closes, so that end is when +-- this install's worker began writing rows (installs took 0031 on different days), and 0032's +-- sessions closed before it. Only rows of those sessions are written: a row of such a match that +-- the worker wrote for a session it closed later is its own. An install taking 0031 and this in +-- one upgrade has no such end yet and keeps 0032's rows as they are. The feed saw the whole match +-- when the match has final scores, its server's first kill came before it started, its own first +-- and last kills (by match_row) came within 5 minutes of its start and end, and its clock +-- (event_time) never runs back more than 5 s in the order the kills arrived (a game restart). In +-- those matches, covered, a row's count starts from the feed's, as below, and a row whose side is +-- not on the match's scoreboard (the holding side, White, or none) takes the scoreboard side the +-- feed stamped on the player's kills and deaths there, when it shows exactly one. A player the +-- feed saw with no row gets none: a row needs a name, time on and a side, for few kills (on +-- warcon.app 652 of them, with 4,470 kills). +-- +-- Each of 0032's sessions over a covered match, by when its counters dropped (the starts of its +-- matches after the first) against when the install switched to 66fa7a6: +-- - summing, every drop after the switch (a session open across it too: the restarted worker +-- took its counters as they stood): its counters less the feed over its covered matches, +-- floored at 0, are its last uncovered match of 0032's (which held 0, or the sum when it is +-- the last), or are added to its own last when all are covered; +-- - single, every drop before the switch, or none: a covered last match takes the larger of the +-- feed and the counters; an uncovered one keeps them, and its covered matches get the feed; +-- - held, a drop inside the switch window or drops on both sides, or a sum ending in a match +-- that is not 0032's: every row of it stays as 0032 wrote it, and so does every row of the +-- sessions of the same player it shares a match with (a rejoin), as do two or more sessions +-- sharing matches when one of them sums (their parts of a shared match cannot be told apart). +-- The switch is inferred: never before 66fa7a6 was written (2026-09-20 22:41:46 UTC). The +-- sessions closed after that, over two or more covered matches, whose counters are within 2 plus +-- 10% of the feed's sum and further than twice that from their last match's are summing, and the +-- reverse single (on warcon.app the counters of sessions known by their time are that close on +-- 95%; the feed misses some kills). A switch at time t is contradicted by a single one whose last +-- drop is after t and by a summing one whose first drop is before t; the window is every such +-- time contradicted by at most 1% of them more than the best time is, so a stray session (a +-- worker restart, a dropped feed batch) does not move it. With no summing session the switch is +-- unknown and every session with a drop after 66fa7a6 was written is held. +-- +-- Order: the bound, the matches, the feed's numbers, the sessions and the rows to write, each into +-- a temporary table, holding nothing a writer needs (what they read has stopped changing), the +-- tables analyzed so that each join is planned on real numbers; the rows already as they would be +-- written are dropped from the last, so a second run, or rows put right by hand, writes and +-- rebuilds nothing (a purge before the lock only leaves fewer to write). Then the rows and the +-- totals kept from them (player_totals, player_days) as 0038 says a bulk load does: the sources +-- locked against writes in the writers' order (sessions, lines, matches), the lines' update +-- trigger off, the update, the rebuild (only when there is a row to write), the trigger on again, +-- in the migration's one transaction. A match's kills arrive while it is open, so reading the +-- kills up to 2 minutes past the bound reads them all, from the oldest chunks only. On warcon.app +-- (2026-10-09): switch window 2026-09-20 23:19 to 00:13 UTC, 79,925 rows to write, under a minute +-- before the lock; the update and the rebuild hold the sources for 1 to 2 minutes: deploy it in a +-- quiet hour. +CREATE TEMP TABLE "fed_bound" ON COMMIT DROP AS +SELECT MIN(m.ended_at) AS e FROM matches m + WHERE EXISTS (SELECT 1 FROM match_players p WHERE p.match_id = m.id AND p.cash_delta <> 0);--> statement-breakpoint +CREATE TEMP TABLE "fed_matches" ON COMMIT DROP AS +WITH feed AS ( + SELECT k.server_id, k.match_row, k.ts, + LAG(k.event_time) OVER (PARTITION BY k.match_row ORDER BY k.ts, k.event_time) - k.event_time AS back + FROM kills k + WHERE k.ts <= (SELECT e FROM fed_bound) + interval '2 minutes' +) +SELECT m.id, m.server_id, m.ended_at, m.final_scores + FROM matches m + JOIN (SELECT server_id, MIN(ts) AS since FROM feed GROUP BY server_id) s ON s.server_id = m.server_id + JOIN (SELECT match_row, MIN(ts) AS first_at, MAX(ts) AS last_at, COUNT(*) FILTER (WHERE back > 5) AS resets + FROM feed GROUP BY match_row) f ON f.match_row = m.id + WHERE m.ended_at < (SELECT e FROM fed_bound) + AND CASE WHEN jsonb_typeof(m.final_scores) = 'array' THEN jsonb_array_length(m.final_scores) END > 0 + AND s.since < m.started_at AND f.resets = 0 + AND f.first_at <= m.started_at + interval '5 minutes' AND f.last_at >= m.ended_at - interval '5 minutes';--> statement-breakpoint +ANALYZE "fed_matches";--> statement-breakpoint +CREATE TEMP TABLE "fed_lines" ON COMMIT DROP AS +WITH sides AS ( + SELECT c.id AS match_id, x.steam_id, x.faction, + COUNT(*) FILTER (WHERE x.killer AND NOT k.suicide AND NOT k.team_kill) AS kills, + COUNT(*) FILTER (WHERE NOT x.killer) AS deaths + FROM fed_matches c + JOIN kills k ON k.match_row = c.id AND k.server_id = c.server_id + CROSS JOIN LATERAL (VALUES (k.killer_steam_id, k.killer_faction, true), + (k.victim_steam_id, k.victim_faction, false)) x(steam_id, faction, killer) + WHERE k.ts <= (SELECT MAX(ended_at) FROM fed_matches) + interval '2 minutes' AND x.steam_id IS NOT NULL + GROUP BY 1, 2, 3 +), +players AS ( + SELECT n.match_id, n.steam_id, SUM(n.kills) AS kills, SUM(n.deaths) AS deaths, + COUNT(*) FILTER (WHERE e.on_board) AS sides, MIN(n.faction) FILTER (WHERE e.on_board) AS side + FROM sides n + JOIN fed_matches c ON c.id = n.match_id + CROSS JOIN LATERAL ( + SELECT EXISTS (SELECT 1 FROM jsonb_array_elements(c.final_scores) s WHERE s->>'name' = n.faction) AS on_board) e + GROUP BY 1, 2 +) +SELECT p.match_id, p.server_id, p.steam_id, COALESCE(n.kills, 0)::int AS kills, COALESCE(n.deaths, 0)::int AS deaths, + CASE WHEN n.sides = 1 + AND NOT EXISTS (SELECT 1 FROM jsonb_array_elements(c.final_scores) s WHERE s->>'name' = p.faction) + THEN n.side ELSE p.faction END AS faction + FROM fed_matches c + JOIN match_players p ON p.match_id = c.id AND p.server_id = c.server_id + LEFT JOIN players n ON n.match_id = p.match_id AND n.steam_id = p.steam_id;--> statement-breakpoint +ANALYZE "fed_lines";--> statement-breakpoint +CREATE TEMP TABLE "fed_spans" ON COMMIT DROP AS +WITH s AS ( + SELECT ps.id, ps.server_id, ps.steam_id, ps.joined_at, ps.left_at, ps.kills, ps.deaths + FROM player_sessions ps + JOIN (SELECT DISTINCT server_id, steam_id FROM fed_lines) k ON k.server_id = ps.server_id AND k.steam_id = ps.steam_id + WHERE ps.left_at < (SELECT e FROM fed_bound) +), +b AS ( + SELECT s.*, a.id AS last_id, + CASE WHEN p.id IS NOT NULL AND COALESCE(p.ended_at, now()) > s.joined_at THEN p.id ELSE n.id END AS first_id + FROM s + LEFT JOIN LATERAL (SELECT id FROM matches m WHERE m.server_id = s.server_id AND m.started_at < s.left_at + ORDER BY m.started_at DESC LIMIT 1) a ON true + LEFT JOIN LATERAL (SELECT id, ended_at FROM matches m WHERE m.server_id = s.server_id AND m.started_at <= s.joined_at + ORDER BY m.started_at DESC LIMIT 1) p ON true + LEFT JOIN LATERAL (SELECT id FROM matches m WHERE m.server_id = s.server_id AND m.started_at > s.joined_at + ORDER BY m.started_at LIMIT 1) n ON true +) +SELECT b.id AS sid, b.server_id, b.steam_id, b.left_at, b.kills, b.deaths, b.first_id, b.last_id, + m.id AS match_id, m.started_at, COALESCE(m.ended_at < (SELECT e FROM fed_bound), false) AS old, + c.id IS NOT NULL AS covered, COALESCE(f.kills, 0) AS fk, COALESCE(f.deaths, 0) AS fd + FROM b + JOIN matches m ON m.server_id = b.server_id AND m.id BETWEEN b.first_id AND b.last_id + LEFT JOIN fed_matches c ON c.id = m.id + LEFT JOIN fed_lines f ON f.match_id = m.id AND f.steam_id = b.steam_id + WHERE b.first_id <= b.last_id;--> statement-breakpoint +ANALYZE "fed_spans";--> statement-breakpoint +CREATE TEMP TABLE "fed_sessions" ON COMMIT DROP AS +SELECT x.*, SUM(x.brk) OVER (PARTITION BY x.server_id, x.steam_id ORDER BY x.first_id, x.last_id, x.sid) AS chain + FROM ( + SELECT a.*, + CASE WHEN a.first_id <= MAX(a.last_id) OVER (PARTITION BY a.server_id, a.steam_id ORDER BY a.first_id, a.last_id, a.sid + ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) + THEN 0 ELSE 1 END AS brk + FROM ( + SELECT sid, server_id, steam_id, left_at, kills, deaths, first_id, last_id, COUNT(*) AS n, + (array_agg(started_at ORDER BY match_id))[2] AS second_start, + MAX(started_at) FILTER (WHERE match_id = last_id) AS last_start, + bool_and(covered) AS all_cov, bool_or(covered AND match_id = last_id) AS last_cov, + bool_or(old AND match_id = last_id) AS last_old, + COALESCE(SUM(fk) FILTER (WHERE covered), 0) AS fk, COALESCE(SUM(fd) FILTER (WHERE covered), 0) AS fd, + MAX(fk) FILTER (WHERE match_id = last_id) AS lk, MAX(fd) FILTER (WHERE match_id = last_id) AS ld, + COALESCE(MAX(match_id) FILTER (WHERE old AND NOT covered), last_id) AS target + FROM fed_spans GROUP BY 1, 2, 3, 4, 5, 6, 7, 8) a + ) x;--> statement-breakpoint +ANALYZE "fed_sessions";--> statement-breakpoint +CREATE TEMP TABLE "fed_rows" ON COMMIT DROP AS +WITH labelled AS ( + SELECT CASE WHEN dsum <= tol AND dlast > 2 * tol THEN 'sum' ELSE 'single' END AS looks, + CASE WHEN dsum <= tol AND dlast > 2 * tol THEN second_start ELSE last_start END AS t + FROM (SELECT second_start, last_start, abs(kills - fk) + abs(deaths - fd) AS dsum, + abs(kills - lk) + abs(deaths - ld) AS dlast, 2 + (kills + deaths) / 10.0 AS tol + FROM fed_sessions + WHERE left_at >= timestamptz '2026-09-20 22:41:46+00' AND n >= 2 AND all_cov) d + WHERE (dsum <= tol AND dlast > 2 * tol) OR (dlast <= tol AND dsum > 2 * tol) +), +against AS ( + SELECT t, + COUNT(*) FILTER (WHERE looks = 'sum') OVER (ORDER BY t RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW EXCLUDE GROUP) + + COUNT(*) FILTER (WHERE looks = 'single') OVER (ORDER BY t RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING EXCLUDE GROUP) AS n + FROM (SELECT looks, t FROM labelled UNION ALL SELECT NULL, timestamptz '2026-09-20 22:41:46+00') e +), +switch AS ( + SELECT MIN(t) AS lo, CASE WHEN EXISTS (SELECT 1 FROM labelled WHERE looks = 'sum') THEN MAX(t) END AS hi + FROM against + WHERE t >= timestamptz '2026-09-20 22:41:46+00' + AND n <= (SELECT MIN(n) FROM against WHERE t >= timestamptz '2026-09-20 22:41:46+00') + (SELECT COUNT(*) FROM labelled) / 100 +), +kinds AS ( + SELECT x.*, CASE WHEN x.n = 1 OR x.last_start <= w.lo THEN 'single' WHEN x.second_start >= w.hi THEN 'sum' END AS kind + FROM fed_sessions x CROSS JOIN switch w +), +chains AS ( + SELECT server_id, steam_id, chain, + bool_or(kind IS NULL OR (kind = 'sum' AND NOT last_old)) OR (COUNT(*) > 1 AND bool_or(kind = 'sum')) AS held + FROM kinds GROUP BY 1, 2, 3 +), +live AS ( + SELECT k.* FROM kinds k JOIN chains c ON c.server_id = k.server_id AND c.steam_id = k.steam_id AND c.chain = k.chain + WHERE NOT c.held +), +held AS ( + SELECT DISTINCT sp.match_id, sp.steam_id + FROM fed_spans sp JOIN kinds k ON k.sid = sp.sid + JOIN chains c ON c.server_id = k.server_id AND c.steam_id = k.steam_id AND c.chain = k.chain + WHERE c.held +), +ends AS ( + SELECT last_id AS match_id, steam_id, MAX(kills) AS kills, MAX(deaths) AS deaths + FROM live WHERE kind = 'single' AND last_cov GROUP BY 1, 2 +), +rest AS ( + SELECT target AS match_id, steam_id, GREATEST(kills - fk, 0) AS kills, GREATEST(deaths - fd, 0) AS deaths + FROM live WHERE kind = 'sum' +) +SELECT f.match_id, f.steam_id, + GREATEST(f.kills, COALESCE(e.kills, 0)) + COALESCE(r.kills, 0) AS kills, + GREATEST(f.deaths, COALESCE(e.deaths, 0)) + COALESCE(r.deaths, 0) AS deaths, f.faction + FROM fed_lines f + LEFT JOIN ends e ON e.match_id = f.match_id AND e.steam_id = f.steam_id + LEFT JOIN rest r ON r.match_id = f.match_id AND r.steam_id = f.steam_id + WHERE EXISTS (SELECT 1 FROM fed_spans sp WHERE sp.match_id = f.match_id AND sp.steam_id = f.steam_id) + AND NOT EXISTS (SELECT 1 FROM held h WHERE h.match_id = f.match_id AND h.steam_id = f.steam_id) +UNION ALL +SELECT r.match_id, r.steam_id, r.kills, r.deaths, p.faction + FROM rest r JOIN match_players p ON p.match_id = r.match_id AND p.steam_id = r.steam_id + WHERE NOT EXISTS (SELECT 1 FROM fed_matches c WHERE c.id = r.match_id);--> statement-breakpoint +DELETE FROM fed_rows f USING match_players p + WHERE p.match_id = f.match_id AND p.steam_id = f.steam_id + AND (p.kills, p.deaths, p.faction) IS NOT DISTINCT FROM (f.kills, f.deaths, f.faction);--> statement-breakpoint +LOCK TABLE "player_sessions", "match_players", "matches" IN SHARE ROW EXCLUSIVE MODE;--> statement-breakpoint +ALTER TABLE "match_players" DISABLE TRIGGER "player_totals_lines_updated";--> statement-breakpoint +UPDATE match_players p + SET kills = f.kills, deaths = f.deaths, faction = f.faction + FROM fed_rows f + WHERE p.match_id = f.match_id AND p.steam_id = f.steam_id + AND (p.kills, p.deaths, p.faction) IS DISTINCT FROM (f.kills, f.deaths, f.faction);--> statement-breakpoint +SELECT player_totals_rebuild() WHERE EXISTS (SELECT 1 FROM fed_rows);--> statement-breakpoint +ALTER TABLE "match_players" ENABLE TRIGGER "player_totals_lines_updated"; diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 7ff92ccd..3f4407dd 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -344,6 +344,13 @@ "when": 1791741444587, "tag": "0048_slot_groups", "breakpoints": true + }, + { + "idx": 49, + "version": "7", + "when": 1791569710555, + "tag": "0049_match_players_from_feed", + "breakpoints": true } ] -} \ No newline at end of file +} diff --git a/src/test/match-feed-backfill.test.ts b/src/test/match-feed-backfill.test.ts new file mode 100644 index 00000000..b6697a27 --- /dev/null +++ b/src/test/match-feed-backfill.test.ts @@ -0,0 +1,593 @@ +// Migration 0047 gives 0032's rows the feed's kills and deaths where the feed saw the whole match, +// keeps every session's counters in the player's totals (a sum where it was one, a single match's +// where it was that), and gives a row the feed's side where its own was not on the scoreboard; the +// totals are rebuilt from the rows. Each install here is a database of its own, migrated to just +// before 0047: a history seeded around the time 66fa7a6 was written (C), 0032 run over it, the +// worker's rows written, then 0047 applied by the migrator as at a deploy. Their own, because the +// bound and the switch are each install's, which the other suites' history would move. +import { afterAll, beforeAll, describe, expect, test } from 'bun:test'; +import { SQL } from 'bun'; +import { randomBytes } from 'node:crypto'; +import { cp, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import { and, asc, eq, inArray, sql } from 'drizzle-orm'; +import { connect, runMigrations, type Db } from '$lib/server/db'; +import { kills, matches, matchPlayers, playerSessions } from '$lib/server/db/schema'; +import { hasTestDb } from './db'; +import { oracleBase, oracleRangeBase, rangeRows, totalsRows } from './totals-oracle'; + +const FEED = '0047_match_players_from_feed'; +const HOUR = 3_600_000; +const MIN = 60_000; +const C = Date.parse('2026-09-20T22:41:46Z'); +const h = (hours: number) => new Date(C + hours * HOUR); +const SCORES = [ + { name: 'Lonestar', score: 100 }, + { name: 'Wagner', score: 40 } +]; +const id = (n: number) => `765611980000001${String(n).padStart(2, '0')}`; +// the feed's own players, who have no row +const E = id(1); +const G = id(2); +const V = id(3); +const LW: [string, string] = ['Lonestar', 'Wagner']; +const WL: [string, string] = ['Wagner', 'Lonestar']; + +async function run(db: Db, file: string) { + const text = await Bun.file(`drizzle/${file}.sql`).text(); + await db.transaction(async (tx) => { + for (const stmt of text.split('--> statement-breakpoint')) await tx.execute(sql.raw(stmt)); + }); +} + +/** A database migrated to just before 0047 (cut, as player-totals-writes explains), and its drop. */ +async function install() { + const base = process.env.TEST_DATABASE_URL!; + const name = `warcon_test_feed_${randomBytes(4).toString('hex')}`; + const admin = new SQL(base, { max: 1 }); + await admin.unsafe(`CREATE DATABASE "${name}"`); + await admin.close(); + const url = new URL(base); + url.pathname = `/${name}`; + const { client, db } = connect(url.href); + const dir = await mkdtemp(join(tmpdir(), 'warcon-migrate-')); + await cp('drizzle', dir, { recursive: true }); + const journal = JSON.parse(await readFile(join(dir, 'meta', '_journal.json'), 'utf8')); + const cut = journal.entries.findIndex((e: { tag: string }) => e.tag === FEED); + expect(cut).toBeGreaterThan(0); + journal.entries = journal.entries.slice(0, cut); + await writeFile(join(dir, 'meta', '_journal.json'), JSON.stringify(journal)); + await runMigrations(db, dir); + const drop = async () => { + await client.close(); + const a = new SQL(base, { max: 1 }); + await a.unsafe(`DROP DATABASE IF EXISTS "${name}" WITH (FORCE)`); + await a.close(); + await rm(dir, { recursive: true, force: true }); + }; + return { db, drop }; +} + +/** One-hour matches from these hours after C, those in `unscored` without scores. */ +async function addMatches(db: Db, serverId: string, starts: number[], unscored: number[] = []) { + const rows = await db + .insert(matches) + .values( + starts.map((s) => ({ + serverId, + startedAt: h(s), + endedAt: h(s + 1), + map: 'Europe', + finalScores: unscored.includes(s) ? null : SCORES, + winner: unscored.includes(s) ? null : 'Lonestar' + })) + ) + .returning({ id: matches.id, startedAt: matches.startedAt }); + return rows.map((r) => ({ id: r.id, start: r.startedAt.getTime() })); +} + +type Match = { id: number; start: number }; + +function feed(serverId: string) { + let n = 0; + /** A kill `min` minutes into the match (or at an hour after C with no match). */ + return ( + m: Match | number, + min: number, + killer: string | null, + victim: string, + sides: [string | null, string | null] = LW, + extra: Partial = {} + ): typeof kills.$inferInsert => { + const start = typeof m === 'number' ? h(m).getTime() : m.start; + return { + ts: new Date(start + min * MIN), + serverId, + eventId: `${serverId}:${++n}`, + instanceId: 'i', + matchId: 'g', + matchRow: typeof m === 'number' ? null : m.id, + eventTime: min * 60, + map: 'Europe', + killerSteamId: killer, + killerName: killer, + killerFaction: sides[0], + victimSteamId: victim, + victimName: victim, + victimFaction: sides[1], + cause: 'Id.Item.AK74M', + distanceM: 30, + headshot: false, + suicide: false, + teamKill: false, + tags: [], + ...extra + }; + }; +} + +/** A closed session from one hour after C to another, with its counters. */ +const session = ( + serverId: string, + steamId: string, + from: number, + to: number, + faction: string, + k: number, + d: number +) => ({ + serverId, + steamId, + name: `Player ${steamId.slice(-2)}`, + faction, + joinedAt: h(from), + lastSeen: h(to), + leftAt: h(to), + kills: k, + deaths: d, + cash: 1000 +}); + +/** The worker's row of a match. */ +const worker = (matchId: number, serverId: string, k: number, d: number, cashDelta: number) => ({ + matchId, + serverId, + steamId: V, + name: 'Player 03', + faction: 'Lonestar', + seconds: 3000, + kills: k, + deaths: d, + cashDelta +}); + +const rowsOf = (db: Db, matchId: number) => + db + .select() + .from(matchPlayers) + .where(eq(matchPlayers.matchId, matchId)) + .orderBy(asc(matchPlayers.steamId)); +const lineOf = async (db: Db, matchId: number, steamId: string) => + (await rowsOf(db, matchId)) + .filter((r) => r.steamId === steamId) + .map((r) => [r.faction, r.kills, r.deaths])[0]; + +async function exact(db: Db, ids: string[]) { + await db.transaction(async (tx) => { + expect(await totalsRows(tx, ids)).toEqual(await oracleBase(tx, ids)); + for (const from of [h(-24), h(2.5)]) + expect(await rangeRows(tx, ids, from)).toEqual(await oracleRangeBase(tx, ids, from)); + }); + const [trigger] = (await db.execute(sql` + SELECT tgenabled FROM pg_trigger WHERE tgname = 'player_totals_lines_updated'`)) as { + tgenabled: string; + }[]; + expect(trigger.tgenabled).toBe('O'); +} + +describe.skipIf(!hasTestDb)('the match rows from the feed', () => { + const A = 'feed-a'; + const B = 'feed-b'; + // single before the switch: NS1 ends covered with the feed below its counters, NS2 ends + // uncovered; DS1, DS2 look single and DU1, DU2, P look summing, which puts the switch between + // C+1h and C+3h; HW drops inside that, HX on both sides of it, J1 inside it with J2 rejoining + // after it; summing after it: P over three covered matches, Z with a remainder on its own last, + // L losing its sum to a covered last match, DC doubling it on an uncovered one; RJ a rejoin of a + // single and a summing session; XL a sum ending in a match that is not 0032's. NS1, NS3, L and + // L2 have kills in a match the feed did not see whole, which would move them if it counted. + const [ + NS1, + NS2, + DS1, + DS2, + DU1, + DU2, + HW, + HX, + J, + P, + Z, + W, + T, + L, + DC, + U, + Q, + Y, + N, + R, + RJ, + XL, + NS3, + L2 + ] = Array.from({ length: 24 }, (_, i) => id(10 + i)); + // WK: the worker's row, with no cash moved, in a covered match of 0032's, for a session it + // closed after the bound + const WK = id(35); + let db: Db; + let drop: () => Promise; + let m: Match[] = []; + let o: Match[] = []; + + beforeAll(async () => { + ({ db, drop } = await install()); + // M0 the feed's first; M2 the feed stopping early; M10 no scores; M12 a game restart; + // M14 the worker's first with cash moved (its end is the bound); M15 the worker's, quiet + m = await addMatches(db, A, [-4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], [6]); + // another server: o0 0032's, o1 the worker's while nobody's cash moved, o2 with cash moved + o = await addMatches(db, B, [-1, 11, 12]); + const k = feed(A); + const kb = feed(B); + const frames = [0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15].flatMap((i) => [ + k(m[i], 1, E, G), + k(m[i], 59, E, G) + ]); + await db.insert(kills).values([ + ...frames, + k(m[2], 1, E, G), + k(m[2], 40, E, G), + k(m[12], 30, E, G), + k(m[12], 31, E, G, LW, { eventTime: 30 }), + // M0: NS1 3; M1: NS1 2 and 1, NS2 3 and 2; M2: NS3 1; M3: NS3 1 + ...[32, 36, 40].map((t) => k(m[0], t, NS1, E)), + k(m[2], 10, NS3, E), + k(m[3], 40, NS3, E), + k(m[1], 5, NS1, E), + k(m[1], 10, NS1, E), + k(m[1], 15, E, NS1, WL), + ...[20, 25, 30].map((t) => k(m[1], t, NS2, E)), + ...[35, 40].map((t) => k(m[1], t, E, NS2, WL)), + // M3, M4, M5: DS1 and DS2 6 in their first match, 2 and 1 in their last + ...[5, 10, 15, 20, 25, 30].map((t) => k(m[3], t, DS1, E)), + k(m[4], 5, DS1, E), + k(m[4], 10, DS1, E), + k(m[4], 15, E, DS1, WL), + ...[20, 25, 30, 35, 40, 45].map((t) => k(m[4], t, DS2, E)), + k(m[5], 5, DS2, E), + k(m[5], 10, DS2, E), + k(m[5], 15, E, DS2, WL), + // HX 1 in each of M4-M7; HW 2 in M5, 1 and 1 in M6; J 1 in each of M5-M7 + ...[4, 5, 6, 7].map((i) => k(m[i], 50, HX, E)), + k(m[5], 20, HW, E), + k(m[5], 25, HW, E), + k(m[6], 35, HW, E), + k(m[6], 40, E, HW, WL), + k(m[5], 35, J, E), + k(m[6], 52, J, E), + k(m[7], 40, J, E), + // M6, M7: DU1 and DU2 6 in their first match, 2 and 1 in their last + ...[5, 10, 15, 20, 25, 30].flatMap((t) => [k(m[6], t, DU1, E), k(m[6], t + 1, DU2, E)]), + ...[DU1, DU2].flatMap((p, i) => [ + k(m[7], 5 + i, p, E), + k(m[7], 10 + i, p, E), + k(m[7], 15 + i, E, p, WL) + ]), + // M7: P 3 and 2 (a team kill and a suicide are not kills); one batch 3 s behind + k(m[7], 25, P, E), + k(m[7], 27, P, E, LW, { headshot: true }), + k(m[7], 29, E, P, WL, { eventTime: 27 * 60 - 3 }), + k(m[7], 31, P, E, ['Lonestar', 'Lonestar'], { teamKill: true }), + k(m[7], 33, P, P, ['Lonestar', 'Lonestar'], { suicide: true, cause: null }), + k(m[7], 35, P, E), + // M8: P 3 and 2 (one death to the environment); W 2 and 1 on Wagner; Z 2 and 0 on + // Lonestar, which does not move a row already on a team + k(m[8], 5, P, E), + k(m[8], 10, E, P, WL), + k(m[8], 12, W, E, WL), + k(m[8], 14, W, E, WL), + k(m[8], 16, P, W), + k(m[8], 20, Z, E), + k(m[8], 22, Z, E), + k(m[8], 24, null, P, [null, 'Lonestar'], { cause: null }), + k(m[8], 26, P, E), + k(m[8], 19, RJ, E), + k(m[8], 27, RJ, E), + k(m[8], 40, RJ, E), + k(m[9], 30, RJ, E), + // M9: P 2 and 1; T 1 and 1, once on each side + k(m[9], 5, P, E), + k(m[9], 10, T, E), + k(m[9], 15, E, T), + k(m[9], 20, P, E), + k(m[9], 25, E, P, WL), + // M10 (no scores): L 1 and 1 of its 4 and 1; M11: L 2 and 1, DC 3 and 0; M12: DC 2 and + // 2, L2 1 of its 3; M13: L2 2 + k(m[10], 5, L, E), + k(m[10], 25, E, L, WL), + k(m[12], 10, L2, E), + k(m[13], 10, L2, E), + k(m[13], 20, L2, E), + k(m[11], 5, L, E), + k(m[11], 10, L, E), + k(m[11], 15, E, L, WL), + ...[20, 25, 30].map((t) => k(m[11], t, DC, E)), + k(m[12], 35, DC, E), + k(m[12], 40, DC, E), + k(m[12], 45, E, DC, WL), + k(m[12], 50, E, DC, WL), + k(m[11], 35, XL, E), + k(m[11], 40, XL, E), + k(m[12], 55, XL, E), + k(m[14], 20, XL, E), + // the other server: fed before o0, and throughout every match + kb(-2, 0, R, E), + kb(o[0], 1, R, E), + kb(o[0], 59, R, E), + ...[1, 2].flatMap((i) => [kb(o[i], 1, V, E), kb(o[i], 59, V, E)]) + ]); + await db + .insert(playerSessions) + .values([ + session(A, NS1, -3.5, -2.1, 'Lonestar', 4, 1), + session(A, NS2, -2.5, -1.2, 'Lonestar', 5, 1), + session(A, DS1, -0.5, 0.9, 'Lonestar', 2, 1), + session(A, DS2, 0.5, 1.9, 'Lonestar', 2, 1), + session(A, HX, 0.2, 3.5, 'Lonestar', 3, 0), + session(A, HW, 1.5, 2.9, 'White', 3, 1), + session(A, J, 1.6, 2.6, 'Lonestar', 2, 0), + session(A, J, 2.7, 3.8, 'Lonestar', 2, 0), + session(A, DU1, 2.5, 3.9, 'Lonestar', 8, 1), + session(A, DU2, 2.5, 3.9, 'Lonestar', 8, 1), + session(A, P, 3.5, 5.9, 'Lonestar', 8, 5), + session(A, Z, 4.2, 5.8, 'Wagner', 3, 0), + session(A, W, 4.1, 4.9, 'White', 2, 1), + session(A, T, 5.1, 5.7, 'White', 1, 1), + session(A, N, 6.1, 6.4, 'Lonestar', 2, 2), + session(A, L, 6.5, 7.9, 'Lonestar', 6, 2), + session(A, DC, 7.5, 8.9, 'Lonestar', 5, 2), + session(A, U, 8.2, 8.8, 'Lonestar', 5, 2), + session(A, RJ, 4.3, 4.5, 'Lonestar', 2, 0), + session(A, RJ, 4.6, 5.5, 'Lonestar', 2, 0), + session(A, XL, 7.2, 10.5, 'Lonestar', 4, 1), + session(A, NS3, -1.5, -0.5, 'Lonestar', 1, 0), + session(A, L2, 8.5, 9.8, 'Lonestar', 5, 0), + session(A, Q, -3.9, -3.1, 'Lonestar', 4, 2), + session(A, Y, -1.9, -1.1, 'Lonestar', 5, 1), + session(B, R, -0.9, -0.1, 'White', 3, 1) + ]); + await run(db, '0032_match_players_backfill'); + await db + .insert(matchPlayers) + .values([ + worker(m[14].id, A, 9, 9, 700), + worker(m[15].id, A, 1, 0, 0), + { ...worker(m[13].id, A, 6, 2, 0), steamId: WK }, + worker(o[1].id, B, 1, 0, 0), + worker(o[2].id, B, 4, 4, 300) + ]); + await db.insert(playerSessions).values(session(A, WK, 9.5, 11.5, 'Lonestar', 6, 2)); + await runMigrations(db, 'drizzle'); + }, 60_000); + + afterAll(() => drop?.()); + + const line = (i: number, steamId: string) => lineOf(db, m[i].id, steamId); + + test('a summing session over covered matches: each its feed, any remainder on its last', async () => { + expect([await line(7, P), await line(8, P), await line(9, P)]).toEqual([ + ['Lonestar', 3, 2], + ['Lonestar', 3, 2], + ['Lonestar', 2, 1] + ]); + // Z's counters are one kill above the feed: it goes on Z's own last match + expect([await line(8, Z), await line(9, Z)]).toEqual([ + ['Wagner', 2, 0], + ['Wagner', 1, 0] + ]); + // the feed's other columns, which 0032 filled, stay + const p = (await rowsOf(db, m[7].id)).find((r) => r.steamId === P)!; + expect([p.headshots, p.teamKills, p.suicides]).toEqual([1, 1, 1]); + }); + + test('a sum on a covered last match: what the feed did not see goes to its uncovered match', async () => { + expect([await line(10, L), await line(11, L)]).toEqual([ + ['Lonestar', 4, 1], + ['Lonestar', 2, 1] + ]); + expect([await line(12, L2), await line(13, L2)]).toEqual([ + ['Lonestar', 3, 0], + ['Lonestar', 2, 0] + ]); + }); + + test('a sum on an uncovered last match: it keeps what its covered matches do not hold', async () => { + expect([await line(11, DC), await line(12, DC)]).toEqual([ + ['Lonestar', 3, 0], + ['Lonestar', 2, 2] + ]); + }); + + test('a single match counted: the larger of feed and counters there, the feed before it', async () => { + // NS1's counters are its covered last match's, two kills above the feed; its first match, + // the feed's first, is not counted from the feed + expect([await line(0, NS1), await line(1, NS1)]).toEqual([ + ['Lonestar', 0, 0], + ['Lonestar', 4, 1] + ]); + // nor is the match where the feed stopped early + expect([await line(2, NS3), await line(3, NS3)]).toEqual([ + ['Lonestar', 0, 0], + ['Lonestar', 1, 0] + ]); + // NS2 ends uncovered: that match keeps its counters, the covered one before gets the feed + expect([await line(1, NS2), await line(2, NS2)]).toEqual([ + ['Lonestar', 3, 2], + ['Lonestar', 5, 1] + ]); + // the sessions that told the switch + expect([ + await line(3, DS1), + await line(4, DS1), + await line(6, DU1), + await line(7, DU1) + ]).toEqual([ + ['Lonestar', 6, 0], + ['Lonestar', 2, 1], + ['Lonestar', 6, 0], + ['Lonestar', 2, 1] + ]); + }); + + test('sessions the switch leaves unclear, and their rejoins, stay as 0032 wrote them', async () => { + expect([await line(5, HW), await line(6, HW)]).toEqual([ + ['White', 0, 0], + ['White', 3, 1] + ]); + expect(await Promise.all([4, 5, 6, 7].map((i) => line(i, HX)))).toEqual([ + ['Lonestar', 0, 0], + ['Lonestar', 0, 0], + ['Lonestar', 0, 0], + ['Lonestar', 3, 0] + ]); + expect(await Promise.all([5, 6, 7].map((i) => line(i, J)))).toEqual([ + ['Lonestar', 0, 0], + ['Lonestar', 2, 0], + ['Lonestar', 2, 0] + ]); + // a rejoin where one of the two sums: their parts of the shared match cannot be told apart + expect([await line(8, RJ), await line(9, RJ)]).toEqual([ + ['Lonestar', 2, 0], + ['Lonestar', 2, 0] + ]); + // a sum whose last match is not 0032's (the worker's may have written it since) + expect(await Promise.all([11, 12, 13, 14].map((i) => line(i, XL)))).toEqual([ + ['Lonestar', 0, 0], + ['Lonestar', 0, 0], + ['Lonestar', 0, 0], + ['Lonestar', 4, 1] + ]); + }); + + test('the holding side takes the one team the feed shows; two teams leave it', async () => { + expect(await line(8, W)).toEqual(['Wagner', 2, 1]); + expect(await line(9, T)).toEqual(['White', 1, 1]); + }); + + test('a player the feed saw without a row gets none', async () => { + const ids = await db + .select({ id: matchPlayers.steamId }) + .from(matchPlayers) + .where(and(inArray(matchPlayers.steamId, [E, G]), inArray(matchPlayers.serverId, [A, B]))); + expect(ids).toEqual([]); + }); + + test("matches the feed did not see whole, and the worker's, keep their numbers", async () => { + expect(await line(0, Q)).toEqual(['Lonestar', 4, 2]); + expect(await line(2, Y)).toEqual(['Lonestar', 5, 1]); + expect(await line(10, N)).toEqual(['Lonestar', 2, 2]); + expect(await line(12, U)).toEqual(['Lonestar', 5, 2]); + expect(await line(13, WK)).toEqual(['Lonestar', 6, 2]); + expect(await line(14, V)).toEqual(['Lonestar', 9, 9]); + expect(await line(15, V)).toEqual(['Lonestar', 1, 0]); + }); + + test("the worker's first end with cash moved bounds 0032's matches on every server", async () => { + // before it, though this server's own first match with cash moved came later + expect(await lineOf(db, o[0].id, R)).toEqual(['Lonestar', 3, 1]); + // after it, though nobody's cash had moved on this server yet + expect(await lineOf(db, o[1].id, V)).toEqual(['Lonestar', 1, 0]); + expect(await lineOf(db, o[2].id, V)).toEqual(['Lonestar', 4, 4]); + }); + + test('the totals and the day rows agree with the rows, and the trigger is back on', async () => { + await exact(db, [A, B]); + const [p] = (await totalsRows(db, [A], [P])) as { kills: string; deaths: string }[]; + expect([p.kills, p.deaths]).toEqual(['8', '5']); + }); + + test('running it again changes nothing', async () => { + const ids = [...m, ...o].map((x) => x.id); + const before = await Promise.all(ids.map((i) => rowsOf(db, i))); + await run(db, FEED); + expect(await Promise.all(ids.map((i) => rowsOf(db, i)))).toEqual(before); + }); + + test('with nothing to write it rebuilds nothing', async () => { + // a total put off by hand stays off: the rebuild would have put it back + const off = sql`server_id = ${A} AND steam_id = ${P}`; + await db.execute(sql`UPDATE player_totals SET kills = kills + 1000 WHERE ${off}`); + await run(db, FEED); + const [t] = (await db.execute(sql`SELECT kills::text FROM player_totals WHERE ${off}`)) as { + kills: string; + }[]; + expect(t.kills).toBe('1008'); + await db.execute(sql`UPDATE player_totals SET kills = kills - 1000 WHERE ${off}`); + }); +}); + +describe.skipIf(!hasTestDb)( + 'the match rows from the feed, with no session telling the switch', + () => { + const S = 'feed-c'; + const [B0, B1, B2] = [id(40), id(41), id(42)]; + let db: Db; + let drop: () => Promise; + let k: Match[] = []; + + beforeAll(async () => { + ({ db, drop } = await install()); + // k1 has no scores; k3 the worker's first with cash moved + k = await addMatches(db, S, [-2, 1, 2, 3], [1]); + const f = feed(S); + await db + .insert(kills) + .values([ + f(-3, 0, E, G), + ...[0, 1, 2, 3].flatMap((i) => [f(k[i], 1, E, G), f(k[i], 59, E, G)]), + f(k[0], 5, B0, E), + f(k[0], 10, B0, E), + f(k[0], 15, E, B0, WL), + ...[5, 10, 15].map((t) => f(k[1], t, B1, E)), + f(k[1], 20, E, B1, WL), + f(k[2], 5, B1, E), + f(k[2], 10, B1, E), + f(k[2], 20, B2, E), + f(k[2], 25, B2, E), + f(k[2], 30, E, B2, WL) + ]); + await db + .insert(playerSessions) + .values([ + session(S, B0, -1.9, -1.2, 'Lonestar', 1, 0), + session(S, B1, 1.5, 2.9, 'Lonestar', 5, 1), + session(S, B2, 2.2, 2.8, 'Lonestar', 1, 0) + ]); + await run(db, '0032_match_players_backfill'); + await db.insert(matchPlayers).values(worker(k[3].id, S, 3, 3, 200)); + await runMigrations(db, 'drizzle'); + }, 60_000); + + afterAll(() => drop?.()); + + test('a session with a drop after 66fa7a6 was written is held; single matches get the feed', async () => { + expect([await lineOf(db, k[1].id, B1), await lineOf(db, k[2].id, B1)]).toEqual([ + ['Lonestar', 0, 0], + ['Lonestar', 5, 1] + ]); + expect(await lineOf(db, k[0].id, B0)).toEqual(['Lonestar', 2, 1]); + expect(await lineOf(db, k[2].id, B2)).toEqual(['Lonestar', 2, 1]); + await exact(db, [S]); + }); + } +); From 899a525f0171d662468af4183dda388bc9fb7101 Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 22:08:31 +0100 Subject: [PATCH 092/102] README: the upgrade that recounts early match rows from the feed --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 8f11b3b0..bf8af632 100644 --- a/README.md +++ b/README.md @@ -1743,6 +1743,17 @@ settings) · `serverLog` (Audit trail) · `raw` (Raw RCON). transaction that disables the `player_totals_*` triggers on those tables, loads, runs `SELECT player_totals_rebuild();` (both kinds of totals; it refuses to run over a closed session that breaks the rule) and enables them again: writers wait for it, readers do not. +- Matches played before the panel kept a row per player per match got their rows once, from the + sessions, which cannot split a session's kills and deaths between the matches it spanned. The + migration that recounts that history from the kill feed gives those rows the feed's kills and + deaths where the feed saw the whole match, keeps whatever a session's own counters held beyond + the feed on another of its matches (nobody's totals go down), and gives a row that held none of + the match's teams the feed's side, so the boards' kills, deaths and results for that history + change once. A session it cannot place keeps what it had, and an install that upgrades from + before match rows existed straight past it keeps the sessions' numbers, as its worker has + written no row yet to tell that history by. It works out the new counts first, then holds + sessions, matches and match rows against writes while it writes them and rebuilds the totals as + a bulk load does: on a busy install a minute or two in which observation waits. - Audit rows are never deleted by the panel. Prune them with SQL if you need to. Deleting an account pseudonymises its rows rather than removing them (see [Accounts and personal data](#accounts-and-personal-data)). From 8fabf43ba5ddf4881257ba7d8609f3ee94a36a99 Mon Sep 17 00:00:00 2001 From: jbob0 Date: Wed, 23 Sep 2026 09:55:46 -0400 Subject: [PATCH 093/102] Restart schedule per server: hours up, daily at a time, or none WARDOGS hosts no longer agree on when a server restarts. The game's own restart is after so many hours up (24 now, twelve before), but BisectHosting now restarts servers once a day at a time the owner picks in their panel, still at the end of the round then in progress (#28). On such a host an uptime count is wrong from the first manual restart onward: measured on a Bisect server set to 07:00 America/Chicago, the process started 2026-09-22 19:04 UTC and restarted 2026-09-23 12:39 UTC, just after the round in progress at 12:00 UTC ended, where 24 hours up would have put the window at 19:04. servers.restart_schedule (jsonb, null = the game's default of 24 hours up) holds { kind: 'uptime', hours } | { kind: 'daily', time: 'HH:MM', timeZone } | { kind: 'none' }. restartWindow takes the schedule instead of a fixed hour count and also returns dueAt; a daily window opens at the first occurrence of the time after the game started, in the zone, following DST. The header, the Discord status cards, the Restart notice rule and its dry run all read it. An org owner sets it under Game restart on the server's Settings tab (PATCH /api/servers/:id { restartSchedule }, audited with the rest of server.update). Migration 0048_restart_schedule (0034 in the pull request, regenerated on main). --- README.md | 11 + drizzle/0050_restart_schedule.sql | 1 + drizzle/meta/0050_snapshot.json | 5549 +++++++++++++++++ drizzle/meta/_journal.json | 9 +- src/lib/rule-kinds.ts | 2 +- src/lib/server/access.ts | 4 + src/lib/server/db/schema.ts | 5 + src/lib/server/servers.ts | 13 + src/lib/server/trigger-rules.ts | 23 +- src/lib/server/triggers.test.ts | 14 + src/lib/server/triggers.ts | 24 +- src/lib/server/webhook-status-core.test.ts | 14 + src/lib/server/webhook-status-core.ts | 8 +- src/lib/server/webhook-status.ts | 8 +- src/lib/types.ts | 3 + src/lib/uptime.test.ts | 128 +- src/lib/uptime.ts | 169 +- src/routes/(app)/server/[id]/+layout.svelte | 4 +- .../(app)/server/[id]/automation/+page.svelte | 13 +- .../(app)/server/[id]/config/+page.svelte | 2 +- .../(app)/server/[id]/settings/+page.svelte | 4 +- .../[id]/settings/RestartSchedule.svelte | 167 + 22 files changed, 6135 insertions(+), 40 deletions(-) create mode 100644 drizzle/0050_restart_schedule.sql create mode 100644 drizzle/meta/0050_snapshot.json create mode 100644 src/routes/(app)/server/[id]/settings/RestartSchedule.svelte diff --git a/README.md b/README.md index bf8af632..c266f5b3 100644 --- a/README.md +++ b/README.md @@ -668,6 +668,7 @@ rule at most, so once it has one, picking that kind opens the rule it has. | Kill distance watch | Acts on a player whose kills with the chosen weapons come from at least N metres away, M of them in one match: a defibrillator or a fist reaches a few metres, so the same kill from across the map is a player the game did not stop. The weapons are offered in three lists, as the kill feed names them: hand-held (a new rule starts with the defibrillator; charges that are placed and set off from anywhere are not offered), the vehicles' guns (a Humvee's M249 or minigun turret, the L81 mortar's shells), and the vehicles themselves (a roadkill, or a vehicle blown up with its crew inside: the L81 mortar in this list is not its shells). From 0 m every kill with them counts, one the feed sends without a distance too, so a server can act on each kill with a weapon or a vehicle it does not allow: an infantry-only server can act on whoever kills from a Humvee's turret. It flags them (audit trail and the Discord mirror, whose post opens the player's page), warns them (the rule's text whispered to them, mirrored the same way; a blank text says the weapon is not allowed on this server), kills them and whispers them the rule's text (so a server can answer each Humvee kill with the killer's death: the feed only reports kills, so a player who drives one without killing anybody is not seen), kicks them, or bans them for N days or for good on this server's own ban list or the organisation's, like a ban by hand: every server the ban reaches takes its lists again at once and removes them at its next look, and the ban is lifted from the list. A shorter ban already on that list is made to last as long. A killed, kicked or banned player is left alone for a minute while that lands, so a roadkill of three is one kill; one who does it again after that, that match, is acted on at their next such kill. A flag or a warning comes again in the same match only after the rule's cooldown, and at their first such kill in the next. A warning, a kill and a kick need the player still on when they are sent, and a kill goes within half a minute or not at all (one sent later would land on them doing something else, or on the next map). A kill the game refuses (no living character, presumably) still sends the whisper; with that refused too, the action fails. Two rules that kill on the same weapon each kill. To warn first and kick after, make two rules on the same weapons, the kick's count higher. Needs the [kill feed](#kill-feed), whose distance is between killer and victim; acted on as each kill arrives, and counted per match as the Team kill limit counts. A kill that comes within a minute of the killer's own death is not counted: the player is dead, so it is a round already on its way, and the game credits a vehicle's shell that lands after the vehicle was destroyed to the gunner's own weapon, from wherever the gunner is by then (an M4 kill from 2,300 m). The audit trail notes each kill left out this way, with how long after the death it came; Discord is not told. Editing, switching off or deleting the rule starts the counts over and drops what it had queued. The counts are kept in the worker's memory and start over when it restarts. The rule believes the feed: whoever holds a server's feed token can make it act, so keep bans on every server for rules on servers whose host you trust. | | Team balance | Keeps the open sides within a set number of players of each other (3 by default), closes one faction, or both. Nobody who is playing is moved mid-match: balancing places a player when they arrive (on the side they picked while that keeps within the gap, else on the lighter one), puts back a player who switches onto a side more than the gap bigger than the one they left, and evens everyone up when a new match starts (a map change or the scores starting over). Whoever is on when the rule is switched on or changed, after the worker restarts, when the server comes back from being out of reach, or after two minutes (three looks, at a slower player list cadence) without a look at the player list, counts as placed until the next match, so it never reshuffles the match it walks in on; starting over also forgets who was told and the asks. The side a player was placed on is kept for ten minutes away, so leaving and rejoining on the bigger side is put back too. Optional: keep clan tags together (a short tag in brackets at the front of the name; a preference that yields to the gap; when a new match is evened up, players whose clan is mostly on the other side move first, then those with the fewest clanmates beside them), and SteamIDs it never moves (staff who switch sides themselves). A move made from the Players tab or the API is kept, not put back; one made anywhere else (the game's own console, another balancer) is put back like a switch, so run no other balancer beside it. Right after a match end, placing waits up to 30 seconds from the players' return (the list is empty while the next map loads) while a quarter or more of them have not picked a side, and whom it moves is not decided by list order. Everyone on the closed faction is moved to the smaller other side (or their clan's, within the gap). Every move is the game's own move, sent without the kill the Players tab's Move adds. Moves go out a few at a time as the player list refreshes, so a full server's sort takes about half a minute; moves in flight count toward their side, and one not seen landed within 30 seconds is decided again; a queued move goes out only while the rule still holds that decision, so a retry, a new match or a person moving the player drops it. A player who switches onto the bigger side is put back every time; a player asked to move three times in ten minutes for any other reason, or put back three times without it taking, is left where they are until the ten minutes pass. Watch only lists each move it would make under Actions, as skipped, and moves nobody. Optional names for the sides (e.g. Red and Green) and a whisper, `{team}`, sent once to each player it moves (again after two hours away). One rule per server; changing or switching it off drops its queued moves. Its moves reach Discord only when they fail. What it remembers is the worker's: a restart forgets the moves in flight, who was told, the asks and the sides. A rule saved before balancing existed only closes its faction until balancing is ticked. Nothing to dry-run: faction moves are not in the session history; use Watch only. | | Match broadcast | Announces the result when a match ends and the map as the next one starts, either message optional, with at least N players on (the game shows nobody on while the next map loads, so the announcement waits up to three minutes for the players to be back). A match ends when the map changes or the faction scores fall back to zero (a faction reached the cap, or an admin ended the round; live builds send no score cap or match clock, so Warcon assumes the game's default of 100), so `{faction}` is whoever led at that moment, tied factions named together. Besides the server's placeholders, `{score}` and `{scores}` of the match that ended, `{previous}` (its map), and from the players' lines of it `{mvp}` (the most kills, tied players named together) and `{top}` (the top three with their kills). Sent one poll after the round ends. | +| Restart notice | Broadcasts a heads-up N minutes before the server's scheduled restart and a message once it is due, optionally repeated every N minutes while the round drags on, with at least N players on. The restart itself lands when the round in progress ends. Follows the server's [game restart](#game-restart) schedule. Besides the server's placeholders, `{minutes}` gives the time to the restart window. | | Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier (a total, per server and per session, and the player's progress toward the reward for _Automation_ holders), the leaderboard's Seed time column and the dry run show it. | | AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | | Bounty | Puts a bounty on a player who gets N kills in a row without dying in one match (15 by default) while at least M players are on (20 by default), and announces it to the server. A run is the match page's Best streak: a kill of another player adds to it, a team kill or a suicide does not, and any death ends it. One bounty is open at a time; once it ends, the next goes to whoever is on a run of N or more, at their next kill. The first enemy to kill the marked player claims it: the claim can be announced and the claimer whispered, and they get a reserved slot for D days on this server or on every server in the organisation, or nothing but the announcement. A team kill, a suicide or the environment never ends a bounty, nor a kill between players whose sides the panel has not seen, so nobody clears their own or has a friend do it. It lapses when the marked player leaves (gone past the minute's leave grace, so the empty list of a map change is no leave), when the match ends, or when the panel has lost sight of the server for a few looks (its own 24-hour restart is one such time), and runs start over when the panel sees the match end. A claimer who already holds a slot on that list keeps whichever lasts longer. The open bounty shows on the rule's row and outlives a worker restart, which forgets the runs (one from a match that ended meanwhile lapses at the next kill of its player); saving the rule or switching it off calls it off. A **Bounties** box on a [Discord webhook](#discord-webhooks) posts a card when one is set, claimed or lapses, with names and never a SteamID, for a players' channel. Needs the [kill feed](#kill-feed), acted on as each kill arrives; like every feed rule it believes the feed, and a friend on the other side can claim a bounty. The dry run replays the day's kills against the player counts of the server's samples. One rule per server. | @@ -939,6 +940,16 @@ Player sessions stay, since they are presence rather than stats. Careers and boa server start again from the next match, and the match in progress is recorded from the purge on. The purge is audited with the counts. +### Game restart + +A WARDOGS server restarts itself on a schedule, always at the end of the round then in progress. +Which schedule depends on the host, so an org owner sets it per server under **Game restart** on +the Settings tab: after N hours up (the game's own restart, 24 unless set; it was twelve before +September 2026), daily at a time in a time zone (hosts that let you pick the time, such as +BisectHosting: enter the time and zone their panel shows, e.g. `07:00` `America/Chicago`; +daylight saving is followed), or none. The header's restart countdown, the status cards' +"Restarts after this round" and the Restart notice rule all follow it. + ### Public pages Two pages of a server can be opened to anyone with the address. An org owner **switches each on** diff --git a/drizzle/0050_restart_schedule.sql b/drizzle/0050_restart_schedule.sql new file mode 100644 index 00000000..279e88c4 --- /dev/null +++ b/drizzle/0050_restart_schedule.sql @@ -0,0 +1 @@ +ALTER TABLE "servers" ADD COLUMN "restart_schedule" jsonb; \ No newline at end of file diff --git a/drizzle/meta/0050_snapshot.json b/drizzle/meta/0050_snapshot.json new file mode 100644 index 00000000..f31ed874 --- /dev/null +++ b/drizzle/meta/0050_snapshot.json @@ -0,0 +1,5549 @@ +{ + "id": "ff8b4fee-bd7a-4872-ab0d-14c3b57c1dd5", + "prevId": "9adec4e5-faee-4465-bc35-3b2e1123ba07", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "issuer": { + "name": "issuer", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": { + "account_user_id_idx": { + "name": "account_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "account_issuer_account_id_uidx": { + "name": "account_issuer_account_id_uidx", + "columns": [ + { + "expression": "issuer", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "account_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_user_id_fk": { + "name": "account_user_id_user_id_fk", + "tableFrom": "account", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.api_keys": { + "name": "api_keys", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "key_hash": { + "name": "key_hash", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hint": { + "name": "hint", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "last_used_at": { + "name": "last_used_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "api_keys_org_idx": { + "name": "api_keys_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "api_keys_org_id_organizations_id_fk": { + "name": "api_keys_org_id_organizations_id_fk", + "tableFrom": "api_keys", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "api_keys_created_by_user_id_fk": { + "name": "api_keys_created_by_user_id_fk", + "tableFrom": "api_keys", + "tableTo": "user", + "columnsFrom": [ + "created_by" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "api_keys_key_hash_unique": { + "name": "api_keys_key_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "key_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.audit_log": { + "name": "audit_log", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "actor_id": { + "name": "actor_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "actor_name": { + "name": "actor_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_name": { + "name": "server_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "status": { + "name": "status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "message": { + "name": "message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "duration_ms": { + "name": "duration_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "audit_ts_idx": { + "name": "audit_ts_idx", + "columns": [ + { + "expression": "ts", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_server_idx": { + "name": "audit_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_org_idx": { + "name": "audit_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_actor_idx": { + "name": "audit_actor_idx", + "columns": [ + { + "expression": "actor_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_action_idx": { + "name": "audit_action_idx", + "columns": [ + { + "expression": "category", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "action", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "audit_target_idx": { + "name": "audit_target_idx", + "columns": [ + { + "expression": "target", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"audit_log\".\"target\" <> ''", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhook_posts": { + "name": "json_webhook_posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "webhook_id": { + "name": "webhook_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "json_webhook_posts_event_idx": { + "name": "json_webhook_posts_event_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_next_idx": { + "name": "json_webhook_posts_next_idx", + "columns": [ + { + "expression": "webhook_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "json_webhook_posts_open_idx": { + "name": "json_webhook_posts_open_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"json_webhook_posts\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhook_posts_webhook_id_json_webhooks_id_fk": { + "name": "json_webhook_posts_webhook_id_json_webhooks_id_fk", + "tableFrom": "json_webhook_posts", + "tableTo": "json_webhooks", + "columnsFrom": [ + "webhook_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.json_webhooks": { + "name": "json_webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "secret_enc": { + "name": "secret_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "json_webhooks_org_idx": { + "name": "json_webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "json_webhooks_org_id_organizations_id_fk": { + "name": "json_webhooks_org_id_organizations_id_fk", + "tableFrom": "json_webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.kills": { + "name": "kills", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_id": { + "name": "event_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "event_type": { + "name": "event_type", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'killed'" + }, + "parsed_kill": { + "name": "parsed_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "raw_event": { + "name": "raw_event", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "instance_id": { + "name": "instance_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_id": { + "name": "match_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "match_row": { + "name": "match_row", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "event_time": { + "name": "event_time", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "killer_steam_id": { + "name": "killer_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_name": { + "name": "killer_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "killer_faction": { + "name": "killer_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_steam_id": { + "name": "victim_steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "victim_name": { + "name": "victim_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "victim_faction": { + "name": "victim_faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "cause": { + "name": "cause", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "distance_m": { + "name": "distance_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "headshot": { + "name": "headshot", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "suicide": { + "name": "suicide", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "team_kill": { + "name": "team_kill", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "kills_event_idx": { + "name": "kills_event_idx", + "columns": [ + { + "expression": "event_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_server_ts_idx": { + "name": "kills_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_killer_idx": { + "name": "kills_killer_idx", + "columns": [ + { + "expression": "killer_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "kills_victim_idx": { + "name": "kills_victim_idx", + "columns": [ + { + "expression": "victim_steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.list_entries": { + "name": "list_entries", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "added_by": { + "name": "added_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "added_by_name": { + "name": "added_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "added_at": { + "name": "added_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "removed_at": { + "name": "removed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "removed_by": { + "name": "removed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "removed_by_name": { + "name": "removed_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "removal": { + "name": "removal", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "list_entries_active_uidx": { + "name": "list_entries_active_uidx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"list_entries\".\"removed_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_list_idx": { + "name": "list_entries_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "removed_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_steam_idx": { + "name": "list_entries_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "list_entries_expiry_idx": { + "name": "list_entries_expiry_idx", + "columns": [ + { + "expression": "expires_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"list_entries\".\"removed_at\" is null and \"list_entries\".\"expires_at\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "list_entries_list_id_lists_id_fk": { + "name": "list_entries_list_id_lists_id_fk", + "tableFrom": "list_entries", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.lists": { + "name": "lists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'Default'" + }, + "is_default": { + "name": "is_default", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "on_from": { + "name": "on_from", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "on_until": { + "name": "on_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "every_server": { + "name": "every_server", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "archived_at": { + "name": "archived_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "share_token": { + "name": "share_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "lists_org_kind_name_uidx": { + "name": "lists_org_kind_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is null and \"lists\".\"archived_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_org_default_uidx": { + "name": "lists_org_default_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"is_default\"", + "concurrently": false, + "method": "btree", + "with": {} + }, + "lists_server_kind_uidx": { + "name": "lists_server_kind_uidx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "kind", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"lists\".\"server_id\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "lists_org_id_organizations_id_fk": { + "name": "lists_org_id_organizations_id_fk", + "tableFrom": "lists", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "lists_server_id_servers_id_fk": { + "name": "lists_server_id_servers_id_fk", + "tableFrom": "lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "lists_share_token_unique": { + "name": "lists_share_token_unique", + "nullsNotDistinct": false, + "columns": [ + "share_token" + ] + } + }, + "policies": {}, + "checkConstraints": { + "lists_group_kind": { + "name": "lists_group_kind", + "value": "\"lists\".\"server_id\" is not null or \"lists\".\"is_default\" or \"lists\".\"kind\" = 'reserve'" + }, + "lists_group_shape": { + "name": "lists_group_shape", + "value": "(\"lists\".\"server_id\" is null and not \"lists\".\"is_default\") or (\"lists\".\"on_from\" is null and \"lists\".\"on_until\" is null and \"lists\".\"every_server\" and \"lists\".\"archived_at\" is null)" + }, + "lists_window": { + "name": "lists_window", + "value": "\"lists\".\"on_from\" is null or \"lists\".\"on_until\" is null or \"lists\".\"on_from\" < \"lists\".\"on_until\"" + } + }, + "isRLSEnabled": false + }, + "public.login_attempts": { + "name": "login_attempts", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "count": { + "name": "count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "first_at": { + "name": "first_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.match_players": { + "name": "match_players", + "schema": "", + "columns": { + "match_id": { + "name": "match_id", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "seconds": { + "name": "seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash_delta": { + "name": "cash_delta", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "longest_m": { + "name": "longest_m", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "match_players_server_idx": { + "name": "match_players_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "match_players_steam_idx": { + "name": "match_players_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "match_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "match_players_match_id_steam_id_pk": { + "name": "match_players_match_id_steam_id_pk", + "columns": [ + "match_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.matches": { + "name": "matches", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "ended_at": { + "name": "ended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "peak_players": { + "name": "peak_players", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "final_scores": { + "name": "final_scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "winner": { + "name": "winner", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "matches_server_idx": { + "name": "matches_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "started_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_open_idx": { + "name": "matches_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"matches\".\"ended_at\" is null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "matches_server_ended_idx": { + "name": "matches_server_ended_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ended_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_ban_reasons": { + "name": "org_ban_reasons", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "reasons": { + "name": "reasons", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "org_ban_reasons_org_id_organizations_id_fk": { + "name": "org_ban_reasons_org_id_organizations_id_fk", + "tableFrom": "org_ban_reasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_invites": { + "name": "org_invites", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "org_role": { + "name": "org_role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'member'" + }, + "server_role_id": { + "name": "server_role_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "max_uses": { + "name": "max_uses", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "uses": { + "name": "uses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "revoked_at": { + "name": "revoked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_invites_org_idx": { + "name": "org_invites_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_invites_org_id_organizations_id_fk": { + "name": "org_invites_org_id_organizations_id_fk", + "tableFrom": "org_invites", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_invites_server_role_id_org_roles_id_fk": { + "name": "org_invites_server_role_id_org_roles_id_fk", + "tableFrom": "org_invites", + "tableTo": "org_roles", + "columnsFrom": [ + "server_role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "org_invites_token_unique": { + "name": "org_invites_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_members": { + "name": "org_members", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "invite_id": { + "name": "invite_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_members_user_idx": { + "name": "org_members_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_members_org_id_organizations_id_fk": { + "name": "org_members_org_id_organizations_id_fk", + "tableFrom": "org_members", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "org_members_user_id_user_id_fk": { + "name": "org_members_user_id_user_id_fk", + "tableFrom": "org_members", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "org_members_org_id_user_id_pk": { + "name": "org_members_org_id_user_id_pk", + "columns": [ + "org_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.org_roles": { + "name": "org_roles", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "capabilities": { + "name": "capabilities", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "builtin": { + "name": "builtin", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "org_roles_builtin_uidx": { + "name": "org_roles_builtin_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "builtin", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "where": "\"org_roles\".\"builtin\" is not null", + "concurrently": false, + "method": "btree", + "with": {} + }, + "org_roles_name_uidx": { + "name": "org_roles_name_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "lower(\"name\")", + "asc": true, + "isExpression": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "org_roles_org_id_organizations_id_fk": { + "name": "org_roles_org_id_organizations_id_fk", + "tableFrom": "org_roles", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.organizations": { + "name": "organizations", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "slug": { + "name": "slug", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "server_limit": { + "name": "server_limit", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "suspended_at": { + "name": "suspended_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "suspended_reason": { + "name": "suspended_reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "members_reserved": { + "name": "members_reserved", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "allow_public_status": { + "name": "allow_public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "allow_public_leaderboards": { + "name": "allow_public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "discord_invite_url": { + "name": "discord_invite_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "ban_message": { + "name": "ban_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'{reason}'" + }, + "board_opens": { + "name": "board_opens", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'official'" + }, + "board_hidden": { + "name": "board_hidden", + "type": "text[]", + "primaryKey": false, + "notNull": true, + "default": "'{}'::text[]" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "organizations_slug_unique": { + "name": "organizations_slug_unique", + "nullsNotDistinct": false, + "columns": [ + "slug" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.outbox": { + "name": "outbox", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trigger_id": { + "name": "trigger_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trigger_name": { + "name": "trigger_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "trigger_kind": { + "name": "trigger_kind", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "action": { + "name": "action", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "params": { + "name": "params", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "target": { + "name": "target", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "detail": { + "name": "detail", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ok_message": { + "name": "ok_message", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "dedupe_key": { + "name": "dedupe_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "attempts": { + "name": "attempts", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "not_before": { + "name": "not_before", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "outcome": { + "name": "outcome", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "done_at": { + "name": "done_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "outbox_dedupe_idx": { + "name": "outbox_dedupe_idx", + "columns": [ + { + "expression": "dedupe_key", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_pending_idx": { + "name": "outbox_pending_idx", + "columns": [ + { + "expression": "state", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "not_before", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"outbox\".\"state\" in ('pending', 'sending')", + "concurrently": false, + "method": "btree", + "with": {} + }, + "outbox_server_idx": { + "name": "outbox_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "outbox_server_id_servers_id_fk": { + "name": "outbox_server_id_servers_id_fk", + "tableFrom": "outbox", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.passkey": { + "name": "passkey", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "credential_id": { + "name": "credential_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "counter": { + "name": "counter", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "device_type": { + "name": "device_type", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backed_up": { + "name": "backed_up", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "transports": { + "name": "transports", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "aaguid": { + "name": "aaguid", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "passkey_user_id_idx": { + "name": "passkey_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "passkey_credential_id_idx": { + "name": "passkey_credential_id_idx", + "columns": [ + { + "expression": "credential_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "passkey_user_id_user_id_fk": { + "name": "passkey_user_id_user_id_fk", + "tableFrom": "passkey", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_aliases": { + "name": "player_aliases", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "holder": { + "name": "holder", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "first_seen": { + "name": "first_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "player_aliases_steam_idx": { + "name": "player_aliases_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_aliases_server_id_steam_id_name_pk": { + "name": "player_aliases_server_id_steam_id_name_pk", + "columns": [ + "server_id", + "steam_id", + "name" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_days": { + "name": "player_days", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "day": { + "name": "day", + "type": "date", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "crossings": { + "name": "crossings", + "type": "timestamp with time zone[]", + "primaryKey": false, + "notNull": false + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_days_server_id_day_steam_id_pk": { + "name": "player_days_server_id_day_steam_id_pk", + "columns": [ + "server_id", + "day", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_marks": { + "name": "player_marks", + "schema": "", + "columns": { + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "watched": { + "name": "watched", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "updated_by_name": { + "name": "updated_by_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "player_marks_org_id_organizations_id_fk": { + "name": "player_marks_org_id_organizations_id_fk", + "tableFrom": "player_marks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "player_marks_org_id_steam_id_pk": { + "name": "player_marks_org_id_steam_id_pk", + "columns": [ + "org_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_notes": { + "name": "player_notes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "author_id": { + "name": "author_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "author_name": { + "name": "author_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "body": { + "name": "body", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "player_notes_idx": { + "name": "player_notes_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "player_notes_org_id_organizations_id_fk": { + "name": "player_notes_org_id_organizations_id_fk", + "tableFrom": "player_notes", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_sessions": { + "name": "player_sessions", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "bigserial", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "faction": { + "name": "faction", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "joined_at": { + "name": "joined_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "left_at": { + "name": "left_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "kills": { + "name": "kills", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": { + "player_sessions_open_idx": { + "name": "player_sessions_open_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "left_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "player_sessions_steam_idx": { + "name": "player_sessions_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "joined_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.player_totals": { + "name": "player_totals", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sessions": { + "name": "sessions", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "seconds": { + "name": "seconds", + "type": "numeric", + "primaryKey": false, + "notNull": true, + "default": "'0'" + }, + "seed_seconds": { + "name": "seed_seconds", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "cash": { + "name": "cash", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "last_seen": { + "name": "last_seen", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "matches": { + "name": "matches", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kills": { + "name": "kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "deaths": { + "name": "deaths", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "headshots": { + "name": "headshots", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "team_kills": { + "name": "team_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "suicides": { + "name": "suicides", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "vehicle_kills": { + "name": "vehicle_kills", + "type": "bigint", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "kill_streak": { + "name": "kill_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "death_streak": { + "name": "death_streak", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "wins": { + "name": "wins", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "losses": { + "name": "losses", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "draws": { + "name": "draws", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "player_totals_server_id_steam_id_pk": { + "name": "player_totals_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_map_rollups": { + "name": "sample_map_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "secs": { + "name": "secs", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_map_rollups_server_id_bucket_map_pk": { + "name": "sample_map_rollups_server_id_bucket_map_pk", + "columns": [ + "server_id", + "bucket", + "map" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.sample_rollups": { + "name": "sample_rollups", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "bucket": { + "name": "bucket", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "samples": { + "name": "samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "ok_samples": { + "name": "ok_samples", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "up_s": { + "name": "up_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "down_s": { + "name": "down_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "player_s": { + "name": "player_s", + "type": "real", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_cap": { + "name": "max_cap", + "type": "integer", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": { + "sample_rollups_server_id_bucket_pk": { + "name": "sample_rollups_server_id_bucket_pk", + "columns": [ + "server_id", + "bucket" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.samples": { + "name": "samples", + "schema": "", + "columns": { + "ts": { + "name": "ts", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "max_players": { + "name": "max_players", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "map": { + "name": "map", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "experiences": { + "name": "experiences", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "lighting": { + "name": "lighting", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "match_seconds": { + "name": "match_seconds", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scores": { + "name": "scores", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "cash": { + "name": "cash", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "latency_ms": { + "name": "latency_ms", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "samples_server_ts_idx": { + "name": "samples_server_ts_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "ts", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.seasons": { + "name": "seasons", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "starts_at": { + "name": "starts_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "seasons_org_start_uidx": { + "name": "seasons_org_start_uidx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "starts_at", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": true, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "seasons_org_id_organizations_id_fk": { + "name": "seasons_org_id_organizations_id_fk", + "tableFrom": "seasons", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_bans": { + "name": "server_bans", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_by": { + "name": "banned_by", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "banned_at_utc": { + "name": "banned_at_utc", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_bans_steam_idx": { + "name": "server_bans_steam_idx", + "columns": [ + { + "expression": "steam_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_bans_server_id_servers_id_fk": { + "name": "server_bans_server_id_servers_id_fk", + "tableFrom": "server_bans", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_bans_server_id_steam_id_pk": { + "name": "server_bans_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_grants": { + "name": "server_grants", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "role_id": { + "name": "role_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "granted_by": { + "name": "granted_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_grants_user_idx": { + "name": "server_grants_user_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "server_grants_role_idx": { + "name": "server_grants_role_idx", + "columns": [ + { + "expression": "role_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_grants_server_id_servers_id_fk": { + "name": "server_grants_server_id_servers_id_fk", + "tableFrom": "server_grants", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_user_id_user_id_fk": { + "name": "server_grants_user_id_user_id_fk", + "tableFrom": "server_grants", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_grants_role_id_org_roles_id_fk": { + "name": "server_grants_role_id_org_roles_id_fk", + "tableFrom": "server_grants", + "tableTo": "org_roles", + "columnsFrom": [ + "role_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "restrict", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_grants_server_id_user_id_pk": { + "name": "server_grants_server_id_user_id_pk", + "columns": [ + "server_id", + "user_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_state": { + "name": "server_list_state", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "source_list_id": { + "name": "source_list_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "attempted_at": { + "name": "attempted_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "server_list_state_source_idx": { + "name": "server_list_state_source_idx", + "columns": [ + { + "expression": "source_list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_list_state_server_id_servers_id_fk": { + "name": "server_list_state_server_id_servers_id_fk", + "tableFrom": "server_list_state", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_list_state_source_list_id_lists_id_fk": { + "name": "server_list_state_source_list_id_lists_id_fk", + "tableFrom": "server_list_state", + "tableTo": "lists", + "columnsFrom": [ + "source_list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_list_state_server_id_kind_steam_id_pk": { + "name": "server_list_state_server_id_kind_steam_id_pk", + "columns": [ + "server_id", + "kind", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_list_sync": { + "name": "server_list_sync", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "synced_at": { + "name": "synced_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_list_sync_server_id_servers_id_fk": { + "name": "server_list_sync_server_id_servers_id_fk", + "tableFrom": "server_list_sync", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_lists": { + "name": "server_lists", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "list_id": { + "name": "list_id", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "server_lists_list_idx": { + "name": "server_lists_list_idx", + "columns": [ + { + "expression": "list_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "server_lists_server_id_servers_id_fk": { + "name": "server_lists_server_id_servers_id_fk", + "tableFrom": "server_lists", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "server_lists_list_id_lists_id_fk": { + "name": "server_lists_list_id_lists_id_fk", + "tableFrom": "server_lists", + "tableTo": "lists", + "columnsFrom": [ + "list_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_lists_server_id_list_id_pk": { + "name": "server_lists_server_id_list_id_pk", + "columns": [ + "server_id", + "list_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_live": { + "name": "server_live", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "ok": { + "name": "ok", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "tier": { + "name": "tier", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'idle'" + }, + "build": { + "name": "build", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "game_server_id": { + "name": "game_server_id", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "started_at": { + "name": "started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "reserved_slots": { + "name": "reserved_slots", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "players": { + "name": "players", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "player_count": { + "name": "player_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "status_at": { + "name": "status_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "players_at": { + "name": "players_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "observed_at": { + "name": "observed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "feed_at": { + "name": "feed_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_live_server_id_servers_id_fk": { + "name": "server_live_server_id_servers_id_fk", + "tableFrom": "server_live", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.server_reserved": { + "name": "server_reserved", + "schema": "", + "columns": { + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "configured": { + "name": "configured", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "live": { + "name": "live", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "seen_at": { + "name": "seen_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "server_reserved_server_id_servers_id_fk": { + "name": "server_reserved_server_id_servers_id_fk", + "tableFrom": "server_reserved", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "server_reserved_server_id_steam_id_pk": { + "name": "server_reserved_server_id_steam_id_pk", + "columns": [ + "server_id", + "steam_id" + ] + } + }, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.servers": { + "name": "servers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "host": { + "name": "host", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "port": { + "name": "port", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "scheme": { + "name": "scheme", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'http'" + }, + "password_enc": { + "name": "password_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "sort_order": { + "name": "sort_order", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "allow_private": { + "name": "allow_private", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "feed_token_enc": { + "name": "feed_token_enc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "feed_token_hash": { + "name": "feed_token_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "public_status": { + "name": "public_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_leaderboards": { + "name": "public_leaderboards", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "public_kills": { + "name": "public_kills", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "restart_schedule": { + "name": "restart_schedule", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "servers_org_id_organizations_id_fk": { + "name": "servers_org_id_organizations_id_fk", + "tableFrom": "servers", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "servers_feed_token_hash_unique": { + "name": "servers_feed_token_hash_unique", + "nullsNotDistinct": false, + "columns": [ + "feed_token_hash" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_user_id_idx": { + "name": "session_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_user_id_fk": { + "name": "session_user_id_user_id_fk", + "tableFrom": "session", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": [ + "token" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.site_settings": { + "name": "site_settings", + "schema": "", + "columns": { + "key": { + "name": "key", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "value": { + "name": "value", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_by": { + "name": "updated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.steam_profiles": { + "name": "steam_profiles", + "schema": "", + "columns": { + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "persona": { + "name": "persona", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "avatar": { + "name": "avatar", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "profile_url": { + "name": "profile_url", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "public": { + "name": "public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "account_created_at": { + "name": "account_created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "vac_bans": { + "name": "vac_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "game_bans": { + "name": "game_bans", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "days_since_last_ban": { + "name": "days_since_last_ban", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "community_banned": { + "name": "community_banned", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "economy_ban": { + "name": "economy_ban", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'none'" + }, + "friends_state": { + "name": "friends_state", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'unknown'" + }, + "friends_total": { + "name": "friends_total", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked": { + "name": "friends_checked", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "banned_friends": { + "name": "banned_friends", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "friends_checked_at": { + "name": "friends_checked_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "fetched_at": { + "name": "fetched_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "error": { + "name": "error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.triggers": { + "name": "triggers", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "server_id": { + "name": "server_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "kind": { + "name": "kind", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "config": { + "name": "config", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "last_fired_at": { + "name": "last_fired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_result": { + "name": "last_result", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "fire_count": { + "name": "fire_count", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "triggers_server_idx": { + "name": "triggers_server_idx", + "columns": [ + { + "expression": "server_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "triggers_server_id_servers_id_fk": { + "name": "triggers_server_id_servers_id_fk", + "tableFrom": "triggers", + "tableTo": "servers", + "columnsFrom": [ + "server_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.two_factor": { + "name": "two_factor", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "secret": { + "name": "secret", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "backup_codes": { + "name": "backup_codes", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "verified": { + "name": "verified", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": true + }, + "failed_verification_count": { + "name": "failed_verification_count", + "type": "integer", + "primaryKey": false, + "notNull": false, + "default": 0 + }, + "locked_until": { + "name": "locked_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "two_factor_user_id_idx": { + "name": "two_factor_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "two_factor_secret_idx": { + "name": "two_factor_secret_idx", + "columns": [ + { + "expression": "secret", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "two_factor_user_id_user_id_fk": { + "name": "two_factor_user_id_user_id_fk", + "tableFrom": "two_factor", + "tableTo": "user", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "username": { + "name": "username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "display_username": { + "name": "display_username", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "must_change_password": { + "name": "must_change_password", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "steam_id": { + "name": "steam_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "default_org_id": { + "name": "default_org_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "two_factor_enabled": { + "name": "two_factor_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "auth_complete": { + "name": "auth_complete", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "auth_grace_started_at": { + "name": "auth_grace_started_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "recovery_key_hash": { + "name": "recovery_key_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "recovery_key_at": { + "name": "recovery_key_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + } + }, + "indexes": {}, + "foreignKeys": { + "user_default_org_id_organizations_id_fk": { + "name": "user_default_org_id_organizations_id_fk", + "tableFrom": "user", + "tableTo": "organizations", + "columnsFrom": [ + "default_org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "user_email_unique": { + "name": "user_email_unique", + "nullsNotDistinct": false, + "columns": [ + "email" + ] + }, + "user_username_unique": { + "name": "user_username_unique", + "nullsNotDistinct": false, + "columns": [ + "username" + ] + }, + "user_steam_id_unique": { + "name": "user_steam_id_unique", + "nullsNotDistinct": false, + "columns": [ + "steam_id" + ] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.webhooks": { + "name": "webhooks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "org_id": { + "name": "org_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "url_enc": { + "name": "url_enc", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "url_hint": { + "name": "url_hint", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "events": { + "name": "events", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "trigger_kinds": { + "name": "trigger_kinds", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "server_ids": { + "name": "server_ids", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "enabled": { + "name": "enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "status_enabled": { + "name": "status_enabled", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_style": { + "name": "status_style", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'banner'" + }, + "status_interval_s": { + "name": "status_interval_s", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 60 + }, + "link_status": { + "name": "link_status", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_leaderboard": { + "name": "link_leaderboard", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": true + }, + "link_panel": { + "name": "link_panel", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "status_messages": { + "name": "status_messages", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "status_sent_at": { + "name": "status_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_sent_at": { + "name": "last_sent_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": false + }, + "last_status": { + "name": "last_status", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "last_error": { + "name": "last_error", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "created_by": { + "name": "created_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "webhooks_org_idx": { + "name": "webhooks_org_idx", + "columns": [ + { + "expression": "org_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "webhooks_org_id_organizations_id_fk": { + "name": "webhooks_org_id_organizations_id_fk", + "tableFrom": "webhooks", + "tableTo": "organizations", + "columnsFrom": [ + "org_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.worker_ownership": { + "name": "worker_ownership", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "label": { + "name": "label", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "''" + }, + "acquired_at": { + "name": "acquired_at", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "lease_until": { + "name": "lease_until", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 3f4407dd..2d9b8f35 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -351,6 +351,13 @@ "when": 1791569710555, "tag": "0049_match_players_from_feed", "breakpoints": true + }, + { + "idx": 50, + "version": "7", + "when": 1791741585904, + "tag": "0050_restart_schedule", + "breakpoints": true } ] -} +} \ No newline at end of file diff --git a/src/lib/rule-kinds.ts b/src/lib/rule-kinds.ts index d7486a15..bce51676 100644 --- a/src/lib/rule-kinds.ts +++ b/src/lib/rule-kinds.ts @@ -35,7 +35,7 @@ export const RULE_KINDS: { kind: TriggerKind; group: RuleGroup; label: string; b kind: 'restart_notice', group: 'Messages', label: 'Restart notice', - blurb: 'Warn players before the 24-hour restart and tell them when it lands.' + blurb: 'Warn players before the scheduled restart and tell them when it lands.' }, { kind: 'match_broadcast', diff --git a/src/lib/server/access.ts b/src/lib/server/access.ts index 350f8626..8bb0272f 100644 --- a/src/lib/server/access.ts +++ b/src/lib/server/access.ts @@ -16,6 +16,7 @@ import { type Capability } from '../capabilities'; import type { ListKind } from '../types'; +import { readRestartSchedule, type RestartSchedule } from '../uptime'; import { accessFromCaps, resolveAccess, type ServerAccess } from './access-resolve'; import { keyActorId, keyActorName, keyCoversServer, type ApiKeyPrincipal } from './apikeys-core'; import { @@ -444,6 +445,8 @@ export type ServerSummary = { publicStatus: boolean; publicLeaderboards: boolean; publicKills: boolean; + /** the server's own restart schedule; null runs on the game's default */ + restartSchedule: RestartSchedule | null; allowPublicStatus: boolean; allowPublicLeaderboards: boolean; }; @@ -471,6 +474,7 @@ export function shapeServer( publicStatus: s.publicStatus, publicLeaderboards: s.publicLeaderboards, publicKills: s.publicKills, + restartSchedule: readRestartSchedule(s.restartSchedule), allowPublicStatus: org.allowPublicStatus, allowPublicLeaderboards: org.allowPublicLeaderboards }; diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 369178ac..082688dc 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -377,6 +377,11 @@ export const servers = pgTable('servers', { publicLeaderboards: boolean('public_leaderboards').notNull().default(false), /** the public status page also shows the last kills (needs the feed and the status page on) */ publicKills: boolean('public_kills').notNull().default(false), + /** + * When the game restarts this server, as $lib/uptime's RestartSchedule: after so many hours up, + * daily at a time in a zone (the host's own restart), or none. null = the game's default. + */ + restartSchedule: jsonb('restart_schedule'), createdBy: text('created_by'), createdAt: ts('created_at').notNull().defaultNow(), updatedAt: ts('updated_at').notNull().defaultNow() diff --git a/src/lib/server/servers.ts b/src/lib/server/servers.ts index 9da51abb..f4c4826d 100644 --- a/src/lib/server/servers.ts +++ b/src/lib/server/servers.ts @@ -17,6 +17,7 @@ import { rolesOf } from './roles'; import { assertCanAddServer } from './orgs'; import { ensureServerLists, lockOrg } from './lists'; import { allowed, FEATURE_LABELS, NOT_ALLOWED, type PublicFeature } from '$lib/features'; +import { readRestartSchedule } from '$lib/uptime'; export interface TargetFields { name?: string; @@ -287,6 +288,17 @@ export async function updateServer( if (!org) throw new ApiError(404, 'Organisation not found.', 'not_found'); Object.assign(set, publicSwitches(org, body)); } + // null goes back to the game's default; anything else must be a whole schedule + if (body.restartSchedule !== undefined) { + const schedule = + body.restartSchedule === null ? null : readRestartSchedule(body.restartSchedule); + if (body.restartSchedule !== null && !schedule) + throw new ApiError( + 400, + 'The restart schedule is not valid: hours from 1 to 168, or a time as HH:MM with a time zone such as America/Chicago.' + ); + set.restartSchedule = schedule; + } if (typeof body.password === 'string' && body.password) set.passwordEnc = encryptSecret(env, body.password); if (!Object.keys(set).length) throw new ApiError(400, 'Nothing to update.'); @@ -315,6 +327,7 @@ export async function updateServer( publicStatus: set.publicStatus, publicLeaderboards: set.publicLeaderboards, publicKills: set.publicKills, + restartSchedule: set.restartSchedule, credentialRotated: !!body.password } }); diff --git a/src/lib/server/trigger-rules.ts b/src/lib/server/trigger-rules.ts index 54b1a71c..e06d75ea 100644 --- a/src/lib/server/trigger-rules.ts +++ b/src/lib/server/trigger-rules.ts @@ -12,7 +12,7 @@ import { validateNameChange, type NameChangeConfig } from './name-change'; import { validateBounty, type BountyConfig } from './bounty'; import { validateRotationShuffle, type RotationShuffleConfig } from './rotation-shuffle'; import { causeTags } from './cause-tags'; -import { RESTART_AFTER_HOURS, restartWindow } from '$lib/uptime'; +import { MAX_RESTART_LEAD_MINUTES, restartWindow, type RestartSchedule } from '$lib/uptime'; import { MAX_CHAT } from '$lib/chat'; import { isVehicleCrash, TEAM_KILL_NOT_COUNTED, VEHICLE_CRASH } from '$lib/causes'; import { mapName } from '$lib/format'; @@ -142,10 +142,11 @@ export function pingKickStep( return { state: next, kicks }; } /** - * Tells players about the game's own restart: WARDOGS restarts a server once it has been up for - * 24 hours, at the end of the round then in progress. Two broadcasts per uptime cycle: a - * heads-up `leadMinutes` before the window opens (0 = none) and `message` once it has, repeated - * every `repeatMinutes` while the round drags on (0 = once). + * Tells players about the server's scheduled restart (its restart schedule, $lib/uptime: after so + * many hours up, or daily at a set time), which happens at the end of the round then in + * progress. Two broadcasts per game start: a heads-up `leadMinutes` before the window opens + * (0 = none) and `message` once it has, repeated every `repeatMinutes` while the round drags on + * (0 = once). */ export interface RestartNoticeConfig { message: string; @@ -346,7 +347,7 @@ export function validateConfig(kind: TriggerKind, raw: unknown): TriggerConfig { case 'restart_notice': { const message = str(c.message, MAX_CHAT); if (!message) throw new ApiError(400, 'The restart message is empty.'); - const leadMinutes = int(c.leadMinutes, 0, 0, RESTART_AFTER_HOURS * 60 - 1); + const leadMinutes = int(c.leadMinutes, 0, 0, MAX_RESTART_LEAD_MINUTES); const leadMessage = str(c.leadMessage, MAX_CHAT); if (leadMinutes && !leadMessage) throw new ApiError(400, 'Add the heads-up message, or set the heads-up to 0 minutes.'); @@ -625,10 +626,16 @@ const SAME_START_MS = 60_000; export function restartNoticeStage( cfg: Pick, prev: RestartNoticeState | null | undefined, - input: { startedAt: number; playerCount: number; now: number } + input: { + startedAt: number; + playerCount: number; + now: number; + /** the server's restart schedule; null or undefined is the game's default */ + schedule?: RestartSchedule | null; + } ): RestartNoticeStage | null { if (!input.startedAt || input.playerCount < cfg.minPlayers) return null; - const w = restartWindow(new Date(input.startedAt).toISOString(), RESTART_AFTER_HOURS, input.now); + const w = restartWindow(new Date(input.startedAt).toISOString(), input.schedule, input.now); if (!w) return null; // The start is derived from the uptime at each look, so it moves by the look's latency: a // start within SAME_START_MS of the one on record is the same run, not a restart. diff --git a/src/lib/server/triggers.test.ts b/src/lib/server/triggers.test.ts index 891955e8..21b05220 100644 --- a/src/lib/server/triggers.test.ts +++ b/src/lib/server/triggers.test.ts @@ -736,6 +736,20 @@ describe('restartNoticeStage', () => { expect(restartNoticeStage({ ...cfg, leadMinutes: 0 }, null, at(23.9))).toBeNull(); expect(restartNoticeStage({ ...cfg, leadMinutes: 0 }, null, at(24))!.stage).toBe('due'); }); + test('a daily schedule opens the window at its time of day, not 24 hours up', () => { + // the start is 19:00 the evening before in Chicago, so 07:00 there comes twelve hours later + const daily = { kind: 'daily', time: '07:00', timeZone: 'America/Chicago' } as const; + const on = (hours: number) => ({ ...at(hours), schedule: daily }); + const lead = restartNoticeStage(cfg, null, on(11.6))!; + expect(lead.stage).toBe('lead'); + expect(lead.minutes).toBe(24); + expect(restartNoticeStage(cfg, lead.state, on(12.1))!.stage).toBe('due'); + // the game's default would still be twelve hours off + expect(restartNoticeStage(cfg, null, at(12.1))).toBeNull(); + }); + test('no scheduled restart, no notice', () => { + expect(restartNoticeStage(cfg, null, { ...at(200), schedule: { kind: 'none' } })).toBeNull(); + }); }); describe('team_kill', () => { diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index 83a700fd..c8c05811 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -181,7 +181,13 @@ import { type BountyReplayEvent, type OpenBounty } from './bounty'; -import { fmtUptime, RESTART_AFTER_HOURS, restartWindow } from '$lib/uptime'; +import { + describeRestartSchedule, + fmtUptime, + RESTART_AFTER_HOURS, + restartScheduleOf, + restartWindow +} from '$lib/uptime'; import { ROTATION_SHUFFLE, rotationShuffleState, @@ -1405,7 +1411,8 @@ function evalRestartNotice( const hit = restartNoticeStage(cfg, row.state as RestartNoticeState | null, { startedAt: ctx.startedAt, playerCount: ctx.status.playerCount, - now: ctx.ts.getTime() + now: ctx.ts.getTime(), + schedule: restartScheduleOf(ctx.server.restartSchedule) }); if (!hit) return; const message = renderTemplate( @@ -2751,8 +2758,9 @@ export async function dryRun( .from(serverLive) .where(eq(serverLive.serverId, server.id)) .limit(1); + const schedule = restartScheduleOf(server.restartSchedule); const w = live?.startedAt - ? restartWindow(live.startedAt.toISOString(), RESTART_AFTER_HOURS, to.getTime()) + ? restartWindow(live.startedAt.toISOString(), schedule, to.getTime()) : null; if (!w || !live?.startedAt) { result.notes.push( @@ -2760,7 +2768,13 @@ export async function dryRun( ); return result; } - const dueAt = new Date(live.startedAt.getTime() + RESTART_AFTER_HOURS * 3600_000); + if (w.dueAt === null) { + result.notes.push( + 'This server has no scheduled restart (Settings tab), so the rule never sends anything.' + ); + return result; + } + const dueAt = new Date(w.dueAt); const v = dryRunVars(server.name, null, { players: live.players, uptime: fmtUptime(w.upMs) @@ -2777,7 +2791,7 @@ export async function dryRun( `${w.due ? 'already ' : ''}broadcast: ${renderTemplate(c.message, { ...v, minutes: 0 }, MAX_CHAT)}` ); result.notes.push( - `Up ${fmtUptime(w.upMs)}; the restart window ${w.due ? 'is open: the game restarts when this round ends' : `opens in ${fmtUptime(w.untilDueMs ?? 0)}`}. Times shown are the coming cycle, not a replay; each stage goes once per game start${c.repeatMinutes ? `, the main message again every ${c.repeatMinutes} min while the window stays open` : ''}, and only with at least ${c.minPlayers} on.` + `Restart schedule: ${describeRestartSchedule(schedule)} (Settings tab). Up ${fmtUptime(w.upMs)}; the restart window ${w.due ? 'is open: the game restarts when this round ends' : `opens in ${fmtUptime(w.untilDueMs ?? 0)}`}. Times shown are the coming cycle, not a replay; each stage goes once per game start${c.repeatMinutes ? `, the main message again every ${c.repeatMinutes} min while the window stays open` : ''}, and only with at least ${c.minPlayers} on.` ); return result; } diff --git a/src/lib/server/webhook-status-core.test.ts b/src/lib/server/webhook-status-core.test.ts index 5dffb124..fcc4e14b 100644 --- a/src/lib/server/webhook-status-core.test.ts +++ b/src/lib/server/webhook-status-core.test.ts @@ -365,6 +365,20 @@ describe('uptime', () => { `Up since · 🔁 Restarts after this round` ); }); + test('a daily restart schedule says so from its time of day', () => { + // 06:30 in Chicago is 11:30 UTC, half an hour before opts.now, 23 hours into this start + const daily = { + ...server, + restartSchedule: { kind: 'daily', time: '06:30', timeZone: 'America/Chicago' } as const + }; + const started = '2026-09-12T13:00:00Z'; + expect( + buildStatusEmbed(opts, server, live({ startedAt: started })).fields?.at(-1)?.value + ).not.toContain('Restarts'); + expect( + buildStatusEmbed(opts, daily, live({ startedAt: started })).fields?.at(-1)?.value + ).toContain('🔁 Restarts after this round'); + }); test('the start time and the restart note are in the change key; the ticking uptime is not', () => { const k = (now: number, at: string | null) => statusMessage({ ...opts, now }, server, live({ startedAt: at })).key; diff --git a/src/lib/server/webhook-status-core.ts b/src/lib/server/webhook-status-core.ts index 3104192b..ed130129 100644 --- a/src/lib/server/webhook-status-core.ts +++ b/src/lib/server/webhook-status-core.ts @@ -9,7 +9,7 @@ import { resolve } from 'node:path'; import type { FactionScore, LiveView, Player } from '$lib/types'; import { factionColor, fmtDuration, isMod, mapName, prettify, zoneLabel } from '$lib/format'; import { mapArtCandidates } from '$lib/map-art'; -import { RESTART_AFTER_HOURS, restartWindow } from '$lib/uptime'; +import { restartWindow, type RestartSchedule } from '$lib/uptime'; import { scoreCapOf } from '$lib/match'; import type { StatusStyle } from '$lib/status-styles'; import type { FeatureSet } from '$lib/features'; @@ -18,6 +18,8 @@ import type { DiscordPayload, Embed, EmbedField } from './webhook-delivery'; export interface StatusServer { id: string; name: string; + /** when the game restarts it; null or absent is the game's default */ + restartSchedule?: RestartSchedule | null; } export interface StatusOptions { appName: string; @@ -332,7 +334,7 @@ function buildBody(opts: StatusOptions, server: StatusServer, live: LiveView | n const observedAt = live.observedAt; // Discord renders "9 hours ago" itself, so the uptime line needs no edit to stay right; the // restart note flips once, when the threshold passes. - const restart = restartWindow(live.startedAt, RESTART_AFTER_HOURS, opts.now); + const restart = restartWindow(live.startedAt, server.restartSchedule, opts.now); const upLine = restart ? `Up since ${relative(live.startedAt!)}${restart.due ? ' · 🔁 Restarts after this round' : ''}\n` : ''; @@ -413,7 +415,7 @@ function substance(server: StatusServer, live: LiveView | null, now: number): un if (!live.ok || !live.status) return [server.id, server.name, 'down', live.error, live.gameServerId]; const s = live.status; - const restart = restartWindow(live.startedAt, RESTART_AFTER_HOURS, now); + const restart = restartWindow(live.startedAt, server.restartSchedule, now); return [ server.id, server.name, diff --git a/src/lib/server/webhook-status.ts b/src/lib/server/webhook-status.ts index 4b59e2af..08489b1b 100644 --- a/src/lib/server/webhook-status.ts +++ b/src/lib/server/webhook-status.ts @@ -14,6 +14,7 @@ import { liveView } from './live'; import { deleteDiscord, editDiscord, postDiscord, type PostResult } from './webhook-delivery'; import { cardLinks, statusMessage, type StatusServer } from './webhook-status-core'; import { effectiveFeatures, type FeatureSet } from '$lib/features'; +import { readRestartSchedule } from '$lib/uptime'; export const STATUS_TICK_MS = 20_000; /** Re-edit an unchanged message this often so its embed timestamps do not drift into the past. */ @@ -108,7 +109,12 @@ export async function refreshStatusMessages(env: Env, now = Date.now()): Promise const byOrg = new Map(); for (const { server, org } of rows) { const list = byOrg.get(server.orgId) ?? []; - list.push({ id: server.id, name: server.name, features: effectiveFeatures(org, server) }); + list.push({ + id: server.id, + name: server.name, + restartSchedule: readRestartSchedule(server.restartSchedule), + features: effectiveFeatures(org, server) + }); byOrg.set(server.orgId, list); } // Different webhooks are different rate-limit buckets, so they need not wait on each other; diff --git a/src/lib/types.ts b/src/lib/types.ts index 034ded1c..df6ea7d3 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -3,6 +3,7 @@ import type { StatusStyle } from './status-styles'; import type { OrgRole } from '$lib/server/access'; import type { BuiltinRole, Capability } from '$lib/capabilities'; import type { BanReason } from '$lib/ban-reasons'; +import type { RestartSchedule } from '$lib/uptime'; export type { OrgRole, Capability, BuiltinRole }; @@ -65,6 +66,8 @@ export interface ServerInfo { publicLeaderboards: boolean; /** the public status page also carries the last kills */ publicKills: boolean; + /** when the game restarts it (see $lib/uptime); null runs on the game's default */ + restartSchedule: RestartSchedule | null; /** what the site owner allows this server's organisation */ allowPublicStatus: boolean; allowPublicLeaderboards: boolean; diff --git a/src/lib/uptime.test.ts b/src/lib/uptime.test.ts index ffad3f36..3e8046c6 100644 --- a/src/lib/uptime.test.ts +++ b/src/lib/uptime.test.ts @@ -1,5 +1,14 @@ import { describe, expect, test } from 'bun:test'; -import { fmtUptime, restartWindow } from './uptime'; +import { + DEFAULT_RESTART_SCHEDULE, + describeRestartSchedule, + fmtUptime, + MAX_RESTART_HOURS, + nextDailyAt, + readRestartSchedule, + restartScheduleOf, + restartWindow +} from './uptime'; const T0 = Date.parse('2026-09-14T00:00:00Z'); const H = 3600_000; @@ -36,6 +45,123 @@ describe('restartWindow', () => { }); }); +describe('restartWindow on a daily schedule', () => { + // BisectHosting's daily restart, measured on a WARFORGE host 2026-09-23: 07:00 America/Chicago + // (12:00 UTC in daylight time), the round then in progress finishing first. + const daily = { kind: 'daily', time: '07:00', timeZone: 'America/Chicago' } as const; + const at = (iso: string) => Date.parse(iso); + + test('the window opens at the next 07:00 after the game started, not 24 hours after it', () => { + const started = '2026-09-22T19:04:00Z'; + const before = restartWindow(started, daily, at('2026-09-23T11:30:00Z'))!; + expect(before.due).toBe(false); + expect(before.dueAt).toBe(at('2026-09-23T12:00:00Z')); + expect(before.untilDueMs).toBe(30 * 60_000); + const after = restartWindow(started, daily, at('2026-09-23T12:39:00Z'))!; + expect(after.due).toBe(true); + expect(after.untilDueMs).toBeNull(); + }); + test('a game that starts after the time waits for the next day', () => { + const w = restartWindow('2026-09-23T12:40:03Z', daily, at('2026-09-23T13:44:00Z'))!; + expect(w.dueAt).toBe(at('2026-09-24T12:00:00Z')); + expect(w.due).toBe(false); + }); + test('a game started just before the time is due the same day', () => { + const w = restartWindow('2026-09-23T11:58:00Z', daily, at('2026-09-23T12:01:00Z'))!; + expect(w.dueAt).toBe(at('2026-09-23T12:00:00Z')); + expect(w.due).toBe(true); + }); + test('the time follows the zone across a DST change', () => { + // US daylight time ends 2026-11-01: 07:00 Chicago is 13:00 UTC from then on + const w = restartWindow('2026-10-31T13:00:00Z', daily, at('2026-10-31T14:00:00Z'))!; + expect(w.dueAt).toBe(at('2026-11-01T13:00:00Z')); + }); + test('a time the clock skips lands an hour later', () => { + // 02:30 does not exist in Chicago on 2027-03-14; 03:30 CDT is 08:30 UTC + const w = restartWindow( + '2027-03-13T12:00:00Z', + { kind: 'daily', time: '02:30', timeZone: 'America/Chicago' }, + at('2027-03-13T13:00:00Z') + )!; + expect(w.dueAt).toBe(at('2027-03-14T08:30:00Z')); + }); + test('an ambiguous time takes its first occurrence', () => { + // 01:30 happens twice in Chicago on 2026-11-01; the first is 01:30 CDT, 06:30 UTC + expect(nextDailyAt(at('2026-10-31T12:00:00Z'), '01:30', 'America/Chicago')).toBe( + at('2026-11-01T06:30:00Z') + ); + }); + test('UTC and zones east of it', () => { + expect(nextDailyAt(at('2026-09-23T06:00:00Z'), '06:00', 'UTC')).toBe( + at('2026-09-24T06:00:00Z') + ); + expect(nextDailyAt(at('2026-09-23T01:00:00Z'), '04:00', 'Europe/Warsaw')).toBe( + at('2026-09-23T02:00:00Z') + ); + }); +}); + +describe('restartWindow on other schedules', () => { + test('an uptime schedule of its own replaces the default', () => { + const w = restartWindow( + new Date(T0 - 13 * H).toISOString(), + { kind: 'uptime', hours: 12 }, + T0 + )!; + expect(w.due).toBe(true); + expect(w.dueAt).toBe(T0 - H); + }); + test('none: uptime only', () => { + const w = restartWindow(new Date(T0 - 30 * H).toISOString(), { kind: 'none' }, T0)!; + expect(w).toEqual({ upMs: 30 * H, due: false, untilDueMs: null, dueAt: null }); + }); + test('no schedule is the game default of 24 hours', () => { + expect(restartWindow(new Date(T0 - 23 * H).toISOString(), null, T0)!.due).toBe(false); + expect(restartWindow(new Date(T0 - 24 * H).toISOString(), undefined, T0)!.due).toBe(true); + }); +}); + +describe('readRestartSchedule', () => { + test('accepts the three kinds', () => { + expect(readRestartSchedule({ kind: 'none' })).toEqual({ kind: 'none' }); + expect(readRestartSchedule({ kind: 'uptime', hours: 12 })).toEqual({ + kind: 'uptime', + hours: 12 + }); + expect( + readRestartSchedule({ kind: 'daily', time: ' 07:00 ', timeZone: 'America/Chicago' }) + ).toEqual({ kind: 'daily', time: '07:00', timeZone: 'America/Chicago' }); + }); + test('refuses anything else', () => { + for (const bad of [ + null, + 'daily', + {}, + { kind: 'weekly' }, + { kind: 'uptime', hours: 0 }, + { kind: 'uptime', hours: 1.5 }, + { kind: 'uptime', hours: MAX_RESTART_HOURS + 1 }, + { kind: 'daily', time: '7:00', timeZone: 'UTC' }, + { kind: 'daily', time: '24:00', timeZone: 'UTC' }, + { kind: 'daily', time: '07:00', timeZone: 'Central' }, + { kind: 'daily', time: '07:00' } + ]) + expect(readRestartSchedule(bad)).toBeNull(); + }); + test('a server without a valid schedule runs on the default', () => { + expect(restartScheduleOf(null)).toEqual(DEFAULT_RESTART_SCHEDULE); + expect(restartScheduleOf({ kind: 'uptime', hours: -3 })).toEqual(DEFAULT_RESTART_SCHEDULE); + }); + test('describes itself', () => { + expect(describeRestartSchedule({ kind: 'uptime', hours: 24 })).toBe('after 24 hours up'); + expect(describeRestartSchedule({ kind: 'uptime', hours: 1 })).toBe('after 1 hour up'); + expect( + describeRestartSchedule({ kind: 'daily', time: '07:00', timeZone: 'America/Chicago' }) + ).toBe('daily at 07:00 America/Chicago'); + expect(describeRestartSchedule({ kind: 'none' })).toBe('none'); + }); +}); + describe('fmtUptime', () => { test('units', () => { expect(fmtUptime(0)).toBe('<1m'); diff --git a/src/lib/uptime.ts b/src/lib/uptime.ts index da072aa8..333fa554 100644 --- a/src/lib/uptime.ts +++ b/src/lib/uptime.ts @@ -1,38 +1,177 @@ -// How long the game process has been up, and where that sits against the game's scheduled -// restart. A WARDOGS server restarts once its uptime passes 24 hours (fixed in the game, not -// a setting), but not on the mark: the restart happens when the round in progress ends. So past -// the threshold the server is "restarting after this round", and before it there is a window -// that opens in so many minutes. The worker derives `startedAt` from `uptimeSeconds` on -// GET /v1/health; the header, the status cards and (later) the rules read this. - -/** Hours of uptime after which WARDOGS restarts the server at the end of the round. Hard-coded in the game. */ +// How long the game process has been up, and where that sits against the server's scheduled +// restart. WARDOGS restarts a server on a schedule, but not on the mark: the restart happens when +// the round in progress ends. So once the scheduled time passes the server is "restarting after +// this round", and before it there is a window that opens in so many minutes. The worker derives +// `startedAt` from `uptimeSeconds` on GET /v1/health; the header, the status cards and the +// Restart notice rule read this. +// +// What the schedule is depends on the host, so it is a per-server setting (`restart_schedule`): +// - uptime: once the process has been up so many hours (the game's own restart, 24 by default, +// twelve before September 2026). +// - daily: at a time of day the host lets the owner pick (BisectHosting since September 2026), +// in the host's time zone. The round then in progress still finishes first. +// - none: no scheduled restart; the uptime shows, nothing else. + +/** Hours of uptime after which WARDOGS restarts a server that has no schedule of its own. */ export const RESTART_AFTER_HOURS = 24; +/** `daily`'s time is "HH:MM" on a 24-hour clock, its zone an IANA name such as America/Chicago. */ +export type RestartSchedule = + | { kind: 'uptime'; hours: number } + | { kind: 'daily'; time: string; timeZone: string } + | { kind: 'none' }; + +/** What a server with no `restart_schedule` of its own gets. */ +export const DEFAULT_RESTART_SCHEDULE: RestartSchedule = { + kind: 'uptime', + hours: RESTART_AFTER_HOURS +}; + +/** The longest uptime schedule a server may set: a week. */ +export const MAX_RESTART_HOURS = 168; + +/** The longest a restart notice's heads-up may lead by: just under a day, the longest daily cycle. */ +export const MAX_RESTART_LEAD_MINUTES = 24 * 60 - 1; + +const TIME = /^([01]\d|2[0-3]):([0-5]\d)$/; + +export function isTimeZone(tz: string): boolean { + if (!tz) return false; + try { + new Intl.DateTimeFormat('en-US', { timeZone: tz }); + return true; + } catch { + return false; + } +} + +/** A stored or submitted schedule, checked; null when it is missing or not a schedule. */ +export function readRestartSchedule(raw: unknown): RestartSchedule | null { + if (!raw || typeof raw !== 'object') return null; + const r = raw as Record; + if (r.kind === 'none') return { kind: 'none' }; + if (r.kind === 'uptime') { + const hours = Number(r.hours); + return Number.isInteger(hours) && hours >= 1 && hours <= MAX_RESTART_HOURS + ? { kind: 'uptime', hours } + : null; + } + if (r.kind === 'daily') { + const time = typeof r.time === 'string' ? r.time.trim() : ''; + const timeZone = typeof r.timeZone === 'string' ? r.timeZone.trim() : ''; + return TIME.test(time) && isTimeZone(timeZone) ? { kind: 'daily', time, timeZone } : null; + } + return null; +} + +/** The schedule a server runs on: its own, else the game's default. */ +export const restartScheduleOf = (raw: unknown): RestartSchedule => + readRestartSchedule(raw) ?? DEFAULT_RESTART_SCHEDULE; + +/** "after 24 hours up", "daily at 07:00 America/Chicago", "none". */ +export function describeRestartSchedule(s: RestartSchedule): string { + if (s.kind === 'uptime') return `after ${s.hours} hour${s.hours === 1 ? '' : 's'} up`; + if (s.kind === 'daily') return `daily at ${s.time} ${s.timeZone}`; + return 'none'; +} + +/** Milliseconds `timeZone` is ahead of UTC at the instant `at`. */ +function zoneOffsetMs(timeZone: string, at: number): number { + const parts = new Intl.DateTimeFormat('en-US', { + timeZone, + hourCycle: 'h23', + year: 'numeric', + month: 'numeric', + day: 'numeric', + hour: 'numeric', + minute: 'numeric', + second: 'numeric' + }).formatToParts(at); + const n = (type: string) => Number(parts.find((p) => p.type === type)?.value); + const wall = Date.UTC( + n('year'), + n('month') - 1, + n('day'), + n('hour') % 24, + n('minute'), + n('second') + ); + return wall - Math.floor(at / 1000) * 1000; +} + +/** + * The first moment after `after` that the clock in `timeZone` reads `time`. A time that does not + * exist on a spring-forward day lands an hour later, the way the clock itself skips it. + */ +export function nextDailyAt(after: number, time: string, timeZone: string): number { + const [hh, mm] = time.split(':').map(Number); + const local = new Date(after + zoneOffsetMs(timeZone, after)); + for (let day = 0; day <= 2; day++) { + const wall = Date.UTC( + local.getUTCFullYear(), + local.getUTCMonth(), + local.getUTCDate() + day, + hh, + mm + ); + // The offset at the guess, then at the answer: when a DST change falls between them, the + // answer with its own offset is the real one, and with neither (a skipped time) the later. + let at = wall - zoneOffsetMs(timeZone, wall); + const off = zoneOffsetMs(timeZone, at); + if (wall - off !== at) { + const alt = wall - off; + at = zoneOffsetMs(timeZone, alt) === off ? alt : Math.max(at, alt); + } + if (at > after) return at; + } + // unreachable for a real zone: the time recurs within two days + return after + 24 * 3600_000; +} + export interface RestartWindow { /** milliseconds since the game process started */ upMs: number; - /** the threshold has passed: the server restarts when the current round ends */ + /** the scheduled time has passed: the server restarts when the current round ends */ due: boolean; - /** milliseconds until the threshold; null when due, or when no restart is scheduled */ + /** milliseconds until the scheduled time; null when due, or when no restart is scheduled */ untilDueMs: number | null; + /** when the window opens (ms since the epoch) for this game start; null when none is scheduled */ + dueAt: number | null; } /** Shown as "restart window in …" once the threshold is this close. */ export const RESTART_SOON_MS = 60 * 60_000; -/** null when the start time is unknown. `restartAfterHours` 0 means no restart on uptime (tests). */ +/** + * null when the start time is unknown. `schedule` is the server's schedule; a number is hours of + * uptime, 0 meaning no scheduled restart (tests), and null or undefined the game's default. + */ export function restartWindow( startedAt: string | null | undefined, - restartAfterHours: number, + schedule: RestartSchedule | number | null | undefined, now: number ): RestartWindow | null { if (!startedAt) return null; const started = Date.parse(startedAt); if (!Number.isFinite(started)) return null; const upMs = Math.max(0, now - started); - if (!(restartAfterHours > 0)) return { upMs, due: false, untilDueMs: null }; - const untilDueMs = restartAfterHours * 3600_000 - upMs; - return untilDueMs <= 0 ? { upMs, due: true, untilDueMs: null } : { upMs, due: false, untilDueMs }; + const s: RestartSchedule = + typeof schedule === 'number' + ? schedule > 0 + ? { kind: 'uptime', hours: schedule } + : { kind: 'none' } + : (schedule ?? DEFAULT_RESTART_SCHEDULE); + const dueAt = + s.kind === 'uptime' + ? started + s.hours * 3600_000 + : s.kind === 'daily' + ? nextDailyAt(started, s.time, s.timeZone) + : null; + if (dueAt === null) return { upMs, due: false, untilDueMs: null, dueAt: null }; + const untilDueMs = dueAt - now; + return untilDueMs <= 0 + ? { upMs, due: true, untilDueMs: null, dueAt } + : { upMs, due: false, untilDueMs, dueAt }; } /** "3d 2h", "9h 12m", "12m", "<1m": the two largest units that are non-zero, minutes at least. */ diff --git a/src/routes/(app)/server/[id]/+layout.svelte b/src/routes/(app)/server/[id]/+layout.svelte index 31df5052..a5776948 100644 --- a/src/routes/(app)/server/[id]/+layout.svelte +++ b/src/routes/(app)/server/[id]/+layout.svelte @@ -8,7 +8,7 @@ import Badge from '$lib/components/Badge.svelte'; import RoleBadge from '$lib/components/RoleBadge.svelte'; import { toast } from '$lib/toast.svelte'; - import { fmtUptime, restartWindow, RESTART_AFTER_HOURS, RESTART_SOON_MS } from '$lib/uptime'; + import { fmtUptime, restartWindow, RESTART_SOON_MS } from '$lib/uptime'; import type { LayoutProps } from './$types'; let { data, children }: LayoutProps = $props(); @@ -75,7 +75,7 @@ return () => clearInterval(t); }); let restart = $derived( - live === false ? null : restartWindow(ident.startedAt, RESTART_AFTER_HOURS, now) + live === false ? null : restartWindow(ident.startedAt, data.server.restartSchedule, now) ); let slowed = $derived(!!throttled[data.server.id]); diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 27c33d37..0d904f50 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -26,6 +26,7 @@ import { watchLive } from '$lib/live'; import { RULE_KINDS } from '$lib/rule-kinds'; import RulePicker from '$lib/components/RulePicker.svelte'; + import { restartScheduleOf } from '$lib/uptime'; import type { DryRunResult, MapSelection, @@ -38,6 +39,7 @@ let { data }: PageProps = $props(); let id = $derived(data.server.id); let admin = $derived(can(data.server.caps, 'automation.manage')); + let restartSchedule = $derived(restartScheduleOf(data.server.restartSchedule)); let path = $derived(`/api/servers/${encodeURIComponent(id)}/triggers`); /** A risk_kick rule's score threshold, 0 when off; rules saved with a level read as 20 or 50. */ @@ -1684,7 +1686,16 @@
{@render placeholders('restart_notice', [f.leadMessage, f.message])}

- The game restarts 24 hours after it started, once the round then in progress ends. + {#if restartSchedule.kind === 'uptime'} + The game restarts this server {restartSchedule.hours} hours after it started, once the round + then in progress ends. + {:else if restartSchedule.kind === 'daily'} + The host restarts this server daily at {restartSchedule.time} ({restartSchedule.timeZone}), + once the round then in progress ends. + {:else} + This server has no scheduled restart, so this rule sends nothing. + {/if} + The schedule is set on the Settings tab.

{:else if f.kind === 'match_broadcast'}
diff --git a/src/routes/(app)/server/[id]/config/+page.svelte b/src/routes/(app)/server/[id]/config/+page.svelte index a5b2d51d..0ce2cca8 100644 --- a/src/routes/(app)/server/[id]/config/+page.svelte +++ b/src/routes/(app)/server/[id]/config/+page.svelte @@ -408,7 +408,7 @@ weapon, distance, headshot) to Warcon a second or two after it happens: the kill feed on the Overview tab, combat stats on Analytics and player dossiers, and the team-kill trigger. {#if feed && !feed.configured}Configure writes the endpoint and a token into the config - document; the game reads them at its next restart (its own 24-hour one, or a manual restart).{:else if feed && !data.server.manager}An + document; the game reads them at its next restart (its scheduled one, or a manual restart).{:else if feed && !data.server.manager}An owner of the organisation holds the token.{/if}

diff --git a/src/routes/(app)/server/[id]/settings/+page.svelte b/src/routes/(app)/server/[id]/settings/+page.svelte index f096de34..c604a11a 100644 --- a/src/routes/(app)/server/[id]/settings/+page.svelte +++ b/src/routes/(app)/server/[id]/settings/+page.svelte @@ -1,8 +1,9 @@ + +
+ Game restart +

+ When this server restarts on its own. WARDOGS restarts a server after {RESTART_AFTER_HOURS} hours + up; some hosts instead restart it every day at a time you pick in their panel (BisectHosting does). + Either way the round in progress finishes first. The header's countdown, the status cards and the + Restart notice rule follow this. +

+ {#if !data.server.manager} +

+ Restarts {describeRestartSchedule(current)}. Only an owner of {data.server.orgName} can change this. +

+ {:else} +
+ + +

+ The time and zone your host's panel shows, e.g. 07:00 America/Chicago. Daylight saving is + followed. +

+ +
+ + {#if data.server.restartSchedule} + + {:else} + game default + {/if} +
+
+ {/if} +
From 57987cb544bc1201d9e61f4c63af41af92dbec8b Mon Sep 17 00:00:00 2001 From: James Causon Date: Fri, 9 Oct 2026 23:58:58 +0100 Subject: [PATCH 094/102] Restart time: the game's RestartTimeUtc, or an owner's own UTC time - One resolver for the header, cards, Restart notice, Rotation shuffle and their dry runs: an owner's time, else RestartTimeUtc in effect, else 24 h. - The worker reads RestartTimeUtc in its hourly config read and once more after a restart; server_live keeps the value in effect apart from the file. - servers.restart_schedule is { time: 'HH:MM' } or null; the hours, zone and none kinds go. PATCH /api/servers/:id stays requireServerManager. - Migration 0048_restart_schedule. --- drizzle/0050_restart_schedule.sql | 2 + drizzle/meta/0050_snapshot.json | 16 +- drizzle/meta/_journal.json | 2 +- src/lib/health.svelte.ts | 32 +- src/lib/server/access.ts | 8 +- src/lib/server/db/schema.ts | 8 +- src/lib/server/live.ts | 6 + src/lib/server/observe.ts | 51 +- src/lib/server/rotation-shuffle.ts | 8 +- src/lib/server/servers.ts | 16 +- src/lib/server/trigger-rules.ts | 7 +- src/lib/server/triggers.test.ts | 23 +- src/lib/server/triggers.ts | 47 +- src/lib/server/webhook-status-core.test.ts | 23 +- src/lib/server/webhook-status-core.ts | 14 +- src/lib/server/webhook-status.ts | 4 +- src/lib/types.ts | 13 +- src/lib/uptime.test.ts | 244 +++++----- src/lib/uptime.ts | 210 +++------ .../(app)/server/[id]/+layout.server.ts | 12 +- src/routes/(app)/server/[id]/+layout.svelte | 10 +- .../(app)/server/[id]/automation/+page.svelte | 29 +- .../[id]/settings/RestartSchedule.svelte | 168 ++----- src/test/restart-schedule.test.ts | 437 ++++++++++++++++++ 24 files changed, 903 insertions(+), 487 deletions(-) create mode 100644 src/test/restart-schedule.test.ts diff --git a/drizzle/0050_restart_schedule.sql b/drizzle/0050_restart_schedule.sql index 279e88c4..a322d707 100644 --- a/drizzle/0050_restart_schedule.sql +++ b/drizzle/0050_restart_schedule.sql @@ -1 +1,3 @@ +ALTER TABLE "server_live" ADD COLUMN "restart_time_utc" text;--> statement-breakpoint +ALTER TABLE "server_live" ADD COLUMN "restart_time_utc_file" text;--> statement-breakpoint ALTER TABLE "servers" ADD COLUMN "restart_schedule" jsonb; \ No newline at end of file diff --git a/drizzle/meta/0050_snapshot.json b/drizzle/meta/0050_snapshot.json index f31ed874..1981ec18 100644 --- a/drizzle/meta/0050_snapshot.json +++ b/drizzle/meta/0050_snapshot.json @@ -1,5 +1,5 @@ { - "id": "ff8b4fee-bd7a-4872-ab0d-14c3b57c1dd5", + "id": "f1eb8ccd-59cd-4785-8010-355adb022172", "prevId": "9adec4e5-faee-4465-bc35-3b2e1123ba07", "version": "7", "dialect": "postgresql", @@ -4234,6 +4234,18 @@ "primaryKey": false, "notNull": false }, + "restart_time_utc": { + "name": "restart_time_utc", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "restart_time_utc_file": { + "name": "restart_time_utc_file", + "type": "text", + "primaryKey": false, + "notNull": false + }, "status": { "name": "status", "type": "jsonb", @@ -5546,4 +5558,4 @@ "schemas": {}, "tables": {} } -} \ No newline at end of file +} diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 2d9b8f35..4255026b 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -360,4 +360,4 @@ "breakpoints": true } ] -} \ No newline at end of file +} diff --git a/src/lib/health.svelte.ts b/src/lib/health.svelte.ts index 445ee93c..1ed5b113 100644 --- a/src/lib/health.svelte.ts +++ b/src/lib/health.svelte.ts @@ -6,9 +6,15 @@ export const health = $state>({}); /** Servers whose listener asked the panel to slow down (429 with Retry-After), and until when. */ export const throttled = $state>({}); /** What the worker knows about each server's build, as the live stream reports it. */ -export const identity = $state< - Record ->({}); +export interface Identity { + build: string; + gameServerId: string; + startedAt: string | null; + /** RestartTimeUtc in effect and in the config document (LiveView) */ + restartTimeUtc: string | null; + restartTimeUtcFile: string | null; +} +export const identity = $state>({}); export interface Occupancy { players: number; @@ -49,16 +55,14 @@ export function noteLive(v: LiveView) { occupancy[v.serverId] = occ; if (v.build || v.gameServerId || v.startedAt) { const cur = untrack(() => identity[v.serverId]); - if ( - !cur || - cur.build !== v.build || - cur.gameServerId !== v.gameServerId || - cur.startedAt !== v.startedAt - ) - identity[v.serverId] = { - build: v.build, - gameServerId: v.gameServerId, - startedAt: v.startedAt - }; + const next: Identity = { + build: v.build, + gameServerId: v.gameServerId, + startedAt: v.startedAt, + restartTimeUtc: v.restartTimeUtc ?? null, + restartTimeUtcFile: v.restartTimeUtcFile ?? null + }; + if (!cur || (Object.keys(next) as (keyof Identity)[]).some((k) => cur[k] !== next[k])) + identity[v.serverId] = next; } } diff --git a/src/lib/server/access.ts b/src/lib/server/access.ts index 8bb0272f..d49f615d 100644 --- a/src/lib/server/access.ts +++ b/src/lib/server/access.ts @@ -16,7 +16,7 @@ import { type Capability } from '../capabilities'; import type { ListKind } from '../types'; -import { readRestartSchedule, type RestartSchedule } from '../uptime'; +import { readManualRestart, type ManualRestart } from '../uptime'; import { accessFromCaps, resolveAccess, type ServerAccess } from './access-resolve'; import { keyActorId, keyActorName, keyCoversServer, type ApiKeyPrincipal } from './apikeys-core'; import { @@ -445,8 +445,8 @@ export type ServerSummary = { publicStatus: boolean; publicLeaderboards: boolean; publicKills: boolean; - /** the server's own restart schedule; null runs on the game's default */ - restartSchedule: RestartSchedule | null; + /** an owner's own restart time (UTC); null: the game decides */ + restartSchedule: ManualRestart | null; allowPublicStatus: boolean; allowPublicLeaderboards: boolean; }; @@ -474,7 +474,7 @@ export function shapeServer( publicStatus: s.publicStatus, publicLeaderboards: s.publicLeaderboards, publicKills: s.publicKills, - restartSchedule: readRestartSchedule(s.restartSchedule), + restartSchedule: readManualRestart(s.restartSchedule), allowPublicStatus: org.allowPublicStatus, allowPublicLeaderboards: org.allowPublicLeaderboards }; diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 082688dc..6ae9d32a 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -378,8 +378,8 @@ export const servers = pgTable('servers', { /** the public status page also shows the last kills (needs the feed and the status page on) */ publicKills: boolean('public_kills').notNull().default(false), /** - * When the game restarts this server, as $lib/uptime's RestartSchedule: after so many hours up, - * daily at a time in a zone (the host's own restart), or none. null = the game's default. + * An owner's own restart time, `{ time: 'HH:MM' }` (UTC, $lib/uptime's ManualRestart), used + * instead of the game's: null = the game decides (RestartTimeUtc, else 24 hours up). */ restartSchedule: jsonb('restart_schedule'), createdBy: text('created_by'), @@ -1194,6 +1194,10 @@ export const serverLive = pgTable('server_live', { startedAt: ts('started_at'), /** MaxReservedSlots from the config document: player slots held back for reserved players; null until read */ reservedSlots: integer('reserved_slots'), + /** RestartTimeUtc ("HH:MM") the running process started with; null when unset or not yet read */ + restartTimeUtc: text('restart_time_utc'), + /** RestartTimeUtc as the config document holds it now (in effect from the next restart) */ + restartTimeUtcFile: text('restart_time_utc_file'), /** Status as the action registry shapes it */ status: jsonb('status'), /** Player[] as the action registry shapes it */ diff --git a/src/lib/server/live.ts b/src/lib/server/live.ts index cd8ad502..f013a21a 100644 --- a/src/lib/server/live.ts +++ b/src/lib/server/live.ts @@ -28,6 +28,8 @@ export function liveView(m: ServerMemory): LiveView { gameServerId: m.identity.gameServerId, startedAt: iso(m.startedAt), reservedSlots: m.identity.reservedSlots, + restartTimeUtc: m.identity.restartTimeUtc, + restartTimeUtcFile: m.identity.restartTimeUtcFile, throttledUntil: m.holdUntil > Date.now() ? iso(m.holdUntil) : null, status: m.status, players: m.players, @@ -50,6 +52,8 @@ export function liveViewFromRow(r: ServerLiveRow): LiveView { gameServerId: r.gameServerId ?? '', startedAt: r.startedAt ? r.startedAt.toISOString() : null, reservedSlots: r.reservedSlots ?? null, + restartTimeUtc: r.restartTimeUtc ?? null, + restartTimeUtcFile: r.restartTimeUtcFile ?? null, // A hold lasts seconds; a row read cold from the database is not inside one. throttledUntil: null, status: saneStatus(r.status), @@ -71,6 +75,8 @@ export async function writeLive(db: DbOrTx, m: ServerMemory, ts: Date): Promise< gameServerId: m.identity.gameServerId, startedAt: m.startedAt ? new Date(m.startedAt) : null, reservedSlots: m.identity.reservedSlots, + restartTimeUtc: m.identity.restartTimeUtc, + restartTimeUtcFile: m.identity.restartTimeUtcFile, status: m.status, players: m.players, playerCount: m.status?.playerCount ?? m.players.length, diff --git a/src/lib/server/observe.ts b/src/lib/server/observe.ts index 9c1ea36b..3030a783 100644 --- a/src/lib/server/observe.ts +++ b/src/lib/server/observe.ts @@ -12,6 +12,7 @@ import { forLog, publicMessage } from './http'; import type { OrgRow, ServerRow } from './access'; import { ACTIONS, readConfig } from './actions'; import { reservedSlotsHeld } from '../reserved-doc'; +import { restartTimeFromConfig } from '../uptime'; import { GameError, WardogsClient } from './rcon'; import { matches, samples, serverLive } from './db/schema'; import type { DbOrTx } from './db'; @@ -150,6 +151,16 @@ export interface Identity { gameServerId: string; /** MaxReservedSlots from the config document; null until read or when the document lacks it */ reservedSlots: number | null; + /** RestartTimeUtc in the config document as last read ("HH:MM", UTC); null when unset */ + restartTimeUtcFile: string | null; + /** + * RestartTimeUtc the running process started with: the game reads it at its start, so a change + * to the document waits for the next restart. Taken from the first read of the document since + * the process started (restartTimeRead). + */ + restartTimeUtc: string | null; + /** restartTimeUtc has been read for this process start; a restart clears it */ + restartTimeRead: boolean; features: Features | null; /** when it was last (re)read; 0 asks the next observation to read it */ checkedAt: number; @@ -203,6 +214,9 @@ export function memoryFor(server: ServerRow, org: OrgRow): ServerMemory { build: '', gameServerId: '', reservedSlots: null, + restartTimeUtcFile: null, + restartTimeUtc: null, + restartTimeRead: false, features: null, checkedAt: 0, hydrated: false @@ -240,6 +254,8 @@ async function hydrateIdentity(env: Env, m: ServerMemory): Promise { build: serverLive.build, gameServerId: serverLive.gameServerId, reservedSlots: serverLive.reservedSlots, + restartTimeUtc: serverLive.restartTimeUtc, + restartTimeUtcFile: serverLive.restartTimeUtcFile, startedAt: serverLive.startedAt }) .from(serverLive) @@ -250,6 +266,15 @@ async function hydrateIdentity(env: Env, m: ServerMemory): Promise { if (!m.identity.gameServerId) m.identity.gameServerId = row.gameServerId; if (m.identity.reservedSlots === null) m.identity.reservedSlots = row.reservedSlots; if (!m.startedAt && row.startedAt) m.startedAt = row.startedAt.getTime(); + // The restart time the last worker found in effect, for the start it wrote with it (a + // restart since then is seen by refreshUptime, which asks for a new read). With no + // history (both empty: never read, or never set), the first read of the document is + // taken as in effect, though it may hold a change made since the process started. + if (!m.identity.restartTimeRead && (row.restartTimeUtc || row.restartTimeUtcFile)) { + m.identity.restartTimeUtc = row.restartTimeUtc; + m.identity.restartTimeUtcFile = row.restartTimeUtcFile; + m.identity.restartTimeRead = true; + } } } catch (e) { console.warn(`[warcon] identity of ${m.server.name} not read:`, publicMessage(e)); @@ -301,8 +326,15 @@ async function refreshIdentity(client: WardogsClient, m: ServerMemory, now: numb } // How many player slots the server holds back for reserved players lives in its config document // (MaxReservedSlots), which every build serves; the status route only reports the public cap. + // So does the game's daily restart time (RestartTimeUtc), which it reads when it starts. try { - next.reservedSlots = reservedSlotsHeld((await readConfig(client)).text); + const text = (await readConfig(client)).text; + next.reservedSlots = reservedSlotsHeld(text); + next.restartTimeUtcFile = restartTimeFromConfig(text); + if (!next.restartTimeRead) { + next.restartTimeUtc = next.restartTimeUtcFile; + next.restartTimeRead = true; + } } catch (err) { retrySoon(); holdFor(m, err); @@ -314,6 +346,11 @@ async function refreshIdentity(client: WardogsClient, m: ServerMemory, now: numb /** uptimeSeconds is whole seconds and the read has latency: a start time this close is the same start. */ const START_DRIFT_MS = 5_000; +/** + * A start this much later than the one on record is a restart (the look's latency through a relay + * moves the start by more than the drift above); as SAME_START_MS in trigger-rules. + */ +const NEW_START_MS = 60_000; /** * Reads the process uptime and keeps it as a start time. A failure keeps the previous answer @@ -330,7 +367,14 @@ async function refreshUptime(client: WardogsClient, m: ServerMemory): Promise START_DRIFT_MS) m.startedAt = startedAt; + if (Math.abs(startedAt - m.startedAt) <= START_DRIFT_MS) return; + // A restart: the process read its config at its start, so read the document again soon, + // and take what it says then as the restart time in effect. + if (m.startedAt && startedAt - m.startedAt > NEW_START_MS) { + m.identity.restartTimeRead = false; + m.identity.checkedAt = 0; + } + m.startedAt = startedAt; } catch (err) { if (err instanceof GameError && err.code === 'no_route') m.healthUnserved = true; else holdFor(m, err); @@ -439,6 +483,8 @@ const liveKeyOf = (m: ServerMemory) => m.identity.build, m.identity.gameServerId, m.identity.reservedSlots, + m.identity.restartTimeUtc, + m.identity.restartTimeUtcFile, m.startedAt, idsOf(m.players) ]); @@ -643,6 +689,7 @@ export async function observeServer(env: Env, m: ServerMemory, kinds: ObserveKin profiles: risk.profiles, performance: risk.performance, startedAt: m.startedAt, + restartTimeUtc: m.identity.restartTimeUtc, matchEnd, recovered: wasOffline, // the lines the match stage will write, for the broadcast's {mvp} and {top} diff --git a/src/lib/server/rotation-shuffle.ts b/src/lib/server/rotation-shuffle.ts index a44b53f6..6bcbbc22 100644 --- a/src/lib/server/rotation-shuffle.ts +++ b/src/lib/server/rotation-shuffle.ts @@ -1,9 +1,9 @@ // The Rotation shuffle rule. An Ordered rotation of every map, time of day and control zone starts // from the top at each game start, so a server plays the same few entries every day; a Random one // can put a map on several times in a row. Live builds change the rotation only through the config -// document, so the rule writes it in a new order once a run: in the last round before the 24-hour -// restart where it can see that coming, so the server comes back up on it, otherwise right after the -// restart; and once when the rule is saved. The maps take turns in the rule's order and each map's +// document, so the rule writes it in a new order once a run: in the last round before the server's +// next restart ($lib/uptime: daily at a time UTC, or 24 hours up) where it can see that coming, so +// the server comes back up on it, otherwise right after the restart; and once when the rule is saved. The maps take turns in the rule's order and each map's // control zones take turns ($lib/rotation-doc). Where a server goes next once its order changes has // not been seen, so the new order starts with the map after the one on and puts the entry on last // (a server that stays on its entry, or goes back to the top, then goes on from the top), is read @@ -69,7 +69,7 @@ const SAME_RUN_MS = 60_000; /** * One look at the server: whether to shuffle, and the state to keep (null: nothing changes). A rule * with no state (new, or switched on again) shuffles at once. After that, once a run: when the - * 24-hour restart is due (the round on is the last), for the next run to start on; or after a + * next restart is due (the round on is the last), for the next run to start on; or after a * restart that no shuffle was made for (one the rule could not see coming, or a second one in a * row), for the rest of that run. Nothing while the start is unknown. */ diff --git a/src/lib/server/servers.ts b/src/lib/server/servers.ts index f4c4826d..7eb16729 100644 --- a/src/lib/server/servers.ts +++ b/src/lib/server/servers.ts @@ -17,7 +17,7 @@ import { rolesOf } from './roles'; import { assertCanAddServer } from './orgs'; import { ensureServerLists, lockOrg } from './lists'; import { allowed, FEATURE_LABELS, NOT_ALLOWED, type PublicFeature } from '$lib/features'; -import { readRestartSchedule } from '$lib/uptime'; +import { readManualRestart } from '$lib/uptime'; export interface TargetFields { name?: string; @@ -288,16 +288,12 @@ export async function updateServer( if (!org) throw new ApiError(404, 'Organisation not found.', 'not_found'); Object.assign(set, publicSwitches(org, body)); } - // null goes back to the game's default; anything else must be a whole schedule + // An owner's own restart time, { time: 'HH:MM' } UTC; null hands the restart back to the game if (body.restartSchedule !== undefined) { - const schedule = - body.restartSchedule === null ? null : readRestartSchedule(body.restartSchedule); - if (body.restartSchedule !== null && !schedule) - throw new ApiError( - 400, - 'The restart schedule is not valid: hours from 1 to 168, or a time as HH:MM with a time zone such as America/Chicago.' - ); - set.restartSchedule = schedule; + const own = body.restartSchedule === null ? null : readManualRestart(body.restartSchedule); + if (body.restartSchedule !== null && !own) + throw new ApiError(400, 'The restart time is not valid: a UTC time from 00:00 to 23:59.'); + set.restartSchedule = own; } if (typeof body.password === 'string' && body.password) set.passwordEnc = encryptSecret(env, body.password); diff --git a/src/lib/server/trigger-rules.ts b/src/lib/server/trigger-rules.ts index e06d75ea..9d194bfa 100644 --- a/src/lib/server/trigger-rules.ts +++ b/src/lib/server/trigger-rules.ts @@ -142,9 +142,8 @@ export function pingKickStep( return { state: next, kicks }; } /** - * Tells players about the server's scheduled restart (its restart schedule, $lib/uptime: after so - * many hours up, or daily at a set time), which happens at the end of the round then in - * progress. Two broadcasts per game start: a heads-up `leadMinutes` before the window opens + * Tells players about the server's next restart ($lib/uptime's restartScheduleOf: daily at a + * time UTC, or 24 hours up), which happens at the end of the round then in progress. Two broadcasts per game start: a heads-up `leadMinutes` before the window opens * (0 = none) and `message` once it has, repeated every `repeatMinutes` while the round drags on * (0 = once). */ @@ -630,7 +629,7 @@ export function restartNoticeStage( startedAt: number; playerCount: number; now: number; - /** the server's restart schedule; null or undefined is the game's default */ + /** the server's restart schedule (restartScheduleOf); null or undefined is 24 hours up */ schedule?: RestartSchedule | null; } ): RestartNoticeStage | null { diff --git a/src/lib/server/triggers.test.ts b/src/lib/server/triggers.test.ts index 21b05220..743b5eb7 100644 --- a/src/lib/server/triggers.test.ts +++ b/src/lib/server/triggers.test.ts @@ -736,20 +736,19 @@ describe('restartNoticeStage', () => { expect(restartNoticeStage({ ...cfg, leadMinutes: 0 }, null, at(23.9))).toBeNull(); expect(restartNoticeStage({ ...cfg, leadMinutes: 0 }, null, at(24))!.stage).toBe('due'); }); - test('a daily schedule opens the window at its time of day, not 24 hours up', () => { - // the start is 19:00 the evening before in Chicago, so 07:00 there comes twelve hours later - const daily = { kind: 'daily', time: '07:00', timeZone: 'America/Chicago' } as const; - const on = (hours: number) => ({ ...at(hours), schedule: daily }); - const lead = restartNoticeStage(cfg, null, on(11.6))!; - expect(lead.stage).toBe('lead'); - expect(lead.minutes).toBe(24); - expect(restartNoticeStage(cfg, lead.state, on(12.1))!.stage).toBe('due'); - // the game's default would still be twelve hours off + test('a daily time opens the window at that time UTC, not 24 hours up', () => { + // the start is midnight UTC, so 12:00 UTC comes twelve hours later + for (const source of ['config', 'manual'] as const) { + const schedule = { kind: 'daily', time: '12:00', source } as const; + const on = (hours: number) => ({ ...at(hours), schedule }); + const lead = restartNoticeStage(cfg, null, on(11.6))!; + expect(lead.stage).toBe('lead'); + expect(lead.minutes).toBe(24); + expect(restartNoticeStage(cfg, lead.state, on(12.1))!.stage).toBe('due'); + } + // 24 hours up would still be twelve hours off expect(restartNoticeStage(cfg, null, at(12.1))).toBeNull(); }); - test('no scheduled restart, no notice', () => { - expect(restartNoticeStage(cfg, null, { ...at(200), schedule: { kind: 'none' } })).toBeNull(); - }); }); describe('team_kill', () => { diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index c8c05811..a8bca171 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -184,9 +184,9 @@ import { import { describeRestartSchedule, fmtUptime, - RESTART_AFTER_HOURS, restartScheduleOf, - restartWindow + restartWindow, + type RestartSchedule } from '$lib/uptime'; import { ROTATION_SHUFFLE, @@ -581,6 +581,8 @@ export interface TickContext { performance: Map; /** when the game process started (ms), from GET /v1/health; 0 while unknown */ startedAt: number; + /** RestartTimeUtc the process started with ("HH:MM", UTC); null or absent when unset */ + restartTimeUtc?: string | null; /** the match that ended between the previous look and this one, or null */ matchEnd: MatchEnd | null; /** the first look after the server was out of reach: what happened meanwhile is unknown (a match @@ -1412,7 +1414,7 @@ function evalRestartNotice( startedAt: ctx.startedAt, playerCount: ctx.status.playerCount, now: ctx.ts.getTime(), - schedule: restartScheduleOf(ctx.server.restartSchedule) + schedule: restartScheduleOf(ctx.server.restartSchedule, ctx.restartTimeUtc) }); if (!hit) return; const message = renderTemplate( @@ -1456,7 +1458,11 @@ function evalRotationShuffle( ) { const now = ctx.ts.getTime(); const w = ctx.startedAt - ? restartWindow(new Date(ctx.startedAt).toISOString(), RESTART_AFTER_HOURS, now) + ? restartWindow( + new Date(ctx.startedAt).toISOString(), + restartScheduleOf(ctx.server.restartSchedule, ctx.restartTimeUtc), + now + ) : null; const prev = rotationShuffleState(row.state); const step = shuffleStep(prev, { startedAt: ctx.startedAt, restartDue: !!w?.due }); @@ -1585,7 +1591,7 @@ function evalAfkProtection( * A Bounty rule at each look: a match end starts the runs over, and an open bounty lapses when the * match ends, when its player's session closes (gone past the leave grace, so a map change's empty * list is no leave), or at the first look after the server was out of reach (whatever happened - * meanwhile, its 24-hour restart among it, is unknown). Kills set and claim bounties as they arrive + * meanwhile, its restart among it, is unknown). Kills set and claim bounties as they arrive * (feed-events.ts). The bounty is let go here, before the look is written, so no kill claims it * meanwhile; a look whose write fails leaves it open on the rule's row only, where a restart reads * it back and the next look or claim lapses it (a claim checks the bounty's match). @@ -2112,6 +2118,10 @@ async function matchStartBefore(env: Env, serverId: string, from: Date): Promise ); } +/** A dry run's word on a daily restart time ("Restarts daily at 08:00 UTC, …. "); none for 24 hours up. */ +const restartsNote = (s: RestartSchedule): string => + s.kind === 'daily' ? `Restarts ${describeRestartSchedule(s)}. ` : ''; + /** Replays the last 24 hours of this server's history against a rule. Touches nobody. */ export async function dryRun( env: Env, @@ -2728,22 +2738,23 @@ export async function dryRun( if (kind === 'rotation_shuffle') { const c = cfg as RotationShuffleConfig; const [live] = await env.db - .select({ startedAt: serverLive.startedAt }) + .select({ startedAt: serverLive.startedAt, restartTimeUtc: serverLive.restartTimeUtc }) .from(serverLive) .where(eq(serverLive.serverId, server.id)) .limit(1); + const schedule = restartScheduleOf(server.restartSchedule, live?.restartTimeUtc); const w = live?.startedAt - ? restartWindow(live.startedAt.toISOString(), RESTART_AFTER_HOURS, to.getTime()) + ? restartWindow(live.startedAt.toISOString(), schedule, to.getTime()) : null; if (!w || !live?.startedAt) result.notes.push( 'The worker has not read this server’s uptime yet (GET /v1/health), so there is nothing to project.' ); else { - const dueAt = new Date(live.startedAt.getTime() + RESTART_AFTER_HOURS * 3600_000); - push(w.due ? to : dueAt, 'shuffle in the last round, for after the restart'); + push(w.due ? to : new Date(w.dueAt), 'shuffle in the last round, for after the restart'); + const restart = schedule.kind === 'daily' ? 'the daily restart' : 'the 24-hour restart'; result.notes.push( - `Up ${fmtUptime(w.upMs)}; ${w.due ? 'the 24-hour restart comes when this round ends' : `the 24-hour restart is due in ${fmtUptime(w.untilDueMs ?? 0)}`}. A restart that comes first (a set restart time, a crash, one from the host's panel) is followed by a shuffle once the server is back.` + `${restartsNote(schedule)}Up ${fmtUptime(w.upMs)}; ${w.due ? `${restart} comes when this round ends` : `${restart} is due in ${fmtUptime(w.untilDueMs ?? 0)}`}. A restart that comes first (a set restart time, a crash, one from the host's panel) is followed by a shuffle once the server is back.` ); } result.notes.push( @@ -2754,11 +2765,15 @@ export async function dryRun( if (kind === 'restart_notice') { const c = cfg as RestartNoticeConfig; const [live] = await env.db - .select({ startedAt: serverLive.startedAt, players: serverLive.playerCount }) + .select({ + startedAt: serverLive.startedAt, + players: serverLive.playerCount, + restartTimeUtc: serverLive.restartTimeUtc + }) .from(serverLive) .where(eq(serverLive.serverId, server.id)) .limit(1); - const schedule = restartScheduleOf(server.restartSchedule); + const schedule = restartScheduleOf(server.restartSchedule, live?.restartTimeUtc); const w = live?.startedAt ? restartWindow(live.startedAt.toISOString(), schedule, to.getTime()) : null; @@ -2768,12 +2783,6 @@ export async function dryRun( ); return result; } - if (w.dueAt === null) { - result.notes.push( - 'This server has no scheduled restart (Settings tab), so the rule never sends anything.' - ); - return result; - } const dueAt = new Date(w.dueAt); const v = dryRunVars(server.name, null, { players: live.players, @@ -2791,7 +2800,7 @@ export async function dryRun( `${w.due ? 'already ' : ''}broadcast: ${renderTemplate(c.message, { ...v, minutes: 0 }, MAX_CHAT)}` ); result.notes.push( - `Restart schedule: ${describeRestartSchedule(schedule)} (Settings tab). Up ${fmtUptime(w.upMs)}; the restart window ${w.due ? 'is open: the game restarts when this round ends' : `opens in ${fmtUptime(w.untilDueMs ?? 0)}`}. Times shown are the coming cycle, not a replay; each stage goes once per game start${c.repeatMinutes ? `, the main message again every ${c.repeatMinutes} min while the window stays open` : ''}, and only with at least ${c.minPlayers} on.` + `${restartsNote(schedule)}Up ${fmtUptime(w.upMs)}; the restart window ${w.due ? 'is open: the game restarts when this round ends' : `opens in ${fmtUptime(w.untilDueMs ?? 0)}`}. Times shown are the coming cycle, not a replay; each stage goes once per game start${c.repeatMinutes ? `, the main message again every ${c.repeatMinutes} min while the window stays open` : ''}, and only with at least ${c.minPlayers} on.` ); return result; } diff --git a/src/lib/server/webhook-status-core.test.ts b/src/lib/server/webhook-status-core.test.ts index fcc4e14b..bf2cac25 100644 --- a/src/lib/server/webhook-status-core.test.ts +++ b/src/lib/server/webhook-status-core.test.ts @@ -365,19 +365,22 @@ describe('uptime', () => { `Up since · 🔁 Restarts after this round` ); }); - test('a daily restart schedule says so from its time of day', () => { - // 06:30 in Chicago is 11:30 UTC, half an hour before opts.now, 23 hours into this start - const daily = { - ...server, - restartSchedule: { kind: 'daily', time: '06:30', timeZone: 'America/Chicago' } as const - }; + test("a daily time says so from that time UTC: an owner's own, else the config in effect", () => { + // 11:30 UTC is half an hour before opts.now, 23 hours into this start const started = '2026-09-12T13:00:00Z'; + const line = (srv: typeof server & { restartSchedule?: { time: string } }, over = {}) => + buildStatusEmbed(opts, srv, live({ startedAt: started, ...over })).fields?.at(-1)?.value; + expect(line(server)).not.toContain('Restarts'); + expect(line(server, { restartTimeUtc: '11:30' })).toContain('🔁 Restarts after this round'); + // only what the process started with counts, not a change waiting in the file + expect(line(server, { restartTimeUtcFile: '11:30' })).not.toContain('Restarts'); + expect(line({ ...server, restartSchedule: { time: '11:30' } })).toContain( + '🔁 Restarts after this round' + ); + // an owner's own time comes first expect( - buildStatusEmbed(opts, server, live({ startedAt: started })).fields?.at(-1)?.value + line({ ...server, restartSchedule: { time: '12:30' } }, { restartTimeUtc: '11:30' }) ).not.toContain('Restarts'); - expect( - buildStatusEmbed(opts, daily, live({ startedAt: started })).fields?.at(-1)?.value - ).toContain('🔁 Restarts after this round'); }); test('the start time and the restart note are in the change key; the ticking uptime is not', () => { const k = (now: number, at: string | null) => diff --git a/src/lib/server/webhook-status-core.ts b/src/lib/server/webhook-status-core.ts index ed130129..7ebf15b0 100644 --- a/src/lib/server/webhook-status-core.ts +++ b/src/lib/server/webhook-status-core.ts @@ -9,7 +9,7 @@ import { resolve } from 'node:path'; import type { FactionScore, LiveView, Player } from '$lib/types'; import { factionColor, fmtDuration, isMod, mapName, prettify, zoneLabel } from '$lib/format'; import { mapArtCandidates } from '$lib/map-art'; -import { restartWindow, type RestartSchedule } from '$lib/uptime'; +import { restartScheduleOf, restartWindow, type ManualRestart } from '$lib/uptime'; import { scoreCapOf } from '$lib/match'; import type { StatusStyle } from '$lib/status-styles'; import type { FeatureSet } from '$lib/features'; @@ -18,8 +18,8 @@ import type { DiscordPayload, Embed, EmbedField } from './webhook-delivery'; export interface StatusServer { id: string; name: string; - /** when the game restarts it; null or absent is the game's default */ - restartSchedule?: RestartSchedule | null; + /** an owner's own restart time; null or absent: the game decides */ + restartSchedule?: ManualRestart | null; } export interface StatusOptions { appName: string; @@ -334,7 +334,7 @@ function buildBody(opts: StatusOptions, server: StatusServer, live: LiveView | n const observedAt = live.observedAt; // Discord renders "9 hours ago" itself, so the uptime line needs no edit to stay right; the // restart note flips once, when the threshold passes. - const restart = restartWindow(live.startedAt, server.restartSchedule, opts.now); + const restart = restartWindow(live.startedAt, scheduleFor(server, live), opts.now); const upLine = restart ? `Up since ${relative(live.startedAt!)}${restart.due ? ' · 🔁 Restarts after this round' : ''}\n` : ''; @@ -409,13 +409,17 @@ function buildBody(opts: StatusOptions, server: StatusServer, live: LiveView | n }); } +/** The owner's own time, else RestartTimeUtc as the running process has it, else 24 hours up. */ +const scheduleFor = (server: StatusServer, live: LiveView) => + restartScheduleOf(server.restartSchedule, live.restartTimeUtc); + /** What an edit is for: everything shown except the clocks. */ function substance(server: StatusServer, live: LiveView | null, now: number): unknown { if (!live || !live.observedAt) return [server.id, server.name, 'waiting']; if (!live.ok || !live.status) return [server.id, server.name, 'down', live.error, live.gameServerId]; const s = live.status; - const restart = restartWindow(live.startedAt, server.restartSchedule, now); + const restart = restartWindow(live.startedAt, scheduleFor(server, live), now); return [ server.id, server.name, diff --git a/src/lib/server/webhook-status.ts b/src/lib/server/webhook-status.ts index 08489b1b..369497ff 100644 --- a/src/lib/server/webhook-status.ts +++ b/src/lib/server/webhook-status.ts @@ -14,7 +14,7 @@ import { liveView } from './live'; import { deleteDiscord, editDiscord, postDiscord, type PostResult } from './webhook-delivery'; import { cardLinks, statusMessage, type StatusServer } from './webhook-status-core'; import { effectiveFeatures, type FeatureSet } from '$lib/features'; -import { readRestartSchedule } from '$lib/uptime'; +import { readManualRestart } from '$lib/uptime'; export const STATUS_TICK_MS = 20_000; /** Re-edit an unchanged message this often so its embed timestamps do not drift into the past. */ @@ -112,7 +112,7 @@ export async function refreshStatusMessages(env: Env, now = Date.now()): Promise list.push({ id: server.id, name: server.name, - restartSchedule: readRestartSchedule(server.restartSchedule), + restartSchedule: readManualRestart(server.restartSchedule), features: effectiveFeatures(org, server) }); byOrg.set(server.orgId, list); diff --git a/src/lib/types.ts b/src/lib/types.ts index df6ea7d3..03411d62 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -3,7 +3,7 @@ import type { StatusStyle } from './status-styles'; import type { OrgRole } from '$lib/server/access'; import type { BuiltinRole, Capability } from '$lib/capabilities'; import type { BanReason } from '$lib/ban-reasons'; -import type { RestartSchedule } from '$lib/uptime'; +import type { ManualRestart } from '$lib/uptime'; export type { OrgRole, Capability, BuiltinRole }; @@ -66,8 +66,8 @@ export interface ServerInfo { publicLeaderboards: boolean; /** the public status page also carries the last kills */ publicKills: boolean; - /** when the game restarts it (see $lib/uptime); null runs on the game's default */ - restartSchedule: RestartSchedule | null; + /** an owner's own restart time (UTC), used instead of the game's; null: the game decides */ + restartSchedule: ManualRestart | null; /** what the site owner allows this server's organisation */ allowPublicStatus: boolean; allowPublicLeaderboards: boolean; @@ -148,6 +148,13 @@ export interface LiveView { * reserved players, on top of `status.maxPlayers`; null until the worker has read it */ reservedSlots: number | null; + /** + * RestartTimeUtc ("HH:MM", UTC) from the config document as the running process started with + * it, and as the document holds it now (in effect from the next restart); null when unset or + * not read yet + */ + restartTimeUtc?: string | null; + restartTimeUtcFile?: string | null; /** set while the listener has asked the panel to slow down (429 with Retry-After) */ throttledUntil: string | null; status: Status | null; diff --git a/src/lib/uptime.test.ts b/src/lib/uptime.test.ts index 3e8046c6..59486f83 100644 --- a/src/lib/uptime.test.ts +++ b/src/lib/uptime.test.ts @@ -3,162 +3,188 @@ import { DEFAULT_RESTART_SCHEDULE, describeRestartSchedule, fmtUptime, - MAX_RESTART_HOURS, - nextDailyAt, - readRestartSchedule, + nextUtcAt, + readManualRestart, restartScheduleOf, + restartTimeFromConfig, restartWindow } from './uptime'; const T0 = Date.parse('2026-09-14T00:00:00Z'); const H = 3600_000; +const ago = (hours: number) => new Date(T0 - hours * H).toISOString(); describe('restartWindow', () => { test('unknown start time is null', () => { - expect(restartWindow(null, 12, T0)).toBeNull(); - expect(restartWindow('', 12, T0)).toBeNull(); - expect(restartWindow('not a date', 12, T0)).toBeNull(); + expect(restartWindow(null, null, T0)).toBeNull(); + expect(restartWindow('', null, T0)).toBeNull(); + expect(restartWindow('not a date', null, T0)).toBeNull(); }); - test('before the threshold: a window that opens later', () => { - const w = restartWindow(new Date(T0 - 9 * H).toISOString(), 12, T0)!; - expect(w.upMs).toBe(9 * H); + test('before 24 hours up: a window that opens later', () => { + const w = restartWindow(ago(21), null, T0)!; + expect(w.upMs).toBe(21 * H); expect(w.due).toBe(false); expect(w.untilDueMs).toBe(3 * H); + expect(w.dueAt).toBe(T0 + 3 * H); }); - test('past the threshold: due, restarting after this round', () => { - const w = restartWindow(new Date(T0 - 12.5 * H).toISOString(), 12, T0)!; + test('past 24 hours up: due, restarting after this round', () => { + const w = restartWindow(ago(24.5), DEFAULT_RESTART_SCHEDULE, T0)!; expect(w.due).toBe(true); expect(w.untilDueMs).toBeNull(); - expect(w.upMs).toBe(12.5 * H); + expect(w.upMs).toBe(24.5 * H); }); test('exactly on the threshold counts as due', () => { - expect(restartWindow(new Date(T0 - 12 * H).toISOString(), 12, T0)!.due).toBe(true); - }); - test('no scheduled restart: uptime only', () => { - const w = restartWindow(new Date(T0 - 30 * H).toISOString(), 0, T0)!; - expect(w.due).toBe(false); - expect(w.untilDueMs).toBeNull(); - expect(w.upMs).toBe(30 * H); + expect(restartWindow(ago(24), null, T0)!.due).toBe(true); }); test('a start time in the future (clock skew) reads as just started', () => { - expect(restartWindow(new Date(T0 + 5000).toISOString(), 12, T0)!.upMs).toBe(0); + expect(restartWindow(new Date(T0 + 5000).toISOString(), null, T0)!.upMs).toBe(0); }); }); -describe('restartWindow on a daily schedule', () => { - // BisectHosting's daily restart, measured on a WARFORGE host 2026-09-23: 07:00 America/Chicago - // (12:00 UTC in daylight time), the round then in progress finishing first. - const daily = { kind: 'daily', time: '07:00', timeZone: 'America/Chicago' } as const; +describe('restartWindow on a daily time', () => { const at = (iso: string) => Date.parse(iso); + const daily = (time: string) => ({ kind: 'daily', time, source: 'config' }) as const; - test('the window opens at the next 07:00 after the game started, not 24 hours after it', () => { - const started = '2026-09-22T19:04:00Z'; - const before = restartWindow(started, daily, at('2026-09-23T11:30:00Z'))!; + test('the window opens at the first HH:MM UTC after the process started', () => { + const started = '2026-10-10T08:33:00Z'; + const before = restartWindow(started, daily('08:00'), at('2026-10-11T07:30:00Z'))!; + expect(before.dueAt).toBe(at('2026-10-11T08:00:00Z')); expect(before.due).toBe(false); - expect(before.dueAt).toBe(at('2026-09-23T12:00:00Z')); expect(before.untilDueMs).toBe(30 * 60_000); - const after = restartWindow(started, daily, at('2026-09-23T12:39:00Z'))!; + const after = restartWindow(started, daily('08:00'), at('2026-10-11T08:20:00Z'))!; expect(after.due).toBe(true); expect(after.untilDueMs).toBeNull(); }); - test('a game that starts after the time waits for the next day', () => { - const w = restartWindow('2026-09-23T12:40:03Z', daily, at('2026-09-23T13:44:00Z'))!; - expect(w.dueAt).toBe(at('2026-09-24T12:00:00Z')); - expect(w.due).toBe(false); - }); - test('a game started just before the time is due the same day', () => { - const w = restartWindow('2026-09-23T11:58:00Z', daily, at('2026-09-23T12:01:00Z'))!; - expect(w.dueAt).toBe(at('2026-09-23T12:00:00Z')); + test('a process started just before the time is due the same day', () => { + const w = restartWindow('2026-10-10T07:58:00Z', daily('08:00'), at('2026-10-10T08:01:00Z'))!; + expect(w.dueAt).toBe(at('2026-10-10T08:00:00Z')); expect(w.due).toBe(true); }); - test('the time follows the zone across a DST change', () => { - // US daylight time ends 2026-11-01: 07:00 Chicago is 13:00 UTC from then on - const w = restartWindow('2026-10-31T13:00:00Z', daily, at('2026-10-31T14:00:00Z'))!; - expect(w.dueAt).toBe(at('2026-11-01T13:00:00Z')); - }); - test('a time the clock skips lands an hour later', () => { - // 02:30 does not exist in Chicago on 2027-03-14; 03:30 CDT is 08:30 UTC - const w = restartWindow( - '2027-03-13T12:00:00Z', - { kind: 'daily', time: '02:30', timeZone: 'America/Chicago' }, - at('2027-03-13T13:00:00Z') - )!; - expect(w.dueAt).toBe(at('2027-03-14T08:30:00Z')); - }); - test('an ambiguous time takes its first occurrence', () => { - // 01:30 happens twice in Chicago on 2026-11-01; the first is 01:30 CDT, 06:30 UTC - expect(nextDailyAt(at('2026-10-31T12:00:00Z'), '01:30', 'America/Chicago')).toBe( - at('2026-11-01T06:30:00Z') - ); - }); - test('UTC and zones east of it', () => { - expect(nextDailyAt(at('2026-09-23T06:00:00Z'), '06:00', 'UTC')).toBe( - at('2026-09-24T06:00:00Z') - ); - expect(nextDailyAt(at('2026-09-23T01:00:00Z'), '04:00', 'Europe/Warsaw')).toBe( - at('2026-09-23T02:00:00Z') - ); + test('midnight, and a start on the minute waits for the next day', () => { + expect(nextUtcAt(at('2026-10-10T23:59:00Z'), '00:00')).toBe(at('2026-10-11T00:00:00Z')); + expect(nextUtcAt(at('2026-10-10T08:00:00Z'), '08:00')).toBe(at('2026-10-11T08:00:00Z')); + expect(nextUtcAt(at('2026-12-31T23:30:00Z'), '00:15')).toBe(at('2027-01-01T00:15:00Z')); }); }); -describe('restartWindow on other schedules', () => { - test('an uptime schedule of its own replaces the default', () => { - const w = restartWindow( - new Date(T0 - 13 * H).toISOString(), - { kind: 'uptime', hours: 12 }, - T0 - )!; - expect(w.due).toBe(true); - expect(w.dueAt).toBe(T0 - H); - }); - test('none: uptime only', () => { - const w = restartWindow(new Date(T0 - 30 * H).toISOString(), { kind: 'none' }, T0)!; - expect(w).toEqual({ upMs: 30 * H, due: false, untilDueMs: null, dueAt: null }); - }); - test('no schedule is the game default of 24 hours', () => { - expect(restartWindow(new Date(T0 - 23 * H).toISOString(), null, T0)!.due).toBe(false); - expect(restartWindow(new Date(T0 - 24 * H).toISOString(), undefined, T0)!.due).toBe(true); +describe('restartTimeFromConfig', () => { + const doc = (...lines: string[]) => lines.join('\r\n'); + const SECTION = '[/Script/WDGame.WDServerLifecycleSubsystem]'; + + test('reads RestartTimeUtc from its section, CRLF and all', () => { + expect( + restartTimeFromConfig( + doc( + '[/Script/WDGame.WDGameSession]', + 'ServerName=Test', + '', + SECTION, + 'RestartTimeUtc=08:00', + '' + ) + ) + ).toBe('08:00'); + }); + test('section and key in any case; one-digit hours; spaces and quotes', () => { + expect( + restartTimeFromConfig( + doc('[/script/wdgame.wdserverlifecyclesubsystem]', 'restarttimeutc=0:00') + ) + ).toBe('00:00'); + expect(restartTimeFromConfig(doc(SECTION, 'RestartTimeUtc = 7:05 '))).toBe('07:05'); + expect(restartTimeFromConfig(doc(SECTION, 'RestartTimeUtc="23:59"'))).toBe('23:59'); + }); + test('a header and the key on one line is not the setting: the game strips it', () => { + expect(restartTimeFromConfig(doc(`${SECTION} RestartTimeUtc=08:00`))).toBeNull(); + expect( + restartTimeFromConfig( + doc('[/Script/WDGame.WDGameSession]', 'ServerName=Test', `${SECTION} RestartTimeUtc=08:00`) + ) + ).toBeNull(); + }); + test('absent, elsewhere or not a time: not set', () => { + for (const text of [ + '', + doc('[/Script/WDGame.WDGameSession]', 'RestartTimeUtc=08:00'), + doc(SECTION), + doc(SECTION, 'RestartTimeUtc='), + doc(SECTION, 'RestartTimeUtc=24:00'), + doc(SECTION, 'RestartTimeUtc=08:60'), + doc(SECTION, 'RestartTimeUtc=8'), + doc(SECTION, 'RestartTimeUtc=08:00:00'), + doc(SECTION, 'RestartTimeUtc=morning'), + doc(SECTION, ';RestartTimeUtc=08:00') + ]) + expect(restartTimeFromConfig(text)).toBeNull(); + }); + test('only the time comes out of the document', () => { + const text = doc( + '[/Script/WDGame.WDRCONSettings]', + 'Password=hunter2-rcon', + SECTION, + 'RestartTimeUtc=06:30' + ); + expect(restartTimeFromConfig(text)).toBe('06:30'); }); }); -describe('readRestartSchedule', () => { - test('accepts the three kinds', () => { - expect(readRestartSchedule({ kind: 'none' })).toEqual({ kind: 'none' }); - expect(readRestartSchedule({ kind: 'uptime', hours: 12 })).toEqual({ - kind: 'uptime', - hours: 12 +describe('readManualRestart', () => { + test('a time from 00:00 to 23:59, nothing else kept', () => { + expect(readManualRestart({ time: '00:00' })).toEqual({ time: '00:00' }); + expect(readManualRestart({ time: '23:59' })).toEqual({ time: '23:59' }); + expect(readManualRestart({ time: '07:00', timeZone: 'America/Chicago' })).toEqual({ + time: '07:00' }); - expect( - readRestartSchedule({ kind: 'daily', time: ' 07:00 ', timeZone: 'America/Chicago' }) - ).toEqual({ kind: 'daily', time: '07:00', timeZone: 'America/Chicago' }); }); test('refuses anything else', () => { for (const bad of [ null, - 'daily', + '07:00', + [{ time: '07:00' }], {}, - { kind: 'weekly' }, - { kind: 'uptime', hours: 0 }, - { kind: 'uptime', hours: 1.5 }, - { kind: 'uptime', hours: MAX_RESTART_HOURS + 1 }, - { kind: 'daily', time: '7:00', timeZone: 'UTC' }, - { kind: 'daily', time: '24:00', timeZone: 'UTC' }, - { kind: 'daily', time: '07:00', timeZone: 'Central' }, - { kind: 'daily', time: '07:00' } + { time: '24:00' }, + { time: '7:00' }, + { time: '07:60' }, + { time: ' 07:00' }, + { time: '07:00:00' }, + { time: 700 }, + { kind: 'daily', time: '7am' } ]) - expect(readRestartSchedule(bad)).toBeNull(); + expect(readManualRestart(bad)).toBeNull(); }); - test('a server without a valid schedule runs on the default', () => { - expect(restartScheduleOf(null)).toEqual(DEFAULT_RESTART_SCHEDULE); - expect(restartScheduleOf({ kind: 'uptime', hours: -3 })).toEqual(DEFAULT_RESTART_SCHEDULE); +}); + +describe('restartScheduleOf', () => { + test("an owner's own time, else RestartTimeUtc in effect, else 24 hours up", () => { + expect(restartScheduleOf({ time: '07:00' }, '08:00')).toEqual({ + kind: 'daily', + time: '07:00', + source: 'manual' + }); + expect(restartScheduleOf(null, '08:00')).toEqual({ + kind: 'daily', + time: '08:00', + source: 'config' + }); + expect(restartScheduleOf(null, null)).toEqual({ kind: 'uptime' }); + expect(restartScheduleOf(undefined, undefined)).toEqual(DEFAULT_RESTART_SCHEDULE); + }); + test('a stored value that is not one falls through', () => { + expect(restartScheduleOf({ time: '25:00' }, '08:00')).toEqual({ + kind: 'daily', + time: '08:00', + source: 'config' + }); + expect(restartScheduleOf('07:00', 'soon')).toEqual({ kind: 'uptime' }); }); test('describes itself', () => { - expect(describeRestartSchedule({ kind: 'uptime', hours: 24 })).toBe('after 24 hours up'); - expect(describeRestartSchedule({ kind: 'uptime', hours: 1 })).toBe('after 1 hour up'); - expect( - describeRestartSchedule({ kind: 'daily', time: '07:00', timeZone: 'America/Chicago' }) - ).toBe('daily at 07:00 America/Chicago'); - expect(describeRestartSchedule({ kind: 'none' })).toBe('none'); + expect(describeRestartSchedule({ kind: 'uptime' })).toBe('after 24 hours up'); + expect(describeRestartSchedule(restartScheduleOf(null, '08:00'))).toBe( + 'daily at 08:00 UTC, from RestartTimeUtc in the config' + ); + expect(describeRestartSchedule(restartScheduleOf({ time: '07:00' }, null))).toBe( + 'daily at 07:00 UTC, set on the Settings tab' + ); }); }); diff --git a/src/lib/uptime.ts b/src/lib/uptime.ts index 333fa554..2ad3b35e 100644 --- a/src/lib/uptime.ts +++ b/src/lib/uptime.ts @@ -1,173 +1,115 @@ -// How long the game process has been up, and where that sits against the server's scheduled -// restart. WARDOGS restarts a server on a schedule, but not on the mark: the restart happens when -// the round in progress ends. So once the scheduled time passes the server is "restarting after -// this round", and before it there is a window that opens in so many minutes. The worker derives -// `startedAt` from `uptimeSeconds` on GET /v1/health; the header, the status cards and the -// Restart notice rule read this. +// How long the game process has been up, and where that sits against the server's next restart. +// WARDOGS does not restart on the mark: the restart happens when the round in progress ends. So +// once the time passes the server is "restarting after this round", and before it there is a +// window that opens in so many minutes. The worker derives `startedAt` from `uptimeSeconds` on +// GET /v1/health; the header, the status cards and the rules read this. // -// What the schedule is depends on the host, so it is a per-server setting (`restart_schedule`): -// - uptime: once the process has been up so many hours (the game's own restart, 24 by default, -// twelve before September 2026). -// - daily: at a time of day the host lets the owner pick (BisectHosting since September 2026), -// in the host's time zone. The round then in progress still finishes first. -// - none: no scheduled restart; the uptime shows, nothing else. - -/** Hours of uptime after which WARDOGS restarts a server that has no schedule of its own. */ +// When the restart comes, in order (restartScheduleOf): +// - an owner's own time, set on the Settings tab: daily at HH:MM UTC (`servers.restart_schedule`); +// - the game's own daily time, `RestartTimeUtc=HH:MM` (UTC) in the config document's +// [/Script/WDGame.WDServerLifecycleSubsystem] section, as the running process read it when it +// started (the setting takes effect at the next restart; `server_live.restart_time_utc`); +// - else the game's default: once the process has been up 24 hours. +import { getScalar, parseIni } from './config-doc'; + +/** Hours of uptime after which WARDOGS restarts a server that has no daily time. Fixed in the game. */ export const RESTART_AFTER_HOURS = 24; -/** `daily`'s time is "HH:MM" on a 24-hour clock, its zone an IANA name such as America/Chicago. */ +/** The longest a restart notice's heads-up may lead by: just under a cycle. */ +export const MAX_RESTART_LEAD_MINUTES = RESTART_AFTER_HOURS * 60 - 1; + +/** What a server's next restart is reckoned from; `time` is "HH:MM" UTC. */ export type RestartSchedule = - | { kind: 'uptime'; hours: number } - | { kind: 'daily'; time: string; timeZone: string } - | { kind: 'none' }; - -/** What a server with no `restart_schedule` of its own gets. */ -export const DEFAULT_RESTART_SCHEDULE: RestartSchedule = { - kind: 'uptime', - hours: RESTART_AFTER_HOURS -}; - -/** The longest uptime schedule a server may set: a week. */ -export const MAX_RESTART_HOURS = 168; - -/** The longest a restart notice's heads-up may lead by: just under a day, the longest daily cycle. */ -export const MAX_RESTART_LEAD_MINUTES = 24 * 60 - 1; - -const TIME = /^([01]\d|2[0-3]):([0-5]\d)$/; - -export function isTimeZone(tz: string): boolean { - if (!tz) return false; - try { - new Intl.DateTimeFormat('en-US', { timeZone: tz }); - return true; - } catch { - return false; - } -} + { kind: 'uptime' } | { kind: 'daily'; time: string; source: 'config' | 'manual' }; -/** A stored or submitted schedule, checked; null when it is missing or not a schedule. */ -export function readRestartSchedule(raw: unknown): RestartSchedule | null { - if (!raw || typeof raw !== 'object') return null; - const r = raw as Record; - if (r.kind === 'none') return { kind: 'none' }; - if (r.kind === 'uptime') { - const hours = Number(r.hours); - return Number.isInteger(hours) && hours >= 1 && hours <= MAX_RESTART_HOURS - ? { kind: 'uptime', hours } - : null; - } - if (r.kind === 'daily') { - const time = typeof r.time === 'string' ? r.time.trim() : ''; - const timeZone = typeof r.timeZone === 'string' ? r.timeZone.trim() : ''; - return TIME.test(time) && isTimeZone(timeZone) ? { kind: 'daily', time, timeZone } : null; - } - return null; +/** The game's default: 24 hours up. */ +export const DEFAULT_RESTART_SCHEDULE: RestartSchedule = { kind: 'uptime' }; + +/** An owner's own restart time, as `servers.restart_schedule` holds it and the API takes it. */ +export interface ManualRestart { + /** "HH:MM", UTC */ + time: string; } -/** The schedule a server runs on: its own, else the game's default. */ -export const restartScheduleOf = (raw: unknown): RestartSchedule => - readRestartSchedule(raw) ?? DEFAULT_RESTART_SCHEDULE; +const TIME = /^([01]\d|2[0-3]):[0-5]\d$/; -/** "after 24 hours up", "daily at 07:00 America/Chicago", "none". */ -export function describeRestartSchedule(s: RestartSchedule): string { - if (s.kind === 'uptime') return `after ${s.hours} hour${s.hours === 1 ? '' : 's'} up`; - if (s.kind === 'daily') return `daily at ${s.time} ${s.timeZone}`; - return 'none'; +/** An owner's own time, checked: `{ time: "HH:MM" }` from 00:00 to 23:59; null for anything else. */ +export function readManualRestart(raw: unknown): ManualRestart | null { + if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return null; + const time = (raw as Record).time; + return typeof time === 'string' && TIME.test(time) ? { time } : null; } -/** Milliseconds `timeZone` is ahead of UTC at the instant `at`. */ -function zoneOffsetMs(timeZone: string, at: number): number { - const parts = new Intl.DateTimeFormat('en-US', { - timeZone, - hourCycle: 'h23', - year: 'numeric', - month: 'numeric', - day: 'numeric', - hour: 'numeric', - minute: 'numeric', - second: 'numeric' - }).formatToParts(at); - const n = (type: string) => Number(parts.find((p) => p.type === type)?.value); - const wall = Date.UTC( - n('year'), - n('month') - 1, - n('day'), - n('hour') % 24, - n('minute'), - n('second') - ); - return wall - Math.floor(at / 1000) * 1000; +const S_LIFECYCLE = '/Script/WDGame.WDServerLifecycleSubsystem'; +const RESTART_TIME_KEY = 'RestartTimeUtc'; + +/** + * RestartTimeUtc in a config document, as "HH:MM"; null when the document does not set it, or not + * as a time. Section and key match in any case, as the game reads them; a header and the key on + * one line is a key of the section above, which the game strips, so it is not the setting. + */ +export function restartTimeFromConfig(text: string): string | null { + const raw = getScalar(parseIni(text), S_LIFECYCLE, RESTART_TIME_KEY); + const m = raw === null ? null : /^(\d{1,2}):(\d{2})$/.exec(raw.trim()); + if (!m || Number(m[1]) > 23 || Number(m[2]) > 59) return null; + return `${m[1].padStart(2, '0')}:${m[2]}`; } /** - * The first moment after `after` that the clock in `timeZone` reads `time`. A time that does not - * exist on a spring-forward day lands an hour later, the way the clock itself skips it. + * The schedule a server runs on: an owner's own time, else RestartTimeUtc as the running process + * read it, else 24 hours up. */ -export function nextDailyAt(after: number, time: string, timeZone: string): number { +export function restartScheduleOf( + manual: unknown, + inEffect: string | null | undefined +): RestartSchedule { + const own = readManualRestart(manual); + if (own) return { kind: 'daily', time: own.time, source: 'manual' }; + if (inEffect && TIME.test(inEffect)) return { kind: 'daily', time: inEffect, source: 'config' }; + return DEFAULT_RESTART_SCHEDULE; +} + +/** "after 24 hours up", "daily at 08:00 UTC, from RestartTimeUtc in the config", … */ +export function describeRestartSchedule(s: RestartSchedule): string { + if (s.kind === 'uptime') return `after ${RESTART_AFTER_HOURS} hours up`; + return `daily at ${s.time} UTC, ${s.source === 'config' ? 'from RestartTimeUtc in the config' : 'set on the Settings tab'}`; +} + +/** The first moment after `after` that the UTC clock reads `time`. */ +export function nextUtcAt(after: number, time: string): number { const [hh, mm] = time.split(':').map(Number); - const local = new Date(after + zoneOffsetMs(timeZone, after)); - for (let day = 0; day <= 2; day++) { - const wall = Date.UTC( - local.getUTCFullYear(), - local.getUTCMonth(), - local.getUTCDate() + day, - hh, - mm - ); - // The offset at the guess, then at the answer: when a DST change falls between them, the - // answer with its own offset is the real one, and with neither (a skipped time) the later. - let at = wall - zoneOffsetMs(timeZone, wall); - const off = zoneOffsetMs(timeZone, at); - if (wall - off !== at) { - const alt = wall - off; - at = zoneOffsetMs(timeZone, alt) === off ? alt : Math.max(at, alt); - } - if (at > after) return at; - } - // unreachable for a real zone: the time recurs within two days - return after + 24 * 3600_000; + const d = new Date(after); + const at = Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), hh, mm); + return at > after ? at : at + 24 * 3600_000; } export interface RestartWindow { /** milliseconds since the game process started */ upMs: number; - /** the scheduled time has passed: the server restarts when the current round ends */ + /** the time has passed: the server restarts when the current round ends */ due: boolean; - /** milliseconds until the scheduled time; null when due, or when no restart is scheduled */ + /** milliseconds until the time; null when due */ untilDueMs: number | null; - /** when the window opens (ms since the epoch) for this game start; null when none is scheduled */ - dueAt: number | null; + /** when the window opens for this game start (ms since the epoch) */ + dueAt: number; } /** Shown as "restart window in …" once the threshold is this close. */ export const RESTART_SOON_MS = 60 * 60_000; -/** - * null when the start time is unknown. `schedule` is the server's schedule; a number is hours of - * uptime, 0 meaning no scheduled restart (tests), and null or undefined the game's default. - */ +/** null when the start time is unknown; no schedule is the game's default. */ export function restartWindow( startedAt: string | null | undefined, - schedule: RestartSchedule | number | null | undefined, + schedule: RestartSchedule | null | undefined, now: number ): RestartWindow | null { if (!startedAt) return null; const started = Date.parse(startedAt); if (!Number.isFinite(started)) return null; const upMs = Math.max(0, now - started); - const s: RestartSchedule = - typeof schedule === 'number' - ? schedule > 0 - ? { kind: 'uptime', hours: schedule } - : { kind: 'none' } - : (schedule ?? DEFAULT_RESTART_SCHEDULE); + const s = schedule ?? DEFAULT_RESTART_SCHEDULE; const dueAt = - s.kind === 'uptime' - ? started + s.hours * 3600_000 - : s.kind === 'daily' - ? nextDailyAt(started, s.time, s.timeZone) - : null; - if (dueAt === null) return { upMs, due: false, untilDueMs: null, dueAt: null }; + s.kind === 'daily' ? nextUtcAt(started, s.time) : started + RESTART_AFTER_HOURS * 3600_000; const untilDueMs = dueAt - now; return untilDueMs <= 0 ? { upMs, due: true, untilDueMs: null, dueAt } diff --git a/src/routes/(app)/server/[id]/+layout.server.ts b/src/routes/(app)/server/[id]/+layout.server.ts index 9d73ae9e..91c6c42a 100644 --- a/src/routes/(app)/server/[id]/+layout.server.ts +++ b/src/routes/(app)/server/[id]/+layout.server.ts @@ -5,7 +5,7 @@ import { getOrg, getServer, requireUser, serverAccessFor, shapeServer } from '$l import { publicMessage } from '$lib/server/http'; import { gateway } from '$lib/server/gateway'; import { cachedCatalog, rememberCatalog } from '$lib/server/catalog-cache'; -import type { Occupancy } from '$lib/health.svelte'; +import type { Identity, Occupancy } from '$lib/health.svelte'; import type { Catalog, Features, ServerInfo } from '$lib/types'; const EMPTY: Catalog = { maps: [], lightings: [], experiences: [] }; @@ -59,10 +59,12 @@ export const load: LayoutServerLoad = async ({ params, locals }) => { } // What the worker last learned about the build: never a game request from a page load, and // never a reason for the page to fail (the worker may be down or the relay slow). - let identity: { build: string; gameServerId: string; startedAt: string | null } = { + let identity: Identity = { build: '', gameServerId: '', - startedAt: null + startedAt: null, + restartTimeUtc: null, + restartTimeUtcFile: null }; let occupancy: Occupancy | null = null; try { @@ -70,7 +72,9 @@ export const load: LayoutServerLoad = async ({ params, locals }) => { identity = { build: live?.build ?? '', gameServerId: live?.gameServerId ?? '', - startedAt: live?.startedAt ?? null + startedAt: live?.startedAt ?? null, + restartTimeUtc: live?.restartTimeUtc ?? null, + restartTimeUtcFile: live?.restartTimeUtcFile ?? null }; if (live?.ok && live.status) occupancy = { players: live.status.playerCount, max: live.status.maxPlayers }; diff --git a/src/routes/(app)/server/[id]/+layout.svelte b/src/routes/(app)/server/[id]/+layout.svelte index a5776948..8065fe48 100644 --- a/src/routes/(app)/server/[id]/+layout.svelte +++ b/src/routes/(app)/server/[id]/+layout.svelte @@ -8,7 +8,7 @@ import Badge from '$lib/components/Badge.svelte'; import RoleBadge from '$lib/components/RoleBadge.svelte'; import { toast } from '$lib/toast.svelte'; - import { fmtUptime, restartWindow, RESTART_SOON_MS } from '$lib/uptime'; + import { fmtUptime, restartScheduleOf, restartWindow, RESTART_SOON_MS } from '$lib/uptime'; import type { LayoutProps } from './$types'; let { data, children }: LayoutProps = $props(); @@ -75,7 +75,13 @@ return () => clearInterval(t); }); let restart = $derived( - live === false ? null : restartWindow(ident.startedAt, data.server.restartSchedule, now) + live === false + ? null + : restartWindow( + ident.startedAt, + restartScheduleOf(data.server.restartSchedule, ident.restartTimeUtc), + now + ) ); let slowed = $derived(!!throttled[data.server.id]); diff --git a/src/routes/(app)/server/[id]/automation/+page.svelte b/src/routes/(app)/server/[id]/automation/+page.svelte index 0d904f50..28d6716e 100644 --- a/src/routes/(app)/server/[id]/automation/+page.svelte +++ b/src/routes/(app)/server/[id]/automation/+page.svelte @@ -26,6 +26,7 @@ import { watchLive } from '$lib/live'; import { RULE_KINDS } from '$lib/rule-kinds'; import RulePicker from '$lib/components/RulePicker.svelte'; + import { identity } from '$lib/health.svelte'; import { restartScheduleOf } from '$lib/uptime'; import type { DryRunResult, @@ -39,7 +40,16 @@ let { data }: PageProps = $props(); let id = $derived(data.server.id); let admin = $derived(can(data.server.caps, 'automation.manage')); - let restartSchedule = $derived(restartScheduleOf(data.server.restartSchedule)); + let restartNote = $derived.by(() => { + const s = restartScheduleOf( + data.server.restartSchedule, + (identity[data.server.id] ?? data.identity).restartTimeUtc + ); + if (s.kind === 'uptime') + return 'The game restarts 24 hours after it started, once the round then in progress ends.'; + const from = s.source === 'config' ? 'RestartTimeUtc in its config' : 'set on the Settings tab'; + return `The game restarts daily at ${s.time} UTC (${from}), once the round then in progress ends.`; + }); let path = $derived(`/api/servers/${encodeURIComponent(id)}/triggers`); /** A risk_kick rule's score threshold, 0 when off; rules saved with a level read as 20 or 50. */ @@ -1612,9 +1622,9 @@
When

- Once when you save it, then once a day: in the last round before the 24-hour restart, - so the server comes back up on a new order, or straight after a restart it could not - see coming. + Once when you save it, then once a day: in the last round before the scheduled + restart, so the server comes back up on a new order, or straight after a restart it + could not see coming.

@@ -1686,16 +1696,7 @@

{@render placeholders('restart_notice', [f.leadMessage, f.message])}

- {#if restartSchedule.kind === 'uptime'} - The game restarts this server {restartSchedule.hours} hours after it started, once the round - then in progress ends. - {:else if restartSchedule.kind === 'daily'} - The host restarts this server daily at {restartSchedule.time} ({restartSchedule.timeZone}), - once the round then in progress ends. - {:else} - This server has no scheduled restart, so this rule sends nothing. - {/if} - The schedule is set on the Settings tab. + {restartNote} See Game restart on the Settings tab.

{:else if f.kind === 'match_broadcast'}
diff --git a/src/routes/(app)/server/[id]/settings/RestartSchedule.svelte b/src/routes/(app)/server/[id]/settings/RestartSchedule.svelte index 760b1c9e..9c21b654 100644 --- a/src/routes/(app)/server/[id]/settings/RestartSchedule.svelte +++ b/src/routes/(app)/server/[id]/settings/RestartSchedule.svelte @@ -1,81 +1,34 @@ +{#snippet expected()} +
+ +
+
+ {#if schedule.kind === 'uptime'} + After 24 hours up + · the game's default; the round in progress finishes first + {:else} + Daily at {schedule.time} UTC + · {schedule.source === 'manual' + ? 'set here' + : data.server.manager + ? "from this server's config file (RestartTimeUtc)" + : "from this server's config file"}; the round in progress finishes first + {/if} +
+ {#if next?.due} +
The restart window is open: the server restarts when this round ends.
+ {:else if next} +
Next restart window: {when(next.dueAt)}, in {span(next.untilDueMs ?? 0)}.
+ {/if} + {#if pending !== undefined} +
+ {#if pending} + Changed in the file to {pending} UTC: the server uses it from its next restart. + {:else} + Taken out of the file: the server goes back to 24 hours up from its next restart. + {/if} +
+ {/if} + {#if data.server.manager && (fromConfig || pending !== undefined)} +
+ Set it on the Config page. +
+ {/if} +
+
+{/snippet} +
Game restart

- Restarts {describeRestartSchedule(schedule)}; the round in progress finishes first. + When this server restarts on its own. The header countdown, the status cards and the Restart + notice rule follow it.

{#if !data.server.manager} + {@render expected()}

Only an owner of {data.server.orgName} can change this.

{:else}
+ {@render expected()}
+

Used instead of the server's own setting.

{/if} - +
+ + {#if saved === null}game default{/if} +
{/if} From bbbd175b7f4c2b7be53bbc643d92d760408e6f0f Mon Sep 17 00:00:00 2001 From: James Causon Date: Sat, 10 Oct 2026 00:00:37 +0100 Subject: [PATCH 096/102] README: Game restart, a time set here, RestartTimeUtc or 24 hours up --- README.md | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c266f5b3..32f6de36 100644 --- a/README.md +++ b/README.md @@ -671,8 +671,8 @@ rule at most, so once it has one, picking that kind opens the rule it has. | Restart notice | Broadcasts a heads-up N minutes before the server's scheduled restart and a message once it is due, optionally repeated every N minutes while the round drags on, with at least N players on. The restart itself lands when the round in progress ends. Follows the server's [game restart](#game-restart) schedule. Besides the server's placeholders, `{minutes}` gives the time to the restart window. | | Seeding reward | Time a player spends on with at most N players counts as seed time, by default banked only once the server has filled (a count the rule sets, else the limit the server reports) with the player still on, so staying until the threshold and leaving, or a few minutes on an empty server, earns nothing (a switch on the rule counts every low minute instead); M minutes of it over the sessions that ended in the last D days earns a reserved slot for E days, with an optional whisper: on this server only (its own reserved-slot list, which needs the Reserved slots capability) or on every server in the organisation (the org list, which needs Org reserved slots), chosen on the rule. The seeded server applies it at once and, for an org-wide slot, the other servers at their next sync; it lapses on its own and can be earned again; players who already hold a slot here are skipped. Seed time is kept on each session, so the dossier (a total, per server and per session, and the player's progress toward the reward for _Automation_ holders), the leaderboard's Seed time column and the dry run show it. | | AFK protection | While the server seeds (someone on, fewer than the rule's count, 20 by default, and no side has scored), kills everyone on every N minutes (3 by default, 2 to 10), so the game's idle kick, which also runs while a server waits for its players, does not remove the seeders. The panel cannot tell who is idle, so players are killed too. Set the count no higher than the players the server's match starts at. A side scoring or the count being reached turns it off until the server has sat empty for 10 minutes or the game restarts, so a dip below the count mid-match, or the empty list of a map change, never starts it again; switched off and on, it starts from what the server shows then, so switching it on during a match nobody has scored in yet takes that match for seeding until the first score. Switching it off drops a round not yet sent. Its row says whether it is active or paused, and why. Optional broadcasts after each round and once when the match it kept the seeders for goes live (`{goal}` is the count it turns off at). A round is one action in the trail, kept off Discord unless it fails; it goes only within 30 seconds of being decided, while the last look still showed the server seeding, and players who left since are passed over. One rule per server. | -| Bounty | Puts a bounty on a player who gets N kills in a row without dying in one match (15 by default) while at least M players are on (20 by default), and announces it to the server. A run is the match page's Best streak: a kill of another player adds to it, a team kill or a suicide does not, and any death ends it. One bounty is open at a time; once it ends, the next goes to whoever is on a run of N or more, at their next kill. The first enemy to kill the marked player claims it: the claim can be announced and the claimer whispered, and they get a reserved slot for D days on this server or on every server in the organisation, or nothing but the announcement. A team kill, a suicide or the environment never ends a bounty, nor a kill between players whose sides the panel has not seen, so nobody clears their own or has a friend do it. It lapses when the marked player leaves (gone past the minute's leave grace, so the empty list of a map change is no leave), when the match ends, or when the panel has lost sight of the server for a few looks (its own 24-hour restart is one such time), and runs start over when the panel sees the match end. A claimer who already holds a slot on that list keeps whichever lasts longer. The open bounty shows on the rule's row and outlives a worker restart, which forgets the runs (one from a match that ended meanwhile lapses at the next kill of its player); saving the rule or switching it off calls it off. A **Bounties** box on a [Discord webhook](#discord-webhooks) posts a card when one is set, claimed or lapses, with names and never a SteamID, for a players' channel. Needs the [kill feed](#kill-feed), acted on as each kill arrives; like every feed rule it believes the feed, and a friend on the other side can claim a bounty. The dry run replays the day's kills against the player counts of the server's samples. One rule per server. | -| Rotation shuffle | Puts the rotation in a new order once a day. An Ordered rotation of every map, time of day and control zone starts from the top after each restart, so the server plays the same entries every day; a Random one can put a map on several times in a row. The maps take turns in the order the rule sets, every match a different map (Ozeti, Bakurani, Zestafona, Ozeti…); among each map's own entries its control zones take turns and its times of day come in a new order. Whole rounds of the maps run for as long as the rest can still be kept apart, so a map with fewer entries drops out only near the end of the list, and a map with more than half the entries plays in runs as even as they can be. The rule writes the rotation in the config document (its entries, and the mode set to Ordered; against the revision read, once more after a conflict) once when it is saved, then once a run: in the last round before the 24-hour restart (from the uptime the header shows), so the server comes back up on the new order starting with the map that follows the one on, or straight after a restart it could not see coming (a set restart time, a crash, one from the host's panel). Where a live server goes next when its rotation is rewritten mid-match has not been seen, so the new order is turned, by less than a round, to put the map that follows the one on wherever the server may take its next entry from; the server's rotation is then read back, and turned once more if it does not have that map next. The result names the maps and the next one, and a refusal is told in the panel's own words. A rotation that is switched off, or has fewer than two entries, is left alone, and a shuffle the server refuses is not sent again before the next one is due. Its preview shows when the next shuffle is due. One rule per server. | +| Bounty | Puts a bounty on a player who gets N kills in a row without dying in one match (15 by default) while at least M players are on (20 by default), and announces it to the server. A run is the match page's Best streak: a kill of another player adds to it, a team kill or a suicide does not, and any death ends it. One bounty is open at a time; once it ends, the next goes to whoever is on a run of N or more, at their next kill. The first enemy to kill the marked player claims it: the claim can be announced and the claimer whispered, and they get a reserved slot for D days on this server or on every server in the organisation, or nothing but the announcement. A team kill, a suicide or the environment never ends a bounty, nor a kill between players whose sides the panel has not seen, so nobody clears their own or has a friend do it. It lapses when the marked player leaves (gone past the minute's leave grace, so the empty list of a map change is no leave), when the match ends, or when the panel has lost sight of the server for a few looks (its daily restart is one such time), and runs start over when the panel sees the match end. A claimer who already holds a slot on that list keeps whichever lasts longer. The open bounty shows on the rule's row and outlives a worker restart, which forgets the runs (one from a match that ended meanwhile lapses at the next kill of its player); saving the rule or switching it off calls it off. A **Bounties** box on a [Discord webhook](#discord-webhooks) posts a card when one is set, claimed or lapses, with names and never a SteamID, for a players' channel. Needs the [kill feed](#kill-feed), acted on as each kill arrives; like every feed rule it believes the feed, and a friend on the other side can claim a bounty. The dry run replays the day's kills against the player counts of the server's samples. One rule per server. | +| Rotation shuffle | Puts the rotation in a new order once a day. An Ordered rotation of every map, time of day and control zone starts from the top after each restart, so the server plays the same entries every day; a Random one can put a map on several times in a row. The maps take turns in the order the rule sets, every match a different map (Ozeti, Bakurani, Zestafona, Ozeti…); among each map's own entries its control zones take turns and its times of day come in a new order. Whole rounds of the maps run for as long as the rest can still be kept apart, so a map with fewer entries drops out only near the end of the list, and a map with more than half the entries plays in runs as even as they can be. The rule writes the rotation in the config document (its entries, and the mode set to Ordered; against the revision read, once more after a conflict) once when it is saved, then once a run: in the last round before the server's [game restart](#game-restart) (timed from the uptime the header shows), so the server comes back up on the new order starting with the map that follows the one on, or straight after a restart it could not see coming (a set restart time, a crash, one from the host's panel). Where a live server goes next when its rotation is rewritten mid-match has not been seen, so the new order is turned, by less than a round, to put the map that follows the one on wherever the server may take its next entry from; the server's rotation is then read back, and turned once more if it does not have that map next. The result names the maps and the next one, and a refusal is told in the panel's own words. A rotation that is switched off, or has fewer than two entries, is left alone, and a shuffle the server refuses is not sent again before the next one is due. Its preview shows when the next shuffle is due. One rule per server. | **Dry run** replays the last 24 hours of the server's own history (joins, player counts, empty stretches, cached Steam data) against a rule and lists what it would have done, so you can tune a @@ -942,13 +942,23 @@ The purge is audited with the counts. ### Game restart -A WARDOGS server restarts itself on a schedule, always at the end of the round then in progress. -Which schedule depends on the host, so an org owner sets it per server under **Game restart** on -the Settings tab: after N hours up (the game's own restart, 24 unless set; it was twelve before -September 2026), daily at a time in a time zone (hosts that let you pick the time, such as -BisectHosting: enter the time and zone their panel shows, e.g. `07:00` `America/Chicago`; -daylight saving is followed), or none. The header's restart countdown, the status cards' -"Restarts after this round" and the Restart notice rule all follow it. +A WARDOGS server restarts itself when the round in progress ends, once its restart time has come. +The header's restart countdown, the status cards' "Restarts after this round" and the Restart +notice and Rotation shuffle rules follow that time, which Warcon takes from the first of these: + +1. **A time set here.** An org owner can tick _Set the restart time myself_ under **Game restart** + on the server's Settings tab and give a daily time in UTC. It is used instead of the server's + own setting, for a host that restarts the server from its own panel at a set time. +2. **The server's config.** `RestartTimeUtc=HH:MM` (UTC) in the + `[/Script/WDGame.WDServerLifecycleSubsystem]` section of `ServerSettings.ini` restarts the game + daily at that time. The game reads it when it starts, so a change applies from the next + restart: Warcon reads it with its hourly look at the server's settings and reads the settings + again just after each restart, keeps the time the running server started with apart from what + the file says now, and the panel shows a change waiting for the next restart. Set it on the Config tab. +3. **24 hours up**, the game's default when neither is set. + +Under **Game restart** everyone who can open the server sees which of the three applies and when +the next window opens, in UTC and in their own time. ### Public pages @@ -1127,7 +1137,9 @@ for a list of servers too long for a URL, and `?slim=1` leaves out each server's what the panel's own pages show and costs the game server nothing. By default the panel reads the players every two seconds and the status every five while people are on, and looks at an empty server every thirty seconds; `observedAt` -says when it last looked. Poll this rather than the game actions. `GET /api/servers/:id/summary` +says when it last looked. `restartTimeUtc` is the daily restart time the running server started +with and `restartTimeUtcFile` the one its config holds now, from the next restart (see +[Game restart](#game-restart)); null when not set. Poll this rather than the game actions. `GET /api/servers/:id/summary` answers the same for one server, with the key's capabilities there (its `ok` is the server's, as in the live view). @@ -1179,6 +1191,8 @@ the live view). ], "statusAt": "2026-09-24T13:00:59.215Z", "playersAt": "2026-09-24T13:00:58.213Z", + "restartTimeUtc": null, + "restartTimeUtcFile": "08:00", "observedAt": "2026-09-24T13:00:59.215Z" } } From e360b44c94240cd5fb4fad3f3e5692b808d86e09 Mon Sep 17 00:00:00 2001 From: James Causon Date: Sat, 10 Oct 2026 19:09:53 +0100 Subject: [PATCH 097/102] Live server name: append the live score to the server name A rule keeps the server's own name and an appended part ({scoreline}, {map}, {players}, {max}); the worker writes ServerName in the config document at most once a minute and, when the rule is off, puts the name back while the document still holds the rule's last one. - Saving, switching off and deleting it need Config & settings. - No outbox or audit row per write; the row keeps the last write or a fixed phrase. No migration. --- src/lib/live-name.test.ts | 59 +++ src/lib/live-name.ts | 55 +++ src/lib/rule-kinds.test.ts | 3 +- src/lib/rule-kinds.ts | 19 +- src/lib/server/db/schema.ts | 3 +- src/lib/server/live-name-write.ts | 157 ++++++++ src/lib/server/live-name.test.ts | 88 +++++ src/lib/server/live-name.ts | 81 ++++ src/lib/server/observe.ts | 10 + src/lib/server/trigger-rules.ts | 13 +- src/lib/server/triggers.ts | 43 ++- src/lib/server/webhook-delivery.ts | 1 + src/lib/types.ts | 14 +- .../[id]/triggers/[triggerId]/+server.ts | 4 +- src/test/access.test.ts | 36 +- src/test/live-name-rule.test.ts | 350 ++++++++++++++++++ 16 files changed, 922 insertions(+), 14 deletions(-) create mode 100644 src/lib/live-name.test.ts create mode 100644 src/lib/live-name.ts create mode 100644 src/lib/server/live-name-write.ts create mode 100644 src/lib/server/live-name.test.ts create mode 100644 src/lib/server/live-name.ts create mode 100644 src/test/live-name-rule.test.ts diff --git a/src/lib/live-name.test.ts b/src/lib/live-name.test.ts new file mode 100644 index 00000000..7676afe8 --- /dev/null +++ b/src/lib/live-name.test.ts @@ -0,0 +1,59 @@ +import { describe, expect, test } from 'bun:test'; +import { LIVE_NAME_MAX, liveName, liveNameVars, oneLine } from './live-name'; + +const look = { + map: 'Kavkazi', + playerCount: 27, + maxPlayers: 30, + scores: [ + { name: 'Valkyra', colorHex: '#D86060', score: 34 }, + { name: 'Lonestar', colorHex: '#5B95D8', score: 27 }, + { name: 'Manticore', colorHex: '#7BC462', score: 30 } + ] +}; + +describe('the live server name', () => { + test('the server name, a space, and the appended part filled in', () => { + expect(liveName({ base: 'Demo Clan #1 | Infantry Only', append: '| {scoreline}' }, look)).toBe( + 'Demo Clan #1 | Infantry Only | 34-27-30' + ); + expect(liveName({ base: 'Demo', append: '| {map} {scoreline} ({players}/{max})' }, look)).toBe( + 'Demo | Bakurani 34-27-30 (27/30)' + ); + }); + + test('scores in the order the game lists them, whole and never below nothing', () => { + expect( + liveNameVars({ + ...look, + scores: [ + { name: 'A', colorHex: '', score: 2.6 }, + { name: 'B', colorHex: '', score: -1 } + ] + }).get('scoreline') + ).toBe('3-0'); + expect(liveNameVars({ ...look, scores: [] }).get('scoreline')).toBe(''); + }); + + test('a name it does not know stays as typed, including the names every object has', () => { + expect(liveName({ base: 'Demo', append: '{constructor} {Scoreline} {nope}' }, look)).toBe( + 'Demo {constructor} 34-27-30 {nope}' + ); + }); + + test('one line, whatever was typed or sent: a line break cannot start a new line of the config', () => { + const name = liveName( + { base: 'Demo\r\n[/Script/WDRCON.WDRCONSettings]\nPassword=stolen', append: '|\u2028{map}' }, + { ...look, map: 'Kavkazi\nPassword=x' } + ); + expect(name).not.toMatch(/[\r\n\u2028\u2029\u0085]/); + expect(oneLine('a\tb\u0000c\u007f')).toBe('a b c'); + }); + + test('cut to the longest name it writes, never through an emoji', () => { + const base = `${'x'.repeat(LIVE_NAME_MAX - 3)}`; + const name = liveName({ base, append: '🎯🎯🎯🎯' }, look); + expect(Array.from(name)).toHaveLength(LIVE_NAME_MAX); + expect(name.endsWith(' 🎯🎯')).toBe(true); + }); +}); diff --git a/src/lib/live-name.ts b/src/lib/live-name.ts new file mode 100644 index 00000000..11f577dd --- /dev/null +++ b/src/lib/live-name.ts @@ -0,0 +1,55 @@ +// The Live server name rule's name: the server's own name with a short part appended, filled in +// from what the server shows at the look (each faction's score, the map, the player count). The +// worker writes it and the editor previews it with the same function. Pure and client-safe. +import { mapName } from './format'; +import type { Status } from './types'; + +/** What the appended part can say: all read off the server's status, nothing a player types. */ +export const LIVE_NAME_PLACEHOLDERS = ['scoreline', 'map', 'players', 'max'] as const; + +/** The longest name the rule writes, and the longest server name and appended part it saves. */ +export const LIVE_NAME_MAX = 100; +export const LIVE_NAME_APPEND_MAX = 60; +export const LIVE_NAME_APPEND_DEFAULT = '| {scoreline}'; + +export interface LiveNameConfig { + /** the server's own name: written back when the rule is switched off */ + base: string; + /** what follows it, after a space, with the placeholders above */ + append: string; +} + +/** + * Text on one line: every control character (a line break would start a new line of the config + * document) becomes a space, and the ends are trimmed. + */ +export const oneLine = (text: string): string => + text.replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/g, ' ').trim(); + +/** At most `max` characters, never half an emoji. */ +const cut = (text: string, max: number): string => Array.from(text).slice(0, max).join(''); + +type Look = Pick; + +/** The appended part's placeholders, from the server's status. */ +export function liveNameVars(s: Look): Map { + return new Map([ + ['scoreline', s.scores.map((f) => String(Math.max(0, Math.round(f.score)))).join('-')], + ['map', s.map ? mapName(s.map) : ''], + ['players', String(s.playerCount)], + ['max', String(s.maxPlayers)] + ]); +} + +/** + * The name the rule writes: the server's name, a space, then the appended part filled in. A name + * it does not know stays as typed. One line, at most LIVE_NAME_MAX characters. + */ +export function liveName(cfg: LiveNameConfig, s: Look): string { + const vars = liveNameVars(s); + const tail = cfg.append.replace( + /\{([a-z_]+)\}/gi, + (whole, name: string) => vars.get(name.toLowerCase()) ?? whole + ); + return cut(oneLine(`${oneLine(cfg.base)} ${oneLine(tail)}`), LIVE_NAME_MAX).trim(); +} diff --git a/src/lib/rule-kinds.test.ts b/src/lib/rule-kinds.test.ts index 9c118419..0810d84a 100644 --- a/src/lib/rule-kinds.test.ts +++ b/src/lib/rule-kinds.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from 'bun:test'; -import { FAILURES_ONLY, ONE_PER_SERVER, RULE_GROUPS, RULE_KINDS } from './rule-kinds'; +import { FAILURES_ONLY, NO_ACTIONS, ONE_PER_SERVER, RULE_GROUPS, RULE_KINDS } from './rule-kinds'; import { TRIGGER_KINDS, TRIGGER_LABELS } from './server/trigger-rules'; describe('the kinds of rule the panel lists', () => { @@ -11,6 +11,7 @@ describe('the kinds of rule the panel lists', () => { } for (const kind of FAILURES_ONLY) expect(TRIGGER_KINDS).toContain(kind); for (const kind of ONE_PER_SERVER) expect(TRIGGER_KINDS).toContain(kind); + for (const kind of NO_ACTIONS) expect(TRIGGER_KINDS).toContain(kind); }); test('listed group by group, in the order the groups are shown', () => { diff --git a/src/lib/rule-kinds.ts b/src/lib/rule-kinds.ts index bce51676..94e02780 100644 --- a/src/lib/rule-kinds.ts +++ b/src/lib/rule-kinds.ts @@ -122,6 +122,13 @@ export const RULE_KINDS: { kind: TriggerKind; group: RuleGroup; label: string; b group: 'Server', label: 'Rotation shuffle', blurb: 'A new rotation order every day, the maps in turn so none plays twice in a row.' + }, + { + kind: 'live_name', + group: 'Server', + label: 'Live server name', + blurb: + "Add the match score, map or player count to the end of the server's name in the browser." } ]; @@ -129,14 +136,16 @@ export const RULE_KINDS: { kind: TriggerKind; group: RuleGroup; label: string; b * Kinds a server holds one rule of (createTrigger refuses a second): seed time is one count per * server, two Team balance rules would move players back and forth, two AFK protection rules would * kill everyone twice a round, two Bounty rules would mark two players at once, two Rotation shuffle - * rules would each undo the other's order. The picker opens the one a server has. + * rules would each undo the other's order, two Live server name rules would each write their own + * name over the other's. The picker opens the one a server has. */ export const ONE_PER_SERVER: TriggerKind[] = [ 'seed_reward', 'two_teams', 'afk_protection', 'bounty', - 'rotation_shuffle' + 'rotation_shuffle', + 'live_name' ]; /** @@ -145,3 +154,9 @@ export const ONE_PER_SERVER: TriggerKind[] = [ * those that fail (webhook-delivery.ts). */ export const FAILURES_ONLY: TriggerKind[] = ['two_teams', 'afk_protection']; + +/** + * Rules that queue no actions, so a Discord webhook has nothing of theirs to carry: the Live server + * name rule writes the name at the worker's look (live-name.ts). The webhook editor leaves them out. + */ +export const NO_ACTIONS: TriggerKind[] = ['live_name']; diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 6ae9d32a..a323d1e8 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -853,7 +853,8 @@ export const triggers = pgTable( 'afk_protection', 'name_change', 'bounty', - 'rotation_shuffle' + 'rotation_shuffle', + 'live_name' ] }).notNull(), name: text('name').notNull(), diff --git a/src/lib/server/live-name-write.ts b/src/lib/server/live-name-write.ts new file mode 100644 index 00000000..9325f7cf --- /dev/null +++ b/src/lib/server/live-name-write.ts @@ -0,0 +1,157 @@ +// The Live server name rule's write, at the worker's look (live-name.ts says when and why). +import { ApiError, forLog } from './http'; +import { configResult, readConfig } from './actions'; +import { classifyGameError, GameError, type WardogsClient } from './rcon'; +import { syncPhrase } from './lists-sync'; +import { applyTriggerUpdates } from './outbox'; +import { withOwnedTransaction } from './leadership'; +import { + LIVE_NAME_EVERY_MS, + LIVE_NAME_SAME_MS, + liveNameState, + nameDue, + validateLiveName, + type LiveNameState, + type NameMemory +} from './live-name'; +import type { Env } from './env'; +import type { TriggerRow } from './db/schema'; +import { getScalar, parseIni, setScalarInText, unquote } from '../config-doc'; +import { lockedKeys, S_SESSION } from '../config-fields'; +import { liveName } from '../live-name'; +import type { ConfigSection, Status } from '../types'; + +const PINNED = + "ServerName is pinned by a launch argument on this server's command line, so the panel cannot change it."; + +/** A failed write in a fixed phrase: the game's words go to the log only. */ +export function nameRefusal(err: unknown): string { + if (err instanceof GameError && err.code === 'pinned') return PINNED; + if (err instanceof ApiError) return syncPhrase(err); + console.warn('[warcon] live server name:', forLog(err)); + return 'The name could not be written.'; +} + +const isServerName = (section: string, key: string) => + section.toLowerCase() === S_SESSION.toLowerCase() && key.toLowerCase() === 'servername'; + +/** Refusals that hold until the server's own setup changes: tried again only every ten minutes. */ +const lasting = (err: unknown) => + err instanceof GameError && + (err.status === 405 || ['pinned', 'config_readonly', 'no_route'].includes(err.code)); + +/** + * ServerName set in the config document, against the revision read: only that line changes. With + * `ifNow`, only while the document still holds that name ('changed' when it holds another: someone + * set one since). A document that already holds the name is not written again ('same'), nor is a + * revision conflict tried again here (the next look tries). Refusals carry status and code only. + */ +export async function writeServerName( + client: WardogsClient, + name: string, + ifNow?: string +): Promise<'written' | 'same' | 'changed'> { + const doc = await readConfig(client); + if (!doc.writable) + throw new GameError(409, 'The config document is read-only.', 'config_readonly'); + if (lockedKeys(doc.sections as ConfigSection[]).some((k) => isServerName(k.section, k.key))) + throw new GameError(409, 'ServerName is pinned.', 'pinned'); + // as the document reads: a name written in quotes reads without them + const held = getScalar(parseIni(doc.text), S_SESSION, 'ServerName') ?? ''; + if (held === unquote(name)) return 'same'; + if (ifNow !== undefined && held !== unquote(ifNow)) return 'changed'; + const text = setScalarInText(doc.text, S_SESSION, 'ServerName', name); + if (text === doc.text) return 'same'; + const { status, body, etag } = await client.configCall('PUT', '/v1/config', text, doc.revision); + const r = configResult(status, body, etag); + if (r.ok) return 'written'; + if (r.conflict) + throw new GameError(412, 'The config document changed meanwhile.', 'revision_conflict'); + const e = classifyGameError('PUT', '/v1/config', status, '', body); + e.body = null; + throw e; +} + +/** The parts of the worker's memory of a server this reads and moves. */ +export interface NameLook { + status: Status | null; + liveName: NameMemory | null; + holdUntil: number; +} + +/** + * One look: the rule's name written when it is due, or, with the rule gone from the enabled ones, + * its own name put back. That is decided from the document, not the status the look holds (which + * can be older than the last write): only where this process wrote a name and the document still + * holds it, so a name someone set after switching the rule off stands. The row records what became + * of it. + */ +export async function keepName( + env: Env, + m: NameLook, + client: WardogsClient, + rule: TriggerRow | undefined, + now: number, + period: number +): Promise { + const status = m.status; + if (!status) return; + const cfg = rule ? validateLiveName(rule.config) : null; + if (rule && cfg) + m.liveName = { + ...(m.liveName ?? { attemptAt: 0, written: '', writtenAt: 0, refused: '' }), + ruleId: rule.id, + base: cfg.base + }; + const mem = m.liveName; + if (!mem) return; + const want = cfg ? liveName(cfg, status) : mem.base; + if (cfg) { + if (!nameDue(mem, want, status.serverName, now)) return; + } else { + // Off with nothing written by this process: nothing of its own to take back. + if (!mem.written) { + m.liveName = null; + return; + } + if (now - mem.attemptAt < LIVE_NAME_EVERY_MS) return; + } + mem.attemptAt = now; + let refused = ''; + try { + const done = await writeServerName(client, want, cfg ? undefined : mem.written); + if (done === 'changed') { + m.liveName = null; + return; + } + mem.written = want; + mem.writtenAt = now; + } catch (err) { + if (err instanceof GameError && err.code === 'rate_limited') + m.holdUntil = Math.max(m.holdUntil, now + (err.retryAfterMs || 5000)); + if (lasting(err)) mem.attemptAt = now + LIVE_NAME_SAME_MS - LIVE_NAME_EVERY_MS; + refused = nameRefusal(err); + } + // A refusal is recorded when it is new; a write every time, which is what the row shows. + if (refused && refused === mem.refused) return; + mem.refused = refused; + const was = rule ? liveNameState(rule.state) : null; + const state: LiveNameState = refused + ? { + name: mem.written || was?.name || '', + at: mem.writtenAt || was?.at || 0, + refused, + since: now, + restored: false + } + : { name: want, at: now, refused: '', since: 0, restored: !cfg }; + if (!cfg && !refused) m.liveName = null; + await withOwnedTransaction( + env, + (tx) => + applyTriggerUpdates(tx, [ + { id: mem.ruleId, state, ...(refused ? {} : { lastFiredAt: new Date(now) }) } + ]), + { period } + ); +} diff --git a/src/lib/server/live-name.test.ts b/src/lib/server/live-name.test.ts new file mode 100644 index 00000000..02cc9614 --- /dev/null +++ b/src/lib/server/live-name.test.ts @@ -0,0 +1,88 @@ +import { describe, expect, test } from 'bun:test'; +import { + LIVE_NAME_EVERY_MS, + LIVE_NAME_SAME_MS, + liveNameState, + nameDue, + validateLiveName, + type NameMemory +} from './live-name'; + +describe('Live server name settings', () => { + test('the server name is needed; what is appended defaults to the score line', () => { + expect(() => validateLiveName({})).toThrow(/server's own name/); + expect(() => validateLiveName({ base: ' \n ' })).toThrow(/server's own name/); + expect(validateLiveName({ base: ' Demo ' })).toEqual({ base: 'Demo', append: '| {scoreline}' }); + expect(() => validateLiveName({ base: 'Demo', append: ' ' })).toThrow(/what to append/); + }); + + test('saved on one line, and no longer than the name and the appended part may be', () => { + const c = validateLiveName({ + base: `Demo\r\n[/Script/WDRCON.WDRCONSettings]\r\nPassword=stolen${'x'.repeat(200)}`, + append: `|\n{scoreline}${'y'.repeat(100)}` + }); + expect(c.base).not.toMatch(/[\r\n]/); + expect(c.append).not.toMatch(/[\r\n]/); + expect(Array.from(c.base)).toHaveLength(100); + expect(Array.from(c.append)).toHaveLength(60); + }); + + test('the row state reads back, and anything else is no state', () => { + expect(liveNameState(null)).toBeNull(); + expect(liveNameState({ name: 'A', at: 5, refused: '', since: 0, restored: true })).toEqual({ + name: 'A', + at: 5, + refused: '', + since: 0, + restored: true + }); + expect(liveNameState({ name: 3, at: 'x' })).toEqual({ + name: '', + at: 0, + refused: '', + since: 0, + restored: false + }); + }); +}); + +describe('when the worker writes', () => { + const mem = (over: Partial = {}): NameMemory => ({ + ruleId: 'r', + base: 'Demo', + attemptAt: 0, + written: '', + writtenAt: 0, + refused: '', + ...over + }); + const now = 10_000_000; + + test('when the server shows another name, at most once a minute', () => { + expect(nameDue(mem(), 'Demo | 1-2', 'Demo', now)).toBe(true); + expect(nameDue(mem(), 'Demo | 1-2', 'Demo | 1-2', now)).toBe(false); + expect( + nameDue(mem({ attemptAt: now - LIVE_NAME_EVERY_MS + 1 }), 'Demo | 1-3', 'Demo', now) + ).toBe(false); + expect(nameDue(mem({ attemptAt: now - LIVE_NAME_EVERY_MS }), 'Demo | 1-3', 'Demo', now)).toBe( + true + ); + }); + + test('the name it wrote last, which the server shows otherwise, only every ten minutes', () => { + const wrote = mem({ + attemptAt: now - 120_000, + written: 'Demo | 1-2', + writtenAt: now - 120_000 + }); + expect(nameDue(wrote, 'Demo | 1-2', 'Demo | 1-', now)).toBe(false); + expect( + nameDue({ ...wrote, writtenAt: now - LIVE_NAME_SAME_MS }, 'Demo | 1-2', 'Demo | 1-', now) + ).toBe(true); + expect(nameDue(wrote, 'Demo | 1-3', 'Demo | 1-', now)).toBe(true); + }); + + test('never an empty name', () => { + expect(nameDue(mem(), '', 'Demo', now)).toBe(false); + }); +}); diff --git a/src/lib/server/live-name.ts b/src/lib/server/live-name.ts new file mode 100644 index 00000000..0bf4c925 --- /dev/null +++ b/src/lib/server/live-name.ts @@ -0,0 +1,81 @@ +// The Live server name rule's settings, the state its row keeps and when the worker writes. The +// write itself is live-name-write.ts. At the worker's look at a server with the rule on, the name it +// should carry ($lib/live-name: its own name with the live part appended) goes into the config +// document's ServerName, which the game applies at once, whenever the name the server shows +// differs: at most once a minute, and the same name again at most every ten minutes, in case the +// server shows a name otherwise than it was written. Switched off or deleted, the rule's own name +// goes back the same way, from what the worker remembers (a worker that restarts in between has +// forgotten it). No outbox row and no audit row per write, which would come every minute a match is +// on: the rule keeps the name it last wrote and when, or a fixed phrase for why it could not. +import { ApiError } from './http'; +import { + LIVE_NAME_APPEND_DEFAULT, + LIVE_NAME_APPEND_MAX, + LIVE_NAME_MAX, + oneLine, + type LiveNameConfig +} from '../live-name'; + +/** The fewest milliseconds between two writes, and between two writes of the same name. */ +export const LIVE_NAME_EVERY_MS = 60_000; +export const LIVE_NAME_SAME_MS = 10 * 60_000; + +const upTo = (text: string, max: number) => Array.from(oneLine(text)).slice(0, max).join('').trim(); + +export function validateLiveName(raw: unknown): LiveNameConfig { + const c = (raw && typeof raw === 'object' ? raw : {}) as Record; + const base = upTo(String(c.base ?? ''), LIVE_NAME_MAX); + if (!base) + throw new ApiError( + 400, + "Give the server's own name: the live part is appended to it, and it goes back to it when the rule is off." + ); + const append = upTo(String(c.append ?? LIVE_NAME_APPEND_DEFAULT), LIVE_NAME_APPEND_MAX); + if (!append) throw new ApiError(400, 'Say what to append, such as | {scoreline}.'); + return { base, append }; +} + +/** What the rule's row keeps: the name it last wrote and when, and why the latest try wrote nothing. */ +export interface LiveNameState { + name: string; + /** ms since the epoch; 0 until a name was written */ + at: number; + /** a fixed phrase, '' when the latest try wrote the name */ + refused: string; + /** when the tries began to fail (ms) */ + since: number; + /** the rule's own name was put back once it was switched off */ + restored: boolean; +} + +export function liveNameState(v: unknown): LiveNameState | null { + if (!v || typeof v !== 'object') return null; + const s = v as Record; + const n = (x: unknown) => (typeof x === 'number' && Number.isFinite(x) ? x : 0); + return { + name: typeof s.name === 'string' ? s.name : '', + at: n(s.at), + refused: typeof s.refused === 'string' ? s.refused : '', + since: n(s.since), + restored: s.restored === true + }; +} + +/** What the worker remembers of a server's rule between looks. */ +export interface NameMemory { + /** the rule last seen on, and its own name, which goes back once it is off */ + ruleId: string; + base: string; + attemptAt: number; + /** the last name this process wrote, and when */ + written: string; + writtenAt: number; + /** the phrase last recorded for a failed try */ + refused: string; +} + +/** Whether to write `want` at this look, the server showing `shown`. */ +export function nameDue(mem: NameMemory, want: string, shown: string, now: number): boolean { + if (!want || want === shown || now - mem.attemptAt < LIVE_NAME_EVERY_MS) return false; + return want !== mem.written || now - mem.writtenAt >= LIVE_NAME_SAME_MS; +} diff --git a/src/lib/server/observe.ts b/src/lib/server/observe.ts index 3030a783..37541bec 100644 --- a/src/lib/server/observe.ts +++ b/src/lib/server/observe.ts @@ -75,6 +75,8 @@ import { observations, observationSeconds } from './metrics'; import { notifyWatchedJoins } from './webhook-delivery'; import { nextDue, withHold } from './poller-schedule'; import { cashByFaction } from '$lib/cash'; +import { keepName } from './live-name-write'; +import type { NameMemory } from './live-name'; import type { Features, LiveView, Player, Status } from '$lib/types'; export type Tier = LiveView['tier']; @@ -141,6 +143,8 @@ export interface ServerMemory { startedAt: number; /** the build answered "no such endpoint" to /v1/health; asked again when the identity is re-read */ healthUnserved: boolean; + /** the Live server name rule's write: its own name, to put back once it is off (live-name.ts) */ + liveName: NameMemory | null; /** observations completed */ count: number; } @@ -223,6 +227,7 @@ export function memoryFor(server: ServerRow, org: OrgRow): ServerMemory { }, startedAt: 0, healthUnserved: false, + liveName: null, count: 0 }; registry.set(server.id, m); @@ -809,6 +814,11 @@ export async function observeServer(env: Env, m: ServerMemory, kinds: ObserveKin const seen = players?.map((p) => p.steamId) ?? []; if (isOwner() && seen.length && m.bans.size) await stage('bans', m, () => kickBanned(env, server, m.org, client, seen, m.bans)); + // The Live server name rule's name, or its own name put back once it is off: nothing for a server + // that has never had the rule on. + const nameRule = rows.find((r) => r.kind === 'live_name'); + if (isOwner() && m.status && (nameRule || m.liveName)) + await stage('name', m, () => keepName(env, m, client, nameRule, started, period)); if (diff.joined.length && steamEnabled(env)) void getProfiles( env, diff --git a/src/lib/server/trigger-rules.ts b/src/lib/server/trigger-rules.ts index 9d194bfa..a37254a5 100644 --- a/src/lib/server/trigger-rules.ts +++ b/src/lib/server/trigger-rules.ts @@ -11,6 +11,8 @@ import { validateAfkProtection, type AfkProtectionConfig } from './afk-protectio import { validateNameChange, type NameChangeConfig } from './name-change'; import { validateBounty, type BountyConfig } from './bounty'; import { validateRotationShuffle, type RotationShuffleConfig } from './rotation-shuffle'; +import { validateLiveName } from './live-name'; +import type { LiveNameConfig } from '$lib/live-name'; import { causeTags } from './cause-tags'; import { MAX_RESTART_LEAD_MINUTES, restartWindow, type RestartSchedule } from '$lib/uptime'; import { MAX_CHAT } from '$lib/chat'; @@ -38,7 +40,8 @@ export const TRIGGER_KINDS: TriggerKind[] = [ 'afk_protection', 'name_change', 'bounty', - 'rotation_shuffle' + 'rotation_shuffle', + 'live_name' ]; export const TRIGGER_LABELS: Record = { welcome: 'Welcome whisper', @@ -58,7 +61,8 @@ export const TRIGGER_LABELS: Record = { afk_protection: 'AFK protection', name_change: 'Name change watch', bounty: 'Bounty', - rotation_shuffle: 'Rotation shuffle' + rotation_shuffle: 'Rotation shuffle', + live_name: 'Live server name' }; export interface WelcomeConfig { @@ -234,7 +238,8 @@ export type TriggerConfig = | AfkProtectionConfig | NameChangeConfig | BountyConfig - | RotationShuffleConfig; + | RotationShuffleConfig + | LiveNameConfig; /** A kick reason: not chat, so not held to the game's chat cap. */ export const MAX_REASON = 200; @@ -433,6 +438,8 @@ export function validateConfig(kind: TriggerKind, raw: unknown): TriggerConfig { return validateBounty(c); case 'rotation_shuffle': return validateRotationShuffle(c); + case 'live_name': + return validateLiveName(c); } } diff --git a/src/lib/server/triggers.ts b/src/lib/server/triggers.ts index a8bca171..aef04ff3 100644 --- a/src/lib/server/triggers.ts +++ b/src/lib/server/triggers.ts @@ -196,6 +196,8 @@ import { type ShuffleWhen } from './rotation-shuffle'; import { DEFAULT_SCORE_CAP } from '$lib/match'; +import { liveName, type LiveNameConfig } from '$lib/live-name'; +import { liveNameState } from './live-name'; import { mapName } from '$lib/format'; import { statsIn, usesStats } from '$lib/placeholders'; import { settings } from './settings'; @@ -237,9 +239,19 @@ const shape = (t: TriggerRow): TriggerView => ({ fireCount: t.fireCount, createdAt: t.createdAt ? t.createdAt.toISOString() : null, ...(t.kind === 'afk_protection' ? { phase: afkPhase(t.state) } : {}), - ...(t.kind === 'bounty' ? { bounty: openBounty(t) } : {}) + ...(t.kind === 'bounty' ? { bounty: openBounty(t) } : {}), + ...(t.kind === 'live_name' ? { liveName: lastName(t.state) } : {}) }); +/** A Live server name rule's last write and latest refusal, as its row shows them. */ +function lastName(state: unknown): TriggerView['liveName'] { + const s = liveNameState(state); + const iso = (ms: number) => (ms ? new Date(ms).toISOString() : null); + return s + ? { name: s.name, at: iso(s.at), refused: s.refused, since: iso(s.since), restored: s.restored } + : null; +} + /** A Bounty rule's open bounty, as its row shows it: the one its last save holds, if any. */ function openBounty(t: TriggerRow): TriggerView['bounty'] { const b = savedBounty(t.state, bountyVersion(t)); @@ -296,7 +308,8 @@ const RULE_NEEDS: Record< two_teams: ['players.move', 'moves players between teams'], afk_protection: ['players.kill', 'kills players'], name_change: ['players.kick', 'flags or kicks players'], - rotation_shuffle: ['config.apply', 'rewrites the rotation in the config document'] + rotation_shuffle: ['config.apply', 'rewrites the rotation in the config document'], + live_name: ['config.apply', 'writes the server name in the config document'] }; /** What a reserved slot a rule hands out needs: one here, or on the organisation's list. */ @@ -488,14 +501,22 @@ export async function updateTrigger( return shape(updated); } +/** + * Kinds whose deletion acts on the server: a Live server name rule's own name is written back to the + * config document, so deleting one needs what switching it off does. + */ +const ACTS_WHEN_DELETED: TriggerKind[] = ['live_name']; + export async function deleteTrigger( env: Env, req: Request, user: SessionUser, server: ServerRow, + access: ServerAccess, id: string ): Promise { const row = await triggerOf(env, server.id, id); + if (ACTS_WHEN_DELETED.includes(row.kind)) requireRuleCaps(row.kind, row.config, server, access); await env.db.delete(triggers).where(eq(triggers.id, row.id)); if (SETTINGS_KEYS[row.kind]) await dropQueued(env, row.id, 'The rule was deleted before this was sent.'); @@ -835,6 +856,9 @@ export async function evaluateTriggers( case 'rotation_shuffle': evalRotationShuffle(ctx, row, row.config as RotationShuffleConfig, out); break; + case 'live_name': + // Written at the look itself, after the rules (live-name-write.ts): no action is queued. + break; } } catch (err) { // The rule shows a fixed phrase unless the panel refused in its own words; the error goes @@ -2735,6 +2759,21 @@ export async function dryRun( ); return result; } + if (kind === 'live_name') { + const [live] = await env.db + .select({ status: serverLive.status }) + .from(serverLive) + .where(eq(serverLive.serverId, server.id)) + .limit(1); + const status = live?.status as Status | null | undefined; + if (status) push(to, `name: ${liveName(cfg as LiveNameConfig, status)}`); + else + result.notes.push('The worker has not seen this server yet, so there is no score to show.'); + result.notes.push( + 'Nothing to replay: the rule writes the name from what the server shows at each look, whenever it changes and at most once a minute. Switched off, it puts the name back without the appended part.' + ); + return result; + } if (kind === 'rotation_shuffle') { const c = cfg as RotationShuffleConfig; const [live] = await env.db diff --git a/src/lib/server/webhook-delivery.ts b/src/lib/server/webhook-delivery.ts index 078ab7ef..c133f53f 100644 --- a/src/lib/server/webhook-delivery.ts +++ b/src/lib/server/webhook-delivery.ts @@ -162,6 +162,7 @@ const ACTION_TITLES: Record = { 'trigger.name_change': 'Trigger · name change watch', 'trigger.bounty': 'Trigger · bounty', 'trigger.rotation_shuffle': 'Trigger · rotation shuffle', + 'trigger.live_name': 'Trigger · live server name', 'player.note': 'Player note', 'player.watch': 'Watchlist', 'list.add': 'Org list · added', diff --git a/src/lib/types.ts b/src/lib/types.ts index 03411d62..b8cfb0e2 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -590,7 +590,8 @@ export type TriggerKind = | 'afk_protection' | 'name_change' | 'bounty' - | 'rotation_shuffle'; + | 'rotation_shuffle' + | 'live_name'; export interface TriggerView { id: string; @@ -606,6 +607,17 @@ export interface TriggerView { phase?: { on: boolean; since: string | null; why: string } | null; /** a Bounty rule's open bounty: on whom, the run that set it, and when */ bounty?: { steamId: string; name: string; streak: number; setAt: string } | null; + /** + * a Live server name rule's last write (the name and when) and why the latest try wrote nothing + * ('' when it did); `restored` once its own name went back after it was switched off + */ + liveName?: { + name: string; + at: string | null; + refused: string; + since: string | null; + restored: boolean; + } | null; } export interface DryRunResult { diff --git a/src/routes/api/servers/[id]/triggers/[triggerId]/+server.ts b/src/routes/api/servers/[id]/triggers/[triggerId]/+server.ts index 2e87f71c..bad7cc38 100644 --- a/src/routes/api/servers/[id]/triggers/[triggerId]/+server.ts +++ b/src/routes/api/servers/[id]/triggers/[triggerId]/+server.ts @@ -29,12 +29,12 @@ export const PATCH = route(async (event) => { export const DELETE = route(async (event) => { const env = getEnv(); const user = requireUser(event.locals); - const { server } = await requireServerCap( + const { server, access } = await requireServerCap( env, event.locals, param(event, 'id'), 'automation.manage' ); - await deleteTrigger(env, event.request, user, server, param(event, 'triggerId')); + await deleteTrigger(env, event.request, user, server, access, param(event, 'triggerId')); return apiJson({ ok: true }); }); diff --git a/src/test/access.test.ts b/src/test/access.test.ts index c2d2efb1..80ed78aa 100644 --- a/src/test/access.test.ts +++ b/src/test/access.test.ts @@ -539,7 +539,8 @@ describe.skipIf(!hasTestDb)('access', () => { ['seed_reward', { minutes: 60, scope: 'server' }, 'slots.manage'], ['seed_reward', { minutes: 60, scope: 'org' }, 'lists.reserve'], ['bounty', { reward: 'none' }, 'chat.send'], - ['rotation_shuffle', { maps: ['Europe', 'Kavkazi'] }, 'config.apply'] + ['rotation_shuffle', { maps: ['Europe', 'Kavkazi'] }, 'config.apply'], + ['live_name', { base: 'Demo Clan #1' }, 'config.apply'] ]; for (const [kind, config, cap] of rules) { await holds([]); @@ -1281,6 +1282,36 @@ describe.skipIf(!hasTestDb)('access', () => { expect((await save(w, 'viewer')).status).toBe(201); }); + test('a Live server name rule is deleted only by someone who could switch it off: deleting it writes the name back', async () => { + const w = await seedWorld(env); + const params = { id: w.server.id }; + const make = async (kind: string, config: Record) => { + const made = await api(w, 'owner', 'POST api/servers/[id]/triggers', { + params, + body: { kind, config } + }); + expect(made.status).toBe(201); + return { + id: w.server.id, + triggerId: (made.body as { trigger: { id: string } }).trigger.id + }; + }; + const holds = (caps: string[]) => + env.db + .update(orgRoles) + .set({ capabilities: ['server.view', 'automation.manage', ...caps] }) + .where(eq(orgRoles.id, w.roles.viewer)); + const remove = (ids: { id: string; triggerId: string }) => + api(w, 'viewer', 'DELETE api/servers/[id]/triggers/[triggerId]', { params: ids }); + const named = await make('live_name', { base: 'Demo Clan #1' }); + await holds([]); + expect((await remove(named)).status).toBe(403); + // any other rule still goes with Automation alone + expect((await remove(await make('welcome', { message: 'Hi' }))).status).toBe(200); + await holds(['config.apply']); + expect((await remove(named)).status).toBe(200); + }); + test('two Team balance rules saved at once for one server: one of them is refused', async () => { const w = await seedWorld(env); const save = (closedFaction: string) => @@ -1299,7 +1330,8 @@ describe.skipIf(!hasTestDb)('access', () => { two_teams: { closedFaction: 'Lonestar' }, afk_protection: {}, bounty: {}, - rotation_shuffle: {} + rotation_shuffle: {}, + live_name: { base: 'Demo Clan #1' } }; const save = (kind: string, name: string, config: Record) => api(w, 'owner', 'POST api/servers/[id]/triggers', { diff --git a/src/test/live-name-rule.test.ts b/src/test/live-name-rule.test.ts new file mode 100644 index 00000000..559d4875 --- /dev/null +++ b/src/test/live-name-rule.test.ts @@ -0,0 +1,350 @@ +// The Live server name rule on the worker's own look, against a scripted game (status, config +// document, its revision, a pinned name, refusals): it writes its name into ServerName and nothing +// else, not again within a minute, a name typed across lines stays on one line of the document, a +// refusal is recorded in a fixed phrase, and switched off or deleted it puts the server's own name +// back. +import { afterAll, beforeAll, describe, expect, spyOn, test } from 'bun:test'; +import { join } from 'node:path'; +import { eq } from 'drizzle-orm'; +import type { Env } from '$lib/server/env'; +import { organizations, servers, triggers } from '$lib/server/db/schema'; +import { acquireOrRenew, releaseOwnership } from '$lib/server/leadership'; +import { forgetMemory, memoryFor, memoryOf, observeServer } from '$lib/server/observe'; +import { WardogsClient } from '$lib/server/rcon'; +import { invalidateTriggers, listTriggers } from '$lib/server/triggers'; +import type { LiveNameState } from '$lib/server/live-name'; +import { hasTestDb, testEnv } from './db'; +import { callApi, stubGateway } from './call'; +import { seedWorld, type World } from './world'; + +const ROUTES = join(import.meta.dir, '..', 'routes'); +const SESSION = '[/Script/WDGame.WDGameSession]'; +const DOC = [ + '[/Script/WDRCON.WDRCONSettings]', + 'Password=rcon-secret', + '', + SESSION, + 'ServerName=Demo Clan #1', + 'MaxReservedSlots=2', + '' +].join('\r\n'); + +describe.skipIf(!hasTestDb)('Live server name on a live look', () => { + let env: Env; + let w: World; + let spy: ReturnType; + /** what the scripted game holds and how it answers */ + const game = { + text: DOC, + revision: 1, + scores: [34, 27, 30], + puts: 0, + gets: 0, + pinned: false, + refuse: 0, + /** a status older than the document: the name it showed before the last write */ + statusName: null as string | null + }; + const shownName = () => /^ServerName=(.*)$/m.exec(game.text)?.[1] ?? ''; + + beforeAll(async () => { + env = await testEnv(); + stubGateway(); + w = await seedWorld(env); + expect(await acquireOrRenew(env, 'live-name-live')).toBe(true); + const json = (body: unknown, status = 200) => ({ + status, + statusText: status === 200 ? 'OK' : 'Refused', + headers: { 'content-type': 'application/json', etag: `"r${game.revision}"` }, + text: JSON.stringify(body) + }); + spy = spyOn(WardogsClient, 'forServer').mockImplementation(async (_env, server) => { + const client = new WardogsClient( + env, + { id: server.id, host: 'demo', port: 1, scheme: 'http' }, + 'demo', + `live-name-${server.id}` + ); + client.raw = async (method, path, body, headers = {}) => { + if (method === 'GET' && path === '/v1/players') return json({ players: [], count: 0 }); + if (method === 'GET' && path === '/v1/status') + return json({ + serverName: game.statusName ?? shownName(), + map: 'Kavkazi', + experiences: [], + players: { current: 0, max: 98 }, + factionScores: ['Valkyra', 'Lonestar', 'Manticore'].map((name, i) => ({ + name, + colorHex: '#888888', + score: game.scores[i] + })), + rotation: { nowIndex: 0, nextIndex: 1 } + }); + if (method === 'GET' && path === '/v1/config') { + game.gets++; + return json({ + revision: `r${game.revision}`, + writable: true, + text: game.text, + sections: game.pinned + ? [ + { + section: '/Script/WDGame.WDGameSession', + appliesWhen: 'applied', + allowedKeys: ['ServerName'], + keyOverrides: [ + { + key: 'ServerName', + appliesWhen: 'applied', + writable: false, + lockedBy: 'RCON_FixedServerName' + } + ] + } + ] + : [], + warnings: [] + }); + } + if (method === 'PUT' && path.startsWith('/v1/config')) { + game.puts++; + if (game.refuse) + return json( + { + ok: false, + error: { code: 'invalid', message: 'Password=rcon-secret is not allowed here' } + }, + game.refuse + ); + if (headers['If-Match'] !== `"r${game.revision}"`) + return json({ ok: false, error: { code: 'revision_mismatch', message: 'no' } }, 412); + game.text = body ?? ''; + game.revision++; + return json({ ok: true, revision: `r${game.revision}`, outcomes: [] }); + } + return json({ ok: false, error: { code: 'no_route', message: 'No such endpoint.' } }, 404); + }; + return client; + }); + }); + + afterAll(async () => { + spy.mockRestore(); + forgetMemory(w.server.id); + await releaseOwnership(env); + }); + + const route = async (method: string, path: string) => + (await import(join(ROUTES, path, '+server.ts')))[method]; + const look = async () => { + invalidateTriggers(w.server.id); + const [server] = await env.db.select().from(servers).where(eq(servers.id, w.server.id)); + const [org] = await env.db.select().from(organizations).where(eq(organizations.id, w.org.id)); + await observeServer(env, memoryFor(server, org), { status: true, players: true }); + }; + /** a minute on, as far as the rule's memory goes */ + const aMinuteOn = () => { + const mem = memoryOf(w.server.id)?.liveName; + if (mem) mem.attemptAt -= 61_000; + }; + let ruleId = ''; + const save = async (body: Record) => { + const res = ruleId + ? await callApi( + await route('PATCH', 'api/servers/[id]/triggers/[triggerId]'), + w.users.owner, + { + method: 'PATCH', + params: { id: w.server.id, triggerId: ruleId }, + body + } + ) + : await callApi(await route('POST', 'api/servers/[id]/triggers'), w.users.owner, { + method: 'POST', + params: { id: w.server.id }, + body: { kind: 'live_name', name: 'Live server name', enabled: true, ...body } + }); + expect(res.status).toBeLessThan(300); + ruleId ||= (res.body as { trigger: { id: string } }).trigger.id; + }; + const state = async () => + (await env.db.select().from(triggers).where(eq(triggers.id, ruleId)))[0].state as LiveNameState; + const fresh = async () => { + if (ruleId) await env.db.delete(triggers).where(eq(triggers.id, ruleId)); + ruleId = ''; + forgetMemory(w.server.id); + Object.assign(game, { + text: DOC, + revision: 1, + puts: 0, + gets: 0, + pinned: false, + refuse: 0, + statusName: null + }); + game.scores = [34, 27, 30]; + }; + + test('on: its name in ServerName and nothing else, not again within a minute, again once the score moves', async () => { + await fresh(); + await save({ config: { base: 'Demo Clan #1 | Infantry Only', append: '| {scoreline}' } }); + await look(); + expect(shownName()).toBe('Demo Clan #1 | Infantry Only | 34-27-30'); + expect(game.text).toBe(DOC.replace('ServerName=Demo Clan #1', `ServerName=${shownName()}`)); + expect(await state()).toMatchObject({ + name: 'Demo Clan #1 | Infantry Only | 34-27-30', + refused: '', + restored: false + }); + const view = (await listTriggers(env, w.server.id)).find((t) => t.id === ruleId); + expect(view?.liveName?.name).toBe('Demo Clan #1 | Infantry Only | 34-27-30'); + // the score moves within the minute: nothing yet + game.scores = [35, 27, 30]; + await look(); + expect(game.puts).toBe(1); + aMinuteOn(); + await look(); + expect(game.puts).toBe(2); + expect(shownName()).toBe('Demo Clan #1 | Infantry Only | 35-27-30'); + // nothing changed: nothing written, however long it has been + aMinuteOn(); + await look(); + expect(game.puts).toBe(2); + }); + + test('a name typed across lines stays on one line of the document', async () => { + await fresh(); + await save({ + config: { + base: 'Demo\r\n[/Script/WDRCON.WDRCONSettings]\r\nPassword=stolen', + append: '|\n{scoreline}' + } + }); + await look(); + const lines = game.text.split('\r\n'); + expect(lines).toHaveLength(DOC.split('\r\n').length); + expect(lines.filter((l) => l.startsWith('Password='))).toEqual(['Password=rcon-secret']); + expect(lines.filter((l) => l.startsWith('['))).toEqual([ + '[/Script/WDRCON.WDRCONSettings]', + SESSION + ]); + expect(shownName()).toBe('Demo [/Script/WDRCON.WDRCONSettings] Password=stolen | 34-27-30'); + }); + + test('a pinned name is not written; the row says why in a fixed phrase', async () => { + await fresh(); + game.pinned = true; + await save({ config: { base: 'Demo Clan #1' } }); + await look(); + expect(game.puts).toBe(0); + expect(shownName()).toBe('Demo Clan #1'); + expect((await state()).refused).toBe( + "ServerName is pinned by a launch argument on this server's command line, so the panel cannot change it." + ); + // not read again every minute while it stays pinned, but every ten + const gets = game.gets; + aMinuteOn(); + await look(); + expect(game.gets).toBe(gets); + const mem = memoryOf(w.server.id)!.liveName!; + mem.attemptAt -= 10 * 60_000; + await look(); + expect(game.gets).toBe(gets + 1); + }); + + test("a refusal is recorded once, in the panel's words, never the game's", async () => { + await fresh(); + game.refuse = 400; + await save({ config: { base: 'Demo Clan #1' } }); + await look(); + const s = await state(); + expect(s.refused).toBe('Refused by the server (400, invalid).'); + expect(JSON.stringify(s)).not.toContain('rcon-secret'); + const since = s.since; + aMinuteOn(); + await look(); + expect(game.puts).toBe(2); + expect((await state()).since).toBe(since); + // written once the server takes it + game.refuse = 0; + aMinuteOn(); + await look(); + expect(await state()).toMatchObject({ name: 'Demo Clan #1 | 34-27-30', refused: '' }); + }); + + test("switched off, then deleted: the server's own name goes back", async () => { + await fresh(); + await save({ config: { base: 'Demo Clan #1' } }); + await look(); + expect(shownName()).toBe('Demo Clan #1 | 34-27-30'); + await save({ enabled: false }); + // within the minute of its last write, not yet + await look(); + expect(shownName()).toBe('Demo Clan #1 | 34-27-30'); + aMinuteOn(); + await look(); + expect(shownName()).toBe('Demo Clan #1'); + expect(await state()).toMatchObject({ name: 'Demo Clan #1', restored: true }); + expect(memoryOf(w.server.id)?.liveName).toBeNull(); + // on again: written at once + await save({ enabled: true }); + await look(); + expect(shownName()).toBe('Demo Clan #1 | 34-27-30'); + const del = await callApi( + await route('DELETE', 'api/servers/[id]/triggers/[triggerId]'), + w.users.owner, + { method: 'DELETE', params: { id: w.server.id, triggerId: ruleId } } + ); + expect(del.status).toBeLessThan(300); + ruleId = ''; + aMinuteOn(); + await look(); + expect(shownName()).toBe('Demo Clan #1'); + const puts = game.puts; + await look(); + expect(game.puts).toBe(puts); + }); + + test('switched off, a name someone set since stands', async () => { + await fresh(); + await save({ config: { base: 'Demo Clan #1' } }); + await look(); + expect(shownName()).toBe('Demo Clan #1 | 34-27-30'); + await save({ enabled: false }); + // renamed on the Config tab, which the rule no longer locks + game.text = game.text.replace(/^ServerName=.*$/m, 'ServerName=Brand New Name'); + game.revision++; + aMinuteOn(); + await look(); + expect(shownName()).toBe('Brand New Name'); + expect(memoryOf(w.server.id)?.liveName).toBeNull(); + aMinuteOn(); + await look(); + expect(shownName()).toBe('Brand New Name'); + }); + + test('switched off before the status showed its write: put back from what the document holds', async () => { + await fresh(); + await save({ config: { base: 'Demo Clan #1' } }); + await look(); + expect(shownName()).toBe('Demo Clan #1 | 34-27-30'); + // the look's status still shows the name from before the write + game.statusName = 'Demo Clan #1'; + await save({ enabled: false }); + aMinuteOn(); + await look(); + expect(shownName()).toBe('Demo Clan #1'); + expect(await state()).toMatchObject({ name: 'Demo Clan #1', restored: true }); + }); + + test('a name written in quotes is put back all the same', async () => { + await fresh(); + await save({ config: { base: '"Demo', append: '| {scoreline}"' } }); + await look(); + expect(game.text).toContain('ServerName="Demo | 34-27-30"'); + await save({ enabled: false }); + aMinuteOn(); + await look(); + expect(game.text).toContain('ServerName="Demo\r\n'); + }); +}); From 52bcd867352ae7c0729cbe83aac29216be94fa23 Mon Sep 17 00:00:00 2001 From: James Causon Date: Sat, 10 Oct 2026 19:09:53 +0100 Subject: [PATCH 098/102] Live server name UI: editor, rule line, locked name on Config - Automation: the rule's editor with a preview from the live score, its line (last name written, refused, put back), no dry run. - Config tab: a page load (checked with requireServerCap) tells only Config & settings holders that the rule is on; the name field is read-only then, and an Apply that meets only the rule's new name goes through over it. - Org page: the webhook kind chooser leaves the rule out. --- src/lib/components/ConfigForm.svelte | 20 +- src/routes/(app)/orgs/[id]/+page.svelte | 4 +- .../(app)/server/[id]/automation/+page.svelte | 239 ++++++++++++++---- .../(app)/server/[id]/config/+page.server.ts | 39 +++ .../(app)/server/[id]/config/+page.svelte | 26 +- src/test/live-name-rule.test.ts | 22 +- src/test/load-matrix.test.ts | 1 + 7 files changed, 291 insertions(+), 60 deletions(-) create mode 100644 src/routes/(app)/server/[id]/config/+page.server.ts diff --git a/src/lib/components/ConfigForm.svelte b/src/lib/components/ConfigForm.svelte index 14eaf1a8..4af22aba 100644 --- a/src/lib/components/ConfigForm.svelte +++ b/src/lib/components/ConfigForm.svelte @@ -24,7 +24,8 @@ shadowed = [], disabled = false, tickRange = null, - liveRoutes = true + liveRoutes = true, + nameRule = null }: { text: string; /** the document as last loaded from (or applied to) the server, for change marks */ @@ -36,6 +37,8 @@ tickRange?: { min: number; max: number } | null; /** whether the build serves PATCH /v1/settings, so the "also changeable live" hints apply */ liveRoutes?: boolean; + /** the Automation tab, when a Live server name rule keeps the server name (shown read-only) */ + nameRule?: string | null; } = $props(); let parsed = $derived(parseIni(text)); @@ -58,7 +61,9 @@ new Map(shadowed.map((s) => [`${s.section}|${String(s.key).toLowerCase()}`, s])) ); // A key the command line pins is shown but never editable (live build CL-501228+). - const locked = (f: ConfigField) => !!lockedFor(f, sections); + // So is the name while a Live server name rule keeps it: an edit would be written over. + const ruled = (f: ConfigField) => !!nameRule && f.key === 'serverName'; + const locked = (f: ConfigField) => !!lockedFor(f, sections) || ruled(f); function badge(f: ConfigField): { label: string; cls: string; title: string } | null { const pin = lockedFor(f, sections); if (pin) @@ -117,6 +122,7 @@
{row.label} {#if b}{b.label}{/if} + {#if ruled(first)}live name rule{/if} {#if row.fields.some(changed)}modified{/if} {#if !row.fields.every(inFile)}

- {row.help} - {#if first.live && liveRoutes}Also changeable at once, without a file apply, from {first.live}.{/if} + {#if ruled(first)} + The name shown in the server browser. The Live server name rule on the + Automation tab keeps it, with its live part appended, + at most once a minute; change it there. + {:else} + {row.help} + {#if first.live && liveRoutes}Also changeable at once, without a file apply, from {first.live}.{/if} + {/if}

{/each} diff --git a/src/routes/(app)/orgs/[id]/+page.svelte b/src/routes/(app)/orgs/[id]/+page.svelte index 70596098..e6b03a5d 100644 --- a/src/routes/(app)/orgs/[id]/+page.svelte +++ b/src/routes/(app)/orgs/[id]/+page.svelte @@ -21,7 +21,7 @@ import { STATUS_STYLE_LABELS, STATUS_STYLES, type StatusStyle } from '$lib/status-styles'; import CardOptions from '$lib/components/CardOptions.svelte'; import { FEATURE_LABELS, PUBLIC_FEATURES, allowed } from '$lib/features'; - import { FAILURES_ONLY, RULE_GROUPS, RULE_KINDS } from '$lib/rule-kinds'; + import { FAILURES_ONLY, NO_ACTIONS, RULE_GROUPS, RULE_KINDS } from '$lib/rule-kinds'; import type { PageProps } from './$types'; let { data }: PageProps = $props(); @@ -1070,7 +1070,7 @@ {g} - {#each RULE_KINDS.filter((k) => k.group === g) as k (k.kind)} + {#each RULE_KINDS.filter((k) => k.group === g && !NO_ACTIONS.includes(k.kind)) as k (k.kind)}