From 992dc17983d4e388b028992d15febfc1728e92c8 Mon Sep 17 00:00:00 2001
From: Jamie Ruderman <jamieruderman@gmail.com>
Date: Mon, 23 Mar 2026 19:36:02 -0700
Subject: [PATCH 1/2] fix(electron): harden windows installer cleanup

---
 electron/installer.nsh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/electron/installer.nsh b/electron/installer.nsh
index 63fd8eee9..ccdceb7f2 100644
--- a/electron/installer.nsh
+++ b/electron/installer.nsh
@@ -58,7 +58,7 @@ Var FileHandle
 
     ; Install new agent
     FileWrite $FileHandle "Installing Agent ... $\r$\n"
-    !insertmacro logExec "$\"$INSTDIR\resources\remoteit$\" agent install"
+    !insertmacro logExecRequired "$\"$INSTDIR\resources\remoteit$\" agent install" "The Remote.It agent service could not be installed. Setup will now exit."
     
     ; REMOVE AFTER v3.16.x -- Remove from machine path env var incase already there
     FileWrite $FileHandle "Cleaning up old PATH ... $\r$\n"
@@ -89,11 +89,11 @@ Var FileHandle
     ${else}
         FileWrite $FileHandle "Uninstalling...$\r$\n"
 
-        IfFileExists "$APPDATA\remoteit\config.json" config_found config_not_found
+        IfFileExists "$COMMONAPPDATA\remoteit\config.json" config_found config_not_found
         config_found:
             FileWrite $FileHandle "Config found$\r$\n"
             
-            !insertmacro logPowershell "(Get-Content -Raw -Path $APPDATA\remoteit\config.json | ConvertFrom-Json).device.uid.length"
+            !insertmacro logPowershell "(Get-Content -Raw -Path '$COMMONAPPDATA\remoteit\config.json' | ConvertFrom-Json).device.uid.length"
             
             IntCmp $1 0 notDevice notDevice thereIsDevice
                 notDevice:
@@ -135,6 +135,7 @@ Var FileHandle
     
     ; Remove from path env var
     !insertmacro logPowershell "[Environment]::SetEnvironmentVariable('PATH', (([Environment]::GetEnvironmentVariable('PATH', 'Machine')).Split(';') | Where-Object { ($$_ -notlike '*\${PRODUCT_FILENAME}*') -and ($$_ -ne '') }) -join ';', 'Machine')"
+    !insertmacro logPowershell "[Environment]::SetEnvironmentVariable('PATH', (([Environment]::GetEnvironmentVariable('PATH', 'User')).Split(';') | Where-Object { ($$_ -notlike '*\${PRODUCT_FILENAME}*') -and ($$_ -ne '') }) -join ';', 'User')"
 
     ; Remove files
     FileWrite $FileHandle "$\r$\nRemoving installation directories... $\r$\n"
@@ -194,6 +195,16 @@ Var FileHandle
     FileWrite $FileHandle "Result Output: $1$\r$\n"
 !macroend
 
+!macro logExecRequired command errorMessage
+    !insertmacro logExec "${command}"
+    ${If} $0 != 0
+        FileWrite $FileHandle "Fatal installer error: ${errorMessage}$\r$\n"
+        FileClose $FileHandle
+        MessageBox MB_OK|MB_ICONSTOP "${errorMessage}"
+        Abort
+    ${EndIf}
+!macroend
+
 !macro openLogFile section
     IfFileExists "$TEMP\${LOGNAME}" logFound logNotFound
     logFound:

From d6f8ee0e97779b73ecfcd359f18525b3b26496c4 Mon Sep 17 00:00:00 2001
From: Jamie Ruderman <jamieruderman@gmail.com>
Date: Mon, 23 Mar 2026 19:48:09 -0700
Subject: [PATCH 2/2] chore(electron): update connectd version

---
 electron/src/backend/binary-versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron/src/backend/binary-versions.json b/electron/src/backend/binary-versions.json
index d3aafa629..09711a452 100644
--- a/electron/src/backend/binary-versions.json
+++ b/electron/src/backend/binary-versions.json
@@ -1,6 +1,6 @@
 {
   "cli": "4.1.0",
-  "connectd": "5.5.0",
+  "connectd": "5.5.1",
   "muxer": "0.10.0",
   "demuxer": "0.10.0",
   "cliUrl": "https://downloads.remote.it/cli/v",