Explorar el Código

feat(flutter): Can work

huangrunheng hace 3 años
padre
commit
7980c1c5b0

+ 1 - 2
config/template.json

@@ -875,7 +875,6 @@
     "hunt_config": {
       "kirin_group_team": "-1,-1",
       "netherworld_group_team": "-1,-1"
-    },
-    "exit_battle": false
+    }
   }
 }

+ 2 - 7
module/device/device.py

@@ -85,13 +85,8 @@ class Device(Screenshot, Control, AppControl, EmulatorManager):
 
         try:
             super().screenshot()
-        except RequestHumanTakeover:
-            if not self.ascreencap_available:
-                logger.error('aScreenCap unavailable on current device, fallback to auto')
-                self.run_simple_screenshot_benchmark()
-                super().screenshot()
-            else:
-                raise
+        except RequestHumanTakeover as e:
+            raise RequestHumanTakeover
 
         if self.handle_night_commission():
             super().screenshot()

+ 107 - 145
module/logger.py

@@ -37,86 +37,81 @@ class RichFileHandler(RichHandler):
     # Rename
     pass
 
-class LogStream(TextIOBase):
-    def __init__(self, *args, func: Callable[[ConsoleRenderable], None] = None, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._func = func
-
-    def write(self, msg: str) -> int:
-        if isinstance(msg, bytes):
-            msg = msg.decode("utf-8")
-        self._func(msg)
-        return len(msg)
-    
-class RichStreamHandler(RichHandler):
-    pass
 
 
-class RichRenderableHandler(RichHandler):
-    """
-    Pass renderable into a function
-    主要是传入一个回调函数
-    """
-
-    def __init__(self, *args, func: Callable[[ConsoleRenderable], None] = None, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._func = func
-
-    def emit(self, record: logging.LogRecord) -> None:
-        message = self.format(record)
-        tb = None
-        if (
-            self.rich_tracebacks
-            and record.exc_info
-            and record.exc_info != (None, None, None)
-        ):
-            exc_type, exc_value, exc_traceback = record.exc_info
-            traceback.print_tb(exc_traceback)
-            self._func(exc_traceback)
-            assert exc_type is not None
-            assert exc_value is not None
-            tb = Traceback.from_exception(
-                exc_type,
-                exc_value,
-                exc_traceback,
-                width=self.tracebacks_width,
-                extra_lines=self.tracebacks_extra_lines,
-                theme=self.tracebacks_theme,
-                word_wrap=self.tracebacks_word_wrap,
-                show_locals=self.tracebacks_show_locals,
-                locals_max_length=self.locals_max_length,
-                locals_max_string=self.locals_max_string,
-            )
-            # 这个好理解转化为特定格式, getMessage()返回寸str
-            message = record.getMessage()
-            if self.formatter:
-                record.message = record.getMessage()
-                formatter = self.formatter
-                if hasattr(formatter, "usesTime") and formatter.usesTime():
-                    record.asctime = formatter.formatTime(
-                        record, formatter.datefmt)
-                message = formatter.formatMessage(record)
-
-        # 这个message_renderable是一个Text对象
-        message_renderable = self.render_message(record, message)
-        log_renderable: ConsoleRenderable = self.render(
-            record=record, traceback=tb, message_renderable=message_renderable
-        )
-
-        # msg2 = Text.from_markup(message).markup
-
-        # 这个message_renderable是一个Text对象
-        # traceback是表示异常的对象
-        # Directly put renderable into function
-        self._func(log_renderable)
-
-    def handle(self, record: logging.LogRecord) -> bool:
-        if not self._func:
-            return True
-        super().handle(record)
-
+#
+# class FlutterHandler(RichHandler):
+#     """
+#     Pass renderable into a function
+#     主要是传入一个回调函数
+#     """
+#
+#     def __init__(self, *args, func: Callable[[ConsoleRenderable], None] = None, **kwargs):
+#         super().__init__(*args, **kwargs)
+#         self._func = func
+#
+#     def emit(self, record: logging.LogRecord) -> None:
+#         message = self.format(record)
+#         tb = None
+#         if (
+#             self.rich_tracebacks
+#             and record.exc_info
+#             and record.exc_info != (None, None, None)
+#         ):
+#             exc_type, exc_value, exc_traceback = record.exc_info
+#             traceback.print_tb(exc_traceback)
+#             self._func(exc_traceback)
+#             assert exc_type is not None
+#             assert exc_value is not None
+#             tb = Traceback.from_exception(
+#                 exc_type,
+#                 exc_value,
+#                 exc_traceback,
+#                 width=self.tracebacks_width,
+#                 extra_lines=self.tracebacks_extra_lines,
+#                 theme=self.tracebacks_theme,
+#                 word_wrap=self.tracebacks_word_wrap,
+#                 show_locals=self.tracebacks_show_locals,
+#                 locals_max_length=self.locals_max_length,
+#                 locals_max_string=self.locals_max_string,
+#             )
+#             # 这个好理解转化为特定格式, getMessage()返回寸str
+#             message = record.getMessage()
+#             if self.formatter:
+#                 record.message = record.getMessage()
+#                 formatter = self.formatter
+#                 if hasattr(formatter, "usesTime") and formatter.usesTime():
+#                     record.asctime = formatter.formatTime(
+#                         record, formatter.datefmt)
+#                 message = formatter.formatMessage(record)
+#
+#         # 这个message_renderable是一个Text对象
+#         message_renderable = self.render_message(record, message)
+#         log_renderable: ConsoleRenderable = self.render(
+#             record=record, traceback=tb, message_renderable=message_renderable
+#         )
+#
+#         # msg2 = Text.from_markup(message).markup
+#
+#         # 这个message_renderable是一个Text对象
+#         # traceback是表示异常的对象
+#         # Directly put renderable into function
+#         if log_renderable:
+#             if log_renderable is not str:
+#                 print(f'-------------------------------------------------------log is not str{log_renderable}')
+#                 log_renderable = str(log_renderable)
+#             self._func(log_renderable)
+#
+#     def handle(self, record: logging.LogRecord) -> bool:
+#         if not self._func:
+#             return True
+#         super().handle(record)
+
+class FlutterHandler(RichHandler):
+    # Rename
+    pass
 
-class HTMLConsole(Console):
+class FlutterConsole(Console):
     """
     Force full feature console
     but not working lol :(
@@ -133,35 +128,16 @@ class HTMLConsole(Console):
             is_terminal=False,
         )
 
+class FlutterLogStream(TextIOBase):
+    def __init__(self, *args, func: Callable[[ConsoleRenderable], None] = None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._func = func
 
-class Highlighter(RegexHighlighter):
-    base_style = 'web.'
-    highlights = [
-        # (r'(?P<datetime>(\d{2}|\d{4})(?:\-)?([0]{1}\d{1}|[1]{1}[0-2]{1})'
-        #  r'(?:\-)?([0-2]{1}\d{1}|[3]{1}[0-1]{1})(?:\s)?([0-1]{1}\d{1}|'
-        #  r'[2]{1}[0-3]{1})(?::)?([0-5]{1}\d{1})(?::)?([0-5]{1}\d{1}).\d+\b)'),
-        (r'(?P<time>([0-1]{1}\d{1}|[2]{1}[0-3]{1})(?::)?'
-         r'([0-5]{1}\d{1})(?::)?([0-5]{1}\d{1})(.\d+\b))'),
-        r"(?P<brace>[\{\[\(\)\]\}])",
-        r"\b(?P<bool_true>True)\b|\b(?P<bool_false>False)\b|\b(?P<none>None)\b",
-        r"(?P<path>(([A-Za-z]\:)|.)?\B([\/\\][\w\.\-\_\+]+)*[\/\\])(?P<filename>[\w\.\-\_\+]*)?",
-        # r"(?<![\\\w])(?P<str>b?\'\'\'.*?(?<!\\)\'\'\'|b?\'.*?(?<!\\)\'|b?\"\"\".*?(?<!\\)\"\"\"|b?\".*?(?<!\\)\")",
-    ]
-
-
-WEB_THEME = Theme({
-    "web.brace": Style(bold=True),
-    "web.bool_true": Style(color="bright_green", italic=True),
-    "web.bool_false": Style(color="bright_red", italic=True),
-    "web.none": Style(color="magenta", italic=True),
-    "web.path": Style(color="magenta"),
-    "web.filename": Style(color="bright_magenta"),
-    "web.str": Style(color="green", italic=False, bold=False),
-    "web.time": Style(color="cyan"),
-    "rule.text": Style(bold=True),
-})
-
-
+    def write(self, msg: str) -> int:
+        if isinstance(msg, bytes):
+            msg = msg.decode("utf-8")
+        self._func(msg)
+        return len(msg)
 
 
 def show_handlers(handlers):
@@ -193,14 +169,9 @@ file_formatter = logging.Formatter(
     fmt='%(asctime)s.%(msecs)03d | %(levelname)8s | %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
 console_formatter = logging.Formatter(
     fmt='%(asctime)s.%(msecs)03d │ %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
-web_formatter = logging.Formatter(
+flutter_formatter = logging.Formatter(
     fmt='%(asctime)s.%(msecs)03d │ %(message)s', datefmt='%H:%M:%S')
 
-# Add console logger
-# console = logging.StreamHandler(stream=sys.stdout)
-# console.setFormatter(formatter)
-# console.flush = sys.stdout.flush
-# logger.addHandler(console)
 
 # Add rich console logger
 # ======================================================================================================================
@@ -219,27 +190,9 @@ logger.addHandler(console_hdlr)
 
 # Ensure running in Alas root folder
 os.chdir(os.path.join(os.path.dirname(__file__), '../'))
-
 # Add file logger
 pyw_name = os.path.splitext(os.path.basename(sys.argv[0]))[0]
 
-# 这个函数貌似没有用到
-def _set_file_logger(name=pyw_name):
-    if '_' in name:
-        name = name.split('_', 1)[0]
-    log_file = f'./log/{datetime.date.today()}_{name}.txt'
-    try:
-        file = logging.FileHandler(log_file, encoding='utf-8')
-    except FileNotFoundError:
-        os.mkdir('./log')
-        file = logging.FileHandler(log_file, encoding='utf-8')
-    file.setFormatter(file_formatter)
-
-    logger.handlers = [h for h in logger.handlers if not isinstance(
-        h, (logging.FileHandler, RichFileHandler))]
-    logger.addHandler(file)
-    logger.log_file = log_file
-
 
 def set_file_logger(name=pyw_name):
     if '_' in name:
@@ -255,7 +208,7 @@ def set_file_logger(name=pyw_name):
         file=file,
         no_color=True,
         highlight=False,
-        width=120,
+        width=100,
     )
 
     hdlr = RichFileHandler(
@@ -276,20 +229,19 @@ def set_file_logger(name=pyw_name):
     logger.addHandler(hdlr)
     logger.log_file = log_file
 
-# 给web设置
+# 给flutter设置
 def set_func_logger(func):
-
-    stream = LogStream(func=func)
-    file_console = Console(
+    stream = FlutterLogStream(func=func)
+    stream_console = Console(
         file=stream,
         force_terminal=False,
         force_interactive=False,
         no_color=True,
         highlight=False,
-        width=120,
+        width=100,
     )
-    hdlr = RichStreamHandler(
-        console=file_console,
+    hdlr = FlutterHandler(
+        console=stream_console,
         show_path=False,
         show_time=False,
         show_level=True,
@@ -298,7 +250,7 @@ def set_func_logger(func):
         tracebacks_extra_lines=3,
         highlighter=NullHighlighter(),
     )
-    hdlr.setFormatter(web_formatter)
+    hdlr.setFormatter(flutter_formatter)
     logger.addHandler(hdlr)
 
 
@@ -329,9 +281,9 @@ def _get_renderables(
 
 def print(*objects: ConsoleRenderable, **kwargs):
     for hdlr in logger.handlers:
-        if isinstance(hdlr, RichRenderableHandler):
+        if isinstance(hdlr, FlutterHandler):
             for renderable in _get_renderables(hdlr.console, *objects, **kwargs):
-                hdlr._func(renderable)
+                hdlr.console.file._func(str(renderable))
         elif isinstance(hdlr, RichHandler):
             hdlr.console.print(*objects)
 
@@ -342,12 +294,26 @@ class GuiRule(Rule):
         options.max_width = 80
         return super().__rich_console__(console, options)
 
+    def __str__(self):
+        total_width = 100
+        cell_len = len(self.title) + 2
+        aside_len = (total_width - cell_len) // 2
+        left = self.characters * aside_len
+        right = self.characters * (total_width - cell_len - aside_len)
+        if self.title:
+            space = ' '
+        else:
+            space = self.characters
+        return f"{left}{space}{self.title}{space}{right}\n"
+
+    def __repr__(self):
+        return self.__str__()
+
 def rule(title="", *, characters="─", style="rule.line", end="\n", align="center"):
     rule = GuiRule(title=title, characters=characters,
                 style=style, end=end)
     print(rule)
 
-
 def hr(title, level=3):
     title = str(title).upper()
     if level == 1:
@@ -363,18 +329,15 @@ def hr(title, level=3):
         logger.rule(title, characters='─')
         logger.rule(characters='═')
 
-
 def attr(name, text):
     logger.info('[%s] %s' % (str(name), str(text)))
 
-
 def attr_align(name, text, front='', align=22):
     name = str(name).rjust(align)
     if front:
         name = front + name[len(front):]
     logger.info('%s: %s' % (name, str(text)))
 
-
 def show():
     logger.info('INFO')
     logger.warning('WARNING')
@@ -393,7 +356,6 @@ def show():
     raise Exception("Exception")
     # Line below exception
 
-
 def error_convert(func):
     def error_wrapper(msg, *args, **kwargs):
         if isinstance(msg, Exception):

+ 7 - 2
module/server/main_manager.py

@@ -49,7 +49,7 @@ class MainManager(ConfigManager):
         tasks : dict[str, Task] = {}
         from asyncio import sleep
         while 1:
-            await sleep(5)
+            await sleep(3)
             # logger.info(asyncio.all_tasks())
             for name, script_p in self.script_process.items():
                 # 遍历所有的
@@ -61,5 +61,10 @@ class MainManager(ConfigManager):
                     continue
                 coroutine_state_name = f'coroutine_state_{name}'
                 if coroutine_state_name not in tasks:
-                    tasks[coroutine_state_name] = asyncio.create_task(script_p.coroutine_broadcast_state(), name=coroutine_state_name)
+                    tasks[coroutine_state_name] = asyncio.create_task(script_p.coroutine_broadcast_state(),
+                                                                      name=coroutine_state_name)
+                coroutine_log_name = f'coroutine_log_{name}'
+                if coroutine_log_name not in tasks:
+                    tasks[coroutine_log_name] = asyncio.create_task(script_p.coroutine_broadcast_log(),
+                                                                    name=coroutine_log_name)
 

+ 63 - 77
module/server/script_process.py

@@ -25,110 +25,94 @@ class ScriptProcess(ScriptWSManager):
         self.state_queue = multiprocessing.Queue()
         self.state: ScriptState = ScriptState.INACTIVE
         self._process = None
-        self._process = multiprocessing.Process(target=func,
-                                                args=(config_name, self.state_queue, self.log_pipe_in,),
-                                                name=self.config_name,
-                                                daemon=True)
 
 
 
 
-    def start(self):
-        if self._process is None:
-            logger.warning(f'Script {self.config_name} is not initialized')
-            return
-        if self._process.is_alive():
+    async def start(self):
+        self.state = ScriptState.RUNNING
+        await self.broadcast_state({"state": self.state})
+        if self._process:
+            logger.warning(f'Script {self.config_name} is initialized')
+        if self._process and self._process.is_alive():
             logger.warning(f'Script {self.config_name} is already running and first stop it')
             self.stop()
+        self._process = multiprocessing.Process(target=func,
+                                                args=(self.config_name, self.state_queue, self.log_pipe_in,),
+                                                name=self.config_name,
+                                                daemon=True)
         self._process.start()
-        self.state = ScriptState.RUNNING
-        self.state_queue.put({"state": self.state})
 
-    def stop(self):
+
+    async def stop(self):
+        self.state = ScriptState.INACTIVE
+        await self.broadcast_state({"state": self.state})
         if self._process is None:
-            logger.warning(f'Script {self.config_name} is not initialized')
+            logger.warning(f'Script {self.config_name} process is removed')
             return
         if not self._process.is_alive():
             logger.warning(f'Script {self.config_name} is not running')
             return
         self._process.terminate()
-        self.state = ScriptState.INACTIVE
-        self.state_queue.put({"state": self.state})
-
-
-
-
-    # def func(self):
-    #     # self.start_log(log_pipe_in)
-    #     try:
-    #         from script import Script
-    #         # script = Script(config_name=self.config_name)
-    #         # script.state_queue = state_queue
-    #         # script.loop()
-    #         # 脚本启动
-    #         from time import sleep
-    #         logger.info(f'Script {self.config_name} start')
-    #         sleep(5)
-    #         logger.info(f'Script {self.config_name} end')
-    #         exit(0)
-    #         raise Exception('test')
-    #     except SystemExit as e:
-    #         logger.info(f'Script {self.config_name} exit')
-    #         self.state = ScriptState.WARNING
-    #         self.state_queue.put({"state": self.state})
-    #     except Exception as e:
-    #         logger.exception(f'Run script {self.config_name} error')
-    #         logger.error(f'Error: {e}')
-    #         raise
-
-    # def start_log(self, log_pipe_in) -> None:
-    #     try:
-    #         from module.logger import set_file_logger, set_func_logger
-    #         set_file_logger(name=self.config_name)
-    #         set_func_logger(log_pipe_in.send)
-    #     except Exception as e:
-    #         logger.exception(f'Start log error')
-    #         logger.error(f'Error: {e}')
-    #         raise
-
-
-    async def broadcast_state_log(self):
-        try:
-            data = self.state_queue.get_nowait()
-            if not data:
-                pass
-            if self.state == ScriptState.INACTIVE:
-                pass
-            await self.broadcast_state(data)
-        except QueueEmpty as e:
-            pass
-        except Exception as e:
-            raise e
+        self._process = None
 
     async def coroutine_broadcast_state(self):
         try:
             while 1:
+                if self.state == ScriptState.INACTIVE:
+                    await sleep(1)
+                    continue
                 await sleep(0.1)
                 try:
+                    if self.state_queue.empty():
+                        await sleep(1)
+                        continue
                     data = self.state_queue.get_nowait()
                     if not data:
                         await sleep(0.5)
                         continue
-                    if self.state == ScriptState.INACTIVE:
-                        logger.warning()
-                        continue
                     await self.broadcast_state(data)
                 except QueueEmpty as e:
+                    logger.warning(f'QueueEmpty: {e}')
                     await sleep(0.5)
                     continue
                 except Exception as e:
-                    raise e
+                    logger.error(f'Error: {e}')
+                    continue
         except CancelledError as e:
             logger.warning(f'{self.config_name} state coroutine is cancelled')
             return
 
+    async def coroutine_broadcast_log(self):
+        try:
+            while 1:
+                if self.state == ScriptState.INACTIVE:
+                    await sleep(1)
+                    continue
+                await sleep(0.05)
+                try:
+                    if not self.log_pipe_out.poll():
+                        await sleep(0.3)
+                        continue
+                    log = self.log_pipe_out.recv()
+                    if not log:
+                        await sleep(0.5)
+                        continue
+                    await self.broadcast_log(log)
+                except EOFError as e:
+                    await sleep(0.5)
+                    logger.warning(f'EOFError: {e}')
+                    continue
+                except Exception as e:
+                    logger.error(f'Log Error: {e}')
+                    continue
+        except CancelledError as e:
+            logger.warning(f'{self.config_name} log coroutine is cancelled')
+            return
+
 
 def func(config: str, state_queue: multiprocessing.Queue, log_pipe_in) -> None:
+
     def start_log() -> None:
         try:
             from module.logger import set_file_logger, set_func_logger
@@ -139,21 +123,23 @@ def func(config: str, state_queue: multiprocessing.Queue, log_pipe_in) -> None:
             logger.error(f'Error: {e}')
             raise
     start_log()
+    logger.hr(f'Script [{config}] process start')
+    import time
     try:
+        # while 1:
+        #     time.sleep(1)
+        #     logger.info(f'Script {config} is running')
+        #     state_queue.put({"state": ScriptState.RUNNING})
         from script import Script
         script = Script(config_name=config)
         script.state_queue = state_queue
         script.loop()
-        # 脚本启动
-        # from time import sleep
-        # logger.info(f'Script {self.config_name} start')
-        # sleep(5)
-        # logger.info(f'Script {self.config_name} end')
-        # exit(0)
-        # raise Exception('test')
     except SystemExit as e:
-        logger.info(f'Script {config} exit')
+        logger.info(f'Script {config} process exit')
+        logger.error(f'Error: {e}')
         state_queue.put({"state": ScriptState.WARNING})
+        time.sleep(0.1)
+        exit(-1)
     except Exception as e:
         logger.exception(f'Run script {config} error')
         logger.error(f'Error: {e}')

+ 2 - 2
module/server/script_router.py

@@ -153,9 +153,9 @@ async def websocket_endpoint(websocket: WebSocket, script_name: str):
                 mm.config_cache.update_scheduler()
                 await script_process.broadcast_state({"schedule":mm.config_cache.get_schedule_data()})
             elif data == 'start':
-                script_process.start()
+                await script_process.start()
             elif data == 'stop':
-                script_process.stop()
+                await script_process.stop()
 
     except WebSocketDisconnect:
         logger.warning(f'[{script_name}] websocket disconnect')

+ 2 - 2
tasks/Script/config_device.py

@@ -17,8 +17,8 @@ class ScreenshotMethod(str, Enum):
     ADB = 'ADB'
     ADB_NC = 'ADB_nc'
     UIAUTOMATOR2 = 'uiautomator2'
-    DROIDCAST = 'Droidcast'
-    DROIDCAST_RAW = 'Droidcast_raw'
+    DROIDCAST = 'DroidCast'
+    DROIDCAST_RAW = 'DroidCast_raw'
     SCRCPY = 'scrcpy'
     WINDOW_BACKGROUND = 'window_background'