feat(RpiConnect/Windows): Receive rpi-imager callback without UAC prompt

Signed-off-by: paulober <[email protected]>

Author: paulober

src/main.cpp

@@ -37,8 +37,8 @@
 #ifdef Q_OS_WIN
 #include <windows.h>
 #include <winnls.h>
-#include <QLocalServer>
-#include <QLocalSocket>
+#include <QTcpServer>
+#include <QTcpSocket>
 #endif
 #include "imageadvancedoptions.h"
 
@@ -55,6 +55,7 @@ static QTextStream cerr(stderr);
 static void consoleMsgHandler(QtMsgType, const QMessageLogContext &, const QString &str) {
     cerr << str << endl;
 }
+const quint16 kPort = 49629;
 #endif
 
 
@@ -311,55 +312,25 @@ int main(int argc, char *argv[])
     }
 
 #ifdef Q_OS_WIN
-    // ---- single-instance + URL forwarding ----
-    // Build a stable per-user name by hashing the per-user AppData path.
-    // This is consistent across elevated/non-elevated tokens for the same user.
-    auto base = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-    if (base.isEmpty()) base = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
-    QByteArray hash = QCryptographicHash::hash(base.toUtf8(), QCryptographicHash::Sha1);
-    const QString serverName = QStringLiteral("rpi-imager-urlpipe-%1").arg(QString::fromLatin1(hash.toHex()));
-    qDebug() << "Using IPC Server name:" << serverName;
-
-    // First, try to connect to an existing instance (client-first).
-    {
-        QLocalSocket probe;
-        probe.connectToServer(serverName);
-        if (probe.waitForConnected(150)) {
-            // A primary instance exists; forward the URL (if any) and exit.
-            if (!callbackUrl.isEmpty()) {
-                const QByteArray msg = callbackUrl.toString(QUrl::FullyEncoded).toUtf8();
-                probe.write(msg);
-                probe.flush();
-                probe.waitForBytesWritten(200);
-            }
-            return 0; // secondary: do not open another window
-        }
-    }
-
-    // No instance reachable. Become the server.
-    // Remove stale endpoint left by a crash (safe even if it doesn’t exist).
-    QLocalServer::removeServer(serverName);
-
-    static QLocalServer server; // must outlive the lambda
-    if (!server.listen(serverName)) {
-        // As a last resort: if listen still fails, we’re better off continuing as a single instance.
-        qWarning() << "Failed to listen on" << serverName << ":" << server.errorString();
-    } else {
-        QObject::connect(&server, &QLocalServer::newConnection, &app, [&imageWriter]() {
-            while (QLocalSocket *s = server.nextPendingConnection()) {
-                s->waitForReadyRead(1000);
+    // callback server
+    QTcpServer server;
+    QObject::connect(&server, &QTcpServer::newConnection, &app, [&]() {
+        while (auto *s = server.nextPendingConnection()) {
+            QObject::connect(s, &QTcpSocket::readyRead, s, [s, &imageWriter]() {
                 const QByteArray payload = s->readAll();
-                s->close();
-                s->deleteLater();
+                s->disconnectFromHost();
                 QMetaObject::invokeMethod(
                     &imageWriter,
                     [payload, &imageWriter] {
                         imageWriter.handleIncomingUrl(QUrl(QString::fromUtf8(payload)));
                     },
                     Qt::QueuedConnection
-                );
-            }
-        });
+                    );
+            });
+        }
+    });
+    if (!server.listen(QHostAddress::LocalHost, kPort)) {
+        qWarning() << "TCP listen failed:" << server.errorString();
     }
 #endif
 

src/windows/PlatformPackaging.cmake

@@ -64,7 +64,9 @@ add_custom_command(TARGET ${PROJECT_NAME}
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy
         "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.exe"
-        "${CMAKE_SOURCE_DIR}/../license.txt" "${CMAKE_SOURCE_DIR}/windows/rpi-imager-cli.cmd"
+        "${CMAKE_SOURCE_DIR}/../license.txt"
+        "${CMAKE_SOURCE_DIR}/windows/rpi-imager-cli.cmd"
+        "${CMAKE_SOURCE_DIR}/windows/RpiImagerCallbackRelay.ps1"
         "${CMAKE_BINARY_DIR}/deploy")
 
 add_custom_command(TARGET ${PROJECT_NAME}

src/windows/RpiImagerCallbackRelay.ps1

@@ -0,0 +1,54 @@
+param([string]$url)
+
+# --- Configuration ---
+$port = 49629   # must match the port used by imager
+# ---------------------
+
+function Send-Url {
+    param([string]$u)
+    try {
+        $client = New-Object System.Net.Sockets.TcpClient
+        $iar = $client.BeginConnect('127.0.0.1', $port, $null, $null)
+        $wait = $iar.AsyncWaitHandle.WaitOne(300)  # 300 ms connect timeout
+        if (-not $wait) {
+            $client.Close()
+            return $false
+        }
+        $client.EndConnect($iar)
+
+        $stream = $client.GetStream()
+        $bytes = [System.Text.Encoding]::UTF8.GetBytes($u)
+        $stream.Write($bytes, 0, $bytes.Length)
+        $stream.Flush()
+        $stream.Close()
+        $client.Close()
+        return $true
+    } catch {
+        return $false
+    }
+}
+
+if (Send-Url $url) {
+    exit 0
+}
+
+try {
+    $exe = Join-Path $PSScriptRoot "rpi-imager.exe"
+    if (Test-Path -LiteralPath $exe) {
+        Start-Process -FilePath $exe -ArgumentList @("$url") -WorkingDirectory $PSScriptRoot
+        exit 0
+    } else {
+        Add-Type -AssemblyName System.Windows.Forms
+        $title = "Raspberry Pi Imager"
+        $message = "Could not find Raspberry Pi Imager. Please start the application manually and try again."
+        [System.Windows.Forms.MessageBox]::Show($message, $title, [System.Windows.Forms.MessageBoxButtons]::OK, [System.Windows.Forms.MessageBoxIcon]::Error) | Out-Null
+        exit 2
+    }
+} catch {
+    # show an error dialog
+    Add-Type -AssemblyName System.Windows.Forms
+    $title = "Raspberry Pi Imager"
+    $message = "Raspberry Pi Imager is not running. Please start the application manually and try again."
+    [System.Windows.Forms.MessageBox]::Show($message, $title, [System.Windows.Forms.MessageBoxButtons]::OK, [System.Windows.Forms.MessageBoxIcon]::Error) | Out-Null
+    exit 2
+}

src/windows/platformquirks_windows.cpp

@@ -165,11 +165,20 @@ void applyQuirks() {
     if (hasNvidiaGraphicsCard()) {
         SetEnvironmentVariableA("QSG_RHI_PREFER_SOFTWARE_RENDERER", "1");
     }
+
+    // make imager single instance because of rpi-connect callback server
+    // will be automatically released once the process exits cleanly or crashes
+    HANDLE hMutex = CreateMutexW(nullptr, TRUE, L"Global\\RaspberryPiImagerMutex");
+    if (GetLastError() == ERROR_ALREADY_EXISTS) {
+        // Another instance running
+        MessageBoxW(nullptr, L"Raspberry Pi Imager is already running.", L"Raspberry Pi Imager", MB_OK | MB_ICONINFORMATION);
+        exit(0);
+    }
 }
 
 void beep() {
     // Use Windows MessageBeep for system beep sound
     MessageBeep(MB_OK);
 }
 
-} // namespace PlatformQuirks
+} // namespace PlatformQuirks

src/windows/rpi-imager.iss.in

@@ -66,13 +66,14 @@ Root: HKLM; Subkey: "Software\Classes\RPI_IMAGINGUTILITY\shell\open\command"; Va
 Root: HKCR; Subkey: "rpi-imager"; ValueType: string; ValueName: ""; ValueData: "URL:Raspberry Pi Imager"; Flags: uninsdeletekey
 Root: HKCR; Subkey: "rpi-imager"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletekey
 Root: HKCR; Subkey: "rpi-imager\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},1"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "rpi-imager\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Flags: uninsdeletekey
+Root: HKCR; Subkey: "rpi-imager\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """powershell.exe"" -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File ""{app}\RpiImagerCallbackRelay.ps1"" ""%1"""; Flags: uninsdeletekey
 
 [Files]
 ; Main program files
 Source: "@CMAKE_BINARY_DIR@\deploy\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion signonce
 
 Source: "@CMAKE_BINARY_DIR@\deploy\rpi-imager-cli.cmd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "@CMAKE_BINARY_DIR@\deploy\RpiImagerCallbackRelay.ps1"; DestDir: "{app}"; Flags: ignoreversion
 Source: "@CMAKE_BINARY_DIR@\deploy\license.txt"; DestDir: "{app}"; Flags: ignoreversion
 
 ; Core DLLs