Add administrative room close and reopen controls
Preserve readable private tables, discussion and pending games while closure blocks new play, joins, messages, AI and seat mutations. Add live-authorized atomic closure audits, room-version/revision fences, dedicated controls and exact saved retries. Reopen with the saved pause/join settings and current credentials; restoring a removed but closed room keeps its AI stopped. Verified types, lint, 5356 offline tests, 52 HTTP tests and build. Seventeen dedicated authenticated HTTP groups and independent privacy/persistence review passed. Desktop/mobile browser QA confirmed one close after a lost response and refresh, persistent readable notices, retained private draft, mobile reopening and saved-seat refresh. All 2,001 baseline rooms, 4,243 seats and related records preserved. Positive production admin acceptance awaits authorized QA access; full admin and rules gates remain open.
This commit is contained in:
1 parent
238de3860d
commit
98b1b3261b
49 files changed
+4255
-86
No files matched your search
@@ -0,0 +1,64 @@
|
||||
import { randomId } from './random-id';
|
||||
import { validAdminClosureInput, type AdminClosureInput, type AdminClosureView, type AdminClosureResult } from './admin-closure';
|
||||
|
||||
type Storage = Pick<globalThis.Storage, 'getItem' | 'setItem' | 'removeItem'>;
|
||||
const key = (account: string, code: string) => `dune.admin-closure-request.v1:${account}:${code}`;
|
||||
const object = (value: unknown): value is Record<string, unknown> => !!value && typeof value === 'object' && !Array.isArray(value);
|
||||
const keys = (value: Record<string, unknown>, names: string[]) => Object.keys(value).length === names.length && names.every(name => Object.hasOwn(value, name));
|
||||
const integer = (value: unknown): value is number => Number.isSafeInteger(value) && Number(value) >= 0;
|
||||
const timestamp = (value: unknown) => value === null || integer(value) && value <= 8_640_000_000_000_000;
|
||||
|
||||
export function validAdminClosureView(value: unknown): value is AdminClosureView {
|
||||
return object(value) && keys(value, ['removed', 'code', 'version', 'closed', 'revision', 'closedAt', 'updatedAt', 'paused', 'joinLocked']) &&
|
||||
typeof value.code === 'string' && /^[A-Z2-9]{8}$/.test(value.code) && integer(value.version) && integer(value.revision) &&
|
||||
typeof value.removed === 'boolean' && typeof value.closed === 'boolean' && typeof value.paused === 'boolean' && typeof value.joinLocked === 'boolean' &&
|
||||
timestamp(value.closedAt) && timestamp(value.updatedAt);
|
||||
}
|
||||
|
||||
export function adminClosureResponse(value: unknown, code: string): AdminClosureView {
|
||||
if (!validAdminClosureView(value) || value.code !== code) throw new Error('The server returned unreadable room availability.');
|
||||
return value;
|
||||
}
|
||||
|
||||
export function adminClosureConfirmation(value: unknown, code: string, input: AdminClosureInput): AdminClosureResult {
|
||||
if (!object(value) || !keys(value, ['operationId', 'replayed', 'appliedRevision', 'appliedVersion', 'room']) ||
|
||||
value.operationId !== input.operationId || typeof value.replayed !== 'boolean' ||
|
||||
!integer(value.appliedVersion) || value.appliedVersion !== input.expectedVersion + 1 ||
|
||||
!integer(value.appliedRevision) || value.appliedRevision !== input.expectedRevision + 1)
|
||||
throw new Error('The server did not confirm this closure or reopening request.');
|
||||
const room = adminClosureResponse(value.room, code);
|
||||
if (room.version < value.appliedVersion || room.revision < value.appliedRevision)
|
||||
throw new Error('The server returned room availability older than the confirmed change.');
|
||||
return value as AdminClosureResult;
|
||||
}
|
||||
|
||||
export function newAdminClosureRequest(view: AdminClosureView, closed: boolean, reason: string): AdminClosureInput {
|
||||
const input = { operationId: randomId(), expectedVersion: view.version, expectedRevision: view.revision, closed, reason: reason.trim() };
|
||||
if (!validAdminClosureInput(input)) throw new Error('Enter a reason of 1–300 characters on one line.');
|
||||
if (view.removed) throw new Error('Restore this removed room before changing its closure.');
|
||||
if (closed === view.closed) throw new Error('Refresh the room before choosing a closure or reopening.');
|
||||
return input;
|
||||
}
|
||||
|
||||
export function readAdminClosureRequest(storage: Storage, account: string, code: string): AdminClosureInput | null {
|
||||
const raw = storage.getItem(key(account, code));
|
||||
if (raw === null) return null;
|
||||
let value: unknown;
|
||||
try { value = raw.length <= 2048 ? JSON.parse(raw) : null; } catch { value = null; }
|
||||
if (!validAdminClosureInput(value)) throw new Error('This tab’s saved closure or reopening request is unreadable. Inspect the current room before discarding its local retry record.');
|
||||
return value;
|
||||
}
|
||||
|
||||
/** Save before sending; a different unresolved request must never be replaced. */
|
||||
export function saveAdminClosureRequest(storage: Storage, account: string, code: string, input: AdminClosureInput) {
|
||||
if (!validAdminClosureInput(input)) throw new Error('Invalid closure or reopening request.');
|
||||
const previous = readAdminClosureRequest(storage, account, code), encoded = JSON.stringify(input);
|
||||
if (previous && JSON.stringify(previous) !== encoded) throw new Error('Resolve the saved closure or reopening request before sending a different change.');
|
||||
storage.setItem(key(account, code), encoded);
|
||||
if (storage.getItem(key(account, code)) !== encoded) throw new Error('The closure or reopening request could not be preserved in this tab. Nothing was sent.');
|
||||
}
|
||||
|
||||
export function clearAdminClosureRequest(storage: Storage, account: string, code: string) {
|
||||
storage.removeItem(key(account, code));
|
||||
if (storage.getItem(key(account, code)) !== null) throw new Error('The saved closure or reopening request could not be cleared.');
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
export type AdminClosureInput = {
|
||||
operationId: string;
|
||||
expectedVersion: number;
|
||||
expectedRevision: number;
|
||||
closed: boolean;
|
||||
reason: string;
|
||||
};
|
||||
|
||||
export type AdminClosureView = {
|
||||
removed: boolean;
|
||||
code: string;
|
||||
version: number;
|
||||
closed: boolean;
|
||||
revision: number;
|
||||
closedAt: number | null;
|
||||
updatedAt: number | null;
|
||||
paused: boolean;
|
||||
joinLocked: boolean;
|
||||
};
|
||||
|
||||
export type AdminClosureResult = {
|
||||
operationId: string;
|
||||
replayed: boolean;
|
||||
appliedRevision: number;
|
||||
appliedVersion: number;
|
||||
room: AdminClosureView;
|
||||
};
|
||||
|
||||
export function validAdminClosureInput(
|
||||
value: unknown,
|
||||
): value is AdminClosureInput {
|
||||
if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
|
||||
const input = value as Record<string, unknown>;
|
||||
const fields = [
|
||||
'operationId',
|
||||
'expectedVersion',
|
||||
'expectedRevision',
|
||||
'closed',
|
||||
'reason',
|
||||
];
|
||||
return (
|
||||
Object.keys(input).length === fields.length &&
|
||||
fields.every((field) => Object.hasOwn(input, field)) &&
|
||||
typeof input.operationId === 'string' &&
|
||||
input.operationId.length === 36 &&
|
||||
/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(
|
||||
input.operationId,
|
||||
) &&
|
||||
[input.expectedVersion, input.expectedRevision].every(
|
||||
(version) =>
|
||||
Number.isSafeInteger(version) &&
|
||||
Number(version) >= 0 &&
|
||||
Number(version) < Number.MAX_SAFE_INTEGER,
|
||||
) &&
|
||||
typeof input.closed === 'boolean' &&
|
||||
typeof input.reason === 'string' &&
|
||||
!!input.reason.trim() &&
|
||||
input.reason.length <= 300 &&
|
||||
!input.reason
|
||||
.split('')
|
||||
.some((char) => char.charCodeAt(0) < 32 || char.charCodeAt(0) === 127)
|
||||
);
|
||||
}
|
||||
@@ -17,7 +17,7 @@ export function validAdminLobbyView(value: unknown): value is AdminLobbyView {
|
||||
typeof value.advanced !== 'boolean' || typeof value.techTokens !== 'boolean' || typeof value.strongholdCards !== 'boolean' ||
|
||||
!Array.isArray(value.players) || value.players.length > 6 || !object(value.control)) return false;
|
||||
const control = value.control;
|
||||
return keys(control, ['paused', 'joinLocked', 'revision', 'updatedAt']) && typeof control.paused === 'boolean' && typeof control.joinLocked === 'boolean' &&
|
||||
return keys(control, ['paused', 'joinLocked', 'revision', 'updatedAt', ...(control.closed === true ? ['closed'] : [])]) && typeof control.paused === 'boolean' && typeof control.joinLocked === 'boolean' &&
|
||||
integer(control.revision) && (control.updatedAt === null || integer(control.updatedAt)) && value.players.every(player =>
|
||||
object(player) && keys(player, ['id', 'name', 'faction', 'bot', 'position', 'ready', 'hostEligible']) &&
|
||||
typeof player.id === 'string' && typeof player.name === 'string' && FACTIONS.some(faction => faction.id === player.faction) &&
|
||||
|
||||
@@ -9,7 +9,7 @@ const integer = (value: unknown): value is number => Number.isSafeInteger(value)
|
||||
const timestamp = (value: unknown) => value === null || integer(value) && value <= 8_640_000_000_000_000;
|
||||
|
||||
export function validAdminRemovalView(value: unknown): value is AdminRemovalView {
|
||||
return object(value) && keys(value, ['code', 'version', 'removed', 'revision', 'removedAt', 'updatedAt', 'paused', 'joinLocked']) &&
|
||||
return object(value) && keys(value, ['code', 'version', 'removed', 'revision', 'removedAt', 'updatedAt', 'paused', 'joinLocked', ...(value.closed === true ? ['closed'] : [])]) &&
|
||||
typeof value.code === 'string' && /^[A-Z2-9]{8}$/.test(value.code) && integer(value.version) && integer(value.revision) &&
|
||||
typeof value.removed === 'boolean' && typeof value.paused === 'boolean' && typeof value.joinLocked === 'boolean' &&
|
||||
timestamp(value.removedAt) && timestamp(value.updatedAt);
|
||||
|
||||
@@ -7,6 +7,7 @@ export type AdminRemovalInput = {
|
||||
};
|
||||
|
||||
export type AdminRemovalView = {
|
||||
closed?: true;
|
||||
code: string;
|
||||
version: number;
|
||||
removed: boolean;
|
||||
|
||||
@@ -17,6 +17,9 @@ export class ClientRequestError extends Error {
|
||||
}
|
||||
}
|
||||
|
||||
export const isRoomClosed = (error: unknown): error is ClientRequestError =>
|
||||
error instanceof ClientRequestError && error.code === 'ROOM_CLOSED';
|
||||
|
||||
export const isRoomRemoved = (error: unknown): error is ClientRequestError =>
|
||||
error instanceof ClientRequestError && error.code === 'ROOM_REMOVED';
|
||||
|
||||
@@ -33,7 +36,7 @@ export function subscribeRoomRemoval(listener: (room: string) => void) {
|
||||
export function requestMayHaveCompleted(error: unknown): boolean {
|
||||
// Creation/recovery can commit before their final private read loses to removal.
|
||||
// A temporary removal is never proof that a preceding mutation did not commit.
|
||||
if (isRoomRemoved(error)) return true;
|
||||
if (isRoomRemoved(error) || isRoomClosed(error)) return true;
|
||||
if (!(error instanceof ClientRequestError) || error.kind !== 'http')
|
||||
return true;
|
||||
return (
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/** Public room operations only. Reasons and administrator identities stay private. */
|
||||
export type RoomControl = {
|
||||
closed?: true;
|
||||
paused: boolean;
|
||||
joinLocked: boolean;
|
||||
revision: number;
|
||||
|
||||
Reference in new issue
Block a user