@couch-kit/host 1.4.0 → 1.5.0

package/lib/provider.d.ts

@@ -9,6 +9,8 @@ export interface GameHostConfig<S extends IGameState, A extends IAction> {
     devServerUrl?: string;
     staticDir?: string;
     debug?: boolean;
+    /** Timeout (ms) before a disconnected player is permanently removed (default: 5 minutes). */
+    disconnectTimeout?: number;
     /** Called when a player successfully joins. */
     onPlayerJoined?: (playerId: string, name: string) => void;
     /** Called when a player disconnects. */

package/lib/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAGf,OAAO,EAQL,KAAK,UAAU,EACf,KAAK,OAAO,EAGb,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO;IACrE,YAAY,EAAE,CAAC,CAAC;IAChB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,+CAA+C;IAC/C,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,wCAAwC;IACxC,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,yCAAyC;IACzC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,UAAU,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO;IACpE,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;IAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,KAAK,GAAG,IAAI,CAAC;CAC3B;AA4CD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,EAAE,EACxE,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,MAAM,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC9B,qBA4TA;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,KAK/C,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAC7C"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAGf,OAAO,EAUL,KAAK,UAAU,EACf,KAAK,OAAO,EAGb,MAAM,iBAAiB,CAAC;AAQzB,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO;IACrE,YAAY,EAAE,CAAC,CAAC;IAChB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,6FAA6F;IAC7F,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+CAA+C;IAC/C,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,wCAAwC;IACxC,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,yCAAyC;IACzC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,UAAU,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO;IACpE,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;IAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,KAAK,GAAG,IAAI,CAAC;CAC3B;AA4CD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,EAAE,EACxE,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,MAAM,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC9B,qBAmaA;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,KAK/C,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAC7C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@couch-kit/host",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -55,7 +55,7 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@couch-kit/core": "0.5.1",
+    "@couch-kit/core": "0.6.0",
     "buffer": "^6.0.3",
     "js-sha1": "^0.7.0",
     "react-native-nitro-http-server": "^1.5.4"

package/src/provider.tsx

@@ -14,8 +14,10 @@ import {
   InternalActionTypes,
   DEFAULT_HTTP_PORT,
   DEFAULT_WS_PORT_OFFSET,
+  DEFAULT_DISCONNECT_TIMEOUT,
   createGameReducer,
   derivePlayerId,
+  derivePlayerIdLegacy,
   isValidSecret,
   type IGameState,
   type IAction,
@@ -23,6 +25,12 @@ import {
   type ClientMessage,
 } from "@couch-kit/core";
 
+/** Maximum actions per rate-limit window. */
+const RATE_LIMIT_MAX = 60;
+
+/** Rate-limit window duration (ms). */
+const RATE_LIMIT_WINDOW = 1000;
+
 export interface GameHostConfig<S extends IGameState, A extends IAction> {
   initialState: S;
   reducer: (state: S, action: A) => S;
@@ -32,6 +40,8 @@ export interface GameHostConfig<S extends IGameState, A extends IAction> {
   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;
   /** Called when a player successfully joins. */
   onPlayerJoined?: (playerId: string, name: string) => void;
   /** Called when a player disconnects. */
@@ -125,23 +135,36 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
     stateRef.current = state;
   }, [state]);
 
-  // Send WELCOME messages after state has settled (post-render).
+  // 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;
 
     const server = wsServer.current;
-    for (const [socketId, playerId] of pendingWelcome.current) {
+    for (const [
+      socketId,
+      { playerId, isReconnect },
+    ] of pendingWelcome.current) {
       welcomedClients.current.add(socketId);
-      server.send(socketId, {
-        type: MessageTypes.WELCOME,
-        payload: {
-          playerId,
-          state,
-          serverTime: Date.now(),
-        },
-      });
+      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]);
@@ -178,8 +201,24 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
   // Track socket IDs that have received their WELCOME message
   const welcomedClients = useRef<Set<string>>(new Set());
 
-  // Track socket IDs that need a WELCOME message after state settles
-  const pendingWelcome = useRef<Map<string, string>>(new Map()); // socketId -> playerId
+  // Track socket IDs that need a WELCOME/RECONNECTED message after state settles
+  const pendingWelcome = useRef<
+    Map<string, { playerId: string; isReconnect: boolean }>
+  >(new Map());
+
+  // Cache: socketId -> playerId (avoids async derivation in hot paths)
+  const socketIdToPlayerId = useRef<Map<string, string>>(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[]>([]);
+
+  // Rate limiting: track action count per socket
+  const rateLimits = useRef<
+    Map<string, { count: number; windowStart: number }>
+  >(new Map());
 
   useEffect(() => {
     const port = config.wsPort || httpPort + DEFAULT_WS_PORT_OFFSET;
@@ -240,39 +279,69 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
             return;
           }
 
-          const playerId = derivePlayerId(secret);
-
-          // Update session maps
-          sessions.current.set(secret, socketId);
-          reverseMap.current.set(socketId, secret);
-
-          // Cancel any pending cleanup timer for this player
-          const existingTimer = cleanupTimers.current.get(playerId);
-          if (existingTimer) {
-            clearTimeout(existingTimer);
-            cleanupTimers.current.delete(playerId);
-          }
-
-          // Check if this is a returning player
-          const existingPlayer = stateRef.current.players[playerId];
-          if (existingPlayer) {
-            // Reconnection — restore existing player
-            dispatch({
-              type: InternalActionTypes.PLAYER_RECONNECTED,
-              payload: { playerId },
-            } as InternalAction<S>);
-          } else {
-            // New player
-            dispatch({
-              type: InternalActionTypes.PLAYER_JOINED,
-              payload: { id: playerId, ...payload },
-            } as InternalAction<S>);
-          }
-
-          // Queue WELCOME
-          pendingWelcome.current.set(socketId, playerId);
-
-          configRef.current.onPlayerJoined?.(playerId, payload.name);
+          // Async dual-derivation: try SHA-256 first, fall back to legacy
+          derivePlayerId(secret).then((hashedId) => {
+            let playerId = hashedId;
+
+            // Migration: if a player exists under the legacy ID, use that instead
+            const legacyId = derivePlayerIdLegacy(secret);
+            if (
+              !stateRef.current.players[playerId] &&
+              stateRef.current.players[legacyId]
+            ) {
+              playerId = legacyId;
+            }
+
+            // Cache the resolved playerId for this socket
+            socketIdToPlayerId.current.set(socketId, playerId);
+
+            // Update session maps
+            sessions.current.set(secret, socketId);
+            reverseMap.current.set(socketId, secret);
+
+            // Cancel any pending cleanup timer for this player
+            const existingTimer = cleanupTimers.current.get(playerId);
+            if (existingTimer) {
+              clearTimeout(existingTimer);
+              cleanupTimers.current.delete(playerId);
+            }
+
+            // Check if this is a returning player
+            const existingPlayer = stateRef.current.players[playerId];
+            if (existingPlayer) {
+              // Reconnection — restore existing player
+              dispatch({
+                type: InternalActionTypes.PLAYER_RECONNECTED,
+                payload: { playerId },
+              } as InternalAction<S>);
+
+              // Reset assets loaded status on reconnect
+              assetsLoaded.current.set(playerId, false);
+
+              // Queue RECONNECTED message
+              pendingWelcome.current.set(socketId, {
+                playerId,
+                isReconnect: true,
+              });
+            } else {
+              // New player
+              dispatch({
+                type: InternalActionTypes.PLAYER_JOINED,
+                payload: { id: playerId, ...payload },
+              } as InternalAction<S>);
+
+              // Initialize assets loaded status
+              assetsLoaded.current.set(playerId, false);
+
+              // Queue WELCOME message
+              pendingWelcome.current.set(socketId, {
+                playerId,
+                isReconnect: false,
+              });
+            }
+
+            configRef.current.onPlayerJoined?.(playerId, payload.name);
+          });
           break;
         }
 
@@ -302,12 +371,32 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
             });
             return;
           }
