qa: plumb RADIANCE_OUTBOUND_SOCKS_ADDRESS into the Android client

.github/scripts/linux_config_url_smoke.sh

@@ -2,23 +2,25 @@
 set -euo pipefail
 
 if [[ -z "${JOIN_SERVER_CONFIG_URLS:-}" ]]; then
-  echo "Skipping Linux config URL smoke test (JOIN_SERVER_CONFIG_URLS is not set)."
-  exit 0
+	echo "Skipping Linux config URL smoke test (JOIN_SERVER_CONFIG_URLS is not set)."
+	exit 0
 fi
 
 config_urls_file="$(mktemp)"
 cleanup() {
-  rm -f "$config_urls_file"
+	rm -f "$config_urls_file"
 }
 trap cleanup EXIT
 
 set +x
-printf '%s' "$JOIN_SERVER_CONFIG_URLS" > "$config_urls_file"
+printf '%s' "$JOIN_SERVER_CONFIG_URLS" >"$config_urls_file"
 chmod 600 "$config_urls_file"
 set -x
 
 config_server_base="${JOIN_SERVER_CONFIG_SERVER_NAME:-ci-config-url-smoke-${GITHUB_RUN_ID:-local}-${GITHUB_RUN_ATTEMPT:-1}}"
 config_skip_cert="${JOIN_SERVER_CONFIG_SKIP_CERT_VERIFICATION:-true}"
 
-sg lantern -c "env PATH=$PATH HOME=$HOME JOIN_SERVER_CONFIG_URLS_FILE=\"$config_urls_file\" JOIN_SERVER_CONFIG_SERVER_NAME=\"${config_server_base}-api\" JOIN_SERVER_CONFIG_SKIP_CERT_VERIFICATION=\"$config_skip_cert\" xvfb-run -a flutter test integration_test/vpn/linux_config_url_api_smoke_test.dart -d linux --dart-define=DISABLE_SYSTEM_TRAY=true"
-sg lantern -c "env PATH=$PATH HOME=$HOME JOIN_SERVER_CONFIG_URLS_FILE=\"$config_urls_file\" JOIN_SERVER_CONFIG_SERVER_NAME=\"${config_server_base}-ui\" JOIN_SERVER_CONFIG_SKIP_CERT_VERIFICATION=\"$config_skip_cert\" xvfb-run -a flutter test integration_test/vpn/linux_config_url_smoke_test.dart -d linux --dart-define=DISABLE_SYSTEM_TRAY=true"
+JOIN_SERVER_CONFIG_URLS_FILE="$config_urls_file" JOIN_SERVER_CONFIG_SERVER_NAME="${config_server_base}-api" JOIN_SERVER_CONFIG_SKIP_CERT_VERIFICATION="$config_skip_cert" \
+	xvfb-run -a flutter test integration_test/vpn/linux_config_url_api_smoke_test.dart -d linux --dart-define=DISABLE_SYSTEM_TRAY=true
+JOIN_SERVER_CONFIG_URLS_FILE="$config_urls_file" JOIN_SERVER_CONFIG_SERVER_NAME="${config_server_base}-ui" JOIN_SERVER_CONFIG_SKIP_CERT_VERIFICATION="$config_skip_cert" \
+	xvfb-run -a flutter test integration_test/vpn/linux_config_url_smoke_test.dart -d linux --dart-define=DISABLE_SYSTEM_TRAY=true

.github/scripts/windows_connect_smoke.ps1

