修复 OneBot V12 反向 WS 逻辑问题 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

This-is-XiaoDeng merged 3 commits into master from fix-issue-40

Jan 11, 2025

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,5 @@ __pycache__ @@
     config.json
     .vscode/
     .cache/
-    commands.json
+    commands.json
+    .idea/

LICENSE

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     MIT License
-    Copyright (c) 2023 IT Craft Development Team
+    Copyright (c) 2025 IT Craft Development Team
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ Expand Down @@

README.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,15 +17,9 @@ Discord 平台的 OneBot 实现 @@
     [文档](https://onedisc.itcdt.top) · [下载](https://onedisc.itcdt.top/download.html) · [快速开始](https://onedisc.itcdt.top/quickstart.html) · [差异](https://onedisc.itcdt.top/differences.html)
     </div>
-    > [!WARNING]
-    > 本项目含有部分较为混乱的代码，在阅读时请注意控制您的血压
     > [!IMPORTANT]
     > 在使用之前，我们建议您阅读: [差异：OneBot V12](https://onedisc.itcdt.top/differences.html) 与 [差异：OneBot V11](https://onedisc.itcdt.top/diff-v11.html)
-    > [!NOTE]
-    > OneDisc 的稳定版暂时没有 MacOS 版本[^2]，我们建议 MacOS 用户使用测试版
     ## 兼容性
     OneDisc 在 Discord 上实现了 OneBot V11/V12 标准，并做了一些拓展
@@ Expand All @@
     ## 性能
-    内存占用约 70MB[^1]，稳定运行无报错
-    [^1]: 就目前分析表明，这似乎是 `discord_event.py` 造成的，但是我们没有分析出具体原因
-    [^2]: 我们尝试提供 MacOS 版本，但是 [Actions](https://github.com/ITCraftDevelopmentTeam/OneDisc/actions/workflows/build-release.yml) 报错了
+    内存占用约 70MB，稳定运行无报错

network/__init__.py

-Original file line number
+Diff line change
@@ -1,13 +1,3 @@
-    # from network.v12.http import HTTPServer
-    # import asyncio
-    # from network.v12.http_webhook import HttpWebhookConnect
-    # from network.v11.http import HTTPServer4OB11
-    # from network.v11.http_post import HTTPPost4OB11
-    # from network.v11.ws import WebSocket4OB11
-    # from network.v11.ws_reverse import init_websocket_reverse_connection
-    # from network.v12.ws import WebSocketServer
-    # from network.v12.ws_reverse import WebSocketClient
     from typing import Callable, Coroutine, Union
     import network.v12.http
     import network.v12.http_webhook
@@ Expand Down Expand Up / @@ -56,7 +46,7 @@ async def start_connection( @@
                 network.v12.ws.WebSocketServer(config), "start_server"
             ),
             "ws-reverse": lambda config: start_connection(
-                network.v12.ws_reverse.WebSocketClient(config), "connect"
+                network.v12.ws_reverse.WebSocketClient(config), "reconnect"
             ),
         },
 : {
@@ Expand Down @@

Provide feedback