Fix getting account id + logging messages

Notable Changes:
- Fix getting account id on Windows and big-endian systems
- Add extra logging to users during PSN connection process

gui/include/psnaccountid.h

@@ -42,12 +42,25 @@ class PSNAccountID : public QObject {
     QString basicAuthHeader;
     Settings *settings = {};
 
-    static QByteArray to_bytes(long number, int num_bytes) {
+    static QByteArray to_bytes_little_endian(long long number, int num_bytes) {
         QByteArray byte_array;
-        for (int i = 0; i < num_bytes; i++) {
-            char result = number & 0xFF;
-            byte_array.append(result);
-            number >>= 8;
+        int n = 1;
+        if(*(char *)&n == 1) // little endian
+        {
+            for (int i = 0; i < num_bytes; i++)
+            {
+                char result = number & 0xFF;
+                byte_array.append(result);
+                number >>= 8;
+            }
+        }
+        else // big endian
+        {
+            for (int i = num_bytes - 1; i >= 0; i--)
+            {
+                char result = (number >> (8 * num_bytes)) & 0xFF;
+                byte_array.append(result);
+            }    
         }
         return byte_array;
     }

gui/include/qmlbackend.h

@@ -55,8 +55,20 @@ class QmlBackend : public QObject
     Q_PROPERTY(bool discoveryEnabled READ discoveryEnabled WRITE setDiscoveryEnabled NOTIFY discoveryEnabledChanged)
     Q_PROPERTY(QVariantList hosts READ hosts NOTIFY hostsChanged)
     Q_PROPERTY(bool autoConnect READ autoConnect NOTIFY autoConnectChanged)
+    Q_PROPERTY(PsnConnectState connectState READ connectState WRITE setConnectState NOTIFY connectStateChanged)
 
 public:
+
+    enum class PsnConnectState
+    {
+        NotStarted,
+        InitiatingConnection,
+        LinkingConsole,
+        DataConnectionStart,
+        DataConnectionFinished,
+        ConnectFailed
+    };
+    Q_ENUM(PsnConnectState);
     QmlBackend(Settings *settings, QmlMainWindow *window);
     ~QmlBackend();
 
@@ -69,6 +81,9 @@ class QmlBackend : public QObject
     void setDiscoveryEnabled(bool enabled);
     void refreshAuth();
 
+    PsnConnectState connectState() const;
+    void setConnectState(PsnConnectState connect_state);
+
     QVariantList hosts() const;
 
     bool autoConnect() const;
@@ -106,7 +121,7 @@ class QmlBackend : public QObject
 signals:
     void sessionChanged(StreamSession *session);
     void psnConnect(StreamSession *session, const QString &duid, const bool &ps5);
-    void psnConnectDone(bool connected);
+    void connectStateChanged();
     void controllersChanged();
     void discoveryEnabledChanged();
     void hostsChanged();
@@ -154,6 +169,7 @@ class QmlBackend : public QObject
     StreamSession *session = {};
     QThread *frame_thread = {};
     QThread psn_connection_thread;
+    PsnConnectState psn_connect_state;
     DiscoveryManager discovery_manager;
     QHash<int, QmlController*> controllers;
     DisplayServer regist_dialog_server;
@@ -162,4 +178,4 @@ class QmlBackend : public QObject
     bool resume_session = false;
     HostMAC auto_connect_mac = {};
     QMap<QString, PsnHost> psn_hosts;
-};
+};

gui/include/streamsession.h

@@ -283,6 +283,7 @@ class StreamSession : public QObject
 #endif
 		void SessionQuit(ChiakiQuitReason reason, const QString &reason_str);
 		void LoginPINRequested(bool incorrect);
+		void DataHolepunchProgress(bool finished);
 		void ConnectedChanged();
 		void MeasuredBitrateChanged();
 		void AveragePacketLossChanged();

gui/src/psnaccountid.cpp

@@ -3,6 +3,7 @@
 
 #include <qjsonobject.h>
 #include <QObject>
+#include <QDebug>
 PSNAccountID::PSNAccountID(Settings *settings, QObject *parent)
     : QObject(parent)
     , settings(settings)
@@ -40,8 +41,7 @@ void PSNAccountID::handleAccessTokenResponse(const QString& url, const QJsonDocu
 void PSNAccountID::handUserIDResponse(const QString& url, const QJsonDocument& jsonDocument) {
     QJsonObject object = jsonDocument.object();
     QString user_id = object.value("user_id").toString();
-
-    QByteArray byte_representation = to_bytes(std::stoll(user_id.toStdString()), 8);
+    QByteArray byte_representation = to_bytes_little_endian(std::stoll(user_id.toStdString()), 8);
     settings->SetPsnAccountId(byte_representation.toBase64());
     emit AccountIDResponse(byte_representation.toBase64());
 }

gui/src/qml/Main.qml

@@ -168,13 +168,6 @@ Item {
             root.showPSNTokenDialog(qsTr(""), true);
         }
 
-        function onPsnConnectDone(connected) {
-            if (connected)
-                root.showStreamView();
-            else
-                root.showMainView();
-        }
-
         function onError(title, text) {
             errorTitleLabel.text = title;
             errorTextLabel.text = text;

gui/src/qml/PsnView.qml

@@ -57,8 +57,41 @@ Rectangle {
     }
 
     Timer {
+        id: closeTimer
         interval: 1500
         running: true
         onTriggered: view.allowClose = true
     }
+
+    Timer {
+        id: failTimer
+        interval: 1500
+        running: false
+        onTriggered: root.showMainView()
+    }
+
+    Connections {
+        target: Chiaki
+
+        function onConnectStateChanged() {
+            switch(Chiaki.connectState)
+            {
+                case Chiaki.PsnConnectState.LinkingConsole:
+                    infoLabel.text = qsTr("Linking Chiaki4deck with PlayStation console ...")
+                    view.allowClose = false
+                    break
+                case Chiaki.PsnConnectState.DataConnectionStart:
+                    infoLabel.text = qsTr("Console Linked ... Establising data connection with console over PSN ...")
+                    view.allowClose = true
+                    break
+                case Chiaki.PsnConnectState.DataConnectionFinished:
+                    root.showStreamView()
+                    break
+                case Chiaki.PsnConnectState.ConnectFailed:
+                    qsTr("Connection over PSN failed closing ...")
+                    failTimer.running = true
+                    break
+            }
+        }
+    }
 }

gui/src/qmlbackend.cpp

@@ -109,6 +109,7 @@ QmlBackend::QmlBackend(Settings *settings, QmlMainWindow *window)
     connect(worker, &PsnConnectionWorker::resultReady, this, &QmlBackend::checkPsnConnection);
     psn_connection_thread.start();
 
+    setConnectState(PsnConnectState::NotStarted);
     connect(settings, &Settings::RegisteredHostsUpdated, this, &QmlBackend::hostsChanged);
     connect(settings, &Settings::ManualHostsUpdated, this, &QmlBackend::hostsChanged);
     connect(&discovery_manager, &DiscoveryManager::HostsUpdated, this, &QmlBackend::updateDiscoveryHosts);
@@ -221,6 +222,17 @@ void QmlBackend::setDiscoveryEnabled(bool enabled)
     emit discoveryEnabledChanged();
 }
 
+QmlBackend::PsnConnectState QmlBackend::connectState() const
+{
+    return psn_connect_state;
+}
+
+void QmlBackend::setConnectState(PsnConnectState connect_state)
+{
+    psn_connect_state = connect_state;
+    emit connectStateChanged();
+}
+
 QVariantList QmlBackend::hosts() const
 {
     QVariantList out;
@@ -293,11 +305,14 @@ void QmlBackend::psnCancel()
 
 void QmlBackend::checkPsnConnection(const bool &connected)
 {
-    emit psnConnectDone(connected);
     if(connected)
+    {
+        setConnectState(PsnConnectState::LinkingConsole);
         psnSessionStart();
+    }
     else
     {
+        setConnectState(PsnConnectState::ConnectFailed);
         delete session;
         session = NULL;
     }
@@ -306,7 +321,6 @@ void QmlBackend::checkPsnConnection(const bool &connected)
 void QmlBackend::psnSessionStart()
 {
     session->Start();
-    emit sessionChanged(session);
 
     sleep_inhibit->inhibit();
 }
@@ -396,6 +410,13 @@ void QmlBackend::createSession(const StreamSessionConnectInfo &connect_info)
             emit sessionPinDialogRequested();
     });
 
+    connect(session, &StreamSession::DataHolepunchProgress, this, [this](bool finished) {
+        if(finished)
+            setConnectState(PsnConnectState::DataConnectionFinished);
+        else
+            setConnectState(PsnConnectState::DataConnectionStart);
+    });
+
     connect(session, &StreamSession::ConnectedChanged, this, [this]() {
         if (session->IsConnected())
             setDiscoveryEnabled(false);
@@ -416,7 +437,10 @@ void QmlBackend::createSession(const StreamSessionConnectInfo &connect_info)
         sleep_inhibit->inhibit();
     }
     else
+    {
+        setConnectState(PsnConnectState::InitiatingConnection);
         emit psnConnect(session, session_info.duid, chiaki_target_is_ps5(session_info.target));
+    }
 }
 
 bool QmlBackend::closeRequested()

gui/src/streamsession.cpp

@@ -1373,6 +1373,9 @@ void StreamSession::Event(ChiakiEvent *event)
 		case CHIAKI_EVENT_LOGIN_PIN_REQUEST:
 			emit LoginPINRequested(event->login_pin_request.pin_incorrect);
 			break;
+		case CHIAKI_EVENT_HOLEPUNCH:
+			emit DataHolepunchProgress(event->data_holepunch.finished);
+			break;
 		case CHIAKI_EVENT_RUMBLE: {
 			uint8_t left = event->rumble.left;
 			uint8_t right = event->rumble.right;

lib/include/chiaki/session.h

@@ -146,6 +146,7 @@ typedef struct chiaki_trigger_effects_event_t
 typedef enum {
 	CHIAKI_EVENT_CONNECTED,
 	CHIAKI_EVENT_LOGIN_PIN_REQUEST,
+	CHIAKI_EVENT_HOLEPUNCH,
 	CHIAKI_EVENT_KEYBOARD_OPEN,
 	CHIAKI_EVENT_KEYBOARD_TEXT_CHANGE,
 	CHIAKI_EVENT_KEYBOARD_REMOTE_CLOSE,
@@ -167,6 +168,10 @@ typedef struct chiaki_event_t
 		{
 			bool pin_incorrect; // false on first request, true if the pin entered before was incorrect
 		} login_pin_request;
+		struct
+		{
+			bool finished; // false when punching hole, true when finished
+		} data_holepunch;
 	};
 } ChiakiEvent;
 

lib/src/session.c

@@ -534,6 +534,10 @@ static void *session_thread_func(void *arg)
 	if(session->rudp)
 	{
 		CHIAKI_LOGI(session->log, "Punching hole for data connection");
+		ChiakiEvent event_start = { 0 };
+		event_start.type = CHIAKI_EVENT_HOLEPUNCH;
+		event_start.data_holepunch.finished = false;
+		chiaki_session_send_event(session, &event_start);
 		err = chiaki_holepunch_session_punch_hole(session->holepunch_session, CHIAKI_HOLEPUNCH_PORT_TYPE_DATA);
 		if (err != CHIAKI_ERR_SUCCESS)
 		{
@@ -542,6 +546,10 @@ static void *session_thread_func(void *arg)
 		}
 		CHIAKI_LOGI(session->log, ">> Punched hole for data connection!");
 		data_sock = chiaki_get_holepunch_sock(session->holepunch_session, CHIAKI_HOLEPUNCH_PORT_TYPE_DATA);
+		ChiakiEvent event_finish = { 0 };
+		event_finish.type = CHIAKI_EVENT_HOLEPUNCH;
+		event_finish.data_holepunch.finished = true;
+		chiaki_session_send_event(session, &event_finish);
 		err = chiaki_cond_timedwait_pred(&session->state_cond, &session->state_mutex, SESSION_EXPECT_TIMEOUT_MS, session_check_state_pred_ctrl_start, session);
 		CHECK_STOP(quit_ctrl);
 	}