-          // Resolve playerId from socketId
-          const actionSecret = reverseMap.current.get(socketId);
-          const resolvedPlayerId = actionSecret
-            ? derivePlayerId(actionSecret)
-            : undefined;
+
+          // Rate limiting
+          const now = Date.now();
+          let rateInfo = rateLimits.current.get(socketId);
+          if (!rateInfo || now - rateInfo.windowStart > RATE_LIMIT_WINDOW) {
+            rateInfo = { count: 0, windowStart: now };
+            rateLimits.current.set(socketId, rateInfo);
+          }
+          rateInfo.count++;
+          if (rateInfo.count > RATE_LIMIT_MAX) {
+            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;
+          }
+
+          // Use cached playerId (populated at JOIN time)
+          const resolvedPlayerId = socketIdToPlayerId.current.get(socketId);
           dispatch({ ...actionPayload, playerId: resolvedPlayerId });
+          actionQueue.current.push(actionPayload);
           break;
         }
 
@@ -321,6 +410,16 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
             },
           });
           break;
+
+        case MessageTypes.ASSETS_LOADED: {
+          const loadedPlayerId = socketIdToPlayerId.current.get(socketId);
+          if (loadedPlayerId) {
+            assetsLoaded.current.set(loadedPlayerId, true);
+            if (configRef.current.debug)
+              console.log(`[GameHost] Assets loaded for ${loadedPlayerId}`);
+          }
+          break;
+        }
       }
     });
 
@@ -330,13 +429,21 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
 
       welcomedClients.current.delete(socketId);
 
-      // Resolve socketId -> secret -> playerId
+      // Use cached playerId
+      const playerId = socketIdToPlayerId.current.get(socketId);
+      socketIdToPlayerId.current.delete(socketId);
+
+      // Clean up reverse map
       const secret = reverseMap.current.get(socketId);
       reverseMap.current.delete(socketId);
 
-      if (!secret) return; // Unknown socket, nothing to do
+      // Clean up rate limits
+      rateLimits.current.delete(socketId);
+
+      if (!playerId || !secret) return; // Unknown socket, nothing to do
 
-      const playerId = derivePlayerId(secret);
+      // Clean up assets loaded tracking
+      assetsLoaded.current.delete(playerId);
 
       // RACE GUARD: Only mark as left if this socket is still the active one for this secret
       if (sessions.current.get(secret) !== socketId) {
@@ -352,18 +459,17 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
 
       configRef.current.onPlayerLeft?.(playerId);
 
-      // Start stale player cleanup timer (5 minutes default)
-      const timer = setTimeout(
-        () => {
-          cleanupTimers.current.delete(playerId);
-          sessions.current.delete(secret);
-          dispatch({
-            type: InternalActionTypes.PLAYER_REMOVED,
-            payload: { playerId },
-          } as InternalAction<S>);
-        },
-        5 * 60 * 1000,
-      );
+      // Start stale player cleanup timer
+      const timeout =
+        configRef.current.disconnectTimeout ?? DEFAULT_DISCONNECT_TIMEOUT;
+      const timer = setTimeout(() => {
+        cleanupTimers.current.delete(playerId);
+        sessions.current.delete(secret);
+        dispatch({
+          type: InternalActionTypes.PLAYER_REMOVED,
+          payload: { playerId },
+        } as InternalAction<S>);
+      }, timeout);
       cleanupTimers.current.set(playerId, timer);
     });
 
