@react-remote-state/client 1.1.7 → 1.2.0

package/dist/index.d.mts

@@ -1,13 +1,7 @@
 import { Game } from '@react-remote-state/types';
 
-declare function getPlayer<GameCustom, PlayerCustom>(playerId?: string, game?: Game<GameCustom, PlayerCustom>): {
-    id: string;
-    host: boolean;
-    connected: boolean;
-    custom: PlayerCustom | undefined;
-} | undefined;
-declare function isHost<GameCustom, PlayerCustom>(playerId?: string, game?: Game<GameCustom, PlayerCustom>): boolean | undefined;
-type Reducer<GameCustom, PlayerCustom, Action> = (game: Game<GameCustom, PlayerCustom>, action: Action, playerId: string) => Game<GameCustom, PlayerCustom>;
+type Reducer<GameCustom, PlayerCustom, Action> = (game: Game<GameCustom, PlayerCustom>, action: Action, playerId: string) => Game<GameCustom, PlayerCustom>;
+
 declare function useRemoteReducer<GameCustom, PlayerCustom, Action>(uri: string, reducer: Reducer<GameCustom, PlayerCustom, Action>, gameId?: string | null, acceptPlayer?: (game: Game<GameCustom, PlayerCustom>) => boolean, storage?: Storage): [
     game: Game<GameCustom, PlayerCustom> | undefined,
     localPlayerId: string | undefined,
@@ -15,4 +9,4 @@ declare function useRemoteReducer<GameCustom, PlayerCustom, Action>(uri: string,
     declined: boolean
 ];
 
-export { getPlayer, isHost, useRemoteReducer };
+export { useRemoteReducer };

package/dist/index.d.ts

@@ -1,13 +1,7 @@
 import { Game } from '@react-remote-state/types';
 
-declare function getPlayer<GameCustom, PlayerCustom>(playerId?: string, game?: Game<GameCustom, PlayerCustom>): {
-    id: string;
-    host: boolean;
-    connected: boolean;
-    custom: PlayerCustom | undefined;
-} | undefined;
-declare function isHost<GameCustom, PlayerCustom>(playerId?: string, game?: Game<GameCustom, PlayerCustom>): boolean | undefined;
-type Reducer<GameCustom, PlayerCustom, Action> = (game: Game<GameCustom, PlayerCustom>, action: Action, playerId: string) => Game<GameCustom, PlayerCustom>;
+type Reducer<GameCustom, PlayerCustom, Action> = (game: Game<GameCustom, PlayerCustom>, action: Action, playerId: string) => Game<GameCustom, PlayerCustom>;
+
 declare function useRemoteReducer<GameCustom, PlayerCustom, Action>(uri: string, reducer: Reducer<GameCustom, PlayerCustom, Action>, gameId?: string | null, acceptPlayer?: (game: Game<GameCustom, PlayerCustom>) => boolean, storage?: Storage): [
     game: Game<GameCustom, PlayerCustom> | undefined,
     localPlayerId: string | undefined,
@@ -15,4 +9,4 @@ declare function useRemoteReducer<GameCustom, PlayerCustom, Action>(uri: string,
     declined: boolean
 ];
 
-export { getPlayer, isHost, useRemoteReducer };
+export { useRemoteReducer };

package/dist/index.js

@@ -5531,11 +5531,13 @@ var require_lodash = __commonJS({
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  getPlayer: () => getPlayer,
-  isHost: () => isHost,
   useRemoteReducer: () => useRemoteReducer
 });
 module.exports = __toCommonJS(src_exports);
+var import_react2 = require("react");
+var import_lodash2 = __toESM(require_lodash());
+
+// src/hooks.ts
 var import_react = require("react");
 
 // src/socket.ts
@@ -5545,8 +5547,10 @@ var mod = {
 };
 var socket_default = mod;
 
-// src/index.ts
+// src/hooks.ts
 var import_lodash = __toESM(require_lodash());
+
+// src/player.ts
 function getPlayer(playerId, game) {
   if (!game || !playerId) {
     return void 0;
@@ -5557,7 +5561,96 @@ function isHost(playerId, game) {
   let player = getPlayer(playerId, game);
   return player == null ? void 0 : player.host;
 }
-function wrapReducer(reducer, acceptPlayer) {
+
+// src/hooks.ts
+function useClientInitialization(meta, setMeta, uri) {
+  (0, import_react.useEffect)(() => {
+    if (!meta.client) {
+      setMeta(__spreadProps(__spreadValues({}, meta), {
+        client: socket_default.connect(uri, { transports: ["websocket"] })
+      }));
+    }
+  }, [meta.client]);
+}
+function useGuestInitialization(meta, setMeta, storage, internalDispatch, gameId, game) {
+  (0, import_react.useEffect)(() => {
+    if (!!meta.client && !meta.isGuestReady) {
+      meta.client.on("error", console.error);
+      meta.client.on("connect", () => {
+        var _a, _b, _c;
+        if (gameId == void 0 && !game) {
+          (_a = meta.client) == null ? void 0 : _a.emit("create");
+        } else if (!!gameId) {
+          let playerCache = (0, import_lodash.flow)(
+            () => !!gameId ? storage.getItem(gameId) : null,
+            (cache) => !!cache ? JSON.parse(cache) : null
+          )();
+          if (!!playerCache) {
+            let rejoin = {
+              playerId: playerCache.playerId,
+              socketId: playerCache.socketId,
+              gameId
+            };
+            (_b = meta.client) == null ? void 0 : _b.emit("rejoin", rejoin);
+          } else {
+            (_c = meta.client) == null ? void 0 : _c.emit("join", { gameId });
+          }
+        }
+      });
+      meta.client.on("assign", (assign) => {
+        var _a, _b;
+        setMeta(__spreadProps(__spreadValues({}, meta), { localPlayerId: assign.playerId }));
+        if (!!((_a = meta == null ? void 0 : meta.client) == null ? void 0 : _a.id)) {
+          let playerCache = {
+            playerId: assign.playerId,
+            socketId: (_b = meta.client) == null ? void 0 : _b.id
+          };
+          storage.setItem(assign.gameId, JSON.stringify(playerCache));
+        }
+      });
+      meta.client.on(
+        "update",
+        (update) => internalDispatch({
+          type: 1 /* Update */,
+          game: update.game
+        })
+      );
+      meta.client.on("decline", () => setMeta(__spreadProps(__spreadValues({}, meta), { declined: true })));
+      setMeta(__spreadProps(__spreadValues({}, meta), { isGuestReady: true }));
+    }
+  }, [meta.client, meta.isGuestReady]);
+}
+function useHostInitialization(meta, setMeta, internalDispatch, game) {
+  (0, import_react.useEffect)(() => {
+    if (!!meta.client) {
+      if (isHost(meta.localPlayerId, game) && !meta.isHostReady) {
+        meta.client.on("join", (join) => {
+          if (!!meta.client) {
+            internalDispatch({
+              type: 2 /* Accept */,
+              playerId: join.playerId,
+              client: meta.client
+            });
+          }
+        });
+        meta.client.on("notify", (notify) => {
+          if (!!game && !!meta.client) {
+            internalDispatch({
+              type: 0 /* Reduce */,
+              client: meta.client,
+              playerId: notify.playerId,
+              action: notify.action
+            });
+          }
+        });
+        setMeta(__spreadProps(__spreadValues({}, meta), { isHostReady: true }));
+      }
+    }
+  });
+}
+
+// src/reducer.ts
+function createInternalReducer(reducer, acceptPlayer) {
   return (game, internalAction) => {
     var _a;
     switch (internalAction.type) {
@@ -5584,16 +5677,18 @@ function wrapReducer(reducer, acceptPlayer) {
     }
   };
 }
-function useRemoteReducer(uri, reducer, gameId, acceptPlayer = (0, import_lodash.constant)(
+
+// src/index.ts
+function useRemoteReducer(uri, reducer, gameId, acceptPlayer = (0, import_lodash2.constant)(
   true
 ), storage = sessionStorage) {
-  let [meta, setMeta] = (0, import_react.useState)({
+  let [meta, setMeta] = (0, import_react2.useState)({
     isHostReady: false,
     isGuestReady: false,
     declined: false
   });
-  let [game, internalDispatch] = (0, import_react.useReducer)(
-    wrapReducer(reducer, acceptPlayer),
+  let [game, internalDispatch] = (0, import_react2.useReducer)(
+    createInternalReducer(reducer, acceptPlayer),
     void 0
   );
   let dispatch = (action) => {
@@ -5601,87 +5696,22 @@ function useRemoteReducer(uri, reducer, gameId, acceptPlayer = (0, import_lodash
       meta.client.emit("notify", { gameId: game.id, action });
     }
   };
-  (0, import_react.useEffect)(() => {
-    if (!meta.client) {
-      setMeta(__spreadProps(__spreadValues({}, meta), {
-        client: socket_default.connect(uri, { transports: ["websocket"] })
-      }));
-    }
-    if (!!meta.client) {
-      if (!meta.isGuestReady) {
-        meta.client.on("error", console.error);
-        meta.client.on("connect", () => {
-          var _a, _b, _c;
-          if (gameId == void 0 && !game) {
-            (_a = meta.client) == null ? void 0 : _a.emit("create");
-          } else if (!!gameId) {
-            let playerCache = (0, import_lodash.flow)(
-              () => !!gameId ? storage.getItem(gameId) : null,
-              (cache) => !!cache ? JSON.parse(cache) : null
-            )();
-            if (!!playerCache) {
-              let rejoin = {
-                playerId: playerCache.playerId,
-                socketId: playerCache.socketId,
-                gameId
-              };
-              (_b = meta.client) == null ? void 0 : _b.emit("rejoin", rejoin);
-            } else {
-              (_c = meta.client) == null ? void 0 : _c.emit("join", { gameId });
-            }
-          }
-        });
-        meta.client.on("assign", (assign) => {
-          var _a, _b;
-          setMeta(__spreadProps(__spreadValues({}, meta), { localPlayerId: assign.playerId }));
-          if (!!((_a = meta == null ? void 0 : meta.client) == null ? void 0 : _a.id)) {
-            let playerCache = {
-              playerId: assign.playerId,
-              socketId: (_b = meta.client) == null ? void 0 : _b.id
-            };
-            storage.setItem(assign.gameId, JSON.stringify(playerCache));
-          }
-        });
-        meta.client.on(
-          "update",
-          (update) => internalDispatch({
-            type: 1 /* Update */,
-            game: update.game
-          })
-        );
-        meta.client.on("decline", () => setMeta(__spreadProps(__spreadValues({}, meta), { declined: true })));
-        setMeta(__spreadProps(__spreadValues({}, meta), { isGuestReady: true }));
-      }
-      if (isHost(meta.localPlayerId, game) && !meta.isHostReady) {
-        meta.client.on("join", (join) => {
-          if (!!meta.client) {
-            internalDispatch({
-              type: 2 /* Accept */,
-              playerId: join.playerId,
-              client: meta.client
-            });
-          }
-        });
-        meta.client.on("notify", (notify) => {
-          if (!!game && !!meta.client) {
-            internalDispatch({
-              type: 0 /* Reduce */,
-              client: meta.client,
-              playerId: notify.playerId,
-              action: notify.action
-            });
-          }
-        });
-        setMeta(__spreadProps(__spreadValues({}, meta), { isHostReady: true }));
-      }
-    }
-  });
+  useClientInitialization(meta, setMeta, uri);
+  useGuestInitialization(
+    meta,
+    setMeta,
+    storage,
+    internalDispatch,
+    gameId,
+    game
+  );
+  if (!gameId) {
+    useHostInitialization(meta, setMeta, internalDispatch, game);
+  }
   return [game, meta.localPlayerId, dispatch, meta.declined];
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getPlayer,
-  isHost,
   useRemoteReducer
 });
 /*! Bundled license information: