LiveKit Electron offer-with-join workaround
This commit is contained in:
1 file changed
+16
-16
@@ -226,7 +226,7 @@ jobs:
|
||||
-Pattern "sso.gandc.ru|will-redirect|allowTrustedOrSsoNavigation"
|
||||
|
||||
|
||||
- name: Force WebRTC ICE policy to all
|
||||
- name: Work around LiveKit Electron offer-with-join
|
||||
shell: powershell
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
@@ -244,13 +244,13 @@ jobs:
|
||||
throw "Unable to locate Electron preload import"
|
||||
}
|
||||
|
||||
if ($Content -match "installForceAllIceTransportPolicy") {
|
||||
throw "WebRTC ICE policy patch is already present"
|
||||
if ($Content -match "installLiveKitElectronOfferWithJoinWorkaround") {
|
||||
throw "LiveKit Electron workaround is already present"
|
||||
}
|
||||
|
||||
$Patch = [Text.Encoding]::UTF8.GetString(
|
||||
[Convert]::FromBase64String(
|
||||
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7"
|
||||
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxMaXZlS2l0RWxlY3Ryb25PZmZlcldpdGhKb2luV29ya2Fyb3VuZCgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IG9yaWdpbmFsVXNlckFnZW50ID0gbmF2aWdhdG9yLnVzZXJBZ2VudDsKCgkJCWlmIChvcmlnaW5hbFVzZXJBZ2VudC5pbmNsdWRlcygnRmlyZWZveC8nKSkgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQljb25zdCBsaXZlS2l0Q29tcGF0VXNlckFnZW50ID0gYCR7b3JpZ2luYWxVc2VyQWdlbnR9IEZpcmVmb3gvMTUwLjBgOwoKCQkJT2JqZWN0LmRlZmluZVByb3BlcnR5KG5hdmlnYXRvciwgJ3VzZXJBZ2VudCcsIHsKCQkJCWNvbmZpZ3VyYWJsZTogdHJ1ZSwKCQkJCWdldDogKCkgPT4gbGl2ZUtpdENvbXBhdFVzZXJBZ2VudCwKCQkJfSk7CgoJCQljb25zb2xlLmluZm8oCgkJCQknW0ZsdXhlciBEZXNrdG9wXSBMaXZlS2l0IEVsZWN0cm9uIG9mZmVyLXdpdGgtam9pbiB3b3JrYXJvdW5kIGVuYWJsZWQnLAoJCQkpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbExpdmVLaXRFbGVjdHJvbk9mZmVyV2l0aEpvaW5Xb3JrYXJvdW5kKCk7Cg=="
|
||||
)
|
||||
)
|
||||
|
||||
@@ -267,15 +267,15 @@ jobs:
|
||||
|
||||
$Result = Get-Content $Path -Raw
|
||||
|
||||
if ($Result -notmatch "installForceAllIceTransportPolicy") {
|
||||
throw "WebRTC ICE policy patch verification failed"
|
||||
if ($Result -notmatch "installLiveKitElectronOfferWithJoinWorkaround") {
|
||||
throw "LiveKit Electron workaround verification failed"
|
||||
}
|
||||
|
||||
Write-Host "Installed preload WebRTC ICE policy override"
|
||||
Write-Host "Installed LiveKit Electron offer-with-join workaround"
|
||||
|
||||
Select-String `
|
||||
-Path $Path `
|
||||
-Pattern "installForceAllIceTransportPolicy|iceTransportPolicy forced to all"
|
||||
-Pattern "installLiveKitElectronOfferWithJoinWorkaround|offer-with-join workaround enabled"
|
||||
|
||||
- name: Install dependencies
|
||||
shell: powershell
|
||||
@@ -795,7 +795,7 @@ jobs:
|
||||
fluxer-src/fluxer_desktop/src/main/Window.ts
|
||||
|
||||
|
||||
- name: Force WebRTC ICE policy to all
|
||||
- name: Work around LiveKit Electron offer-with-join
|
||||
shell: bash
|
||||
run: |
|
||||
set -euxo pipefail
|
||||
@@ -825,13 +825,13 @@ jobs:
|
||||
"Unable to locate Electron preload import"
|
||||
)
|
||||
|
||||
if "installForceAllIceTransportPolicy" in data:
|
||||
if "installLiveKitElectronOfferWithJoinWorkaround" in data:
|
||||
raise SystemExit(
|
||||
"WebRTC ICE policy patch is already present"
|
||||
"LiveKit Electron workaround is already present"
|
||||
)
|
||||
|
||||
patch = base64.b64decode(
|
||||
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7"
|
||||
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxMaXZlS2l0RWxlY3Ryb25PZmZlcldpdGhKb2luV29ya2Fyb3VuZCgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IG9yaWdpbmFsVXNlckFnZW50ID0gbmF2aWdhdG9yLnVzZXJBZ2VudDsKCgkJCWlmIChvcmlnaW5hbFVzZXJBZ2VudC5pbmNsdWRlcygnRmlyZWZveC8nKSkgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQljb25zdCBsaXZlS2l0Q29tcGF0VXNlckFnZW50ID0gYCR7b3JpZ2luYWxVc2VyQWdlbnR9IEZpcmVmb3gvMTUwLjBgOwoKCQkJT2JqZWN0LmRlZmluZVByb3BlcnR5KG5hdmlnYXRvciwgJ3VzZXJBZ2VudCcsIHsKCQkJCWNvbmZpZ3VyYWJsZTogdHJ1ZSwKCQkJCWdldDogKCkgPT4gbGl2ZUtpdENvbXBhdFVzZXJBZ2VudCwKCQkJfSk7CgoJCQljb25zb2xlLmluZm8oCgkJCQknW0ZsdXhlciBEZXNrdG9wXSBMaXZlS2l0IEVsZWN0cm9uIG9mZmVyLXdpdGgtam9pbiB3b3JrYXJvdW5kIGVuYWJsZWQnLAoJCQkpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbExpdmVLaXRFbGVjdHJvbk9mZmVyV2l0aEpvaW5Xb3JrYXJvdW5kKCk7Cg=="
|
||||
).decode("utf-8")
|
||||
|
||||
data = data.replace(
|
||||
@@ -849,18 +849,18 @@ jobs:
|
||||
encoding="utf-8"
|
||||
)
|
||||
|
||||
if "installForceAllIceTransportPolicy" not in result:
|
||||
if "installLiveKitElectronOfferWithJoinWorkaround" not in result:
|
||||
raise SystemExit(
|
||||
"WebRTC ICE policy patch verification failed"
|
||||
"LiveKit Electron workaround verification failed"
|
||||
)
|
||||
|
||||
print(
|
||||
"Installed preload WebRTC ICE policy override"
|
||||
"Installed LiveKit Electron offer-with-join workaround"
|
||||
)
|
||||
PY
|
||||
|
||||
grep -n \
|
||||
-E 'installForceAllIceTransportPolicy|iceTransportPolicy forced to all' \
|
||||
-E 'installLiveKitElectronOfferWithJoinWorkaround|offer-with-join workaround enabled' \
|
||||
fluxer-src/fluxer_desktop/src/preload/index.ts
|
||||
|
||||
- name: Install dependencies
|
||||
|
||||
Reference in new issue
Block a user