mirror of
https://github.com/djdevin/recflare.git
synced 2026-09-08 22:51:30 -07:00
true matchmaking
This commit is contained in:
Devin Zuczek
@@ -0,0 +1,34 @@
|
||||
-- Room instances — live sessions of a room. Stored as a JSON blob in `data` with
|
||||
-- generated (virtual) columns for every field (snake_case, per the C# `[Column]`
|
||||
-- names), the same pattern as the rooms/accounts tables. `id` (roomInstanceId) is
|
||||
-- a sequential key held in the blob. Generated from src/room-instance-db.ts
|
||||
-- (SCHEMA_DDL) — keep in sync. Written/read by the match worker.
|
||||
|
||||
CREATE TABLE IF NOT EXISTS room_instance (
|
||||
data TEXT NOT NULL,
|
||||
id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.roomInstanceId')) VIRTUAL,
|
||||
owner_account_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.ownerAccountId')) VIRTUAL,
|
||||
room_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.roomId')) VIRTUAL,
|
||||
sub_room_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.subRoomId')) VIRTUAL,
|
||||
location TEXT GENERATED ALWAYS AS (json_extract(data, '$.location')) VIRTUAL,
|
||||
data_blob TEXT GENERATED ALWAYS AS (json_extract(data, '$.dataBlob')) VIRTUAL,
|
||||
event_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.eventId')) VIRTUAL,
|
||||
photon_region_id TEXT GENERATED ALWAYS AS (json_extract(data, '$.photonRegionId')) VIRTUAL,
|
||||
photon_room_id TEXT GENERATED ALWAYS AS (json_extract(data, '$.photonRoomId')) VIRTUAL,
|
||||
name TEXT GENERATED ALWAYS AS (json_extract(data, '$.name')) VIRTUAL,
|
||||
max_capacity INTEGER GENERATED ALWAYS AS (json_extract(data, '$.maxCapacity')) VIRTUAL,
|
||||
is_full INTEGER GENERATED ALWAYS AS (json_extract(data, '$.isFull')) VIRTUAL,
|
||||
is_private INTEGER GENERATED ALWAYS AS (json_extract(data, '$.isPrivate')) VIRTUAL,
|
||||
is_in_progress INTEGER GENERATED ALWAYS AS (json_extract(data, '$.isInProgress')) VIRTUAL,
|
||||
room_code TEXT GENERATED ALWAYS AS (json_extract(data, '$.roomCode')) VIRTUAL,
|
||||
room_instance_type INTEGER GENERATED ALWAYS AS (json_extract(data, '$.roomInstanceType')) VIRTUAL,
|
||||
club_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.clubId')) VIRTUAL,
|
||||
encrypt_voice_chat INTEGER GENERATED ALWAYS AS (json_extract(data, '$.EncryptVoiceChat')) VIRTUAL,
|
||||
matchmaking_policy INTEGER GENERATED ALWAYS AS (json_extract(data, '$.matchmakingPolicy')) VIRTUAL,
|
||||
allow_new_users INTEGER GENERATED ALWAYS AS (json_extract(data, '$.allowNewUsers')) VIRTUAL,
|
||||
join_disabled INTEGER GENERATED ALWAYS AS (json_extract(data, '$.joinDisabled')) VIRTUAL,
|
||||
created_at TEXT GENERATED ALWAYS AS (json_extract(data, '$.createdAt')) VIRTUAL
|
||||
);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_room_instance_id ON room_instance (id);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_room_instance_photon_room_id ON room_instance (photon_room_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_room_instance_room_id ON room_instance (room_id);
|
||||
@@ -0,0 +1,208 @@
|
||||
/**
|
||||
* Room instances — live sessions of a room. Stored with the same JSON-blob pattern
|
||||
* as the rooms/accounts tables: the full instance is a JSON blob in `data`, and
|
||||
* every field is a SQLite generated (virtual) column extracted from it (snake_case
|
||||
* per the C# `[Column]` names). `id` is a sequential key held in the blob.
|
||||
*
|
||||
* The `rooms` worker owns the schema (migrations/0004_room_instance.sql). The match
|
||||
* worker finds/creates instances here — keep this in sync. Columns marked
|
||||
* `[JsonIgnore]` in the C# (owner_account_id, data_blob, allow_new_users,
|
||||
* join_disabled) live in the blob but are dropped from the client DTO (`toDto`).
|
||||
*/
|
||||
|
||||
/** Schema DDL (mirror of migrations/0004_room_instance.sql). */
|
||||
export const SCHEMA_DDL: string[] = [
|
||||
`CREATE TABLE IF NOT EXISTS room_instance (
|
||||
data TEXT NOT NULL,
|
||||
id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.roomInstanceId')) VIRTUAL,
|
||||
owner_account_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.ownerAccountId')) VIRTUAL,
|
||||
room_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.roomId')) VIRTUAL,
|
||||
sub_room_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.subRoomId')) VIRTUAL,
|
||||
location TEXT GENERATED ALWAYS AS (json_extract(data, '$.location')) VIRTUAL,
|
||||
data_blob TEXT GENERATED ALWAYS AS (json_extract(data, '$.dataBlob')) VIRTUAL,
|
||||
event_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.eventId')) VIRTUAL,
|
||||
photon_region_id TEXT GENERATED ALWAYS AS (json_extract(data, '$.photonRegionId')) VIRTUAL,
|
||||
photon_room_id TEXT GENERATED ALWAYS AS (json_extract(data, '$.photonRoomId')) VIRTUAL,
|
||||
name TEXT GENERATED ALWAYS AS (json_extract(data, '$.name')) VIRTUAL,
|
||||
max_capacity INTEGER GENERATED ALWAYS AS (json_extract(data, '$.maxCapacity')) VIRTUAL,
|
||||
is_full INTEGER GENERATED ALWAYS AS (json_extract(data, '$.isFull')) VIRTUAL,
|
||||
is_private INTEGER GENERATED ALWAYS AS (json_extract(data, '$.isPrivate')) VIRTUAL,
|
||||
is_in_progress INTEGER GENERATED ALWAYS AS (json_extract(data, '$.isInProgress')) VIRTUAL,
|
||||
room_code TEXT GENERATED ALWAYS AS (json_extract(data, '$.roomCode')) VIRTUAL,
|
||||
room_instance_type INTEGER GENERATED ALWAYS AS (json_extract(data, '$.roomInstanceType')) VIRTUAL,
|
||||
club_id INTEGER GENERATED ALWAYS AS (json_extract(data, '$.clubId')) VIRTUAL,
|
||||
encrypt_voice_chat INTEGER GENERATED ALWAYS AS (json_extract(data, '$.EncryptVoiceChat')) VIRTUAL,
|
||||
matchmaking_policy INTEGER GENERATED ALWAYS AS (json_extract(data, '$.matchmakingPolicy')) VIRTUAL,
|
||||
allow_new_users INTEGER GENERATED ALWAYS AS (json_extract(data, '$.allowNewUsers')) VIRTUAL,
|
||||
join_disabled INTEGER GENERATED ALWAYS AS (json_extract(data, '$.joinDisabled')) VIRTUAL,
|
||||
created_at TEXT GENERATED ALWAYS AS (json_extract(data, '$.createdAt')) VIRTUAL
|
||||
)`,
|
||||
`CREATE UNIQUE INDEX IF NOT EXISTS idx_room_instance_id ON room_instance (id)`,
|
||||
`CREATE UNIQUE INDEX IF NOT EXISTS idx_room_instance_photon_room_id ON room_instance (photon_room_id)`,
|
||||
`CREATE INDEX IF NOT EXISTS idx_room_instance_room_id ON room_instance (room_id)`,
|
||||
]
|
||||
|
||||
/** Client-facing RoomInstance JSON (JsonPropertyName keys; JsonIgnore omitted). */
|
||||
export interface RoomInstanceDto {
|
||||
roomInstanceId: number
|
||||
roomId: number
|
||||
subRoomId: number
|
||||
location: string
|
||||
eventId: number
|
||||
photonRegionId: string
|
||||
photonRoomId: string
|
||||
name: string
|
||||
maxCapacity: number
|
||||
isFull: boolean
|
||||
isPrivate: boolean
|
||||
isInProgress: boolean
|
||||
roomCode: string
|
||||
roomInstanceType: number
|
||||
clubId: number
|
||||
// PascalCase JSON key, per the C# `[JsonPropertyName("EncryptVoiceChat")]`.
|
||||
EncryptVoiceChat: boolean
|
||||
matchmakingPolicy: number
|
||||
createdAt: string
|
||||
}
|
||||
|
||||
/** The full stored instance — the DTO plus the JsonIgnore fields (in the blob). */
|
||||
interface StoredRoomInstance extends RoomInstanceDto {
|
||||
ownerAccountId: number
|
||||
dataBlob: string
|
||||
allowNewUsers: boolean
|
||||
joinDisabled: boolean
|
||||
}
|
||||
|
||||
/** Fields for a new instance; `roomInstanceId` and `createdAt` are assigned here. */
|
||||
export interface NewRoomInstance {
|
||||
ownerAccountId: number
|
||||
roomId: number
|
||||
photonRoomId: string
|
||||
subRoomId?: number
|
||||
location?: string
|
||||
dataBlob?: string
|
||||
eventId?: number
|
||||
photonRegionId?: string
|
||||
name?: string
|
||||
maxCapacity?: number
|
||||
isFull?: boolean
|
||||
isPrivate?: boolean
|
||||
isInProgress?: boolean
|
||||
roomCode?: string
|
||||
roomInstanceType?: number
|
||||
clubId?: number
|
||||
encryptVoiceChat?: boolean
|
||||
matchmakingPolicy?: number
|
||||
allowNewUsers?: boolean
|
||||
joinDisabled?: boolean
|
||||
}
|
||||
|
||||
/** Project a stored instance to the client DTO (JsonIgnore fields dropped). */
|
||||
function toDto(s: StoredRoomInstance): RoomInstanceDto {
|
||||
return {
|
||||
roomInstanceId: s.roomInstanceId,
|
||||
roomId: s.roomId,
|
||||
subRoomId: s.subRoomId,
|
||||
location: s.location,
|
||||
eventId: s.eventId,
|
||||
photonRegionId: s.photonRegionId,
|
||||
photonRoomId: s.photonRoomId,
|
||||
name: s.name,
|
||||
maxCapacity: s.maxCapacity,
|
||||
isFull: s.isFull,
|
||||
isPrivate: s.isPrivate,
|
||||
isInProgress: s.isInProgress,
|
||||
roomCode: s.roomCode,
|
||||
roomInstanceType: s.roomInstanceType,
|
||||
clubId: s.clubId,
|
||||
EncryptVoiceChat: s.EncryptVoiceChat,
|
||||
matchmakingPolicy: s.matchmakingPolicy,
|
||||
createdAt: s.createdAt,
|
||||
}
|
||||
}
|
||||
|
||||
const parse = (data: string): StoredRoomInstance => JSON.parse(data) as StoredRoomInstance
|
||||
|
||||
/**
|
||||
* Ids start high (above 1_000_000) so an instance id never collides with the
|
||||
* dorm's fixed roomInstanceId of 1 — the client keys room transitions off the id,
|
||||
* so a room instance that returned 1 would look like "still in the dorm".
|
||||
*/
|
||||
const ID_BASE = 1_000_000
|
||||
|
||||
/** Insert a new room instance, returning it as a client DTO. */
|
||||
export async function createRoomInstance(
|
||||
db: D1Database,
|
||||
input: NewRoomInstance
|
||||
): Promise<RoomInstanceDto> {
|
||||
const idRow = await db
|
||||
.prepare(`SELECT COALESCE(MAX(id), ${ID_BASE}) + 1 AS next FROM room_instance`)
|
||||
.first<{ next: number }>()
|
||||
const stored: StoredRoomInstance = {
|
||||
roomInstanceId: idRow?.next ?? ID_BASE + 1,
|
||||
ownerAccountId: input.ownerAccountId,
|
||||
roomId: input.roomId,
|
||||
subRoomId: input.subRoomId ?? 0,
|
||||
location: input.location ?? '',
|
||||
dataBlob: input.dataBlob ?? '',
|
||||
eventId: input.eventId ?? 0,
|
||||
photonRegionId: input.photonRegionId ?? 'us',
|
||||
photonRoomId: input.photonRoomId,
|
||||
name: input.name ?? '',
|
||||
maxCapacity: input.maxCapacity ?? 0,
|
||||
isFull: input.isFull ?? false,
|
||||
isPrivate: input.isPrivate ?? false,
|
||||
isInProgress: input.isInProgress ?? false,
|
||||
roomCode: input.roomCode ?? '',
|
||||
roomInstanceType: input.roomInstanceType ?? 0,
|
||||
clubId: input.clubId ?? 0,
|
||||
EncryptVoiceChat: input.encryptVoiceChat ?? false,
|
||||
matchmakingPolicy: input.matchmakingPolicy ?? 0,
|
||||
allowNewUsers: input.allowNewUsers ?? true,
|
||||
joinDisabled: input.joinDisabled ?? false,
|
||||
createdAt: new Date().toISOString(),
|
||||
}
|
||||
await db.prepare('INSERT INTO room_instance (data) VALUES (?1)').bind(JSON.stringify(stored)).run()
|
||||
return toDto(stored)
|
||||
}
|
||||
|
||||
/** Look up a room instance by its id (roomInstanceId). */
|
||||
export async function getRoomInstance(db: D1Database, id: number): Promise<RoomInstanceDto | null> {
|
||||
const row = await db
|
||||
.prepare('SELECT data FROM room_instance WHERE id = ?1')
|
||||
.bind(id)
|
||||
.first<{ data: string }>()
|
||||
return row ? toDto(parse(row.data)) : null
|
||||
}
|
||||
|
||||
/**
|
||||
* The oldest joinable public instance of a room (not private, not full, joins
|
||||
* enabled), or null when there's none to join. Used by matchmaking to reuse an
|
||||
* existing instance before creating a new one.
|
||||
*/
|
||||
export async function getJoinableInstance(
|
||||
db: D1Database,
|
||||
roomId: number
|
||||
): Promise<RoomInstanceDto | null> {
|
||||
const row = await db
|
||||
.prepare(
|
||||
`SELECT data FROM room_instance
|
||||
WHERE room_id = ?1 AND is_private = 0 AND is_full = 0 AND join_disabled = 0
|
||||
ORDER BY id LIMIT 1`
|
||||
)
|
||||
.bind(roomId)
|
||||
.first<{ data: string }>()
|
||||
return row ? toDto(parse(row.data)) : null
|
||||
}
|
||||
|
||||
/** All instances of a given room. */
|
||||
export async function getRoomInstancesByRoom(
|
||||
db: D1Database,
|
||||
roomId: number
|
||||
): Promise<RoomInstanceDto[]> {
|
||||
const { results } = await db
|
||||
.prepare('SELECT data FROM room_instance WHERE room_id = ?1')
|
||||
.bind(roomId)
|
||||
.all<{ data: string }>()
|
||||
return results.map((r) => toDto(parse(r.data)))
|
||||
}
|
||||
@@ -4,6 +4,11 @@ import { beforeAll, describe, expect, it } from 'vitest'
|
||||
import '../../rooms.app'
|
||||
|
||||
import importRooms from '../../../static/ImportRooms.json'
|
||||
import {
|
||||
createRoomInstance,
|
||||
getRoomInstance,
|
||||
SCHEMA_DDL as ROOM_INSTANCE_SCHEMA_DDL,
|
||||
} from '../../room-instance-db'
|
||||
import { SCHEMA_DDL } from '../../rooms-db'
|
||||
|
||||
import type { Env } from '../../context'
|
||||
@@ -41,6 +46,7 @@ async function bearer(sub: string): Promise<Record<string, string>> {
|
||||
// Apply the schema + seed the imported rooms into the test D1 (mirrors the migrations).
|
||||
beforeAll(async () => {
|
||||
for (const stmt of SCHEMA_DDL) await env.DB.prepare(stmt).run()
|
||||
for (const stmt of ROOM_INSTANCE_SCHEMA_DDL) await env.DB.prepare(stmt).run()
|
||||
const insert = env.DB.prepare('INSERT OR IGNORE INTO rooms (data) VALUES (?1)')
|
||||
await env.DB.batch(importRooms.map((r) => insert.bind(JSON.stringify(r))))
|
||||
})
|
||||
@@ -522,6 +528,31 @@ describe('rooms endpoints', () => {
|
||||
expect(room.RoomId).toBe(2)
|
||||
})
|
||||
|
||||
it('room_instance: create + read round-trips and hides JsonIgnore fields', async () => {
|
||||
const created = await createRoomInstance(env.DB, {
|
||||
ownerAccountId: 5,
|
||||
roomId: 2,
|
||||
subRoomId: 3,
|
||||
photonRoomId: crypto.randomUUID(),
|
||||
name: '^RecCenter',
|
||||
maxCapacity: 20,
|
||||
isPrivate: true,
|
||||
encryptVoiceChat: true,
|
||||
})
|
||||
// The DB assigns a sequential id, mapped to `roomInstanceId` in the DTO.
|
||||
expect(created.roomInstanceId).toBeGreaterThan(0)
|
||||
expect(created.roomId).toBe(2)
|
||||
expect(created.isPrivate).toBe(true)
|
||||
expect(created.EncryptVoiceChat).toBe(true) // PascalCase JSON key, per the C#
|
||||
|
||||
// Reads back identically; JsonIgnore columns are not in the DTO.
|
||||
const fetched = await getRoomInstance(env.DB, created.roomInstanceId)
|
||||
expect(fetched).toEqual(created)
|
||||
expect('ownerAccountId' in (fetched as object)).toBe(false)
|
||||
expect('dataBlob' in (fetched as object)).toBe(false)
|
||||
expect('allowNewUsers' in (fetched as object)).toBe(false)
|
||||
})
|
||||
|
||||
it('GET /photon_access_token (bare + /roomserver) returns permissions', async () => {
|
||||
for (const path of ['/photon_access_token', '/roomserver/photon_access_token']) {
|
||||
const res = await SELF.fetch(`${ORIGIN}${path}`)
|
||||
|
||||
Reference in New Issue
Block a user