Reconnect fix (#357)

修复一系列炸服
修复大厅太辣眼睛的bug

CHANGELOG.md

@@ -1,9 +1,11 @@
 # ChangeLog
 
-## v0.4.16
+## v0.4.16 & v0.4.17
 
 在引入freekill-core之后的第一次版本更新，甚至无法保证这次更新是否正常
 
+UI是半成品，0.4.17修复各种爆炸以及半成品UI稍微人性化一点
+
 1. 改进processPrompt，支持双将和暗将
 2. 副将长名旋转
 3. 国战体力上限优化，包括一览和选将框

CMakeLists.txt

@@ -6,7 +6,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.4.16)
+project(FreeKill VERSION 0.4.17)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 find_package(Qt6 REQUIRED COMPONENTS

Fk/Pages/Init.qml

@@ -107,6 +107,7 @@ Item {
       }
 
       Text {
+        id: faqTxt
         anchors.right: parent.right
         anchors.bottom: parent.bottom
         anchors.rightMargin: 8
@@ -123,6 +124,24 @@ Item {
           }
         }
       }
+
+      Text {
+        anchors.right: faqTxt.left
+        anchors.bottom: parent.bottom
+        anchors.rightMargin: 8
+        anchors.bottomMargin: 8
+        text: qsTr("ResFix")
+        color: "blue"
+        font.pixelSize: 24
+        font.underline: true
+        visible: OS === "Android"
+
+        TapHandler {
+          onTapped: {
+            Backend.askFixResource();
+          }
+        }
+      }
     }
   }
 

Fk/Pages/Lobby.qml