@@ -389,11 +495,18 @@ export function GameHostProvider<S extends IGameState, A extends IAction>({
 
   const broadcastState = useCallback(() => {
     if (wsServer.current) {
+      const actions = actionQueue.current;
+      actionQueue.current = [];
       wsServer.current.broadcast({
         type: MessageTypes.STATE_UPDATE,
         payload: {
           newState: stateRef.current,
           timestamp: Date.now(),
+          ...(actions.length === 1
+            ? { action: actions[0] }
+            : actions.length > 1
+              ? { action: actions }
+              : {}),
         },
       });
     }

package/lib/buffer-utils.d.ts

@@ -1,27 +0,0 @@
-/**
- * Buffer management utilities for WebSocket per-client receive buffers.
- * Extracted into a standalone module so they can be tested without
- * react-native dependencies.
- */
-import { Buffer } from "buffer";
-import type { TcpSocketInstance } from "./declarations";
-export interface ManagedSocket {
-    socket: TcpSocketInstance;
-    id: string;
-    isHandshakeComplete: boolean;
-    buffer: Buffer;
-    /** Number of valid bytes currently in `buffer` (may be less than buffer.length). */
-    bufferLength: number;
-    lastPong: number;
-}
-/**
- * Append data to a managed socket's buffer, growing capacity geometrically
- * to avoid re-allocation on every TCP data event.
- */
-export declare function appendToBuffer(managed: ManagedSocket, data: Buffer): void;
-/**
- * Compact the buffer by discarding consumed bytes from the front.
- * If all data has been consumed, reset the length to 0 without re-allocating.
- */
-export declare function compactBuffer(managed: ManagedSocket, consumed: number): void;
-//# sourceMappingURL=buffer-utils.d.ts.map

package/lib/buffer-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"buffer-utils.d.ts","sourceRoot":"","sources":["../src/buffer-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGxD,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,mBAAmB,EAAE,OAAO,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,oFAAoF;IACpF,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAazE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAS5E"}

package/src/buffer-utils.ts

@@ -1,53 +0,0 @@
-/**
- * Buffer management utilities for WebSocket per-client receive buffers.
- * Extracted into a standalone module so they can be tested without
- * react-native dependencies.
- */
-
-import { Buffer } from "buffer";
-import type { TcpSocketInstance } from "./declarations";
-
-// Internal type for a TCP socket with our added management properties.
-export interface ManagedSocket {
-  socket: TcpSocketInstance;
-  id: string;
-  isHandshakeComplete: boolean;
-  buffer: Buffer;
-  /** Number of valid bytes currently in `buffer` (may be less than buffer.length). */
-  bufferLength: number;
-  lastPong: number;
-}
-
-/**
- * Append data to a managed socket's buffer, growing capacity geometrically
- * to avoid re-allocation on every TCP data event.
- */
-export function appendToBuffer(managed: ManagedSocket, data: Buffer): void {
-  const needed = managed.bufferLength + data.length;
-
-  if (needed > managed.buffer.length) {
-    // Grow by at least 2x or to fit the new data, whichever is larger
-    const newCapacity = Math.max(managed.buffer.length * 2, needed);
-    const grown = Buffer.alloc(newCapacity);
-    managed.buffer.copy(grown, 0, 0, managed.bufferLength);
-    managed.buffer = grown;
-  }
-
-  data.copy(managed.buffer, managed.bufferLength);
-  managed.bufferLength = needed;
-}
-
-/**
- * Compact the buffer by discarding consumed bytes from the front.
- * If all data has been consumed, reset the length to 0 without re-allocating.
- */
-export function compactBuffer(managed: ManagedSocket, consumed: number): void {
-  const remaining = managed.bufferLength - consumed;
-  if (remaining <= 0) {
-    managed.bufferLength = 0;
-    return;
-  }
-  // Shift remaining bytes to the front of the existing buffer
-  managed.buffer.copy(managed.buffer, 0, consumed, managed.bufferLength);
-  managed.bufferLength = remaining;
-}

package/src/declarations.d.ts

@@ -1,25 +0,0 @@
-/**
- * Minimal type definition for the raw TCP socket provided by react-native-tcp-socket.
- * Covers only the API surface used by GameWebSocketServer.
- */
-
-import type { Buffer } from "buffer";
-
-export interface TcpSocketInstance {
-  write(data: string | Buffer): void;
-  destroy(): void;
-  on(event: "data", callback: (data: Buffer | string) => void): this;
-  on(event: "error", callback: (error: Error) => void): this;
-  on(event: "close", callback: (hadError: boolean) => void): this;
-  address():
-    | { address: string; family: string; port: number }
-    | Record<string, never>;
-  readonly destroyed: boolean;
-}
-
-declare module "react-native-nitro-http-server" {
-  export class StaticServer {
-    start(port: number, path: string, host?: string): Promise<void>;
-    stop(): void;
-  }
-}