@@ -1,10 +1,8 @@
 param(
   [string]$ServiceName = "LanternSvc",
-  [string]$ServiceExe = "build/windows/x64/runner/Release/lanternsvc.exe",
+  [string]$ServiceExe = "build/windows/x64/runner/Release/lanternd.exe",
   [string]$InstallerPath = "",
-  [string]$TokenPath = "C:\ProgramData\Lantern\ipc-token",
   [string]$TestPath = "integration_test/vpn/windows_connect_smoke_test.dart",
-  [string]$SplitTunnelWebsiteTestPath = "integration_test/vpn/split_tunneling_website_smoke_test.dart",
   [string]$ConfigUrlApiTestPath = "integration_test/vpn/windows_config_url_api_smoke_test.dart",
   [string]$ConfigUrlUiTestPath = "integration_test/vpn/windows_config_url_smoke_test.dart",
   [string]$DefaultConfigServerName = "ci-config-url-smoke",
@@ -13,13 +11,23 @@ param(
   [int]$UninstallTimeoutSeconds = 180,
   [int]$HeartbeatSeconds = 15,
   [switch]$EnableIpCheck,
-  [switch]$ForceFullTunnel,
-  [switch]$RunSplitTunnelWebsiteSmoke,
-  [switch]$RunConfigUrlSmoke,
   [switch]$UseInstaller
 )
 
-$ErrorActionPreference = "Stop"
-
-& "$PSScriptRoot/windows_smoke_suite.ps1" @PSBoundParameters @args
-exit $LASTEXITCODE
+& (Join-Path $PSScriptRoot "windows_smoke_suite.ps1") `
+  -ServiceName $ServiceName `
+  -ServiceExe $ServiceExe `
+  -InstallerPath $InstallerPath `
+  -TestPath $TestPath `
+  -ConfigUrlApiTestPath $ConfigUrlApiTestPath `
+  -ConfigUrlUiTestPath $ConfigUrlUiTestPath `
+  -DefaultConfigServerName $DefaultConfigServerName `
+  -WaitSeconds $WaitSeconds `
+  -InstallerTimeoutSeconds $InstallerTimeoutSeconds `
+  -UninstallTimeoutSeconds $UninstallTimeoutSeconds `
+  -HeartbeatSeconds $HeartbeatSeconds `
+  -RunConnectSmoke:$true `
+  -RunSplitTunnelWebsiteSmoke:$false `
+  -RunConfigUrlSmoke:$true `
+  -EnableIpCheck:$EnableIpCheck `
+  -UseInstaller:$UseInstaller

.github/scripts/windows_smoke_suite.ps1

@@ -1,8 +1,7 @@
 param(
   [string]$ServiceName = "LanternSvc",
-  [string]$ServiceExe = "build/windows/x64/runner/Release/lanternsvc.exe",
+  [string]$ServiceExe = "build/windows/x64/runner/Release/lanternd.exe",
   [string]$InstallerPath = "",
-  [string]$TokenPath = "C:\ProgramData\Lantern\ipc-token",
   [string]$TestPath = "integration_test/vpn/windows_connect_smoke_test.dart",
   [string]$SplitTunnelWebsiteTestPath = "integration_test/vpn/split_tunneling_website_smoke_test.dart",
   [string]$ConfigUrlApiTestPath = "integration_test/vpn/windows_config_url_api_smoke_test.dart",
@@ -99,6 +98,32 @@ function Invoke-ProcessWithTimeout {
   }
 }
 
+function Invoke-LanterndCommand {
+  param(
+    [Parameter(Mandatory = $true)]
+    [string]$FilePath,
+    [Parameter(Mandatory = $true)]
+    [string[]]$ArgumentList,
+    [string]$Description
+  )
+
+  $desc = if ([string]::IsNullOrWhiteSpace($Description)) {
+    "$FilePath $($ArgumentList -join ' ')"
+  } else {
+    $Description
+  }
+
+  Write-Step $desc
+  $output = & $FilePath @ArgumentList 2>&1
+  $exitCode = $LASTEXITCODE
+  if ($output) {
+    $output | ForEach-Object { Write-Host $_ }
+  }
+  if ($exitCode -ne 0) {
+    throw "$desc failed with exit code $exitCode"
+  }
+}
+
 function Invoke-FlutterSmokeTest {
   param(
     [Parameter(Mandatory = $true)]
@@ -172,6 +197,20 @@ function Remove-ServiceIfPresent {
   }
 }
 
+function Show-LanterndInstallDiagnostics {
+  $lanterndPath = "C:\Program Files\Lantern\lanternd.exe"
+  if (Test-Path $lanterndPath) {
+    Write-Step "lanternd.exe exists at $lanterndPath"
+    & $lanterndPath version 2>&1 | ForEach-Object { Write-Step "  version: $_" }
+    return
+  }
+
+  Write-Step "lanternd.exe NOT found at $lanterndPath"
+  Write-Step "Contents of C:\Program Files\Lantern\:"
+  Get-ChildItem "C:\Program Files\Lantern\" -ErrorAction SilentlyContinue |
+    ForEach-Object { Write-Step "  $($_.Name)" }
+}
+
 function Wait-ServiceRunning {
   param(
     [string]$Name,
@@ -191,35 +230,10 @@ function Wait-ServiceRunning {
   }
 
   sc.exe query $Name
+  Show-LanterndInstallDiagnostics
   throw "Windows service did not reach Running state"
 }
 
-function Wait-TokenFile {
-  param(
-    [string]$Path,
-    [int]$TimeoutSeconds
-  )
-
-  for ($i = 0; $i -lt $TimeoutSeconds; $i++) {
-    if (Test-Path $Path) {
-      try {
-        $token = (Get-Content -Path $Path -Raw -ErrorAction Stop).Trim()
-      } catch {
-        $token = ""
-      }
-      if (-not [string]::IsNullOrWhiteSpace($token)) {
-        Write-Step "IPC token detected at $Path with content"
-        return
-      }
-    }
-    if ($i -gt 0 -and ($i % 5) -eq 0) {
-      Write-Step "Waiting for non-empty IPC token at $Path ($i/$TimeoutSeconds s)"
-    }
-    Start-Sleep -Seconds 1
-  }
-  throw "IPC token file missing or empty at $Path"
-}
-
 function Install-FromInstaller {
   param(
     [string]$Path,
@@ -238,6 +252,15 @@ function Install-FromInstaller {
     -PulseSeconds $HeartbeatSeconds `
     -Description "Running installer"
 
+  $lanterndPath = "C:\Program Files\Lantern\lanternd.exe"
+  $svc = Get-Service -Name $Name -ErrorAction SilentlyContinue
+  if (-not $svc -and (Test-Path $lanterndPath)) {
+    Invoke-LanterndCommand `
+      -FilePath $lanterndPath `
+      -ArgumentList @("install") `
+      -Description "Service not found after installer; running lanternd install manually for diagnostics"
+  }
+
   Write-Step "Waiting for Windows service after installer"
   Wait-ServiceRunning -Name $Name -TimeoutSeconds $TimeoutSeconds
 }
@@ -282,24 +305,13 @@ try {
     Write-Step "Smoke setup mode: direct service binary"
     $resolvedServiceExe = (Resolve-Path $ServiceExe).Path
     Remove-ServiceIfPresent -Name $ServiceName
-    Invoke-ScCommand `
-      -ArgumentList @(
-        "create",
-        $ServiceName,
-        "binPath= `"$resolvedServiceExe`"",
-        "start= demand",
-        "DisplayName= Lantern Service (CI)"
-      ) `
-      -Description "Creating Windows service from $resolvedServiceExe"
-    Invoke-ScCommand `
-      -ArgumentList @("start", $ServiceName) `
-      -AllowedExitCodes @(0, 1056) `
-      -Description "Starting Windows service $ServiceName"
+    Invoke-LanterndCommand `
+      -FilePath $resolvedServiceExe `
+      -ArgumentList @("install") `
+      -Description "Installing lanternd service from $resolvedServiceExe"
     Wait-ServiceRunning -Name $ServiceName -TimeoutSeconds $WaitSeconds
   }
 
-  Wait-TokenFile -Path $TokenPath -TimeoutSeconds $WaitSeconds
-
   if ($RunConnectSmoke) {
     Invoke-FlutterSmokeTest `
       -Path $TestPath `
@@ -340,7 +352,6 @@ try {
         $env:JOIN_SERVER_CONFIG_SKIP_CERT_VERIFICATION = "true"
       }
 
-      # Run API and UI smoke tests with unique names to avoid collisions.
       $env:JOIN_SERVER_CONFIG_SERVER_NAME = "$configServerBaseName-api"
       Invoke-FlutterSmokeTest `
         -Path $ConfigUrlApiTestPath `
@@ -361,7 +372,15 @@ finally {
     if ($UseInstaller) {
       Uninstall-FromInstalledService -Name $ServiceName
     } else {
-      Remove-ServiceIfPresent -Name $ServiceName
+      $resolvedServiceExe = (Resolve-Path $ServiceExe -ErrorAction SilentlyContinue).Path
+      if ($resolvedServiceExe) {
+        Invoke-LanterndCommand `
+          -FilePath $resolvedServiceExe `
+          -ArgumentList @("uninstall") `
+          -Description "Uninstalling lanternd service from $resolvedServiceExe"
+      } else {
+        Remove-ServiceIfPresent -Name $ServiceName
+      }
     }
     Write-Step "Cleanup finished"
   } catch {

.github/workflows/build-linux.yml

@@ -206,8 +206,6 @@ jobs:
             exit 1
           fi
 
-          sudo usermod -aG lantern "$USER" || true
-
           systemctl is-active --quiet lanternd.service
           test -S /run/lantern/lanternd.sock
           sudo stat -c "%a %U %G %n" /run/lantern/lanternd.sock
@@ -217,7 +215,7 @@ jobs:
         run: |
           set -euxo pipefail
           code=0
-          sg lantern -c "env HOME=$HOME PATH=$PATH xvfb-run -a timeout 15s /usr/bin/lantern >/tmp/lantern-installed-smoke.log 2>&1" || code=$?
+          env HOME=$HOME PATH=$PATH xvfb-run -a timeout 15s /usr/bin/lantern >/tmp/lantern-installed-smoke.log 2>&1 || code=$?
           if [[ "$code" -ne 124 ]]; then
             cat /tmp/lantern-installed-smoke.log || true
             echo "Installed /usr/bin/lantern did not stay up under xvfb"
@@ -244,7 +242,7 @@ jobs:
             FLUTTER_DART_DEFINES="${FLUTTER_DART_DEFINES} --dart-define=SMOKE_FORCE_FULL_TUNNEL=true"
           fi
           set +e
-          sg lantern -c "env PATH=$PATH HOME=$HOME timeout --signal=TERM --kill-after=30s 8m xvfb-run -a flutter test integration_test/vpn/linux_connect_smoke_test.dart -d linux --reporter=expanded ${FLUTTER_DART_DEFINES}"
+          env PATH=$PATH HOME=$HOME timeout --signal=TERM --kill-after=30s 8m xvfb-run -a flutter test integration_test/vpn/linux_connect_smoke_test.dart -d linux --reporter=expanded ${FLUTTER_DART_DEFINES}
           SMOKE_EXIT=$?
           set -e
 
@@ -259,14 +257,14 @@ jobs:
             exit "$SMOKE_EXIT"
           fi
 
-          if ! grep -Eq 'IPC request.*path=/service/start' /tmp/lanternd-journal-ui-smoke.log; then
-            echo "Missing /service/start IPC request in lanternd journal"
+          if ! grep -Eq 'IPC request.*path=/vpn/connect' /tmp/lanternd-journal-ui-smoke.log; then
+            echo "Missing /vpn/connect IPC request in lanternd journal"
             tail -n 200 /tmp/lanternd-journal-ui-smoke.log || true
             exit 1
           fi
 
-          if ! grep -Eq 'IPC request.*path=/service/stop' /tmp/lanternd-journal-ui-smoke.log; then
-            echo "Missing /service/stop IPC request in lanternd journal"
+          if ! grep -Eq 'IPC request.*path=/vpn/disconnect' /tmp/lanternd-journal-ui-smoke.log; then
+            echo "Missing /vpn/disconnect IPC request in lanternd journal"
             tail -n 200 /tmp/lanternd-journal-ui-smoke.log || true
             exit 1
           fi
@@ -282,7 +280,7 @@ jobs:
         run: |
           set -euxo pipefail
           set +e
-          sg lantern -c "env PATH=$PATH HOME=$HOME timeout --signal=TERM --kill-after=30s 10m xvfb-run -a flutter test integration_test/auth/auth_smoke_test.dart -d linux --reporter=expanded --dart-define=DISABLE_SYSTEM_TRAY=true"
+          env PATH=$PATH HOME=$HOME timeout --signal=TERM --kill-after=30s 10m xvfb-run -a flutter test integration_test/auth/auth_smoke_test.dart -d linux --reporter=expanded --dart-define=DISABLE_SYSTEM_TRAY=true
           AUTH_SMOKE_EXIT=$?
           set -e
           if [[ "$AUTH_SMOKE_EXIT" -eq 124 ]]; then

.github/workflows/build-windows-service.yml

@@ -28,12 +28,12 @@ jobs:
       - name: Build Windows service
         shell: pwsh
         run: |
-          make windows-service-build
-          Move-Item "bin\windows-amd64\lanternsvc.exe" "lanternsvc.exe"
+          make lanternd-windows-amd64
+          Move-Item "bin\windows-amd64\lanternd.exe" "lanternd.exe"
 
       - name: Upload Windows service executable
         uses: actions/upload-artifact@v4
         with:
           name: lantern-service-exe
-          path: "lanternsvc.exe"
+          path: "lanternd.exe"
           retention-days: 2

.github/workflows/build-windows.yml

@@ -159,7 +159,6 @@ jobs:
 
           # Third-party binaries that are already signed by their vendors
           $thirdParty = @(
-            'wintun.dll',           # WinTun
             'flutter_windows.dll',  # Google/Flutter
             'WebView2Loader.dll',   # Microsoft
             'WinSparkle.dll'        # WinSparkle

.github/workflows/release.yml

@@ -41,6 +41,11 @@ on:
         required: false
         type: boolean
         default: true
+      windows_connect_smoke:
+        description: "Run Windows connect/disconnect smoke test on manual dispatch"
+        required: false
+        type: boolean
+        default: false
 
 permissions:
   contents: write
@@ -292,7 +297,7 @@ jobs:
       build_type: ${{ needs.set-metadata.outputs.build_type }}
       installer_base_name: ${{ needs.set-metadata.outputs.installer_base_name }}
       enable_ip_check: ${{ needs.set-metadata.outputs.smoke_enable_ip_check == 'true' }}
-      run_connect_smoke: false
+      run_connect_smoke: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.windows_connect_smoke == 'true' }}
       run_split_tunnel_website_smoke: false
       run_config_url_smoke: false
       force_full_tunnel_smoke: ${{ needs.set-metadata.outputs.build_type == 'nightly' }}