pymud 0.21.0a4__py3-none-any.whl → 0.21.0a5__py3-none-any.whl

pymud/session.py

@@ -1,17 +1,17 @@
-import asyncio, logging, re, math, os, pickle, datetime, sysconfig, time, dataclasses, functools, traceback
+import asyncio, logging, re, math, os, pickle, datetime, sysconfig, time, dataclasses
+from pathlib import Path
 from collections.abc import Iterable
 from collections import OrderedDict
-import logging
 from prompt_toolkit.utils import get_cwidth
 from wcwidth import wcswidth, wcwidth
-from typing import Union, Optional, Any, List, Tuple, Dict
+from typing import Union, Optional, Any, List, Tuple, Dict, Type
 from .logger import Logger
 from .extras import SessionBuffer, DotDict
 from .protocol import MudClientProtocol
-from .modules import ModuleInfo
+from .modules import ModuleInfo, Plugin
 from .objects import BaseObject, Trigger, Alias, Command, Timer, SimpleAlias, SimpleTrigger, SimpleTimer, GMCPTrigger, CodeBlock, CodeLine
 from .settings import Settings
-
+from .decorators import exception, async_exception
 
 class Session:
     """
@@ -102,6 +102,7 @@ class Session:
         "t+"  : "ignore",
         "t-"  : "ignore",
         "show": "test",
+        "echo": "test",
     }
 
     def __init__(self, app, name, host, port, encoding = None, after_connect = None, loop = None, **kwargs):
@@ -163,15 +164,28 @@ class Session:
 
         # 将变量加载和脚本加载调整到会话创建时刻
         if Settings.client["var_autoload"]:
-                file = f"{self.name}.mud"
+            muddir = Path.cwd().joinpath('save')
+            if not muddir.exists() or not muddir.is_dir():
+                muddir.mkdir()
+            
+            # 处理老版本当前目录的.mud文件，移动到save目录下
+            file = f"{self.name}.mud"
+            new_loc_file = muddir.joinpath(file)
+            if not os.path.exists(new_loc_file):
                 if os.path.exists(file):
-                    with open(file, "rb") as fp:
-                        try:
-                            vars = pickle.load(fp)
-                            self._variables.update(vars)
-                            self.info(Settings.gettext("msg_var_autoload_success", file))
-                        except Exception as e:
-                            self.warning(Settings.gettext("msg_var_autoload_fail", file, e))
+                    os.rename(file, new_loc_file)
+            else:
+                if os.path.exists(file):
+                    os.remove(file)
+
+            if os.path.exists(new_loc_file):
+                with open(new_loc_file, "rb") as fp:
+                    try:
+                        vars = pickle.load(fp)
+                        self._variables.update(vars)
+                        self.info(Settings.gettext("msg_var_autoload_success", file))
+                    except Exception as e:
+                        self.warning(Settings.gettext("msg_var_autoload_fail", file, e))
 
         
         if self._auto_script:
@@ -209,7 +223,7 @@ class Session:
     async def connect(self):
         "创建到远程服务器的连接，异步非阻塞方式。"
         def _protocol_factory():
-            return MudClientProtocol(self, onDisconnected = self.onDisconnected)
+            return MudClientProtocol(self, onDisconnected = self.onDisconnected, encoding = self.encoding, encoding_errors = Settings.server["encoding_errors"])
         
         try:
             #self.loop = asyncio.get_running_loop()
@@ -997,7 +1011,8 @@ class Session:
 
         :param cmdtext: 纯文本命令
         """
-        isNotCmd = True
+        keepEval = True
+        notHandle = True
 
         # fix bugs, commands filter for enabled and sorted for priority
         avai_cmds = [cmd for cmd in self._commands.values() if isinstance(cmd, Command) and cmd.enabled]
@@ -1006,15 +1021,16 @@ class Session:
         for command in self._commands.values():
             state = command.match(cmdtext)
             if state.result == Command.SUCCESS:
+                notHandle = False
                 # 命令的任务名称采用命令id，以便于后续查错
                 self.create_task(command.execute(cmdtext), name = "task-{0}".format(command.id))
-                isNotCmd = False
-                break
 
