@couch-kit/host 1.7.13 → 1.7.15

package/src/provider.tsx

@@ -1,63 +1,39 @@
 import React, {
   createContext,
+  useCallback,
   useContext,
   useEffect,
   useMemo,
-  useReducer,
   useRef,
-  useCallback,
+  useSyncExternalStore,
 } from "react";
-import { GameWebSocketServer } from "./websocket";
-import { useStaticServer } from "./server";
 import {
-  MessageTypes,
-  InternalActionTypes,
   DEFAULT_HTTP_PORT,
   DEFAULT_WS_PORT_OFFSET,
-  DEFAULT_DISCONNECT_TIMEOUT,
-  createGameReducer,
-  isValidSecret,
-  type IGameState,
   type IAction,
-  type InternalAction,
+  type IGameState,
 } from "@couch-kit/core";
-import { isValidClientMessage } from "./message-validation";
-import { ActionRateLimiter } from "./rate-limiter";
 import {
-  HostSessionManager,
-  type JoinSessionPayload,
-} from "./session-manager";
-import { authorizeClientAction } from "./action-authorization";
-import {
-  BroadcastScheduler,
-  DEFAULT_STATE_THROTTLE_MS,
-  createStateUpdateMessage,
-} from "./broadcast-scheduler";
+  GameHostRuntime,
+  type GameHostRuntimeConfig,
+} from "@couch-kit/runtime";
+import { useStaticServer } from "./server";
+import { GameWebSocketServer } from "./websocket";
 
