Merge pull request #37 from Mooling0602/dev

dev -> main

Author: Mooling0602

config.ini

@@ -2,7 +2,7 @@
 [framework]
 ver=1
 [main]
-ver=2.5.2
+ver=2.5.3
 [release]
 test=0
 [ci]

matrix_sync/client/init.py

@@ -1,13 +1,16 @@
+import asyncio
 import json
 import sys
 import aiofiles
+from matrix_sync.commands import start_sync
 import matrix_sync.logger.get_logger as get_logger
 import matrix_sync.plg_globals as plg_globals
 
 from . import *
 from ..utils import configDir, tr
 from ..utils.token import getToken
 from nio import LoginResponse
+from mcdreforged.api.decorator import new_thread
 
 
 async def cache_token(resp: LoginResponse):
@@ -30,6 +33,7 @@ async def login_by_password():
         await cache_token(resp)
         plg_globals.token_vaild = True
         logger.info(tr("login.save_token"), "FirstLogin")
+        start_sync()
     else:
         tip = tr("login.failed")
         logger.error(f"{tip}: {resp}", "FirstLogin")
@@ -38,6 +42,13 @@ async def login_by_password():
         logger.error(tr("check_config"), "FirstLogin")
         sys.exit(1)
 
+async def add_init_ask():
+    await login_by_password()
+
+@new_thread()
+def first_login():
+    asyncio.run(add_init_ask())
+
 async def check_token() -> bool:
     user, token = await getToken()
     if user != plg_globals.config["user_id"]:

matrix_sync/client/receiver.py

@@ -23,7 +23,7 @@ async def message_callback(room: MatrixRoom, event: RoomMessageText) -> None:
 def on_sync_error(response: SyncError):
     logger = get_logger()
     global homeserver_online
-    logger.error(f"Sync error: {response.status_code}")
+    logger.error(f"Sync error: {response.status_code}", "Receiver")
     if response.status_code >= 500:
         homeserver_online = False
 

matrix_sync/config/__init__.py

@@ -1,3 +1,4 @@
+import asyncio
 import os
 import matrix_sync.utils.tr as tr
 import matrix_sync.plg_globals as plg_globals
@@ -8,7 +9,7 @@
 from mcdreforged.api.types import PluginServerInterface
 
 
-async def load_config(server: PluginServerInterface):
+def load_config(server: PluginServerInterface):
     plg_globals.config = server.load_config_simple('config.json', account_config)
     if plg_globals.config == account_config:
         server.unload_plugin(plgSelf.id)
@@ -21,4 +22,8 @@ async def load_config(server: PluginServerInterface):
     if not plg_globals.settings["log_style"]["mcdr"]:
         psi.logger.info("Plugin MatrixSync will use its logger, different with MCDR.")
     if os.path.exists(f"{configDir}/token.json"):
-        plg_globals.token_vaild = await check_token()
+        plg_globals.token_vaild = asyncio.run(add_check_task())
+
+async def add_check_task() -> bool:
+    result = await check_token()
+    return result

matrix_sync/entry.py

@@ -11,15 +11,15 @@
 
 
 # Framwork ver: 2.5.1-3
-async def on_load(server: PluginServerInterface, prev_module):
-    await load_config(server)
-    # await check_settings(server)
+def on_load(server: PluginServerInterface, prev_module):
+    load_config(server)
     command_register(server)
     if not os.path.exists(f"{configDir}/token.json"):
-        from .client.init import login_by_password
-        await login_by_password()
-    listen_message(server)
-    start_sync()
+        from .client.init import first_login
+        first_login()
+    else:
+        listen_message(server)
+        start_sync()
 
 def on_server_start(server: PluginServerInterface):
     matrix_reporter(tr("server_status.starting"))

mcdreforged.plugin.json

@@ -1,6 +1,6 @@
 {
 	"id": "matrix_sync",
-	"version": "2.5.2",
+	"version": "2.5.3",
 	"name": "MatrixSync",
 	"description": {
 		"en_us": "Sync messages between online game and Matrix groups.",