Fix background MCP input and add mirror dungeon feedback records
This commit is contained in:
+34
-3
@@ -74,8 +74,8 @@ def serve_lines(server, readline, write):
|
|||||||
write(json.dumps(resp, ensure_ascii=False) + '\n')
|
write(json.dumps(resp, ensure_ascii=False) + '\n')
|
||||||
|
|
||||||
|
|
||||||
def run_stdio(server):
|
def run_stdio(server, out=None):
|
||||||
out = sys.stdout
|
out = sys.stdout if out is None else out
|
||||||
sys.stdout = sys.stderr # AALC 或第三方库的 print 不能混进协议流
|
sys.stdout = sys.stderr # AALC 或第三方库的 print 不能混进协议流
|
||||||
|
|
||||||
def write(s):
|
def write(s):
|
||||||
@@ -87,6 +87,13 @@ def run_stdio(server):
|
|||||||
class _Handler(socketserver.StreamRequestHandler):
|
class _Handler(socketserver.StreamRequestHandler):
|
||||||
|
|
||||||
def handle(self):
|
def handle(self):
|
||||||
|
try:
|
||||||
|
self._handle_session()
|
||||||
|
except (ConnectionResetError, BrokenPipeError):
|
||||||
|
# MCP 客户端关闭/重载时可能直接断开 TCP,不是服务故障。
|
||||||
|
return
|
||||||
|
|
||||||
|
def _handle_session(self):
|
||||||
rfile, wfile = self.rfile, self.wfile
|
rfile, wfile = self.rfile, self.wfile
|
||||||
first = rfile.readline(256).decode('utf-8', 'replace').strip()
|
first = rfile.readline(256).decode('utf-8', 'replace').strip()
|
||||||
if not (first.startswith('AUTH ') and hmac.compare_digest(first[5:], self.server.token)):
|
if not (first.startswith('AUTH ') and hmac.compare_digest(first[5:], self.server.token)):
|
||||||
@@ -122,9 +129,21 @@ def main(argv=None):
|
|||||||
ap.add_argument('--host', default='127.0.0.1')
|
ap.add_argument('--host', default='127.0.0.1')
|
||||||
ap.add_argument('--port', type=int, default=DEFAULT_PORT)
|
ap.add_argument('--port', type=int, default=DEFAULT_PORT)
|
||||||
args = ap.parse_args(argv)
|
args = ap.parse_args(argv)
|
||||||
|
# pythonw.exe 没有标准流;登录任务仍需要可写的日志流。
|
||||||
|
_configure_streams()
|
||||||
|
protocol_out = None
|
||||||
|
if args.stdio:
|
||||||
|
if sys.stdin is None:
|
||||||
|
raise RuntimeError('--stdio requires python.exe, not pythonw.exe')
|
||||||
|
for stream in (sys.stdin, sys.stdout, sys.stderr):
|
||||||
|
if hasattr(stream, 'reconfigure'):
|
||||||
|
stream.reconfigure(encoding='utf-8')
|
||||||
|
protocol_out = sys.stdout
|
||||||
|
# AALC 导入期间也会输出,不能等引擎初始化后才隔离 stdout。
|
||||||
|
sys.stdout = sys.stderr
|
||||||
mcp = build_server(fake=args.fake)
|
mcp = build_server(fake=args.fake)
|
||||||
if args.stdio:
|
if args.stdio:
|
||||||
return run_stdio(mcp)
|
return run_stdio(mcp, protocol_out)
|
||||||
if args.host not in ('127.0.0.1', '::1', 'localhost'):
|
if args.host not in ('127.0.0.1', '::1', 'localhost'):
|
||||||
log('WARNING: 监听 %s 会把游戏控制权暴露到网络上, 建议走 SSH 隧道' % args.host)
|
log('WARNING: 监听 %s 会把游戏控制权暴露到网络上, 建议走 SSH 隧道' % args.host)
|
||||||
srv = make_tcp(mcp, args.host, args.port, load_token(create=True))
|
srv = make_tcp(mcp, args.host, args.port, load_token(create=True))
|
||||||
@@ -132,5 +151,17 @@ def main(argv=None):
|
|||||||
srv.serve_forever()
|
srv.serve_forever()
|
||||||
|
|
||||||
|
|
||||||
|
def _configure_streams():
|
||||||
|
if sys.stdout is not None and sys.stderr is not None:
|
||||||
|
return None
|
||||||
|
os.makedirs(HOME, exist_ok=True)
|
||||||
|
stream = open(os.path.join(HOME, 'server.log'), 'a', encoding='utf-8', buffering=1)
|
||||||
|
if sys.stderr is None:
|
||||||
|
sys.stderr = stream
|
||||||
|
if sys.stdout is None:
|
||||||
|
sys.stdout = stream
|
||||||
|
return stream
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|||||||
Reference in New Issue
Block a user