-        # 再判断是否是别名
-        if isNotCmd:
-            notAlias = True
+                if not command.keepEval:
+                    keepEval = False
+                    break
 
+        # 若持续匹配，再判断是否是别名
+        if keepEval:
             # fix bugs, aliases filter for enabled and sorted for priority, and add oneShot, keepEval judge
             avai_alis = [ali for ali in self._aliases.values() if isinstance(ali, Alias) and ali.enabled]
             avai_alis.sort(key = lambda ali: ali.priority)
@@ -1022,16 +1038,16 @@ class Session:
             for alias in avai_alis:               
                 state = alias.match(cmdtext)
                 if state.result == Alias.SUCCESS:
-                    notAlias = False
+                    notHandle = False
                     if alias.oneShot:
                         self.delAlias(alias.id)
 
                     if not alias.keepEval:
                         break
 
-            # 都不是则是普通命令，直接发送
-            if notAlias:
-                self.writeline(cmdtext)
+        # 都前面都未被处理，则直接发送
+        if notHandle:
+            self.writeline(cmdtext)
 
     async def exec_text_async(self, cmdtext: str):
         """
@@ -1040,7 +1056,8 @@ class Session:
         异步调用时，该函数要等待对应的代码执行完毕后才会返回。可以用于确保命令执行完毕。
         """
         result = None
-        isNotCmd = True
+        keepEval = True
+        notHandle = True
 
         # fix bugs, commands filter for enabled and sorted for priority
         avai_cmds = [cmd for cmd in self._commands.values() if isinstance(cmd, Command) and cmd.enabled]
@@ -1051,12 +1068,13 @@ class Session:
             if state.result == Command.SUCCESS:
                 # 命令的任务名称采用命令id，以便于后续查错
                 result = await self.create_task(command.execute(cmdtext), name = "task-{0}".format(command.id))
-                isNotCmd = False
-                break
+                notHandle = False
+                if not command.keepEval:
+                    keepEval = False
+                    break
 
         # 再判断是否是别名
-        if isNotCmd:
-            notAlias = True
+        if keepEval:
 
             # fix bugs, aliases filter for enabled and sorted for priority, and add oneShot, keepEval judge
             avai_alis = [ali for ali in self._aliases.values() if isinstance(ali, Alias) and ali.enabled]
@@ -1065,16 +1083,16 @@ class Session:
             for alias in avai_alis:               
                 state = alias.match(cmdtext)
                 if state.result == Alias.SUCCESS:
-                    notAlias = False
+                    notHandle = False
                     if alias.oneShot:
                         self.delAlias(alias.id)
 
                     if not alias.keepEval:
                         break
 
-            # 都不是则是普通命令，直接发送
-            if notAlias:
-                self.writeline(cmdtext)
+        # 若均为处理则是普通命令，直接发送
+        if notHandle:
+            self.writeline(cmdtext)
 
         return result
 
@@ -1168,39 +1186,49 @@ class Session:
         """
         return "{0}_{1}".format(prefix, self.getUniqueNumber())
 
-    def enableGroup(self, group: str, enabled = True):
+    def enableGroup(self, group: str, enabled = True, subgroup = True, types: Union[Type, Union[Tuple, List]] = (Alias, Trigger, Command, Timer, GMCPTrigger)):
         """
         使能或禁用Group中所有对象, 返回组内各对象个数。
         
         :param group: 组名，即各对象的 group 属性的值
         :param enabled: 使能/禁用开关。为True时表示使能， False为禁用
