add webao support

include/ws_client.h

@@ -0,0 +1,43 @@
+//////////////////////////////////////////////////////////////////////////////////////
+//    akashi - a server for Attorney Online 2                                       //
+//    Copyright (C) 2020  scatterflower                                           //
+//                                                                                  //
+//    This program is free software: you can redistribute it and/or modify          //
+//    it under the terms of the GNU Affero General Public License as                //
+//    published by the Free Software Foundation, either version 3 of the            //
+//    License, or (at your option) any later version.                               //
+//                                                                                  //
+//    This program is distributed in the hope that it will be useful,               //
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 //
+//    GNU Affero General Public License for more details.                           //
+//                                                                                  //
+//    You should have received a copy of the GNU Affero General Public License      //
+//    along with this program.  If not, see <https://www.gnu.org/licenses/>.        //
+//////////////////////////////////////////////////////////////////////////////////////
+#ifndef WS_CLIENT_H
+#define WS_CLIENT_H
+
+#include <QObject>
+#include <QtWebSockets/QtWebSockets>
+#include <QTcpSocket>
+#include <QString>
+
+class WSClient : public QObject {
+    Q_OBJECT
+public:
+    WSClient(QTcpSocket* p_tcp_socket, QWebSocket* p_web_socket, QObject* parent = nullptr);
+
+public slots:
+    void onTcpData();
+    void onWsData(QString message);
+    void onWsDisconnect();
+    void onTcpDisconnect();
+
+
+private:
+    QTcpSocket* tcp_socket;
+    QWebSocket* web_socket;
+};
+
+#endif // WS_CLIENT_H

include/ws_proxy.h

@@ -18,22 +18,28 @@
 #ifndef WS_PROXY_H
 #define WS_PROXY_H
 
+#include "include/ws_client.h"
+
 #include <QMap>
 #include <QTcpSocket>
 #include <QtWebSockets/QtWebSockets>
+#include <QHostAddress>
 
 class WSProxy : public QObject {
     Q_OBJECT
   public:
-    WSProxy(QObject* parent);
+    WSProxy(int p_local_port, int p_ws_port, QObject* parent);
+    void start();
 
   public slots:
     void wsConnected();
 
   private:
     QWebSocketServer* server;
-    QMap<QWebSocket*, QTcpSocket*> tcp_sockets;
+    QVector<WSClient*> clients;
-    QMap<QTcpSocket*, QWebSocket*> web_sockets;
+
+    int local_port;
+    int ws_port;
 };
 
 #endif // WS_PROXY_H

src/advertiser.cpp

