force ice all v4

.gitea/workflows/desktop.yml

@@ -208,36 +208,37 @@ jobs:
             -Pattern "sso.gandc.ru|will-redirect|allowTrustedOrSsoNavigation"
 
 
-      - name: Force LiveKit ICE policy to all
+      - name: Force WebRTC ICE policy to all
         shell: powershell
         run: |
           $ErrorActionPreference = "Stop"
 
-          $Path = "fluxer-src\fluxer_app\pkgs\livekit-client\src\room\RTCEngine.ts"
+          $Path = "fluxer-src\fluxer_desktop\src\preload\index.ts"
 
           if (-not (Test-Path $Path)) {
-            throw "LiveKit RTCEngine.ts not found at $Path"
+            throw "Desktop preload not found at $Path"
           }
 
           $Content = Get-Content $Path -Raw
+          $Anchor = "import {contextBridge, ipcRenderer, webFrame} from 'electron';"
 
-          $Old = "rtcConfig.iceTransportPolicy = 'relay';"
+          if ($Content -notmatch [regex]::Escape($Anchor)) {
-          $New = "rtcConfig.iceTransportPolicy = 'all';"
+            throw "Unable to locate Electron preload import"
-
-          $Count = (
-            [regex]::Matches(
-              $Content,
-              [regex]::Escape($Old)
-            )
-          ).Count
-
-          if ($Count -ne 1) {
-            throw "Expected exactly one relay ICE policy assignment, found $Count"
           }
 
+          if ($Content -match "installForceAllIceTransportPolicy") {
+            throw "WebRTC ICE policy patch is already present"
+          }
+
+          $Patch = [Text.Encoding]::UTF8.GetString(
+            [Convert]::FromBase64String(
+              "aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7"
+            )
+          )
+
           $Content = $Content.Replace(
-            $Old,
+            $Anchor,
-            $New
+            $Patch
           )
 
           Set-Content `
@@ -248,16 +249,15 @@ jobs:
 
           $Result = Get-Content $Path -Raw
 
-          if ($Result -notmatch "rtcConfig\.iceTransportPolicy = 'all';") {
+          if ($Result -notmatch "installForceAllIceTransportPolicy") {
-            throw "LiveKit ICE policy patch verification failed"
+            throw "WebRTC ICE policy patch verification failed"
           }
 
-          Write-Host "Forced LiveKit iceTransportPolicy=all"
+          Write-Host "Installed preload WebRTC ICE policy override"
 
           Select-String `
             -Path $Path `
-            -Pattern "iceTransportPolicy"
+            -Pattern "installForceAllIceTransportPolicy|iceTransportPolicy forced to all"
-
 
       - name: Install dependencies
         shell: powershell
@@ -741,48 +741,48 @@ jobs:
             fluxer-src/fluxer_desktop/src/main/Window.ts
 
 
-      - name: Force LiveKit ICE policy to all
+      - name: Force WebRTC ICE policy to all
         shell: bash
         run: |
           set -euxo pipefail
 
-          python3 <<'PY'
+          python3 - <<'PY'
           from pathlib import Path
+          import base64
 
           path = Path(
-              "fluxer-src/fluxer_app/pkgs/"
+              "fluxer-src/fluxer_desktop/"
-              "livekit-client/src/room/RTCEngine.ts"
+              "src/preload/index.ts"
           )
 
           if not path.is_file():
               raise SystemExit(
-                  f"LiveKit RTCEngine.ts not found: {path}"
+                  f"Desktop preload not found: {path}"
               )
 
           data = path.read_text(
               encoding="utf-8"
           )
 
-          old = (
+          anchor = "import {contextBridge, ipcRenderer, webFrame} from 'electron';"
-              "rtcConfig.iceTransportPolicy = "
-              "'relay';"
-          )
-          new = (
-              "rtcConfig.iceTransportPolicy = "
-              "'all';"
-          )
 
-          count = data.count(old)
+          if anchor not in data:
-
-          if count != 1:
               raise SystemExit(
-                  "Expected exactly one relay ICE "
+                  "Unable to locate Electron preload import"
-                  f"policy assignment, found {count}"
               )
 
+          if "installForceAllIceTransportPolicy" in data:
+              raise SystemExit(
+                  "WebRTC ICE policy patch is already present"
+              )
+
+          patch = base64.b64decode(
+              "aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7"
+          ).decode("utf-8")
+
           data = data.replace(
-              old,
+              anchor,
-              new,
+              patch,
               1,
           )
 
@@ -795,22 +795,19 @@ jobs:
               encoding="utf-8"
           )
 
-          if new not in result:
+          if "installForceAllIceTransportPolicy" not in result:
               raise SystemExit(
-                  "LiveKit ICE policy patch "
+                  "WebRTC ICE policy patch verification failed"
-                  "verification failed"
               )
 
           print(
-              "Forced LiveKit "
+              "Installed preload WebRTC ICE policy override"
-              "iceTransportPolicy=all"
           )
           PY
 
           grep -n \
-            "iceTransportPolicy" \
+            -E 'installForceAllIceTransportPolicy|iceTransportPolicy forced to all' \
-            fluxer-src/fluxer_app/pkgs/livekit-client/src/room/RTCEngine.ts
+            fluxer-src/fluxer_desktop/src/preload/index.ts
-
 
       - name: Install dependencies
         shell: bash