Merge pull request #35 from DarkCat09/darkcat09-patch1

Errors, bedrock whitelist bug

Author: DarkCat09

python_aternos/__init__.py

@@ -21,10 +21,7 @@
 from .aterrors import CredentialsError
 from .aterrors import TokenError
 from .aterrors import ServerError
-from .aterrors import ServerEulaError
-from .aterrors import ServerRunningError
-from .aterrors import ServerSoftwareError
-from .aterrors import ServerStorageError
+from .aterrors import ServerStartError
 from .aterrors import FileError
 from .aterrors import PermissionError
 from .atjsparse import exec, atob
@@ -41,8 +38,8 @@
     'PlayersList', 'AternosConfig', 'AternosWss',
     'FileManager', 'AternosFile', 'AternosError',
     'CloudflareError', 'CredentialsError', 'TokenError',
-    'ServerError', 'ServerEulaError', 'ServerRunningError',
-    'ServerSoftwareError', 'ServerStorageError', 'FileError',
+    'ServerError', 'ServerStartError', 'FileError',
+    'PermissionError',
     'exec', 'atob', 'to_ecma5_function',
 
     'Edition', 'Status', 'Lists',

python_aternos/atconnect.py

@@ -249,4 +249,6 @@ def request_cloudflare(
             f'{method} completed with {req.status_code} status'
         )
 
+        req.raise_for_status()
+
         return req

python_aternos/aterrors.py

@@ -1,3 +1,6 @@
+from typing import Final
+
+
 class AternosError(Exception):
 
     """Common error class"""
@@ -23,39 +26,62 @@ class TokenError(AternosError):
 
 class ServerError(AternosError):
 
-    """Common class for server errors"""
+    """Common class for server errors
+
+    :param reason: Code which contains error reason
+    :type reason: str
+    :param message: Error message, defaults to ''
+    :type message: str, optional
+    """
 
+    def __init__(self, reason: str, message: str = '') -> None:
 
-class ServerEulaError(ServerError):
+        self.reason = reason
+        super().__init__(message)
 
-    """Raised when trying to start without
-    confirming Mojang EULA"""
 
+class ServerStartError(AternosError):
 
-class ServerRunningError(ServerError):
+    """Raised when Aternos can not start Minecraft server
 
-    """Raised when trying to start
-    already running server"""
+    :param reason: Code which contains error reason
+    :type reason: str
+    """
 
+    MESSAGE: Final = 'Unable to start server, code: {}'
+    reason_msg = {
 
-class ServerSoftwareError(ServerError):
+        'eula':
+            'EULA was not accepted. '
+            'Use start(accepteula=True)',
 
-    """Raised when Aternos notifies about
-    incorrect software version"""
+        'already': 'Server is already running',
+        'wrongversion': 'Incorrect software version installed',
 
+        'file':
+            'File server is unavailbale, '
+            'view https://status.aternos.gmbh',
 
-class ServerStorageError(ServerError):
+        'size': 'Available storage size limit (4 GB) was reached'
+    }
 
-    """Raised when Aternos notifies about
-    violation of storage limits (4 GB for now)"""
+    def __init__(self, reason: str) -> None:
+
+        super().__init__(
+            reason,
+            self.reason_msg.get(
+                reason, self.MESSAGE.format(reason)
+            )
+        )
 
 
 class FileError(AternosError):
 
     """Raised when trying to execute a disallowed
     by Aternos file operation"""
 
-    
+
 class PermissionError(AternosError):
-    """Raised when trying to execute a non-allowed
-    command on a server (Think friends permissions)"""
+
+    """Raised when trying to execute a disallowed command,
+    usually because of shared access rights"""

python_aternos/atplayers.py

@@ -35,7 +35,7 @@ def __init__(self, lst: Union[str, Lists], atserv: 'AternosServer') -> None:
 
         self.atserv = atserv
         self.lst = Lists(lst)
-        
+
         common_whl = (self.lst == Lists.whl)
         bedrock = (atserv.edition == Edition.bedrock)
         if common_whl and bedrock:

python_aternos/atserver.py

@@ -4,11 +4,7 @@
 from typing import Optional, List
 
 from .atconnect import AternosConnect
-from .aterrors import ServerError
-from .aterrors import ServerEulaError
-from .aterrors import ServerRunningError
-from .aterrors import ServerSoftwareError
-from .aterrors import ServerStorageError
+from .aterrors import ServerStartError
 from .atfm import FileManager
 from .atconf import AternosConfig
 from .atplayers import PlayersList
@@ -99,16 +95,8 @@ def start(self, headstart: bool = False, accepteula: bool = True) -> None:
         :param accepteula: Automatically accept
         the Mojang EULA, defaults to `True`
         :type accepteula: bool, optional
-        :raises ServerEulaError: When trying to start a server
-        without accepting the Mojang EULA
-        :raises ServerRunningError: When trying to start a server
-        which is alreday running
-        :raises ServerSoftwareError: When Aternos notifies about
-        incorrect software version
-        :raises ServerStorageError: When Aternos notifies about
-        voilation of storage limits (4 GB for now)
-        :raises ServerError: When API is unable to start a Minecraft server
-        due to unavailability of Aternos' file servers or other problems
+        :raises ServerStartError: When Aternos
+        is unable to start the server
         """
 
         startreq = self.atserver_request(
@@ -120,42 +108,14 @@ def start(self, headstart: bool = False, accepteula: bool = True) -> None:
 
         if startresult['success']:
             return
+
         error = startresult['error']
 
         if error == 'eula' and accepteula:
             self.eula()
-            self.start(accepteula=False)
-
-        elif error == 'eula':
-            raise ServerEulaError(
-                'EULA was not accepted. Use start(accepteula=True)'
-            )
-
-        elif error == 'already':
-            raise ServerRunningError(
-                'Server is already running'
-            )
-
-        elif error == 'wrongversion':
-            raise ServerSoftwareError(
-                'Incorrect software version installed'
-            )
-
-        elif error == 'file':
-            raise ServerError(
-                'File server is unavailbale, view https://status.aternos.gmbh'
-            )
-
-        elif error == 'size':
-            raise ServerStorageError(
-                f'Available storage size is 4GB, '
-                f'your server used: {startresult["size"]}'
-            )
-
-        else:
-            raise ServerError(
-                f'Unable to start server, code: {error}'
-            )
+            return self.start(accepteula=False)
+
+        raise ServerStartError(error)
 
     def confirm(self) -> None: