Increment version

galaxy/api/errors.py

@@ -1,8 +1,6 @@
-from galaxy.api.jsonrpc import ApplicationError
+from galaxy.api.jsonrpc import ApplicationError, UnknownError
 
-class UnknownError(ApplicationError):
-    def __init__(self, data=None):
-        super().__init__(0, "Unknown error", data)
+UnknownError = UnknownError
 
 class AuthenticationRequired(ApplicationError):
     def __init__(self, data=None):

galaxy/api/jsonrpc.py

@@ -25,7 +25,7 @@ class MethodNotFound(JsonRpcError):
 
 class InvalidParams(JsonRpcError):
     def __init__(self):
-        super().__init__(-32601, "Invalid params")
+        super().__init__(-32602, "Invalid params")
 
 class Timeout(JsonRpcError):
     def __init__(self):
@@ -41,6 +41,10 @@ class ApplicationError(JsonRpcError):
             raise ValueError("The error code in reserved range")
         super().__init__(code, message, data)
 
+class UnknownError(ApplicationError):
+    def __init__(self, data=None):
+        super().__init__(0, "Unknown error", data)
+
 Request = namedtuple("Request", ["method", "params", "id"], defaults=[{}, None])
 Method = namedtuple("Method", ["callback", "internal", "sensitive_params"])
 
@@ -171,8 +175,9 @@ class Server():
                     self._send_error(request.id, MethodNotFound())
                 except JsonRpcError as error:
                     self._send_error(request.id, error)
-                except Exception: #pylint: disable=broad-except
+                except Exception as e: #pylint: disable=broad-except
                     logging.exception("Unexpected exception raised in plugin handler")
+                    self._send_error(request.id, UnknownError(str(e)))
 
             asyncio.create_task(handle())
 

galaxy/api/plugin.py

@@ -6,7 +6,6 @@ import dataclasses
 from enum import Enum
 from collections import OrderedDict
 import sys
-import os
 
 from galaxy.api.jsonrpc import Server, NotificationClient
 from galaxy.api.consts import Feature
@@ -49,6 +48,7 @@ class Plugin():
 
         # implemented by developer
         self._register_method("init_authentication", self.authenticate, sensitive_params=["stored_credentials"])
+        self._register_method("pass_login_credentials", self.pass_login_credentials)
         self._register_method(
             "import_owned_games",
             self.get_owned_games,
@@ -274,6 +274,9 @@ class Plugin():
         """
         raise NotImplementedError()
 
+    async def pass_login_credentials(self, step, credentials, cookies):
+        raise NotImplementedError()
+
     async def get_owned_games(self):
         raise NotImplementedError()
 
@@ -298,7 +301,7 @@ class Plugin():
     async def get_users(self, user_id_list):
         raise NotImplementedError()
 
-    async def send_message(self, room_id, message):
+    async def send_message(self, room_id, message_text):
         raise NotImplementedError()
 
     async def mark_as_read(self, room_id, last_message_id):
@@ -316,29 +319,7 @@ class Plugin():
     async def get_game_times(self):
         raise NotImplementedError()
 
-def _prepare_logging(logger_file):
-    root = logging.getLogger()
-    root.setLevel(logging.DEBUG)
-    if logger_file:
-        # ensure destination folder exists
-        os.makedirs(os.path.dirname(os.path.abspath(logger_file)), exist_ok=True)
-        handler = logging.handlers.RotatingFileHandler(
-            logger_file,
-            mode="a",
-            maxBytes=10000000,
-            backupCount=10,
-            encoding="utf-8"
-        )
-    else:
-        handler = logging.StreamHandler()
-    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-    handler.setFormatter(formatter)
-    root.addHandler(handler)
-
 def create_and_run_plugin(plugin_class, argv):
-    logger_file = argv[3] if len(argv) >= 4 else None
-    _prepare_logging(logger_file)
-
     if len(argv) < 3:
         logging.critical("Not enough parameters, required: token, port")
         sys.exit(1)

galaxy/api/types.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import List, Optional
+from typing import List, Dict, Optional
 
 from galaxy.api.consts import LicenseType, LocalGameState, PresenceState
 
@@ -8,6 +8,19 @@ class Authentication():
     user_id: str
     user_name: str
 
+@dataclass
+class Cookie():
+    name: str
+    value: str
+    domain: Optional[str] = None
+    path: Optional[str] = None
+
+@dataclass
+class NextStep():
+    next_step: str
+    auth_params: Dict[str, str]
+    cookies: Optional[List[Cookie]] = None
+
 @dataclass
 class LicenseInfo():
     license_type: LicenseType

setup.py

@@ -2,9 +2,9 @@ from setuptools import setup, find_packages
 
 setup(
     name="galaxy.plugin.api",
-    version="0.16",
+    version="0.20",
     description="Galaxy python plugin API",
     author='Galaxy team',
     author_email='galaxy@gog.com',
-    packages=find_packages()
+    packages=find_packages(exclude=["tests"])
 )