From 92aba4970552bebb6695c4a55b8c88468a934329 Mon Sep 17 00:00:00 2001
From: Yaroslav Gurov <31506978+ygurov@users.noreply.github.com>
Date: Fri, 19 Dec 2025 15:44:42 +0100
Subject: [PATCH] fix: cannot connect to IPC on Windows (#2083)

* fix: replace localsocket by QtRO-embedded one

* fix: make IpcClient initialization lazy
---
 client/core/ipcclient.cpp | 41 ++++++++-------------------------------
 client/core/ipcclient.h   | 24 ++++++++---------------
 2 files changed, 16 insertions(+), 49 deletions(-)

diff --git a/client/core/ipcclient.cpp b/client/core/ipcclient.cpp
index d9ab13f9b..4586b3522 100644
--- a/client/core/ipcclient.cpp
+++ b/client/core/ipcclient.cpp
@@ -3,41 +3,22 @@
 #include <QRemoteObjectNode>
 #include <QtNetwork/qlocalsocket.h>
 
-namespace
-{
-    thread_local IpcClient ipcClient;
-}
-
 IpcClient::IpcClient(QObject *parent) : QObject(parent)
 {
-    connect(&m_localSocket, &QLocalSocket::connected, this, [this]() {
-        m_ClientNode.reset(new QRemoteObjectNode);
-        m_ClientNode->addClientSideConnection(&m_localSocket);
-        m_ipcClient.reset(m_ClientNode->acquire<IpcInterfaceReplica>());
-        m_Tun2SocksClient.reset(m_ClientNode->acquire<IpcProcessTun2SocksReplica>());
-        m_isSocketConnected = true;
-    });
-
-    connect(&m_localSocket, &QLocalSocket::disconnected, this, [this]() {
-        m_ClientNode.clear();
-        m_ipcClient.clear();
-        m_Tun2SocksClient.clear();
-        m_isSocketConnected = false;
-    });
+    m_node.connectToNode(QUrl("local:" + amnezia::getIpcServiceUrl()));
+    m_interface.reset(m_node.acquire<IpcInterfaceReplica>());
+    m_tun2socks.reset(m_node.acquire<IpcProcessTun2SocksReplica>());
 }
 
-IpcClient *IpcClient::Instance()
+IpcClient& IpcClient::Instance()
 {
-    if (!ipcClient.m_isSocketConnected) {
-        ipcClient.establishConnection();
-    }
-
-    return &ipcClient;
+    thread_local IpcClient ipcClient;
+    return ipcClient;
 }
 
 QSharedPointer<IpcInterfaceReplica> IpcClient::Interface()
 {
-    QSharedPointer<IpcInterfaceReplica> rep = Instance()->m_ipcClient;
+    QSharedPointer<IpcInterfaceReplica> rep = Instance().m_interface;
     if (rep.isNull()) {
         qCritical() << "IpcClient::Interface(): Failed to acquire replica";
         return nullptr;
@@ -54,7 +35,7 @@ QSharedPointer<IpcInterfaceReplica> IpcClient::Interface()
 
 QSharedPointer<IpcProcessTun2SocksReplica> IpcClient::InterfaceTun2Socks()
 {
-    QSharedPointer<IpcProcessTun2SocksReplica> rep = Instance()->m_Tun2SocksClient;
+    QSharedPointer<IpcProcessTun2SocksReplica> rep = Instance().m_tun2socks;
     if (rep.isNull()) {
         qCritical() << "IpcClient::InterfaceTun2Socks: Replica is undefined";
         return nullptr;
@@ -69,12 +50,6 @@ QSharedPointer<IpcProcessTun2SocksReplica> IpcClient::InterfaceTun2Socks()
     return rep;
 }
 
-bool IpcClient::establishConnection()
-{
-    m_localSocket.connectToServer(amnezia::getIpcServiceUrl());
-    return m_localSocket.waitForConnected();
-}
-
 QSharedPointer<PrivilegedProcess> IpcClient::CreatePrivilegedProcess()
 {
     QSharedPointer<IpcInterfaceReplica> rep = Interface();
diff --git a/client/core/ipcclient.h b/client/core/ipcclient.h
index f797a3407..74f1bf29d 100644
--- a/client/core/ipcclient.h
+++ b/client/core/ipcclient.h
@@ -15,7 +15,7 @@ class IpcClient : public QObject
 public:
     explicit IpcClient(QObject *parent = nullptr);
 
-    static IpcClient *Instance();
+    static IpcClient& Instance();
 
     static QSharedPointer<IpcInterfaceReplica> Interface();
     static QSharedPointer<IpcProcessTun2SocksReplica> InterfaceTun2Socks();
@@ -24,10 +24,10 @@ public:
     template <typename Func>
     static auto withInterface(Func func)
     {
-        QSharedPointer<IpcInterfaceReplica> iface = Instance()->m_ipcClient;
+        QSharedPointer<IpcInterfaceReplica> iface = Instance().m_interface;
         using ReturnType = decltype(func(std::declval<QSharedPointer<IpcInterfaceReplica>>()));
 
-        if (iface.isNull() || !iface->isReplicaValid()) {
+        if (iface.isNull() || !iface->waitForSource(1000) || !iface->isReplicaValid()) {
             qWarning() << "IpcClient::withInterface(): Service is not running";
 
             if constexpr (std::is_void_v<ReturnType>)
@@ -42,25 +42,19 @@ public:
     template <typename OnSuccess, typename OnFailure>
     static auto withInterface(OnSuccess onSuccess, OnFailure onFailure)
     {
-        QSharedPointer<IpcInterfaceReplica> iface = Instance()->m_ipcClient;
-
-        if (iface.isNull() || !iface->isReplicaValid()) {
+        QSharedPointer<IpcInterfaceReplica> iface = Instance().m_interface;
+        if (iface.isNull() || !iface->waitForSource(1000) || !iface->isReplicaValid()) {
             return onFailure();
         }
 
         return onSuccess(iface);
     }
-
-    bool isSocketConnected() const;
 signals:
 
 private:
-    bool establishConnection();
-
-    QLocalSocket m_localSocket;
-    QSharedPointer<QRemoteObjectNode> m_ClientNode;
-    QSharedPointer<IpcInterfaceReplica> m_ipcClient;
-    QSharedPointer<IpcProcessTun2SocksReplica> m_Tun2SocksClient;
+    QRemoteObjectNode m_node;
+    QSharedPointer<IpcInterfaceReplica> m_interface;
+    QSharedPointer<IpcProcessTun2SocksReplica> m_tun2socks;
 
     struct ProcessDescriptor {
         ProcessDescriptor () {
@@ -72,8 +66,6 @@ private:
         QSharedPointer<QRemoteObjectNode> replicaNode;
         QSharedPointer<QLocalSocket> localSocket;
     };
-
-    bool m_isSocketConnected {false};
 };
 
 #endif // IPCCLIENT_H