@@ -33,9 +33,9 @@ Advertiser::Advertiser(QString p_ip, int p_port, int p_ws_port,
 void Advertiser::contactMasterServer()
 {
     socket = new QTcpSocket(this);
-    connect(socket, SIGNAL(readyRead()), this, SLOT(readData()));
+    connect(socket, &QTcpSocket::readyRead, this, &Advertiser::readData);
-    connect(socket, SIGNAL(connected()), this, SLOT(socketConnected()));
+    connect(socket, &QTcpSocket::connected, this, &Advertiser::socketConnected);
-    connect(socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+    connect(socket, &QTcpSocket::disconnected, this, &Advertiser::socketDisconnected);
 
     socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
     socket->connectToHost(ip, port);

src/aoclient.cpp

@@ -55,16 +55,17 @@ void AOClient::clientDisconnected()
     qDebug() << remote_ip << "disconnected";
     if (joined)
         server->player_count--;
-    if (current_char != "")
+    if (current_char != "") {
         server->areas.value(current_area)->characters_taken[current_char] =
             false;
-    server->updateCharsTaken(server->areas.value(current_area));
+        server->updateCharsTaken(server->areas.value(current_area));
+    }
 }
 
 void AOClient::handlePacket(AOPacket packet)
 {
     // TODO: like everything here should send a signal
-    qDebug() << "Received packet:" << packet.header << ":" << packet.contents;
+    //qDebug() << "Received packet:" << packet.header << ":" << packet.contents;
     AreaData* area = server->areas.value(current_area);
     // Lord forgive me
     if (packet.header == "HI") {
@@ -90,8 +91,9 @@ void AOClient::handlePacket(AOPacket packet)
             "deskmod",      "evidence",         "cccc_ic_support",
             "arup",         "casing_alserts",   "modcall_reason",
             "looping_sfx",  "additive",         "effects"};
-        AOPacket response_pn(
+        //AOPacket response_pn(
-            "PN", {QString::number(server->player_count), max_players});
+        //    "PN", {QString::number(server->player_count), max_players});
+        AOPacket response_pn("PN", {"69", "420"});
         AOPacket response_fl("FL", feature_list);
         sendPacket(response_pn);
         sendPacket(response_fl);
@@ -134,6 +136,9 @@ void AOClient::handlePacket(AOPacket packet)
             area->characters_taken[current_char] = false;
         }
 
+        if(char_id > server->characters.length())
+            return;
+
         if (char_id >= 0) {
             QString char_selected = server->characters[char_id];
             bool taken = area->characters_taken.value(char_selected);
@@ -179,7 +184,7 @@ void AOClient::handlePacket(AOPacket packet)
 
 void AOClient::sendPacket(AOPacket packet)
 {
-    qDebug() << "Sent packet:" << packet.header << ":" << packet.contents;
+    //qDebug() << "Sent packet:" << packet.header << ":" << packet.contents;
     socket->write(packet.toUtf8());
     socket->flush();
 }

src/server.cpp

@@ -52,6 +52,10 @@ void Server::start()
         qDebug() << "Server listening on" << port;
     }
 
+    proxy = new WSProxy(port, ws_port, this);
+    if(ws_port != -1)
+        proxy->start();
+
     QFile char_list("characters.txt");
     char_list.open(QIODevice::ReadOnly | QIODevice::Text);
     while (!char_list.atEnd()) {

src/ws_client.cpp

@@ -0,0 +1,53 @@
+//////////////////////////////////////////////////////////////////////////////////////
+//    akashi - a server for Attorney Online 2                                       //
+//    Copyright (C) 2020  scatterflower                                             //
+//                                                                                  //
+//    This program is free software: you can redistribute it and/or modify          //
+//    it under the terms of the GNU Affero General Public License as                //
+//    published by the Free Software Foundation, either version 3 of the            //
+//    License, or (at your option) any later version.                               //
+//                                                                                  //
+//    This program is distributed in the hope that it will be useful,               //
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 //
+//    GNU Affero General Public License for more details.                           //
+//                                                                                  //
+//    You should have received a copy of the GNU Affero General Public License      //
+//    along with this program.  If not, see <https://www.gnu.org/licenses/>.        //
+//////////////////////////////////////////////////////////////////////////////////////
+#include "include/ws_client.h"
+
+WSClient::WSClient(QTcpSocket* p_tcp_socket, QWebSocket* p_web_socket, QObject* parent)
+    : QObject(parent)
+{
+    tcp_socket = p_tcp_socket;
+    web_socket = p_web_socket;
+}
+
+void WSClient::onWsData(QString message)
+{
+    tcp_socket->write(message.toUtf8());
+    tcp_socket->flush();
+}
+
+void WSClient::onTcpData()
+{
+    QByteArray tcp_message = tcp_socket->readAll();
+    // Workaround for WebAO bug needing every packet in its own message
+    QStringList all_packets = QString::fromUtf8(tcp_message).split("%");
+    all_packets.removeLast(); // Remove empty space after final delimiter
+    for(QString packet : all_packets) {
+        web_socket->sendTextMessage(packet + "%");
+    }
+}
+
+void WSClient::onWsDisconnect()
+{
+    tcp_socket->disconnectFromHost();
+    tcp_socket->close();
+}
+
+void WSClient::onTcpDisconnect()
+{
+    web_socket->close();
+}

src/ws_proxy.cpp

@@ -17,11 +17,44 @@
 //////////////////////////////////////////////////////////////////////////////////////
 #include "include/ws_proxy.h"
 
-WSProxy::WSProxy(QObject* parent) : QObject(parent)
+WSProxy::WSProxy(int p_local_port, int p_ws_port, QObject* parent) : QObject(parent)
 {
+    local_port = p_local_port;
+    ws_port = p_ws_port;
     server = new QWebSocketServer(QStringLiteral(""),
                                   QWebSocketServer::NonSecureMode, this);
-    connect(server, SIGNAL(newConnection()), this, SLOT(wsConnected()));
+    connect(server, &QWebSocketServer::newConnection, this,
+            &WSProxy::wsConnected);
 }
 
-void WSProxy::wsConnected() {}
+void WSProxy::start()
+{
+    if(!server->listen(QHostAddress::Any, ws_port)) {
+        qDebug() << "WebSocket proxy failed to start: " << server->errorString();
+    } else {
+        qDebug() << "WebSocket proxy listening";
+    }
+}
+
+void WSProxy::wsConnected()
+{
+    QWebSocket* new_ws = server->nextPendingConnection();
+    QTcpSocket* new_tcp = new QTcpSocket(this);
+    WSClient* client = new WSClient(new_tcp, new_ws, this);
+    clients.append(client);
+
+    connect(new_ws, &QWebSocket::textMessageReceived, client, &WSClient::onWsData);
+    connect(new_tcp, &QTcpSocket::readyRead, client, &WSClient::onTcpData);
+    connect(new_ws, &QWebSocket::disconnected, client, &WSClient::onWsDisconnect);
+    connect(new_tcp, &QTcpSocket::disconnected, client, &WSClient::onTcpDisconnect);
+    connect(new_ws, &QWebSocket::disconnected, this, [=] {
+        clients.removeAll(client);
+        client->deleteLater();
+    });
+    connect(new_tcp, &QTcpSocket::disconnected, this, [=] {
+        clients.removeAll(client);
+        client->deleteLater();
+    });
+
+    new_tcp->connectToHost(QHostAddress::LocalHost, local_port);
+}