+        :param subgroup: 是否对子组同时生效，默认为True。子组是指名称在父组名之后的用.xxx命名的组。例如, 组 group1.group2 是 group1 的子组。
+        :param types: 要使能的对象类型，默认为 (Alias, Trigger, Command, Timer, GMCPTrigger)。
+            可以指定为单个类型，也可以指定为类型列表或元组。
+            若指定为单个类型，则只使能该类型的对象。
+            若指定为类型列表或元组，则使能该类型列表或元组中的所有类型的对象。
         :return: 5个整数的列表，依次表示改组内操作的 别名，触发器，命令，定时器，GMCP 的个数
         """
         counts = [0, 0, 0, 0, 0]
-        for ali in self._aliases.values():
-            if isinstance(ali, Alias) and (ali.group == group):
-                ali.enabled = enabled
-                counts[0] += 1
-
-        for tri in self._triggers.values():
-            if isinstance(tri, Trigger) and (tri.group == group):
-                tri.enabled = enabled
-                counts[1] += 1
-
-        for cmd in self._commands.values():
-            if isinstance(cmd, Command) and (cmd.group == group):
-                cmd.enabled = enabled
-                counts[2] += 1
-
-        for tmr in self._timers.values():
-            if isinstance(tmr, Timer) and (tmr.group == group):
-                tmr.enabled = enabled
-                counts[3] += 1
-
-        for gmcp in self._gmcp.values():
-            if isinstance(gmcp, GMCPTrigger) and (gmcp.group == group):
-                gmcp.enabled = enabled       
-                counts[4] += 1 
+        if (Alias == types) or (isinstance(types, Union[List, Tuple]) and (Alias in types)):
+            for ali in self._aliases.values():
+                if isinstance(ali, Alias) and ((ali.group == group) or (subgroup and ali.group.startswith(group + "."))):
+                    ali.enabled = enabled
+                    counts[0] += 1
+
+        if (Trigger == types) or (isinstance(types, Union[List, Tuple]) and (Trigger in types)):
+            for tri in self._triggers.values():
+                if isinstance(tri, Trigger) and ((tri.group == group) or (subgroup and tri.group.startswith(group + "."))):
+                    tri.enabled = enabled
+                    counts[1] += 1
+
+        if (Command == types) or (isinstance(types, Union[List, Tuple]) and (Command in types)):
+            for cmd in self._commands.values():
+                if isinstance(cmd, Command) and ((cmd.group == group) or (subgroup and cmd.group.startswith(group + "."))):
+                    cmd.enabled = enabled
+                    counts[2] += 1
+
+        if (Timer == types) or (isinstance(types, Union[List, Tuple]) and (Timer in types)):
+            for tmr in self._timers.values():
+                if isinstance(tmr, Timer) and ((tmr.group == group) or (subgroup and tmr.group.startswith(group + "."))):
+                    tmr.enabled = enabled
+                    counts[3] += 1
+
+        if (GMCPTrigger == types) or (isinstance(types, Union[List, Tuple]) and (GMCPTrigger in types)):
+            for gmcp in self._gmcp.values():
+                if isinstance(gmcp, GMCPTrigger) and ((gmcp.group == group) or (subgroup and gmcp.group.startswith(group + "."))):
+                    gmcp.enabled = enabled       
+                    counts[4] += 1 
 
         return counts
 
@@ -2234,6 +2262,10 @@ class Session:
                     obj.enabled = False
                     self.info(Settings.gettext("msg_object_disabled", obj.__repr__()))
                 elif args[1] == "del":
+                    if hasattr(obj, "__unload__"):
+                        obj.__unload__()
+                    if hasattr(obj, "unload"):
+                        obj.unload()
                     obj.enabled = False
                     objs.pop(args[0])
                     self.info(Settings.gettext("msg_object_deleted", obj.__repr__()))
@@ -2402,7 +2434,7 @@ class Session:
    
         self._handle_objs("Trigger", self._triggers, *code.code[2:])
 
-    def handle_task(self, code: CodeLine, *args, **kwargs):
+    def handle_task(self, code: Optional[CodeLine] = None, *args, **kwargs):
         '''
         嵌入命令 #task 的执行函数，显示当前管理的所有任务清单（仅用于调试）。
         该函数不应该在代码中直接调用。
@@ -2441,6 +2473,9 @@ class Session:
             - ``#t+ mygroup``: 使能名称为 mygroup 的组内的所有对象，包括别名、触发器、命令、定时器、GMCPTrigger等
             - ``#t- mygroup``: 禁用名称为 mygroup 的组内的所有对象，包括别名、触发器、命令、定时器、GMCPTrigger等
 
+        注意:
+            使用#t+/#t-调用时，相当于enableGroup传递的默认参数，即subgroup为True, 且types为所有类型。
+            
         相关命令:
             - #trigger
             - #alias
@@ -2472,7 +2507,7 @@ class Session:
             cnts = self.enableGroup(groupname, False)
             self.info(Settings.gettext("msg_group_disabled", groupname, *cnts))
 
-    def handle_repeat(self, code: CodeLine, *args, **kwargs):
+    def handle_repeat(self, code: Optional[CodeLine] = None, *args, **kwargs):
         '''
         嵌入命令 #repeat / #rep 的执行函数，重复向session输出上一次人工输入的命令。
         该函数不应该在代码中直接调用。
@@ -2676,7 +2711,13 @@ class Session:
     def _load_module(self, module_name):
         "加载指定名称模块"
         try:
-            if module_name not in self._modules.keys():
+            if module_name in self.application.plugins.keys():
+                plugin = self.application.plugins[module_name]
+                if isinstance(plugin, Plugin):
+                    plugin.onSessionCreate(self)
+                    self.info(Settings.gettext("msg_plugin_loaded", module_name))
+
+            elif module_name not in self._modules.keys():
                 self._modules[module_name] = ModuleInfo(module_name, self)
 
             else:
@@ -2714,6 +2755,12 @@ class Session:
             if isinstance(mod, ModuleInfo):
                 mod.unload()
 
+        elif module_name in self.application.plugins.keys():
+            plugin = self.application.plugins[module_name]
+            if isinstance(plugin, Plugin):
+                plugin.onSessionDestroy(self)
+                self.info(Settings.gettext("msg_plugin_unloaded", module_name))
+
         else:
             self.warning(Settings.gettext("msg_module_not_loaded", module_name))
 
@@ -2830,7 +2877,7 @@ class Session:
 
                 elif mod in self.plugins.keys():
                     self.application.reload_plugin(self.plugins[mod])
-                    self.info(Settings.gettext("msg_plugin_reloaded", mod))
+                    self.info(Settings.gettext("msg_plugins_reloaded", mod))
                 else:
                     self.warning(Settings.gettext("msg_name_not_found", mod))
 
@@ -2943,7 +2990,11 @@ class Session:
             - #variable
         '''
 
-        file = f"{self.name}.mud"
+        muddir = Path.cwd().joinpath('save')
+        if not muddir.exists() or not muddir.is_dir():
+            muddir.mkdir()
+
+        file = muddir.joinpath(f"{self.name}.mud")
 
         with open(file, "wb") as fp:
             saved = dict()
@@ -2969,28 +3020,32 @@ class Session:
 
         self.buffer.text = ""
 
+    @exception
     def handle_test(self, code: CodeLine, *args, **kwargs):
         '''
-        嵌入命令 #test / #show 的执行函数，触发器测试命令。类似于zmud的#show命令。
+        嵌入命令 #test / #show / #echo 的执行函数，触发器测试命令。类似于zmud的#show命令。
         该函数不应该在代码中直接调用。
 
         使用:
-            - #show {some_text}: 测试服务器收到{some_text}时的触发器响应情况。此时，触发器不会真的响应。
+            - #show {some_text}: 测试收到服务器{some_text}时的触发器响应情况。此时，触发器不会真的响应。
             - #test {some_test}: 与#show 的差异是，若存在匹配的触发器，无论其是否被使能，该触发器均会实际响应。
+            - #echo {some_text}: 模拟收到服务器 {some_text}的情况，触发器按正常情况响应，但不会显示测试结果。
 
         示例:
-            - ``#show 你深深吸了口气，站了起来。`` ： 模拟服务器收到“你深深吸了口气，站了起来。”时的情况进行触发测试（仅显示触发测试情况）
+            - ``#show 你深深吸了口气，站了起来。`` ： 模拟收到服务器“你深深吸了口气，站了起来。”时的情况进行触发测试（仅显示触发测试情况）
             - ``#test %copy``: 复制一句话，模拟服务器再次收到复制的这句内容时的情况进行触发器测试
-            - ``#test 你深深吸了口气，站了起来。`` ： 模拟服务器收到“你深深吸了口气，站了起来。”时的情况进行触发测试（会实际导致触发器动作）
+            - ``#test 你深深吸了口气，站了起来。`` ： 模拟收到服务器“你深深吸了口气，站了起来。”时的情况进行触发测试（会实际导致触发器动作）
+            - ``#echo 你深深吸了口气，站了起来。`` ： 模拟收到服务器“你深深吸了口气，站了起来。”时的情况进行触发测试（不会显示测试结果）
 
         注意:
             - #show命令测试触发器时，触发器不会真的响应。
             - #test命令测试触发器时，触发器无论是否使能，均会真的响应。
+            - #echo命令可以用来人工激发触发器。
         '''
         cmd = code.code[1].lower()
-        docallback = False
-        if cmd == "test":
-            docallback = True
+        docallback = True
+        if cmd == "show":
+            docallback = False
 
         new_cmd_text, new_code = code.expand(self, *args, **kwargs)
         line = new_cmd_text[6:]       # 取出#test 之后的所有内容
@@ -3016,6 +3071,10 @@ class Session:
         tris_disabled.sort(key = lambda tri: tri.priority)
         
         for raw_line in lines:
+            # echo 模式下，直接将原始数据输出到窗口，并进行触发测试
+            if cmd == "echo":
+                self.writetobuffer(raw_line, True)
+
             tri_line = self.getPlainText(raw_line)
             
             block = False
@@ -3025,7 +3084,7 @@ class Session:
                 else:
                     state = tri.match(tri_line, docallback = docallback)
 
-                if state.result == Trigger.SUCCESS:
+                if state and (state.result == Trigger.SUCCESS):
                     triggered_enabled += 1
                     if not block: 
                         triggered += 1
@@ -3040,58 +3099,59 @@ class Session:
                         info_enabled.append(Settings.gettext("msg_tri_ignored", tri.__detailed__(), Settings.WARN_STYLE, Settings.CLR_STYLE))
                         # info_enabled.append(f"    {Settings.WARN_STYLE}{tri.__detailed__()} 可以触发，但由于优先级与keepEval设定，触发器不会触发。{Settings.CLR_STYLE}")
             
-            
-            for tri in tris_disabled:
-                if tri.raw:
-                    state = tri.match(raw_line, docallback = docallback)
-                else:
-                    state = tri.match(tri_line, docallback = docallback)
-
-                if state.result == Trigger.SUCCESS:
-                    triggered_disabled += 1
-                    #info_disabled.append(f"    {tri.__detailed__()} 可以匹配触发。")
-                    info_disabled.append(Settings.gettext("msg_tri_matched", tri.__detailed__()))
+            if cmd != "echo":
+                for tri in tris_disabled:
+                    if tri.raw:
+                        state = tri.match(raw_line, docallback = docallback)
+                    else:
+                        state = tri.match(tri_line, docallback = docallback)
+
+                    if state and (state.result == Trigger.SUCCESS):
+                        triggered_disabled += 1
+                        #info_disabled.append(f"    {tri.__detailed__()} 可以匹配触发。")
+                        info_disabled.append(Settings.gettext("msg_tri_matched", tri.__detailed__()))
+
+                if triggered_enabled + triggered_disabled == 0:
+                    info_all.append("")
+
+        if cmd != "echo":
+            if triggered_enabled == 0:
+                info_enabled.insert(0, Settings.gettext("msg_enabled_summary_0", Settings.INFO_STYLE))
+                #info_enabled.insert(0, f"{Settings.INFO_STYLE}  使能的触发器中，没有可以触发的。")
+            elif triggered < triggered_enabled:
+                info_enabled.insert(0, Settings.gettext("msg_enabled_summary_1", Settings.INFO_STYLE, triggered_enabled, triggered, triggered_enabled - triggered))
+                #info_enabled.insert(0, f"{Settings.INFO_STYLE}  使能的触发器中，共有 {triggered_enabled} 个可以触发，实际触发 {triggered} 个，另有 {triggered_enabled - triggered} 个由于 keepEval 原因实际不会触发。")
+            else:
+                info_enabled.insert(0, Settings.gettext("msg_enabled_summary_2", Settings.INFO_STYLE, triggered_enabled))
+                #info_enabled.insert(0, f"{Settings.INFO_STYLE}  使能的触发器中，共有 {triggered_enabled} 个全部可以被正常触发。")
 
+            if triggered_disabled > 0:
+                info_disabled.insert(0, Settings.gettext("msg_disabled_summary_0", Settings.INFO_STYLE, triggered_disabled))
+                #info_disabled.insert(0, f"{Settings.INFO_STYLE}  未使能的触发器中，共有 {triggered_disabled} 个可以匹配。")
+            else:
+                info_disabled.insert(0, Settings.gettext("msg_disabled_summary_1", Settings.INFO_STYLE))
+                #info_disabled.insert(0, f"{Settings.INFO_STYLE}  未使能触发器，没有可以匹配的。")
+            
+            info_all.append("")
             if triggered_enabled + triggered_disabled == 0:
-                info_all.append("")
-
-        if triggered_enabled == 0:
-            info_enabled.insert(0, Settings.gettext("msg_enabled_summary_0", Settings.INFO_STYLE))
-            #info_enabled.insert(0, f"{Settings.INFO_STYLE}  使能的触发器中，没有可以触发的。")
-        elif triggered < triggered_enabled:
-            info_enabled.insert(0, Settings.gettext("msg_enabled_summary_1", Settings.INFO_STYLE, triggered_enabled, triggered, triggered_enabled - triggered))
-            #info_enabled.insert(0, f"{Settings.INFO_STYLE}  使能的触发器中，共有 {triggered_enabled} 个可以触发，实际触发 {triggered} 个，另有 {triggered_enabled - triggered} 个由于 keepEval 原因实际不会触发。")
-        else:
-            info_enabled.insert(0, Settings.gettext("msg_enabled_summary_2", Settings.INFO_STYLE, triggered_enabled))
-            #info_enabled.insert(0, f"{Settings.INFO_STYLE}  使能的触发器中，共有 {triggered_enabled} 个全部可以被正常触发。")
-
-        if triggered_disabled > 0:
-            info_disabled.insert(0, Settings.gettext("msg_disabled_summary_0", Settings.INFO_STYLE, triggered_disabled))
-            #info_disabled.insert(0, f"{Settings.INFO_STYLE}  未使能的触发器中，共有 {triggered_disabled} 个可以匹配。")
-        else:
-            info_disabled.insert(0, Settings.gettext("msg_disabled_summary_1", Settings.INFO_STYLE))
-            #info_disabled.insert(0, f"{Settings.INFO_STYLE}  未使能触发器，没有可以匹配的。")
-        
-        info_all.append("")
-        if triggered_enabled + triggered_disabled == 0:
-            #info_all.append(f"PYMUD 触发器测试: {'响应模式' if docallback else '测试模式'}")
-            info_all.append(Settings.gettext("msg_test_summary_0", line))
-            info_all.append(Settings.gettext("msg_test_summary_1"))
-            #info_all.append(f"  测试内容: {line}")
-            #info_all.append(f"  测试结果: 没有可以匹配的触发器。")
-        else:
-            #info_all.append(f"PYMUD 触发器测试: {'响应模式' if docallback else '测试模式'}")
-            info_all.append(Settings.gettext("msg_test_summary_0", line))
-            info_all.append(Settings.gettext("msg_test_summary_2", triggered, triggered_enabled + triggered_disabled))
-            #info_all.append(f"  测试内容: {line}")
-            #info_all.append(f"  测试结果: 有{triggered}个触发器可以被正常触发，一共有{triggered_enabled + triggered_disabled}个满足匹配触发要求。")
-            info_all.extend(info_enabled)
-            info_all.extend(info_disabled)
-        
-        title = Settings.gettext("msg_test_title", Settings.gettext("msg_triggered_mode") if docallback else Settings.gettext("msg_matched_mode"))
-        #title = f"触发器测试 - {'响应模式' if docallback else '测试模式'}"
-        self.info("\n".join(info_all), title)
-        #self.info("PYMUD 触发器测试 完毕")
+                #info_all.append(f"PYMUD 触发器测试: {'响应模式' if docallback else '测试模式'}")
+                info_all.append(Settings.gettext("msg_test_summary_0", line))
+                info_all.append(Settings.gettext("msg_test_summary_1"))
+                #info_all.append(f"  测试内容: {line}")
+                #info_all.append(f"  测试结果: 没有可以匹配的触发器。")
+            else:
+                #info_all.append(f"PYMUD 触发器测试: {'响应模式' if docallback else '测试模式'}")
+                info_all.append(Settings.gettext("msg_test_summary_0", line))
+                info_all.append(Settings.gettext("msg_test_summary_2", triggered, triggered_enabled + triggered_disabled))
+                #info_all.append(f"  测试内容: {line}")
+                #info_all.append(f"  测试结果: 有{triggered}个触发器可以被正常触发，一共有{triggered_enabled + triggered_disabled}个满足匹配触发要求。")
+                info_all.extend(info_enabled)
+                info_all.extend(info_disabled)
+            
+            title = Settings.gettext("msg_test_title", Settings.gettext("msg_triggered_mode") if docallback else Settings.gettext("msg_matched_mode"))
+            #title = f"触发器测试 - {'响应模式' if docallback else '测试模式'}"
+            self.info("\n".join(info_all), title)
+            #self.info("PYMUD 触发器测试 完毕")
 
     def handle_plugins(self, code: CodeLine, *args, **kwargs):
         '''
@@ -3152,7 +3212,7 @@ class Session:
         new_text, new_code = code.expand(self, *args, **kwargs)
         self.replace(new_text[9:])
         
-    def handle_gag(self, code: CodeLine, *args, **kwargs):
+    def handle_gag(self, code: Optional[CodeLine] = None, *args, **kwargs):
         '''
         嵌入命令 #gag 的执行函数，在主窗口中不显示当前行内容，一般用于触发器中。
         该函数不应该在代码中直接调用。
@@ -3239,7 +3299,6 @@ class Session:
     def info2(self, msg, title = None, style = Settings.INFO_STYLE):
         title = title or Settings.gettext("title_msg")
         msg = f"{msg}"
-
         self.writetobuffer("{}〔{}〕{}{}".format(style, title, msg, Settings.CLR_STYLE), newline = True)
 
     def info(self, msg, title = None, style = Settings.INFO_STYLE):
@@ -3387,34 +3446,3 @@ class Session:
                 else:
                     self.application.show_logSelectDialog()
 
-
-def exception(func):
-    """方法异常处理装饰器，捕获异常后通过会话的session.error打印相关信息"""
-    @functools.wraps(func)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return func(self, *args, **kwargs)
-        except Exception as e:
-            # 调用类的错误处理方法
-            session = getattr(self, "session", None)
-            if isinstance(session, Session):
-                session.error(f"函数执行中遇到异常, {e}, 类型为 {type(e)}")
-                session.error(f"异常追踪为： {traceback.format_exc()}")
-            else:
-                raise  # 当没有会话时，选择重新抛出异常
-    return wrapper
-
-def async_exception(func):
-    """异步方法异常处理装饰器，捕获异常后通过会话的session.error打印相关信息"""
-    @functools.wraps(func)
-    async def wrapper(self, *args, **kwargs):
-        try:
-            return await func(self, *args, **kwargs)
-        except Exception as e:
-            session = getattr(self, "session", None)
-            if isinstance(session, Session):
-                session.error(f"异步执行中遇到异常, {e}, 类型为 {type(e)}")
-                session.error(f"异常追踪为： {traceback.format_exc()}")
-            else:
-                raise  # 当没有会话时，选择重新抛出异常
-    return wrapper

pymud/settings.py

@@ -15,7 +15,7 @@ class Settings:
     "APP 简要描述"
     __version__   = importlib.metadata.version("pymud")
     "APP 当前版本"
-    __release__   = "2025-05-17"
+    __release__   = "2025-05-20"
     "APP 当前版本发布日期"
     __author__    = "本牛(newstart)@北侠"
     "APP 作者"
@@ -35,7 +35,7 @@ class Settings:
         "SGA"               : True,                 # Supress Go Ahead
         "ECHO"              : False,                # Echo
         "GMCP"              : True,                 # Generic Mud Communication Protocol
-        "MSDP"              : False,                # Mud Server Data Protocol (has bugs, please disable MSDP)
+        "MSDP"              : True,                 # Mud Server Data Protocol
         "MSSP"              : True,                 # Mud Server Status Protocol
         "MCCP2"             : False,                # Mud Compress Communication Protocol V2
         "MCCP3"             : False,                # Mud Compress Communication Protocol V3