Parcourir la source

feat(notify): connect to the system

runhey il y a 3 ans
Parent
commit
f68e76d2b4
3 fichiers modifiés avec 26 ajouts et 12 suppressions
  1. 4 1
      module/config/config.py
  2. 11 2
      module/notify/notify.py
  3. 11 9
      script.py

+ 4 - 1
module/config/config.py

@@ -317,7 +317,10 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
 
 
     @cached_property
     @cached_property
     def notifier(self):
     def notifier(self):
-        return Notifier(self.model.script.error.notify_config)
+        notifier = Notifier(self.model.script.error.notify_config, enable=self.model.script.error.notify_enable)
+        notifier.config_name = self.config_name.upper()
+        logger.info(f'Notifier: {notifier.config_name}')
+        return notifier
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     config = Config(config_name='oas1')
     config = Config(config_name='oas1')

+ 11 - 2
module/notify/notify.py

@@ -15,7 +15,12 @@ onepush.core.log = logger
 
 
 
 
 class Notifier:
 class Notifier:
-    def __init__(self, _config: str) -> None:
+    def __init__(self, _config: str, enable: bool=False) -> None:
+        self.config_name: str = ""
+        self.enable: bool = enable
+
+        if not self.enable:
+            return
         try:
         try:
             config = {}
             config = {}
             for item in yaml.safe_load_all(_config):
             for item in yaml.safe_load_all(_config):
@@ -42,15 +47,19 @@ class Notifier:
             return
             return
 
 
     def push(self, **kwargs) -> bool:
     def push(self, **kwargs) -> bool:
+        if not self.enable:
+            return False
         # 更新配置
         # 更新配置
+        kwargs["title"] = f"{self.config_name} {kwargs['title']}"
         self.config.update(kwargs)
         self.config.update(kwargs)
         # pre check
         # pre check
         for key in self.required:
         for key in self.required:
             if key not in self.config:
             if key not in self.config:
                 logger.warning(
                 logger.warning(
-                    f"Notifier {self.notifier.name} require param '{key}' but not provided"
+                    f"Notifier {self.notifier} require param '{key}' but not provided"
                 )
                 )
 
 
+
         if isinstance(self.notifier, Custom):
         if isinstance(self.notifier, Custom):
             if "method" not in self.config or self.config["method"] == "post":
             if "method" not in self.config or self.config["method"] == "post":
                 self.config["datatype"] = "json"
                 self.config["datatype"] = "json"

+ 11 - 9
script.py

@@ -323,6 +323,7 @@ class Script:
             self.save_error_log()
             self.save_error_log()
             logger.warning(f'Game stuck, {self.device.package} will be restarted in 10 seconds')
             logger.warning(f'Game stuck, {self.device.package} will be restarted in 10 seconds')
             logger.warning('If you are playing by hand, please stop Alas')
             logger.warning('If you are playing by hand, please stop Alas')
+            self.config.notifier.push(title='crashed', content=f"<{self.config_name}> GameStuckError or GameTooManyClickError")
             self.config.task_call('Restart')
             self.config.task_call('Restart')
             self.device.sleep(10)
             self.device.sleep(10)
             return False
             return False
@@ -336,24 +337,25 @@ class Script:
             return False
             return False
         except GamePageUnknownError:
         except GamePageUnknownError:
             logger.info('Game server may be under maintenance or network may be broken, check server status now')
             logger.info('Game server may be under maintenance or network may be broken, check server status now')
-            self.checker.check_now()
-            if self.checker.is_available():
-                logger.critical('Game page unknown')
-                self.save_error_log()
-                exit(1)
-            else:
-                self.checker.wait_until_available()
-                return False
+            # 这个还不重要 留着坑填
+            logger.critical('Game page unknown')
+            self.save_error_log()
+            self.config.notifier.push(title='crashed', content=f"<{self.config_name}> GamePageUnknownError")
+            exit(1)
+            return False
         except ScriptError as e:
         except ScriptError as e:
             logger.critical(e)
             logger.critical(e)
             logger.critical('This is likely to be a mistake of developers, but sometimes just random issues')
             logger.critical('This is likely to be a mistake of developers, but sometimes just random issues')
+            self.config.notifier.push(title='crashed', content=f"<{self.config_name}> ScriptError")
             exit(1)
             exit(1)
         except RequestHumanTakeover:
         except RequestHumanTakeover:
             logger.critical('Request human takeover')
             logger.critical('Request human takeover')
+            self.config.notifier.push(title='crashed', content=f"<{self.config_name}> RequestHumanTakeover")
             exit(1)
             exit(1)
         except Exception as e:
         except Exception as e:
             logger.exception(e)
             logger.exception(e)
             self.save_error_log()
             self.save_error_log()
+            self.config.notifier.push(title='crashed', content=f"<{self.config_name}> Exception occured")
             exit(1)
             exit(1)
 
 
     def loop(self):
     def loop(self):
@@ -425,7 +427,7 @@ class Script:
             elif self.config.script.error.handle_error:
             elif self.config.script.error.handle_error:
                 # self.config.task_delay(success=False)
                 # self.config.task_delay(success=False)
                 del_cached_property(self, 'config')
                 del_cached_property(self, 'config')
-                self.checker.check_now()
+                # self.checker.check_now()
                 continue
                 continue
             else:
             else:
                 break
                 break