Merge pull request #1283 from A-UNDERSCORE-D/fix/force-localwebserver-does-nothing

Remove protocol.protocolhandler singleton auto-init

EDMarketConnector.py

@@ -384,7 +384,7 @@ from edmc_data import ship_name_map
 from hotkey import hotkeymgr
 from l10n import Translations
 from monitor import monitor
-from protocol import protocolhandler
+import protocol
 from theme import theme
 from ttkHyperlinkLabel import HyperlinkLabel
 
@@ -696,7 +696,7 @@ class AppWindow(object):
         self.w.bind_all('<<Quit>>', self.onexit)  # Updater
 
         # Start a protocol handler to handle cAPI registration. Requires main loop to be running.
-        self.w.after_idle(lambda: protocolhandler.start(self.w))
+        self.w.after_idle(lambda: protocol.protocolhandler.start(self.w))
 
         # Load updater after UI creation (for WinSparkle)
         import update
@@ -1705,7 +1705,7 @@ class AppWindow(object):
 
         # Frontier auth/CAPI handling
         logger.info('Closing protocol handler...')
-        protocolhandler.close()
+        protocol.protocolhandler.close()
 
         logger.info('Closing Frontier CAPI sessions...')
         companion.session.close()
@@ -1912,6 +1912,9 @@ sys.path: {sys.path}'''
         logger.info("Dropping all fdev tokens as --forget-frontier-auth was passed")
         companion.Auth.invalidate(None)
 
+    # Create protocol handler
+    protocol.protocolhandler = protocol.get_handler_impl()()
+
     # TODO: unittests in place of these
     # logger.debug('Test from __main__')
     # test_logging()

companion.py

@@ -33,7 +33,8 @@ from config import appname, appversion, config
 from edmc_data import companion_category_map as category_map
 from EDMCLogging import get_main_logger
 from monitor import monitor
-from protocol import protocolhandler
+# from protocol import protocolhandler
+import protocol
 
 logger = get_main_logger()
 
@@ -375,7 +376,7 @@ class Auth(object):
             f'&code_challenge={challenge}'
             f'&code_challenge_method=S256'
             f'&state={self.state}'
-            f'&redirect_uri={protocolhandler.redirect}'
+            f'&redirect_uri={protocol.protocolhandler.redirect}'
         )
 
         return None
@@ -412,7 +413,7 @@ class Auth(object):
                 'client_id': self.CLIENT_ID,
                 'code_verifier': self.verifier,
                 'code': data['code'][0],
-                'redirect_uri': protocolhandler.redirect,
+                'redirect_uri': protocol.protocolhandler.redirect,
             }
 
             # import http.client as http_client
@@ -698,7 +699,7 @@ class Session(object):
 
         try:
             logger.debug('Trying authorize with payload from handler')
-            self.start_frontier_auth(self.auth.authorize(protocolhandler.lastpayload))  # type: ignore
+            self.start_frontier_auth(self.auth.authorize(protocol.protocolhandler.lastpayload))  # type: ignore
             self.auth = None
 
         except Exception:

protocol.py

@@ -1,12 +1,13 @@
 """protocol handler for cAPI authorisation."""
 
+# spell-checker: words ntdll GURL alloc wfile instantiatable pyright
 import os
 import sys
 import threading
 import urllib.error
 import urllib.parse
 import urllib.request
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, Optional, Type
 
 from config import config
 from constants import appname, protocolhandler_redirect
@@ -115,10 +116,10 @@ if sys.platform == 'darwin' and getattr(sys, 'frozen', False):  # noqa: C901 # i
 
 elif (config.auth_force_edmc_protocol
       or (
-              sys.platform == 'win32'
+          sys.platform == 'win32'
-              and getattr(sys, 'frozen', False)
+          and getattr(sys, 'frozen', False)
-              and not is_wine
+          and not is_wine
-              and not config.auth_force_localserver
+          and not config.auth_force_localserver
       )):
     # spell-checker: words HBRUSH HICON WPARAM wstring WNDCLASS HMENU HGLOBAL
     from ctypes import windll  # type: ignore
@@ -415,20 +416,24 @@ else:  # Linux / Run from source
             pass
 
 
-# singleton
+def get_handler_impl() -> Type[GenericProtocolHandler]:
+    """
+    Get the appropriate GenericProtocolHandler for the current system and config.
+
+    :return: An instantiatable GenericProtocolHandler
+    """
+    if sys.platform == 'darwin' and getattr(sys, 'frozen', False):
+        return DarwinProtocolHandler  # pyright: reportUnboundVariable=false
+
+    elif (
+        (sys.platform == 'win32' and config.auth_force_edmc_protocol)
+        or (getattr(sys, 'frozen', False) and not is_wine and not config.auth_force_localserver)
+    ):
+        return WindowsProtocolHandler
+
+    else:
+        return LinuxProtocolHandler
+
+
+# *late init* singleton
 protocolhandler: GenericProtocolHandler
-
-if sys.platform == 'darwin' and getattr(sys, 'frozen', False):
-    protocolhandler = DarwinProtocolHandler()  # pyright: reportUnboundVariable=false
-
-elif (
-        sys.platform == 'win32'
-        and config.auth_force_edmc_protocol or (
-            getattr(sys, 'frozen', False)
-            and not is_wine
-            and not config.auth_force_localserver
-        )
-        ):
-    protocolhandler = WindowsProtocolHandler()
-else:
-    protocolhandler = LinuxProtocolHandler()