-export interface GameHostConfig<S extends IGameState, A extends IAction> {
-  initialState: S;
-  reducer: (state: S, action: A) => S;
-  port?: number; // Static server port (default 8080)
-  wsPort?: number; // WebSocket port (default: HTTP port + 2, i.e. 8082)
+export interface GameHostConfig<
+  S extends IGameState,
+  A extends IAction,
+> extends GameHostRuntimeConfig<S, A> {
+  port?: number;
+  wsPort?: number;
   devMode?: boolean;
   devServerUrl?: string;
-  staticDir?: string; // Override the default www directory path (required on Android)
-  debug?: boolean;
-  /** Timeout (ms) before a disconnected player is permanently removed (default: 5 minutes). */
-  disconnectTimeout?: number;
-  /** State broadcast throttle interval in milliseconds (default: 33ms, ~30fps). */
-  stateThrottleMs?: number;
+  staticDir?: string;
   /**
-   * Maximum size (in bytes) of an inbound client message. Frames larger than
-   * this are discarded before parsing (default: 256 KiB).
+   * Maximum size of an inbound client message before parsing.
+   * Defaults to 256 KiB.
    */
   maxMessageBytes?: number;
-  /** Called when a player successfully joins. */
-  onPlayerJoined?: (playerId: string, name: string) => void;
-  /** Called when a player disconnects. */
-  onPlayerLeft?: (playerId: string) => void;
-  /** Called when a server error occurs. */
-  onError?: (error: Error) => void;
 }
 
 interface GameHostContextValue<S extends IGameState, A extends IAction> {
@@ -67,27 +43,16 @@ interface GameHostContextValue<S extends IGameState, A extends IAction> {
   serverError: Error | null;
 }
 
-// Create Context with 'any' fallback because Context generics are tricky in React
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const GameHostContext = createContext<GameHostContextValue<any, any> | null>(
   null,
 );
 
 /**
- * React context provider that turns a React Native TV app into a local game server.
- *
- * Starts a static file server (for the web controller) and a WebSocket game server
- * (for real-time state sync). Manages the canonical game state using the provided
- * reducer and broadcasts state updates to all connected clients.
- *
- * @param config - Host configuration including reducer, initial state, ports, and callbacks.
+ * React Native adapter for the transport-neutral authoritative game runtime.
  *
- * @example
- * ```tsx
- * <GameHostProvider config={{ reducer: gameReducer, initialState }}>
- *   <GameScreen />
- * </GameHostProvider>
- * ```
+ * The runtime owns canonical state and protocol behavior. This provider starts
+ * the native static/WebSocket servers and exposes runtime state through React.
  */
 export function GameHostProvider<S extends IGameState, A extends IAction>({
   children,
@@ -96,66 +61,24 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
   children: React.ReactNode;
   config: GameHostConfig<S, A>;
 }) {
-  // Wrap the user's reducer with createGameReducer to handle internal actions
-  // (HYDRATE, PLAYER_JOINED, PLAYER_LEFT) automatically.
-  const [state, dispatch] = useReducer(
-    createGameReducer(config.reducer),
-    config.initialState,
-  );
-
-  // Keep a ref to state so we can access it inside callbacks/effects that don't depend on it
-  const stateRef = useRef(state);
-  useEffect(() => {
-    stateRef.current = state;
-  }, [state]);
-
-  // Send WELCOME/RECONNECTED messages after state has settled (post-render).
-  // This guarantees the joining player is included in the state snapshot.
-  useEffect(() => {
-    if (pendingWelcome.current.size === 0) return;
-    if (!wsServer.current) return;
-
-    if (configRef.current.debug) {
-      console.log(
-        `[GameHost] Sending WELCOME/RECONNECTED to ${pendingWelcome.current.size} client(s)`,
-      );
-    }
-
-    const server = wsServer.current;
-    for (const [
-      socketId,
-      { playerId, isReconnect },
-    ] of pendingWelcome.current) {
-      welcomedClients.current.add(socketId);
-      if (isReconnect) {
-        server.send(socketId, {
-          type: MessageTypes.RECONNECTED,
-          payload: {
-            playerId,
-            state,
-          },
-        });
-      } else {
-        server.send(socketId, {
-          type: MessageTypes.WELCOME,
-          payload: {
-            playerId,
-            state,
-            serverTime: Date.now(),
-          },
-        });
-      }
-    }
-    pendingWelcome.current.clear();
-  }, [state]);
+  const runtimeRef = useRef<GameHostRuntime<S, A> | null>(null);
+  if (!runtimeRef.current) {
+    runtimeRef.current = new GameHostRuntime(config);
+  }
+  const runtime = runtimeRef.current;
 
-  // Keep refs for callback props to avoid stale closures
   const configRef = useRef(config);
   useEffect(() => {
     configRef.current = config;
-  });
+    runtime.updateConfig(config);
+  }, [config, runtime]);
+
+  const state = useSyncExternalStore(
+    runtime.subscribe,
+    runtime.getState,
+    runtime.getState,
+  );
 
-  // 1. Start Static File Server
   const httpPort = config.port || DEFAULT_HTTP_PORT;
   const { url: serverUrl, error: serverError } = useStaticServer({
     port: httpPort,
@@ -164,33 +87,10 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
     staticDir: config.staticDir,
   });
 
-  // 2. Start WebSocket Server (Convention: HTTP port + 2, avoids Metro on 8081)
-  const wsServer = useRef<GameWebSocketServer | null>(null);
-
-  const sessionManager = useRef(
-    new HostSessionManager({
-      getDisconnectTimeout: () =>
-        configRef.current.disconnectTimeout ?? DEFAULT_DISCONNECT_TIMEOUT,
-    }),
-  );
-
-  // Track socket IDs that have received their WELCOME message
-  const welcomedClients = useRef<Set<string>>(new Set());
-
-  // Track socket IDs that need a WELCOME/RECONNECTED message after state settles
-  const pendingWelcome = useRef<
-    Map<string, { playerId: string; isReconnect: boolean }>
-  >(new Map());
-
-  // Track which players have finished loading assets
-  const assetsLoaded = useRef<Map<string, boolean>>(new Map());
-
-  // Queue of actions dispatched since last broadcast (for STATE_UPDATE.action)
-  const actionQueue = useRef<unknown[]>([]);
-
-  const rateLimiter = useRef(new ActionRateLimiter());
+  const shutdownRef = useRef<Promise<void>>(Promise.resolve());
 
   useEffect(() => {
+    let active = true;
     const port = config.wsPort || httpPort + DEFAULT_WS_PORT_OFFSET;
     const server = new GameWebSocketServer({
       port,
@@ -198,257 +98,85 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
       maxMessageBytes: config.maxMessageBytes,
     });
 
-    // Start the WebSocket server asynchronously
-    server.start().catch((error) => {
+    server.on("listening", (listeningPort) => {
+      if (!active) return;
       if (configRef.current.debug) {
-        console.error("[GameHost] Failed to start WebSocket server:", error);
+        console.log(`[GameHost] WebSocket listening on port ${listeningPort}`);
       }
-      configRef.current.onError?.(error);
     });
-    wsServer.current = server;
 
-    server.on("listening", (p) => {
-      if (configRef.current.debug)
-        console.log(`[GameHost] WebSocket listening on port ${p}`);
+    server.on("connection", (connectionId) => {
+      if (!active) return;
+      runtime.handleConnection(connectionId);
     });
 
-    server.on("connection", (socketId) => {
-      if (configRef.current.debug)
-        console.log(`[GameHost] Client connected: ${socketId}`);
-    });
-
-    server.on("message", (socketId, rawMessage) => {
-      // Validate message structure before processing
-      if (!isValidClientMessage(rawMessage)) {
-        if (configRef.current.debug)
-          console.warn(
-            `[GameHost] Invalid message from ${socketId}:`,
-            rawMessage,
+    server.on("message", (connectionId, rawMessage) => {
+      if (!active) return;
+      void runtime
+        .handleMessage(connectionId, rawMessage)
+        .catch((error: unknown) => {
+          runtime.handleError(
+            error instanceof Error ? error : new Error(String(error)),
           );
-        server.send(socketId, {
-          type: MessageTypes.ERROR,
-          payload: { code: "INVALID_MESSAGE", message: "Malformed message" },
         });
-        return;
-      }
-
-      const message = rawMessage;
-
-      if (configRef.current.debug)
-        console.log(`[GameHost] Msg from ${socketId}:`, message);
-
-      switch (message.type) {
-        case MessageTypes.JOIN: {
-          const { secret, ...payload } = message.payload;
-
-          // Validate secret format
-          if (
-            !secret ||
-            typeof secret !== "string" ||
-            !isValidSecret(secret)
-          ) {
-            server.send(socketId, {
-              type: MessageTypes.ERROR,
-              payload: {
-                code: "INVALID_SECRET",
-                message: "Invalid or missing session secret",
-              },
-            });
-            return;
-          }
-
-          sessionManager.current
-            .handleJoin<S>(
-              socketId,
-              message.payload as JoinSessionPayload,
-              () => stateRef.current.players,
-            )
-            .then(({ playerId, isReconnect, action }) => {
-              dispatch(action);
-
-              // Initialize/reset assets loaded status
-              assetsLoaded.current.set(playerId, false);
-
-              // Queue WELCOME/RECONNECTED message
-              pendingWelcome.current.set(socketId, {
-                playerId,
-                isReconnect,
-              });
-
-              configRef.current.onPlayerJoined?.(playerId, payload.name);
-            })
-            .catch((err) => {
-              if (configRef.current.debug) {
-                console.error("[GameHost] Failed to derive player ID:", err);
-              }
-              server.send(socketId, {
-                type: MessageTypes.ERROR,
-                payload: {
-                  code: "JOIN_FAILED",
-                  message: "Failed to process join request",
-                },
-              });
-            });
-          break;
-        }
-
-        case MessageTypes.ACTION: {
-          const actionPayload = message.payload as A;
-
-          // Authorize before doing any work: reject client-injected internal
-          // action types and actions from sockets that never completed a JOIN.
-          const resolvedPlayerId =
-            sessionManager.current.getPlayerIdForSocket(socketId);
-          const auth = authorizeClientAction(
-            actionPayload.type,
-            resolvedPlayerId,
-          );
-          if (auth.kind === "reject") {
-            if (configRef.current.debug)
-              console.warn(
-                `[GameHost] Rejected action from ${socketId} (${auth.code}):`,
-                actionPayload.type,
-              );
-            server.send(socketId, {
-              type: MessageTypes.ERROR,
-              payload: { code: auth.code, message: auth.message },
-            });
-            return;
-          }
-
-          // Rate limiting
-          if (!rateLimiter.current.record(socketId).allowed) {
-            if (configRef.current.debug)
-              console.warn(`[GameHost] Rate limited ${socketId}`);
-            server.send(socketId, {
-              type: MessageTypes.ERROR,
-              payload: {
-                code: "RATE_LIMITED",
-                message: "Too many actions, slow down",
-              },
-            });
-            return;
-          }
-
-          dispatch({ ...actionPayload, playerId: auth.playerId });
-          actionQueue.current.push(actionPayload);
-          break;
-        }
-
-        case MessageTypes.PING:
-          server.send(socketId, {
-            type: MessageTypes.PONG,
-            payload: {
-              id: message.payload.id,
-              origTimestamp: message.payload.timestamp,
-              serverTime: Date.now(),
-            },
-          });
-          break;
-
-        case MessageTypes.ASSETS_LOADED: {
-          const loadedPlayerId =
-            sessionManager.current.getPlayerIdForSocket(socketId);
-          if (loadedPlayerId) {
-            assetsLoaded.current.set(loadedPlayerId, true);
-            if (configRef.current.debug)
-              console.log(`[GameHost] Assets loaded for ${loadedPlayerId}`);
-          }
-          break;
-        }
-      }
     });
 
-    server.on("disconnect", (socketId) => {
-      if (configRef.current.debug)
-        console.log(`[GameHost] Client disconnected: ${socketId}`);
-
-      welcomedClients.current.delete(socketId);
-
-      // Clean up rate limits
-      rateLimiter.current.reset(socketId);
-
-      const result = sessionManager.current.handleDisconnect<S>(socketId);
-      if (result.kind === "unknown") return; // Unknown socket, nothing to do
-
-      // Clean up assets loaded tracking
-      assetsLoaded.current.delete(result.playerId);
-
-      if (result.kind === "stale") {
-        // Player already reconnected on a newer socket — skip
-        return;
-      }
-
-      // Mark disconnected (don't remove from sessions — allow reconnect)
-      dispatch(result.action);
-
-      configRef.current.onPlayerLeft?.(result.playerId);
-
-      // Start stale player cleanup timer
-      sessionManager.current.scheduleRemoval(
-        result.playerId,
-        result.secret,
-        (playerId) => {
-          dispatch({
-            type: InternalActionTypes.PLAYER_REMOVED,
-            payload: { playerId },
-          } as InternalAction<S>);
-        },
-      );
+    server.on("disconnect", (connectionId) => {
+      if (!active) return;
+      runtime.handleDisconnect(connectionId);
     });
 
     server.on("error", (error) => {
-      if (configRef.current.debug)
-        console.error(`[GameHost] Server error:`, error);
-      configRef.current.onError?.(error);
+      if (!active) return;
+      runtime.handleError(error);
     });
 
-    return () => {
-      server.stop();
-      sessionManager.current.clearRemovalTimers();
-    };
-  }, []); // Run once on mount
+    const startPromise = shutdownRef.current
+      .then(async () => {
+        if (!active) return;
 
-  // 3. Throttled State Broadcasts (~30fps)
-  // Batches rapid state changes so at most one broadcast is sent per ~33ms frame,
-  // reducing serialization overhead and network traffic for fast-updating games.
-  const broadcastScheduler = useRef(
-    new BroadcastScheduler({
-      stateThrottleMs: config.stateThrottleMs,
-    }),
-  );
-
-  useEffect(() => {
-    broadcastScheduler.current.setStateThrottleMs(
-      config.stateThrottleMs ?? DEFAULT_STATE_THROTTLE_MS,
-    );
-  }, [config.stateThrottleMs]);
-
-  const broadcastState = useCallback(() => {
-    if (wsServer.current) {
-      const actions = actionQueue.current;
-      actionQueue.current = [];
-      wsServer.current.broadcast(
-        createStateUpdateMessage(stateRef.current, actions),
-      );
-    }
-  }, []);
+        runtime.setTransport({
+          send: (connectionId, message) => {
+            server.send(connectionId, message);
+          },
+          broadcast: (message) => {
+            server.broadcast(message);
+          },
+        });
 
-  useEffect(() => {
-    // Cancel any pending broadcast and schedule a fresh one.
-    // This ensures the broadcast always uses the latest stateRef.
-    broadcastScheduler.current.schedule(broadcastState);
+        await server.start();
+      })
+      .catch((error: unknown) => {
+        if (!active) return;
+        runtime.handleError(
+          error instanceof Error ? error : new Error(String(error)),
+        );
+      });
 
     return () => {
-      broadcastScheduler.current.cancel();
+      active = false;
+      runtime.setTransport(null);
+      runtime.stop();
+      shutdownRef.current = startPromise
+        .then(() => server.stop())
+        .catch((error: unknown) => {
+          if (configRef.current.debug) {
+            console.error("[GameHost] Failed to stop WebSocket server:", error);
+          }
+        });
     };
-  }, [state, broadcastState]);
+  }, []);
+
+  const dispatch = useCallback(
+    (action: A) => {
+      runtime.dispatch(action);
+    },
+    [runtime],
+  );
 
-  // Memoize context value to prevent unnecessary re-renders of consumers
-  // that only use stable references like dispatch
   const contextValue = useMemo(
     () => ({ state, dispatch, serverUrl, serverError }),
-    [state, serverUrl, serverError],
+    [state, dispatch, serverUrl, serverError],
   );
 
   return (
@@ -459,14 +187,7 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
 }
 
 /**
- * React hook to access the game host context.
- *
- * Must be used within a `<GameHostProvider>`. Returns the canonical game state,
- * a dispatch function for actions, the server URL (for QR codes), and any
- * server startup errors.
- *
- * @returns An object with `state`, `dispatch`, `serverUrl`, and `serverError`.
- * @throws If used outside of a `<GameHostProvider>`.
+ * Accesses canonical host state, trusted dispatch, and controller server URL.
  */
 export function useGameHost<S extends IGameState, A extends IAction>() {
   const context = useContext(GameHostContext);

package/src/rate-limiter.ts

@@ -1,66 +1,8 @@
-/** Maximum actions per rate-limit window. */
-export const RATE_LIMIT_MAX = 60;
-
-/** Rate-limit window duration (ms). */
-export const RATE_LIMIT_WINDOW = 1000;
-
-export interface RateLimitInfo {
-  count: number;
-  windowStart: number;
-}
-
-export interface RateLimitResult extends RateLimitInfo {
-  allowed: boolean;
-}
-
-export interface ActionRateLimiterOptions {
-  maxActions?: number;
-  windowMs?: number;
-  now?: () => number;
-}
-
-/**
- * Per-socket action limiter that preserves the host provider's original
- * fixed-window algorithm.
- */
-export class ActionRateLimiter {
-  private readonly maxActions: number;
-  private readonly windowMs: number;
-  private readonly now: () => number;
-  private readonly limits = new Map<string, RateLimitInfo>();
-
-  constructor(options: ActionRateLimiterOptions = {}) {
-    this.maxActions = options.maxActions ?? RATE_LIMIT_MAX;
-    this.windowMs = options.windowMs ?? RATE_LIMIT_WINDOW;
-    this.now = options.now ?? Date.now;
-  }
-
-  record(socketId: string): RateLimitResult {
-    const now = this.now();
-    let rateInfo = this.limits.get(socketId);
-
-    if (!rateInfo || now - rateInfo.windowStart > this.windowMs) {
-      rateInfo = { count: 0, windowStart: now };
-      this.limits.set(socketId, rateInfo);
-    }
-
-    rateInfo.count++;
-
-    return {
-      ...rateInfo,
-      allowed: rateInfo.count <= this.maxActions,
-    };
-  }
-
-  reset(socketId: string): void {
-    this.limits.delete(socketId);
-  }
-
-  clear(): void {
-    this.limits.clear();
-  }
-
-  get(socketId: string): RateLimitInfo | undefined {
-    return this.limits.get(socketId);
-  }
-}
+export {
+  ActionRateLimiter,
+  RATE_LIMIT_MAX,
+  RATE_LIMIT_WINDOW,
+  type ActionRateLimiterOptions,
+  type RateLimitInfo,
+  type RateLimitResult,
+} from "@couch-kit/runtime";