multiplayer 1.0.0__tar.gz → 1.1.0__tar.gz

{multiplayer-1.0.0 → multiplayer-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiplayer
-Version: 1.0.0
+Version: 1.1.0
 Summary: Library that allows you to manage multiple players, locally, on a network, or on the Internet.
 License-Expression: MIT
 License-File: LICENSE.md
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Games/Entertainment
 Requires-Dist: colorlog
 Requires-Dist: cryptography
+Requires-Dist: bcrypt
 Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: requests ; extra == 'dev'
 Requires-Dist: ruff ; extra == 'dev'
@@ -41,12 +42,13 @@ For a detailed technical description of all classes and functions, see the [API
 *   **Observer Support:** Ability to add observers who can view the game state without participating as players.
 *   **Administrator Role:** New `ServerAdmin` class to manage the server, kick players/observers, and monitor server status.
 *   **Game Grouping:** Organize several game sessions within the same server using the `GameGroup` class.
-*   **Multi-Layered Security:** Supports server passwords, admin passwords, and per-game passwords, with optional TLS v1.3 encryption. Passwords can be updated dynamically by administrators.
+*   **Multi-Layered Security:** Supports server passwords, admin passwords, and per-game passwords, with optional TLS v1.3 encryption. Passwords can be updated dynamically by administrators and are securely stored using `bcrypt` hashing.
 *   **Automatic Server Discovery:** Clients can automatically find running servers on the local network.
 *   **Extensible Name Suggestions:** Includes a utility function to suggest creative names for games and players.
 *   **Multiple Games:** The server can manage multiple game sessions simultaneously. By default, the game list for standard clients is filtered to hide finished games, but administrators can access all sessions via specialized methods like `list_all_server_games()` or `list_all_group_games()`.
 *   **Robust Error Handling:** A clear set of custom exceptions for both game logic and network issues.
-*   **Persistent Player Accounts:** Ability for players to create an account with a password for repeated use across the server.
+*   **Persistent Player Accounts:** Ability for players to create an account with a password for repeated use across the server. All persistent passwords (players, groups, and server) are protected with `bcrypt`.
+*   **Data Persistence:** Optional support for persisting server configuration, player accounts, and game sessions to disk (e.g., in JSON format). Hash-based password storage ensures security even if the data file is compromised.
 
 ## Installation
 
@@ -60,9 +62,9 @@ pip install multiplayer
 ### 2. From a Wheel file (GitHub)
 Download the `.whl` file from the [Releases](https://github.com/devfred78/multiplayer/releases) page and run:
 ```sh
-pip install multiplayer-1.0.0-py3-none-any.whl
+pip install multiplayer-1.1.0-py3-none-any.whl
 ```
-*Replace `multiplayer-1.0.0-py3-none-any.whl` with the actual name of the downloaded file.*
+*Replace `multiplayer-1.1.0-py3-none-any.whl` with the actual name of the downloaded file.*
 
 ## Usage
 
@@ -103,7 +105,7 @@ game2 = Game("Match 2")
 group.add_game(game1)
 group.add_game(game2)
 
-print(f"Game 1 ID: {game1.ID}")
+print(f"Game 1 ID: {game1.game_id}")
 # > Game 1 ID: 550e8400-e29b-41d4-a716-446655440000
 
 print(f"Group '{group.name}' has {len(group.games)} games.")

{multiplayer-1.0.0 → multiplayer-1.1.0}/README.md

@@ -19,12 +19,13 @@ For a detailed technical description of all classes and functions, see the [API
 *   **Observer Support:** Ability to add observers who can view the game state without participating as players.
 *   **Administrator Role:** New `ServerAdmin` class to manage the server, kick players/observers, and monitor server status.
 *   **Game Grouping:** Organize several game sessions within the same server using the `GameGroup` class.
-*   **Multi-Layered Security:** Supports server passwords, admin passwords, and per-game passwords, with optional TLS v1.3 encryption. Passwords can be updated dynamically by administrators.
+*   **Multi-Layered Security:** Supports server passwords, admin passwords, and per-game passwords, with optional TLS v1.3 encryption. Passwords can be updated dynamically by administrators and are securely stored using `bcrypt` hashing.
 *   **Automatic Server Discovery:** Clients can automatically find running servers on the local network.
 *   **Extensible Name Suggestions:** Includes a utility function to suggest creative names for games and players.
 *   **Multiple Games:** The server can manage multiple game sessions simultaneously. By default, the game list for standard clients is filtered to hide finished games, but administrators can access all sessions via specialized methods like `list_all_server_games()` or `list_all_group_games()`.
 *   **Robust Error Handling:** A clear set of custom exceptions for both game logic and network issues.
-*   **Persistent Player Accounts:** Ability for players to create an account with a password for repeated use across the server.
+*   **Persistent Player Accounts:** Ability for players to create an account with a password for repeated use across the server. All persistent passwords (players, groups, and server) are protected with `bcrypt`.
+*   **Data Persistence:** Optional support for persisting server configuration, player accounts, and game sessions to disk (e.g., in JSON format). Hash-based password storage ensures security even if the data file is compromised.
 
 ## Installation
 
@@ -38,9 +39,9 @@ pip install multiplayer
 ### 2. From a Wheel file (GitHub)
 Download the `.whl` file from the [Releases](https://github.com/devfred78/multiplayer/releases) page and run:
 ```sh
-pip install multiplayer-1.0.0-py3-none-any.whl
+pip install multiplayer-1.1.0-py3-none-any.whl
 ```
-*Replace `multiplayer-1.0.0-py3-none-any.whl` with the actual name of the downloaded file.*
+*Replace `multiplayer-1.1.0-py3-none-any.whl` with the actual name of the downloaded file.*
 
 ## Usage
 
@@ -81,7 +82,7 @@ game2 = Game("Match 2")
 group.add_game(game1)
 group.add_game(game2)
 
-print(f"Game 1 ID: {game1.ID}")
+print(f"Game 1 ID: {game1.game_id}")
 # > Game 1 ID: 550e8400-e29b-41d4-a716-446655440000
 
 print(f"Group '{group.name}' has {len(group.games)} games.")

{multiplayer-1.0.0 → multiplayer-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "multiplayer"
-version = "1.0.0"
+version = "1.1.0"
 description = "Library that allows you to manage multiple players, locally, on a network, or on the Internet."
 license = "MIT"
 license-files = ["LICENSE.md"]
@@ -19,6 +19,7 @@ classifiers = [
 dependencies = [
     "colorlog",
     "cryptography",
+    "bcrypt",
 ]
 
 [project.scripts]
@@ -40,3 +41,8 @@ build-backend = "uv_build"
 module-name = "multiplayer"
 module-root = "src"
 package-data = { "multiplayer" = ["data/*.csv"] }
+
+[dependency-groups]
+dev = [
+    "requests>=2.34.1",
+]

{multiplayer-1.0.0 → multiplayer-1.1.0}/src/multiplayer/__init__.py

@@ -1,7 +1,7 @@
 """
 This package provides classes for managing a multiplayer game, both locally and over a network.
 """
-__version__ = "1.0.0"
+__version__ = "1.1.0"
 from .game import Game, Player, Observer, GameState, GameGroup
 from .server import GameServer
 from .client import GameClient, RemoteGame, ServerAdmin, GroupAdmin

{multiplayer-1.0.0 → multiplayer-1.1.0}/src/multiplayer/client.py

@@ -197,7 +197,7 @@ class GameClient:
         if group_id:
             params['group_id'] = group_id
         data = self._send_command('create_game', params)
-        remote_game = RemoteGame(data['game_id'], self.host, self.port, self.password, self.use_tls, self.auth_user, self.auth_password)
+        remote_game = RemoteGame(data['game_id'], self.host, self.port, game_options.get('password', self.password), self.use_tls, self.auth_user, self.auth_password)
         
         # Propagate logging configuration if any
         for h in self._logger.handlers:
@@ -218,10 +218,14 @@ class GameClient:
                     pass
         return games_data
 
+    def list_users(self):
+        """Retrieves a list of names of currently connected users."""
+        return self._send_command('list_users')
+
     def create_group(self, name, admin_password=None, **attributes):
         """Requests the server to create a new game group and returns a proxy to it."""
         data = self._send_command('create_group', {'name': name, 'admin_password': admin_password, 'attributes': attributes})
-        remote_group = RemoteGroup(data['group_id'], self.host, self.port, self.password, self.use_tls, self.auth_user, self.auth_password)
+        remote_group = RemoteGroup(data['group_id'], self.host, self.port, admin_password or self.password, self.use_tls, self.auth_user, self.auth_password)
         
         # Propagate logging configuration if any
         for h in self._logger.handlers:
@@ -370,14 +374,7 @@ class ServerAdmin(GameClient):
 
     def list_all_server_games(self):
         """Retrieves a dictionary of all games (even those with GameState.FINISHED) organized by ID."""
-        games_data = self._send_command('list_games', {'include_finished': True})
-        for gid in games_data:
-            if 'state' in games_data[gid]:
-                try:
-                    games_data[gid]['state'] = GameState(games_data[gid]['state'])
-                except ValueError:
-                    pass
-        return games_data
+        return self._send_command('list_games', {'include_finished': True})
 
     def kick_player(self, game_id, player_id):
         """Kicks a player from a specific game."""
@@ -436,6 +433,12 @@ class ServerAdmin(GameClient):
             'hidden': hidden
         })
 
+    def set_server_name(self, name):
+        """Sets a new name for the server."""
+        return self._send_command('set_server_name', {
+            'name': name
+        })
+
     def update_persistent_player(self, name, role=None, managed_groups=None, password=None, **attributes):
         """
         Updates a persistent player's information.
@@ -604,7 +607,12 @@ class RemoteGame:
             'game_password': password,
         }
         if isinstance(player, PersistentPlayer):
-            params['persistent_player_password'] = player.password
+            # The server expects the raw password to verify against its hash
+            # PersistentPlayer.password is now a hash locally too if initialized with a string
+            # But the client test might be using the hash if it's not careful.
+            # However, if we want to support this, we need a way to get the raw password or
+            # ensure the client doesn't hash it.
+            params['persistent_player_password'] = getattr(player, '_raw_password', player.password)
             
         self._send_command('add_player', params)
         
@@ -635,7 +643,7 @@ class RemoteGame:
             'observer_password': password,
         }
         if isinstance(observer, PersistentPlayer):
-            params['persistent_player_password'] = observer.password
+            params['persistent_player_password'] = getattr(observer, '_raw_password', observer.password)
             
         self._send_command('add_observer', params)