Opt: Add an option to disable reload

deploy/template/deploy.yaml

@@ -62,6 +62,9 @@ Deploy:
     InstallUiautomator2: true
 
   Update:
+    # Use auto update and builtin updater feature
+    # This may cause problem https://github.com/LmeSzinc/AzurLaneAutoScript/issues/876
+    EnableReload: true
     # Check update every X minute
     # [Disable] -1
     # [Default] 5

gui.py

@@ -80,6 +80,21 @@ def bind(self) -> socket.socket:
 # monkey patch Config.bing_socket
 uvicorn.Config.bind_socket = bind
 
+
+def run_with_reload(host, port):
+    """
+    Same as command below, but without reuse address patch.
+    uvicorn module.webui.app:app --factory --host 127.0.0.1 --port 22267 --reload --reload-include="reloadflag" --reload-exclude="*.py" --reload-dir="./config/"
+    """
+    uvicorn.run('module.webui.app:app', host=host, port=port, factory=True, reload_dirs=[os.path.join(os.getcwd(), './config/')],
+                reload=True, reload_includes=['reloadflag'], reload_excludes=['*.py'])
+
+
+def run_without_reload(host, port):
+    from module.webui.app import app
+    uvicorn.run(app, host=host, port=port, factory=True)
+
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Alas web service')
     parser.add_argument('--host', type=str,
@@ -88,13 +103,18 @@ def bind(self) -> socket.socket:
                         help='Port to listen. Default to WebuiPort in deploy setting')
     parser.add_argument('-d', '--disable-address-reuse', action="store_true",
                         help='Disable SO_REUSEADDR.')
+    parser.add_argument('--electron', action="store_true",
+                        help='Runs by electron client.')
+    parser.add_argument('--reload', action="store_true",
+                        help='Able to use auto update and builtin updater')
     args, _ = parser.parse_known_args()
 
     webui_config = WebuiConfig()
     host = args.host or webui_config.WebuiHost or '0.0.0.0'
     port = args.port or int(webui_config.WebuiPort) or 22267
+    reload = args.reload or webui_config.bool('EnableReload')
 
-    if args.disable_address_reuse:
+    if args.disable_address_reuse or args.electron:
         reuseaddr = False
     logger.hr('Server config')
     logger.attr('Host', host)
@@ -105,5 +125,7 @@ def bind(self) -> socket.socket:
     except:
         pass
 
-    uvicorn.run('module.webui.app:app', host=host, port=port, factory=True, reload_dirs=[os.path.join(os.getcwd(), './config/')],
-                reload=True, reload_includes=['reloadflag'], reload_excludes=['*.py'])
+    if reload:
+        run_with_reload(host=host, port=port)
+    else:
+        run_without_reload(host=host, port=port)

module/webui/config.py

@@ -64,3 +64,20 @@ def __setattr__(self, key, value):
         if key[0].isupper() and key in self.config:
             self.config[key] = value
             self.write()
+
+    @staticmethod
+    def to_bool(value):
+        value = value.lower()
+        if value == 'null' or value == 'false' or value == '':
+            return False
+        return True
+
+    def bool(self, key):
+        """
+        Args:
+            key (str):
+
+        Returns:
+            bool: Option is ON or OFF.
+        """
+        return self.to_bool(self.config[key])

module/webui/updater.py

@@ -39,6 +39,10 @@ def schedule_time(self):
         self.read()
         return datetime.time.fromisoformat(self.config['AutoRestartTime'])
 
+    @cached_property
+    def enabled(self):
+        return self.bool('EnableReload')
+
     @cached_property
     def repo(self):
         return self.config['Repository']

module/webui/utils.py

@@ -183,7 +183,6 @@ def loop(self) -> None:
 
     def _get_thread(self) -> threading.Thread:
         thread = Thread(target=self.loop)
-        thread.daemon = True
         return thread
 
     def start(self) -> None:

webapp/packages/main/src/config.ts

@@ -11,6 +11,6 @@ const PythonExecutable = config.Deploy.Python.PythonExecutable;
 const WebuiPort = config.Deploy.Webui.WebuiPort.toString();
 
 export const pythonPath = (path.isAbsolute(PythonExecutable) ? PythonExecutable : path.join(alasPath, PythonExecutable));
-export const webuiUrl = `http://localhost:${WebuiPort}`;
+export const webuiUrl = `http://127.0.0.1:${WebuiPort}`;
 export const webuiPath = 'gui.py';
-export const webuiArgs = ['--port', WebuiPort];
+export const webuiArgs = ['--port', WebuiPort, '--electron'];