@@ -22,7 +22,7 @@ Item {
       radius: 8
       height: 124 - 8
       width: 124 - 8
-      color: outdated ? "#E2E2E2" : "lightgreen"
+      color: outdated ? "#E2E2E2" : "#DDDDDDDD"
 
       Text {
         id: roomNameText
@@ -281,7 +281,7 @@ Item {
 
     Rectangle {
       Layout.fillHeight: true
-      Layout.preferredWidth: childrenRect.width + 48
+      Layout.preferredWidth: childrenRect.width + 72
 
       gradient: Gradient {
         orientation: Gradient.Horizontal

android/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.notify.FreeKill"
   android:installLocation="preferExternal"
-  android:versionCode="416"
-  android:versionName="0.4.16">
+  android:versionCode="417"
+  android:versionName="0.4.17">
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

lang/zh_CN.ts

@@ -109,7 +109,7 @@
   </message>
   <message>
     <source>packages/%1: some error occured.</source>
-    <translation>拓展包 %1 出了点问题，尝试在管理拓展包中删除之再试试</translation>
+    <translation>拓展包 %1 出了点问题，可以尝试：进入“管理拓展包”，找到 %1，删除，然后再尝试</translation>
   </message>
 </context>
 
@@ -125,7 +125,7 @@
   </message>
   <message>
     <source>help: unknown password error</source>
-    <translation>提示：请尝试重新启动程序</translation>
+    <translation>提示：请使用“编辑服务器”删除该服务器，然后重新添加服务器并重新输入用户名和密码；若为单机启动则在“加入服务器”中选中服务器127.0.0.1，编辑服务器->删除，然后再单机启动</translation>
   </message>
   <message>
     <source>help: you have been banned!</source>
@@ -141,7 +141,19 @@
   </message>
   <message>
     <source>help: username or password error</source>
-    <translation>提示：可能该用户名已被占用，或者密码错误，如果你是初次注册的话考虑用另一个用户名密码进行登入</translation>
+    <translation>提示：可能该用户名已被占用，或者密码错误，如果你是初次注册的话考虑用另一个用户名密码进行登入；若为单机启动则在“加入服务器”中选中服务器127.0.0.1，编辑服务器->删除，然后再单机启动</translation>
+  </message>
+  <message>
+    <source>help: md5 fail</source>
+    <translation>检测到MD5错误且未发生拓展包变动，若该情况多次发生请考虑点击主界面“资源修复”蓝色文字</translation>
+  </message>
+  <message>
+    <source>fix resource</source>
+    <translation>修复资源文件</translation>
+  </message>
+  <message>
+    <source>help: fix resource</source>
+    <translation>点击“确定”将立刻关闭游戏，下次启动时重新复制资源文件，适用于进入服务器多次提示MD5失败，是否继续？</translation>
   </message>
 </context>
 
@@ -179,6 +191,10 @@
     <source>FAQ</source>
     <translation>常见疑问</translation>
   </message>
+  <message>
+    <source>ResFix</source>
+    <translation>资源修复</translation>
+  </message>
   <message>
     <source>$LoginFAQ</source>
     <translation>
@@ -318,6 +334,10 @@
     <source>MD5 check failed!</source>
     <translation>MD5检测失败！请与服务端保持一致后再登入</translation>
   </message>
+  <message>
+    <source>md5 fail</source>
+    <translation>资源文件错误</translation>
+  </message>
   <message>
     <source>others logged in with this name</source>
     <translation>已经有人用这个名字登入了</translation>

src/network/server_socket.cpp

@@ -24,8 +24,9 @@ bool ServerSocket::listen(const QHostAddress &address, ushort port) {
 void ServerSocket::processNewConnection() {
   QTcpSocket *socket = server->nextPendingConnection();
   ClientSocket *connection = new ClientSocket(socket);
-  connect(connection, &ClientSocket::disconnected, this,
-          [connection]() { connection->deleteLater(); });
+  // 这里怎么能一断连就自己删呢，应该让上层的来
+  //connect(connection, &ClientSocket::disconnected, this,
+  //        [connection]() { connection->deleteLater(); });
   emit new_connection(connection);
 }
 

src/server/auth.cpp

@@ -169,7 +169,7 @@ QJsonObject AuthManager::checkPassword(ClientSocket *client, const QString &name
   if (players.value(id)) {
     auto player = players.value(id);
     // 顶号机制，如果在线的话就让他变成不在线
-    if (player->getState() == Player::Online) {
+    if (player->getState() == Player::Online || player->getState() == Player::Robot) {
       player->doNotify("ErrorDlg", "others logged in again with this name");
       emit player->kicked();
     }

src/server/room.cpp

@@ -240,9 +240,6 @@ void Room::removePlayer(ServerPlayer *player) {
     // 然后基于跑路玩家的socket，创建一个新ServerPlayer对象用来通信
     ServerPlayer *runner = new ServerPlayer(this);
     runner->setSocket(socket);
-    connect(runner, &ServerPlayer::disconnected, server,
-            &Server::onUserDisconnected);
-    connect(runner, &Player::stateChanged, server, &Server::onUserStateChanged);
     runner->setScreenName(player->getScreenName());
     runner->setAvatar(player->getAvatar());
     runner->setId(player->getId());
@@ -512,7 +509,7 @@ void Room::gameOver() {
     }
   }
   server->endTransaction();
-  insideGameOver = true;
+  insideGameOver = false;
 }
 
 void Room::manuallyStart() {

src/server/roombase.cpp

@@ -37,15 +37,16 @@ void RoomBase::chat(ServerPlayer *sender, const QString &jsonData) {
   auto type = doc["type"].toInt();
   doc["sender"] = sender->getId();
 
-  // 屏蔽.号，防止有人在HTML文本发链接，而正常发链接看不出来有啥改动
   auto msg = doc["msg"].toString();
-  msg.replace(".", "․");
-  // 300字限制，与客户端相同
-  msg.erase(msg.begin() + 300, msg.end());
-  doc["msg"] = msg;
   if (!server->checkBanWord(msg)) {
     return;
   }
+  // 屏蔽.号和百分号，防止有人在HTML文本发链接，而正常发链接看不出来有啥改动
+  msg.replace(".", "․");
+  msg.replace("%", "％");
+  // 300字限制，与客户端相同
+  msg.erase(msg.begin() + 300, msg.end());
+  doc["msg"] = msg;
 
   if (type == 1) {
     doc["userName"] = sender->getScreenName();
@@ -57,6 +58,9 @@ void RoomBase::chat(ServerPlayer *sender, const QString &jsonData) {
     doBroadcastNotify(observers, "Chat", json);
   }
 
-  qInfo("[Chat] %s: %s", sender->getScreenName().toUtf8().constData(),
+  qInfo("[Chat/%s] %s: %s",
+        isLobby() ? "Lobby" : QString("#%1").arg(qobject_cast<Room *>(this)
+          ->getId()).toUtf8().constData(),
+        sender->getScreenName().toUtf8().constData(),
         doc["msg"].toString().toUtf8().constData());
 }

src/server/server.cpp

@@ -261,7 +261,7 @@ void Server::processNewConnection(ClientSocket *client) {
 
 void Server::processRequest(const QByteArray &msg) {
   ClientSocket *client = qobject_cast<ClientSocket *>(sender());
-  client->disconnect(this, SLOT(processRequest(const QByteArray &)));
+  disconnect(client, &ClientSocket::message_got, this, &Server::processRequest);
   client->timerSignup.stop();
 
   bool valid = true;
@@ -339,9 +339,6 @@ void Server::processRequest(const QByteArray &msg) {
   ServerPlayer *player = new ServerPlayer(lobby());
   player->setSocket(client);
   client->disconnect(this);
-  connect(player, &ServerPlayer::disconnected, this,
-      &Server::onUserDisconnected);
-  connect(player, &Player::stateChanged, this, &Server::onUserStateChanged);
   player->setScreenName(name);
   player->setAvatar(obj["avatar"].toString());
   player->setId(id);
@@ -374,56 +371,6 @@ void Server::onRoomAbandoned() {
   room->getThread()->removeRoom(room);
 }
 
-void Server::onUserDisconnected() {
-  auto player = qobject_cast<ServerPlayer *>(sender());
-  qInfo() << "Player" << player->getId() << "disconnected";
-  if (players.count() <= 10) {
-    broadcast("ServerMessage", tr("%1 logged out").arg(player->getScreenName()));
-  }
-
-  auto _room = player->getRoom();
-  if (_room->isLobby()) {
-    player->setState(Player::Robot); // 大厅！然而又不能设Offline
-    player->deleteLater();
-  } else {
-    auto room = qobject_cast<Room *>(_room);
-    if (room->isStarted()) {
-      if (room->getObservers().contains(player)) {
-        room->removeObserver(player);
-        player->deleteLater();
-        return;
-      }
-      player->setState(Player::Offline);
-      player->setSocket(nullptr);
-      // TODO: add a robot
-    } else {
-      player->setState(Player::Robot); // 大厅！然而又不能设Offline
-      // 这里有一个多线程问题，可能与Room::gameOver同时deleteLater导致出事
-      // FIXME: 这种解法肯定不安全
-      if (!room->insideGameOver)
-        player->deleteLater();
-    }
-  }
-}
-
-void Server::onUserStateChanged() {
-  ServerPlayer *player = qobject_cast<ServerPlayer *>(sender());
-  auto _room = player->getRoom();
-  if (!_room || _room->isLobby()) return;
-  auto room = qobject_cast<Room *>(_room);
-  if (room->isAbandoned()) return;
-
-  auto state = player->getState();
-  room->doBroadcastNotify(room->getPlayers(), "NetStateChanged",
-      QString("[%1,\"%2\"]").arg(player->getId()).arg(player->getStateString()));
-
-  if (state == Player::Online) {
-    player->resumeGameTimer();
-  } else {
-    player->pauseGameTimer();
-  }
-}
-
 #define SET_DEFAULT_CONFIG(k, v) do {\
   if (config.value(k).isUndefined()) { \
     config[k] = (v); \

src/server/server.h

@@ -66,8 +66,6 @@ public slots:
   void processRequest(const QByteArray &msg);
 
   void onRoomAbandoned();
-  void onUserDisconnected();
-  void onUserStateChanged();
 
 private:
   friend class Shell;

src/server/serverplayer.cpp

@@ -14,6 +14,7 @@ ServerPlayer::ServerPlayer(RoomBase *room) {
   this->room = room;
   server = room->getServer();
   connect(this, &ServerPlayer::kicked, this, &ServerPlayer::kick);
+  connect(this, &Player::stateChanged, this, &ServerPlayer::onStateChanged);
 
   alive = true;
   m_busy = false;
@@ -42,7 +43,7 @@ void ServerPlayer::setSocket(ClientSocket *socket) {
   this->socket = nullptr;
   if (socket != nullptr) {
     connect(socket, &ClientSocket::disconnected, this,
-            &ServerPlayer::disconnected);
+            &ServerPlayer::onDisconnected);
     this->socket = socket;
   }
 
@@ -108,6 +109,9 @@ void ServerPlayer::kick() {
   setState(Player::Offline);
   if (socket != nullptr) {
     socket->disconnectFromHost();
+  } else {
+    // 还是得走一遍这个流程才行
+    onDisconnected();
   }
   setSocket(nullptr);
 }
@@ -115,7 +119,7 @@ void ServerPlayer::kick() {
 void ServerPlayer::reconnect(ClientSocket *client) {
   setSocket(client);
   alive = true;
-  client->disconnect(this);
+  // client->disconnect(this);
   if (server->getPlayers().count() <= 10) {
     server->broadcast("ServerMessage", tr("%1 backed").arg(getScreenName()));
   }
@@ -159,3 +163,51 @@ void ServerPlayer::resumeGameTimer() {
 int ServerPlayer::getGameTime() {
   return gameTime + (getState() == Player::Online ? gameTimer.elapsed() / 1000 : 0);
 }
+
+void ServerPlayer::onStateChanged() {
+  auto _room = getRoom();
+  if (!_room || _room->isLobby()) return;
+  auto room = qobject_cast<Room *>(_room);
+  if (room->isAbandoned()) return;
+
+  auto state = getState();
+  room->doBroadcastNotify(room->getPlayers(), "NetStateChanged",
+      QString("[%1,\"%2\"]").arg(getId()).arg(getStateString()));
+
+  if (state == Player::Online) {
+    resumeGameTimer();
+  } else {
+    pauseGameTimer();
+  }
+}
+
+void ServerPlayer::onDisconnected() {
+  qInfo() << "Player" << getId() << "disconnected";
+  if (server->getPlayers().count() <= 10) {
+    server->broadcast("ServerMessage", tr("%1 logged out").arg(getScreenName()));
+  }
+
+  auto _room = getRoom();
+  if (_room->isLobby()) {
+    setState(Player::Robot); // 大厅！然而又不能设Offline
+    deleteLater();
+  } else {
+    auto room = qobject_cast<Room *>(_room);
+    if (room->isStarted()) {
+      if (room->getObservers().contains(this)) {
+        room->removeObserver(this);
+        deleteLater();
+        return;
+      }
+      setState(Player::Offline);
+      setSocket(nullptr);
+      // TODO: add a robot
+    } else {
+      setState(Player::Robot); // 大厅！然而又不能设Offline
+      // 这里有一个多线程问题，可能与Room::gameOver同时deleteLater导致出事
+      // FIXME: 这种解法肯定不安全
+      if (!room->insideGameOver)
+        deleteLater();
+    }
+  }
+}

src/server/serverplayer.h

@@ -52,9 +52,12 @@ public:
   int getGameTime();
 
 signals:
-  void disconnected();
   void kicked();
 
+public slots:
+  void onStateChanged();
+  void onDisconnected();
+
 private:
   ClientSocket *socket;   // socket for communicating with client
   Router *router;

src/ui/qmlbackend.cpp

@@ -570,6 +570,18 @@ void QmlBackend::showDialog(const QString &type, const QString &text, const QStr
   }
 }
 
+void QmlBackend::askFixResource() {
+#if defined(Q_OS_ANDROID) || defined(Q_OS_LINUX)
+  auto box = new QMessageBox(QMessageBox::Question, tr("fix resource"),
+      tr("help: fix resource"), QMessageBox::Ok | QMessageBox::Cancel);
+  connect(box, &QMessageBox::accepted, box, []() {
+      QFile::remove("fk_ver"); qApp->exit(); });
+  connect(box, &QMessageBox::finished, box, &QObject::deleteLater);
+  box->setWindowModality(Qt::NonModal);
+  box->show();
+#endif
+}
+
 void QmlBackend::removeRecord(const QString &fname) {
   QFile::remove("recording/" + fname);
 }

src/ui/qmlbackend.h

@@ -66,6 +66,7 @@ public:
 
   Q_INVOKABLE void showDialog(const QString &type, const QString &text,
       const QString &orig = QString());
+  Q_INVOKABLE void askFixResource();
 
   qreal volume() const { return m_volume; }
   void setVolume(qreal v) { m_volume = v; }