Compare commits
9
Commits
2c0b5286a7
..
1.0.18
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e4e1c4ffd
|
||
|
|
f28dd4e655
|
||
|
|
bf7ad90a6c
|
||
|
|
22694712f4
|
||
|
|
86047a49a2
|
||
|
|
38205f3958
|
||
|
|
a755ee8691
|
||
|
|
e57e845a3b
|
||
|
|
c901908eab
|
+241
-210
@@ -150,6 +150,38 @@ jobs:
|
||||
throw "CANARY_APP_URL was not configured"
|
||||
}
|
||||
|
||||
$PackagePath = "fluxer-src\fluxer_desktop\package.json"
|
||||
|
||||
if (-not (Test-Path $PackagePath)) {
|
||||
throw "package.json not found at $PackagePath"
|
||||
}
|
||||
|
||||
$Package = Get-Content $PackagePath -Raw | ConvertFrom-Json
|
||||
$Package.homepage = "https://ds.gandc.ru"
|
||||
|
||||
$PackageJson = $Package | ConvertTo-Json -Depth 100
|
||||
|
||||
[System.IO.File]::WriteAllText(
|
||||
$PackagePath,
|
||||
$PackageJson + [Environment]::NewLine,
|
||||
(New-Object System.Text.UTF8Encoding($false))
|
||||
)
|
||||
|
||||
Write-Host "Desktop homepage configured:"
|
||||
(Get-Content $PackagePath -Raw | ConvertFrom-Json).homepage
|
||||
|
||||
$PackageBytes = [System.IO.File]::ReadAllBytes($PackagePath)
|
||||
if (
|
||||
$PackageBytes.Length -ge 3 -and
|
||||
$PackageBytes[0] -eq 0xEF -and
|
||||
$PackageBytes[1] -eq 0xBB -and
|
||||
$PackageBytes[2] -eq 0xBF
|
||||
) {
|
||||
throw "package.json unexpectedly contains UTF-8 BOM"
|
||||
}
|
||||
|
||||
Write-Host "package.json UTF-8 BOM check: OK"
|
||||
|
||||
$WindowPath = "fluxer-src\fluxer_desktop\src\main\Window.ts"
|
||||
|
||||
if (-not (Test-Path $WindowPath)) {
|
||||
@@ -208,6 +240,90 @@ jobs:
|
||||
-Pattern "sso.gandc.ru|will-redirect|allowTrustedOrSsoNavigation"
|
||||
|
||||
|
||||
- name: Configure GSCORD update source
|
||||
shell: powershell
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$PatchScript = [Text.Encoding]::UTF8.GetString(
|
||||
[Convert]::FromBase64String(
|
||||
"CmNvbnN0IGZzID0gcmVxdWlyZSgnZnMnKTsKCmNvbnN0IGRvd25sb2Fkc1BhdGggPSAnZmx1eGVyLXNyYy9mbHV4ZXJfZGVza3RvcC9zcmMvbWFpbi9VcGRhdGVyRG93bmxvYWRzLnRzJzsKY29uc3QgdXBkYXRlclBhdGggPSAnZmx1eGVyLXNyYy9mbHV4ZXJfZGVza3RvcC9zcmMvbWFpbi9VcGRhdGVyLnRzJzsKCmZ1bmN0aW9uIHJlcGxhY2VSZWdleE9uY2UoaW5wdXQsIHBhdHRlcm4sIHJlcGxhY2VtZW50LCBsYWJlbCkgewogIGxldCBjb3VudCA9IDA7CiAgY29uc3Qgb3V0cHV0ID0gaW5wdXQucmVwbGFjZShwYXR0ZXJuLCAoLi4uYXJncykgPT4gewogICAgY291bnQgKz0gMTsKICAgIHJldHVybiB0eXBlb2YgcmVwbGFjZW1lbnQgPT09ICdmdW5jdGlvbicKICAgICAgPyByZXBsYWNlbWVudCguLi5hcmdzKQogICAgICA6IHJlcGxhY2VtZW50OwogIH0pOwoKICBpZiAoY291bnQgIT09IDEpIHsKICAgIHRocm93IG5ldyBFcnJvcihgVW5hYmxlIHRvIHBhdGNoICR7bGFiZWx9OiBtYXRjaGVzPSR7Y291bnR9YCk7CiAgfQoKICByZXR1cm4gb3V0cHV0Owp9CgpsZXQgZG93bmxvYWRzID0gZnMucmVhZEZpbGVTeW5jKGRvd25sb2Fkc1BhdGgsICd1dGY4Jyk7Cgpkb3dubG9hZHMgPSByZXBsYWNlUmVnZXhPbmNlKAogIGRvd25sb2FkcywKICAvY29uc3QgUEtHU19CQVNFX1VSTCA9ICdodHRwczpcL1wvcGtnc1wuZmx1eGVyXC5jb20nO1xyP1xuZXhwb3J0IGNvbnN0IFVQREFURV9CQVNFX1VSTCA9IGBcJFx7UEtHU19CQVNFX1VSTFx9XC9kZXNrdG9wXC9cJFx7QlVJTERfQ0hBTk5FTFx9XC9cJFx7cHJvY2Vzc1wucGxhdGZvcm1cfVwvXCRce0RFU0tUT1BfRE9XTkxPQURfQVJDSFx9YDtccj9cbmV4cG9ydCBjb25zdCBET1dOTE9BRF9QQUdFX1VSTCA9XHI/XG5ccypCVUlMRF9DSEFOTkVMID09PSAnY2FuYXJ5JyBcPyAnaHR0cHM6XC9cL2NhbmFyeVwuZmx1eGVyXC5hcHBcL2Rvd25sb2FkJyA6ICdodHRwczpcL1wvZmx1eGVyXC5hcHBcL2Rvd25sb2FkJzsvLAogICJleHBvcnQgY29uc3QgVVBEQVRFX0JBU0VfVVJMID0gJ2h0dHBzOi8vZ2l0LmdhbmRjLnJ1L2dzY29yZC9nc2NvcmQtZGVza3RvcC9yZWxlYXNlcyc7XG4iICsKICAgICJleHBvcnQgY29uc3QgRE9XTkxPQURfUEFHRV9VUkwgPSBVUERBVEVfQkFTRV9VUkw7IiwKICAnVXBkYXRlckRvd25sb2FkcyB1cGRhdGUgc291cmNlJywKKTsKCmRvd25sb2FkcyA9IHJlcGxhY2VSZWdleE9uY2UoCiAgZG93bmxvYWRzLAogIC9leHBvcnQgZnVuY3Rpb24gYnVpbGRNYW51YWxWZXJzaW9uRG93bmxvYWRVcmxcKHZlcnNpb246IHN0cmluZywgZm9ybWF0OiBNYW51YWxEZXNrdG9wRm9ybWF0XCk6IHN0cmluZyBce1xyP1xuXHMqcmV0dXJuIGBcJFx7VVBEQVRFX0JBU0VfVVJMXH1cL1wkXHt2ZXJzaW9uXH1cL1wkXHtmb3JtYXRcfWA7XHI/XG5cfS8sCiAgImV4cG9ydCBmdW5jdGlvbiBidWlsZE1hbnVhbFZlcnNpb25Eb3dubG9hZFVybCh2ZXJzaW9uOiBzdHJpbmcsIGZvcm1hdDogTWFudWFsRGVza3RvcEZvcm1hdCk6IHN0cmluZyB7XG4iICsKICAgICJcdHZvaWQgdmVyc2lvbjtcbiIgKwogICAgIlx0dm9pZCBmb3JtYXQ7XG4iICsKICAgICJcdHJldHVybiBET1dOTE9BRF9QQUdFX1VSTDtcbiIgKwogICAgIn0iLAogICdtYW51YWwgZmFsbGJhY2sgVVJMJywKKTsKCmRvd25sb2FkcyA9IHJlcGxhY2VSZWdleE9uY2UoCiAgZG93bmxvYWRzLAogIC91cmw6XHMqYnVpbGRNYW51YWxWZXJzaW9uRG93bmxvYWRVcmxcKGluZm9cLnZlcnNpb24sXHMqZm9ybWF0XCksLywKICAidXJsOiBmaWxlPy51cmwgPz8gYnVpbGRNYW51YWxWZXJzaW9uRG93bmxvYWRVcmwoaW5mby52ZXJzaW9uLCBmb3JtYXQpLCIsCiAgJ21hbnVhbCBhc3NldCBVUkwnLAopOwoKaWYgKGRvd25sb2Fkcy5pbmNsdWRlcygncGtncy5mbHV4ZXIuY29tJykpIHsKICB0aHJvdyBuZXcgRXJyb3IoCiAgICAncGtncy5mbHV4ZXIuY29tIGlzIHN0aWxsIHByZXNlbnQgaW4gVXBkYXRlckRvd25sb2Fkcy50cycsCiAgKTsKfQoKaWYgKAogICFkb3dubG9hZHMuaW5jbHVkZXMoCiAgICAnaHR0cHM6Ly9naXQuZ2FuZGMucnUvZ3Njb3JkL2dzY29yZC1kZXNrdG9wL3JlbGVhc2VzJywKICApCikgewogIHRocm93IG5ldyBFcnJvcignR1NDT1JEIHJlbGVhc2VzIFVSTCB3YXMgbm90IGluc3RhbGxlZCcpOwp9Cgpmcy53cml0ZUZpbGVTeW5jKGRvd25sb2Fkc1BhdGgsIGRvd25sb2FkcywgJ3V0ZjgnKTsKCmxldCB1cGRhdGVyID0gZnMucmVhZEZpbGVTeW5jKHVwZGF0ZXJQYXRoLCAndXRmOCcpOwoKdXBkYXRlciA9IHJlcGxhY2VSZWdleE9uY2UoCiAgdXBkYXRlciwKICAvY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmZXRjaFwoYFwkXHtVUERBVEVfQkFTRV9VUkxcfVwvbGF0ZXN0YCwgXHsvLAogICJjb25zdCByZXNwb25zZSA9IGF3YWl0IGZldGNoKFxuIiArCiAgICAiXHRcdCdodHRwczovL2dpdC5nYW5kYy5ydS9hcGkvdjEvcmVwb3MvZ3Njb3JkL2dzY29yZC1kZXNrdG9wL3JlbGVhc2VzL2xhdGVzdCcsXG4iICsKICAgICJcdFx0eyIsCiAgJ0dpdGVhIGxhdGVzdCByZWxlYXNlIFVSTCcsCik7Cgpjb25zdCBnaXRlYVBhcnNlciA9IGAJY29uc3QgcGF5bG9hZCA9IChhd2FpdCByZXNwb25zZS5qc29uKCkpIGFzIHsKCQl0YWdfbmFtZT86IHVua25vd247CgkJcHVibGlzaGVkX2F0PzogdW5rbm93bjsKCQljcmVhdGVkX2F0PzogdW5rbm93bjsKCQlhc3NldHM/OiB1bmtub3duOwoJfTsKCglpZiAoCgkJdHlwZW9mIHBheWxvYWQudGFnX25hbWUgIT09ICdzdHJpbmcnIHx8CgkJcGF5bG9hZC50YWdfbmFtZS50cmltKCkubGVuZ3RoID09PSAwCgkpIHsKCQl0aHJvdyBuZXcgRXJyb3IoJ0dTQ09SRCBsYXRlc3QgcmVsZWFzZSByZXNwb25zZSBtaXNzaW5nIHRhZ19uYW1lJyk7Cgl9CgoJY29uc3QgdmVyc2lvbiA9IHBheWxvYWQudGFnX25hbWUudHJpbSgpLnJlcGxhY2UoL152LywgJycpOwoJY29uc3QgYXNzZXRzID0gQXJyYXkuaXNBcnJheShwYXlsb2FkLmFzc2V0cykgPyBwYXlsb2FkLmFzc2V0cyA6IFtdOwoJY29uc3QgZmlsZXM6IFBhcnRpYWw8CgkJUmVjb3JkPE1hbnVhbERlc2t0b3BGb3JtYXQsIE1hbnVhbExhdGVzdEZpbGU+Cgk+ID0ge307CgoJY29uc3QgaXNBcm02NCA9IHByb2Nlc3MuYXJjaCA9PT0gJ2FybTY0JzsKCglmb3IgKGNvbnN0IHJhd0Fzc2V0IG9mIGFzc2V0cykgewoJCWlmICghaXNSZWNvcmQocmF3QXNzZXQpKSB7CgkJCWNvbnRpbnVlOwoJCX0KCgkJY29uc3QgbmFtZSA9CgkJCXR5cGVvZiByYXdBc3NldC5uYW1lID09PSAnc3RyaW5nJwoJCQkJPyByYXdBc3NldC5uYW1lCgkJCQk6ICcnOwoKCQljb25zdCB1cmwgPQoJCQl0eXBlb2YgcmF3QXNzZXQuYnJvd3Nlcl9kb3dubG9hZF91cmwgPT09ICdzdHJpbmcnCgkJCQk/IHJhd0Fzc2V0LmJyb3dzZXJfZG93bmxvYWRfdXJsCgkJCQk6ICcnOwoKCQlpZiAoIW5hbWUgfHwgIXVybCkgewoJCQljb250aW51ZTsKCQl9CgoJCWNvbnN0IGxvd2VyTmFtZSA9IG5hbWUudG9Mb3dlckNhc2UoKTsKCgkJaWYgKGlzQXJtNjQpIHsKCQkJaWYgKAoJCQkJIWxvd2VyTmFtZS5pbmNsdWRlcygnYXJtNjQnKSAmJgoJCQkJIWxvd2VyTmFtZS5pbmNsdWRlcygnYWFyY2g2NCcpCgkJCSkgewoJCQkJY29udGludWU7CgkJCX0KCQl9IGVsc2UgaWYgKAoJCQlsb3dlck5hbWUuaW5jbHVkZXMoJ2FybTY0JykgfHwKCQkJbG93ZXJOYW1lLmluY2x1ZGVzKCdhYXJjaDY0JykKCQkpIHsKCQkJY29udGludWU7CgkJfQoKCQlpZiAoL2xpbnV4LXg4Line truncated
|
||||
)
|
||||
)
|
||||
|
||||
$PatchPath = Join-Path $env:RUNNER_TEMP "patch-gscord-updater.cjs"
|
||||
|
||||
[System.IO.File]::WriteAllText(
|
||||
$PatchPath,
|
||||
$PatchScript,
|
||||
(New-Object System.Text.UTF8Encoding($false))
|
||||
)
|
||||
|
||||
node $PatchPath
|
||||
|
||||
Select-String `
|
||||
-Path "fluxer-src\fluxer_desktop\src\main\UpdaterDownloads.ts" `
|
||||
-Pattern "git.gandc.ru/gscord/gscord-desktop/releases"
|
||||
|
||||
Select-String `
|
||||
-Path "fluxer-src\fluxer_desktop\src\main\Updater.ts" `
|
||||
-Pattern "api/v1/repos/gscord/gscord-desktop/releases/latest"
|
||||
|
||||
- name: Apply Electron LiveKit compatibility fixes
|
||||
shell: powershell
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$Path = "fluxer-src\fluxer_desktop\src\preload\index.ts"
|
||||
|
||||
if (-not (Test-Path $Path)) {
|
||||
throw "Desktop preload not found at $Path"
|
||||
}
|
||||
|
||||
$Content = Get-Content $Path -Raw
|
||||
$Anchor = "import {contextBridge, ipcRenderer, webFrame} from 'electron';"
|
||||
|
||||
if ($Content -notmatch [regex]::Escape($Anchor)) {
|
||||
throw "Unable to locate Electron preload import"
|
||||
}
|
||||
|
||||
if ($Content -match "installForceAllIceTransportPolicy") {
|
||||
throw "WebRTC ICE policy patch is already present"
|
||||
}
|
||||
|
||||
$Patch = [Text.Encoding]::UTF8.GetString(
|
||||
[Convert]::FromBase64String(
|
||||
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKZnVuY3Rpb24gaW5zdGFsbERpc2FibGVMaXZlS2l0T2ZmZXJXaXRoSm9pbigpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVdlYlNvY2tldCA9IHdpbmRvdy5XZWJTb2NrZXQ7CgkJCWNvbnN0IGNvbXByZXNzaW9uRGVzY3JpcHRvciA9IE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoCgkJCQl3aW5kb3csCgkJCQknQ29tcHJlc3Npb25TdHJlYW0nLAoJCQkpOwoKCQkJbGV0IGNvbXByZXNzaW9uU3VwcHJlc3NlZCA9IGZhbHNlOwoKCQkJY29uc3Qgc3VwcHJlc3NDb21wcmVzc2lvblN0cmVhbSA9ICgpOiB2b2lkID0+IHsKCQkJCWlmIChjb21wcmVzc2lvblN1cHByZXNzZWQpIHsKCQkJCQlyZXR1cm47CgkJCQl9CgoJCQkJT2JqZWN0LmRlZmluZVByb3BlcnR5KHdpbmRvdywgJ0NvbXByZXNzaW9uU3RyZWFtJywgewoJCQkJCWNvbmZpZ3VyYWJsZTogdHJ1ZSwKCQkJCQl3cml0YWJsZTogdHJ1ZSwKCQkJCQl2YWx1ZTogdW5kZWZpbmVkLAoJCQkJfSk7CgoJCQkJY29tcHJlc3Npb25TdXBwcmVzc2VkID0gdHJ1ZTsKCQkJfTsKCgkJCWNvbnN0IHJlc3RvcmVDb21wcmVzc2lvblN0cmVhbSA9ICgpOiB2b2lkID0+IHsKCQkJCWlmICghY29tcHJlc3Npb25TdXBwcmVzc2VkKSB7CgkJCQkJcmV0dXJuOwoJCQkJfQoKCQkJCWlmIChjb21wcmVzc2lvbkRlc2NyaXB0b3IpIHsKCQkJCQlPYmplY3QuZGVmaW5lUHJvcGVydHkoCgkJCQkJCXdpbmRvdywKCQkJCQkJJ0NvbXByZXNzaW9uU3RyZWFtJywKCQkJCQkJY29tcHJlc3Npb25EZXNjcmlwdG9yLAoJCQkJCSk7CgkJCQl9IGVsc2UgewoJCQkJCWRlbGV0ZSAod2luZG93IGFzIHR5cGVvZiB3aW5kb3cgJiB7CgkJCQkJCUNvbXByZXNzaW9uU3RyZWFtPzogdHlwZW9mIENvbXByZXNzaW9uU3RyZWFtOwoJCQkJCX0pLkNvbXByZXNzaW9uU3RyZWFtOwoJCQkJfQoKCQkJCWNvbXByZXNzaW9uU3VwcHJlc3NlZCA9IGZhbHNlOwoJCQl9OwoKCQkJY29uc3QgaXNMaXZlS2l0UnRjU29ja2V0ID0gKHZhbHVlOiBzdHJpbmcgfCBVUkwpOiBib29sZWFuID0+IHsKCQkJCXRyeSB7CgkJCQkJY29uc3QgdXJsID0gbmV3IFVSTChTdHJpbmcodmFsdWUpLCB3aW5kb3cubG9jYXRpb24uaHJlZik7CgkJCQkJcmV0dXJuIC9cL3J0Y1wvdjFcLz8kLy50ZXN0KHVybC5wYXRobmFtZSk7CgkJCQl9IGNhdGNoIHsKCQkJCQlyZXR1cm4gZmFsc2U7CgkJCQl9CgkJCX07CgoJCQl3aW5kb3cuV2ViU29ja2V0ID0gbmV3IFByb3h5KE5hdGl2ZVdlYlNvY2tldCwgewoJCQkJY29uc3RydWN0KFRhcmdldCwgYXJncykgewoJCQkJCWNvbnN0IGlzTGl2ZUtpdFJ0YyA9IGlzTGl2ZUtpdFJ0Y1NvY2tldCgKCQkJCQkJYXJnc1swXSBhcyBzdHJpbmcgfCBVUkwsCgkJCQkJKTsKCgkJCQkJaWYgKGlzTGl2ZUtpdFJ0YykgewoJCQkJCQlyZXN0b3JlQ29tcHJlc3Npb25TdHJlYW0oKTsKCQkJCQl9CgoJCQkJCWxldCBzb2NrZXQ6IFdlYlNvY2tldDsKCgkJCQkJdHJ5IHsKCQkJCQkJc29ja2V0ID0gUmVmbGVjdC5jb25zdHJ1Y3QoVGFyZ2V0LCBhcmdzLCBUYXJnZXQpOwoJCQkJCX0gY2F0Y2ggKGVycm9yKSB7CgkJCQkJCWlmIChpc0xpdmVLaXRSdGMpIHsKCQkJCQkJCXN1cHByZXNzQ29tcHJlc3Npb25TdHJlYW0oKTsKCQkJCQkJfQoJCQkJCQl0aHJvdyBlcnJvcjsKCQkJCQl9CgoJCQkJCWlmIChpc0xpdmVLaXRSdGMpIHsKCQkJCQkJc29ja2V0LmFkZEV2ZW50TGlzdGVuZXIoCgkJCQkJCQknY2xvc2UnLAoJCQkJCQkJKCkgPT4gc3VwcHJlc3NDb21wcmVzc2lvblN0cmVhbSgpLAoJCQkJCQkJe29uY2U6IHRydWV9LAoJCQkJCQkpOwoJCQkJCX0KCgkJCQkJcmV0dXJuIHNvY2tldDsKCQkJCX0sCgkJCX0pIGFzIHR5cGVvZiBXZWJTb2NrZXQ7CgoJCQlzdXBwcmVzc0NvbXByZXNzaW9uU3RyZWFtKCk7CgoJCQljb25zb2xlLmluZm8oCgkJCQknW0ZsdXhlciBEZXNrdG9wXSBMaXZlS2l0IHB1Ymxpc2hlciBvZmZlci13aXRoLWpvaW4gZGlzYWJsZWQnLAoJCQkpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7Cmluc3RhbGxEaXNhYmxlTGl2ZUtpdE9mZmVyV2l0aEpvaW4oKTsK"
|
||||
)
|
||||
)
|
||||
|
||||
$Content = $Content.Replace(
|
||||
$Anchor,
|
||||
$Patch
|
||||
)
|
||||
|
||||
Set-Content `
|
||||
-Path $Path `
|
||||
-Value $Content `
|
||||
-NoNewline `
|
||||
-Encoding utf8
|
||||
|
||||
$Result = Get-Content $Path -Raw
|
||||
|
||||
if ($Result -notmatch "installForceAllIceTransportPolicy") {
|
||||
throw "WebRTC ICE policy patch verification failed"
|
||||
}
|
||||
|
||||
if ($Result -notmatch "installDisableLiveKitOfferWithJoin") {
|
||||
throw "LiveKit offer-with-join workaround verification failed"
|
||||
}
|
||||
|
||||
Write-Host "Installed Electron WebRTC and LiveKit compatibility fixes"
|
||||
|
||||
Select-String `
|
||||
-Path $Path `
|
||||
-Pattern "installForceAllIceTransportPolicy|installDisableLiveKitOfferWithJoin|iceTransportPolicy forced to all|LiveKit publisher offer-with-join disabled"
|
||||
|
||||
- name: Install dependencies
|
||||
shell: powershell
|
||||
run: |
|
||||
@@ -218,100 +334,6 @@ jobs:
|
||||
pnpm install --frozen-lockfile
|
||||
|
||||
|
||||
- name: Force LiveKit ICE policy to all
|
||||
shell: powershell
|
||||
run: |
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
Set-Location fluxer-src
|
||||
|
||||
$PnpmRoot = "node_modules\.pnpm"
|
||||
|
||||
if (-not (Test-Path $PnpmRoot)) {
|
||||
throw "pnpm node_modules directory not found"
|
||||
}
|
||||
|
||||
$LiveKitPackages = Get-ChildItem `
|
||||
-Path $PnpmRoot `
|
||||
-Directory `
|
||||
-Filter "livekit-client@*" |
|
||||
ForEach-Object {
|
||||
Join-Path $_.FullName "node_modules\livekit-client"
|
||||
} |
|
||||
Where-Object {
|
||||
Test-Path $_
|
||||
}
|
||||
|
||||
if (-not $LiveKitPackages) {
|
||||
throw "livekit-client package not found"
|
||||
}
|
||||
|
||||
$Pattern = "(iceTransportPolicy\s*=\s*['""])(relay)(['""])"
|
||||
$TotalReplacements = 0
|
||||
|
||||
foreach ($PackagePath in $LiveKitPackages) {
|
||||
Write-Host "Patching LiveKit package: $PackagePath"
|
||||
|
||||
$PackageJson = Join-Path $PackagePath "package.json"
|
||||
|
||||
if (Test-Path $PackageJson) {
|
||||
$PackageInfo = Get-Content $PackageJson -Raw |
|
||||
ConvertFrom-Json
|
||||
|
||||
Write-Host "livekit-client version: $($PackageInfo.version)"
|
||||
}
|
||||
|
||||
$Files = Get-ChildItem `
|
||||
-Path $PackagePath `
|
||||
-Recurse `
|
||||
-File |
|
||||
Where-Object {
|
||||
$_.Extension -in @(
|
||||
".ts",
|
||||
".js",
|
||||
".mjs",
|
||||
".cjs"
|
||||
)
|
||||
}
|
||||
|
||||
foreach ($File in $Files) {
|
||||
$Content = Get-Content $File.FullName -Raw
|
||||
$Count = [regex]::Matches(
|
||||
$Content,
|
||||
$Pattern
|
||||
).Count
|
||||
|
||||
if ($Count -eq 0) {
|
||||
continue
|
||||
}
|
||||
|
||||
$PatchedContent = [regex]::Replace(
|
||||
$Content,
|
||||
$Pattern,
|
||||
'$1all$3'
|
||||
)
|
||||
|
||||
Set-Content `
|
||||
-Path $File.FullName `
|
||||
-Value $PatchedContent `
|
||||
-NoNewline `
|
||||
-Encoding utf8
|
||||
|
||||
$TotalReplacements += $Count
|
||||
|
||||
Write-Host `
|
||||
"Patched $Count occurrence(s): $($File.FullName)"
|
||||
}
|
||||
}
|
||||
|
||||
if ($TotalReplacements -lt 1) {
|
||||
throw "LiveKit relay ICE policy assignment was not found"
|
||||
}
|
||||
|
||||
Write-Host `
|
||||
"Forced iceTransportPolicy=all in $TotalReplacements occurrence(s)"
|
||||
|
||||
|
||||
- name: Build Fluxer Desktop
|
||||
shell: powershell
|
||||
env:
|
||||
@@ -713,6 +735,42 @@ jobs:
|
||||
print(result)
|
||||
PY
|
||||
|
||||
python3 <<'PY'
|
||||
from pathlib import Path
|
||||
import json
|
||||
|
||||
path = Path(
|
||||
"fluxer-src/fluxer_desktop/package.json"
|
||||
)
|
||||
|
||||
if not path.is_file():
|
||||
raise SystemExit(
|
||||
f"package.json not found: {path}"
|
||||
)
|
||||
|
||||
package = json.loads(
|
||||
path.read_text(
|
||||
encoding="utf-8"
|
||||
)
|
||||
)
|
||||
|
||||
package["homepage"] = "https://ds.gandc.ru"
|
||||
|
||||
path.write_text(
|
||||
json.dumps(
|
||||
package,
|
||||
ensure_ascii=False,
|
||||
indent=2,
|
||||
) + "\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
print(
|
||||
"Desktop homepage configured:",
|
||||
package["homepage"],
|
||||
)
|
||||
PY
|
||||
|
||||
python3 <<'PY'
|
||||
from pathlib import Path
|
||||
import re
|
||||
@@ -784,6 +842,95 @@ jobs:
|
||||
fluxer-src/fluxer_desktop/src/main/Window.ts
|
||||
|
||||
|
||||
- name: Configure GSCORD update source
|
||||
shell: bash
|
||||
run: |
|
||||
set -euxo pipefail
|
||||
|
||||
PATCH_PATH="$(mktemp --suffix=.cjs)"
|
||||
|
||||
printf '%s' 'CmNvbnN0IGZzID0gcmVxdWlyZSgnZnMnKTsKCmNvbnN0IGRvd25sb2Fkc1BhdGggPSAnZmx1eGVyLXNyYy9mbHV4ZXJfZGVza3RvcC9zcmMvbWFpbi9VcGRhdGVyRG93bmxvYWRzLnRzJzsKY29uc3QgdXBkYXRlclBhdGggPSAnZmx1eGVyLXNyYy9mbHV4ZXJfZGVza3RvcC9zcmMvbWFpbi9VcGRhdGVyLnRzJzsKCmZ1bmN0aW9uIHJlcGxhY2VSZWdleE9uY2UoaW5wdXQsIHBhdHRlcm4sIHJlcGxhY2VtZW50LCBsYWJlbCkgewogIGxldCBjb3VudCA9IDA7CiAgY29uc3Qgb3V0cHV0ID0gaW5wdXQucmVwbGFjZShwYXR0ZXJuLCAoLi4uYXJncykgPT4gewogICAgY291bnQgKz0gMTsKICAgIHJldHVybiB0eXBlb2YgcmVwbGFjZW1lbnQgPT09ICdmdW5jdGlvbicKICAgICAgPyByZXBsYWNlbWVudCguLi5hcmdzKQogICAgICA6IHJlcGxhY2VtZW50OwogIH0pOwoKICBpZiAoY291bnQgIT09IDEpIHsKICAgIHRocm93IG5ldyBFcnJvcihgVW5hYmxlIHRvIHBhdGNoICR7bGFiZWx9OiBtYXRjaGVzPSR7Y291bnR9YCk7CiAgfQoKICByZXR1cm4gb3V0cHV0Owp9CgpsZXQgZG93bmxvYWRzID0gZnMucmVhZEZpbGVTeW5jKGRvd25sb2Fkc1BhdGgsICd1dGY4Jyk7Cgpkb3dubG9hZHMgPSByZXBsYWNlUmVnZXhPbmNlKAogIGRvd25sb2FkcywKICAvY29uc3QgUEtHU19CQVNFX1VSTCA9ICdodHRwczpcL1wvcGtnc1wuZmx1eGVyXC5jb20nO1xyP1xuZXhwb3J0IGNvbnN0IFVQREFURV9CQVNFX1VSTCA9IGBcJFx7UEtHU19CQVNFX1VSTFx9XC9kZXNrdG9wXC9cJFx7QlVJTERfQ0hBTk5FTFx9XC9cJFx7cHJvY2Vzc1wucGxhdGZvcm1cfVwvXCRce0RFU0tUT1BfRE9XTkxPQURfQVJDSFx9YDtccj9cbmV4cG9ydCBjb25zdCBET1dOTE9BRF9QQUdFX1VSTCA9XHI/XG5ccypCVUlMRF9DSEFOTkVMID09PSAnY2FuYXJ5JyBcPyAnaHR0cHM6XC9cL2NhbmFyeVwuZmx1eGVyXC5hcHBcL2Rvd25sb2FkJyA6ICdodHRwczpcL1wvZmx1eGVyXC5hcHBcL2Rvd25sb2FkJzsvLAogICJleHBvcnQgY29uc3QgVVBEQVRFX0JBU0VfVVJMID0gJ2h0dHBzOi8vZ2l0LmdhbmRjLnJ1L2dzY29yZC9nc2NvcmQtZGVza3RvcC9yZWxlYXNlcyc7XG4iICsKICAgICJleHBvcnQgY29uc3QgRE9XTkxPQURfUEFHRV9VUkwgPSBVUERBVEVfQkFTRV9VUkw7IiwKICAnVXBkYXRlckRvd25sb2FkcyB1cGRhdGUgc291cmNlJywKKTsKCmRvd25sb2FkcyA9IHJlcGxhY2VSZWdleE9uY2UoCiAgZG93bmxvYWRzLAogIC9leHBvcnQgZnVuY3Rpb24gYnVpbGRNYW51YWxWZXJzaW9uRG93bmxvYWRVcmxcKHZlcnNpb246IHN0cmluZywgZm9ybWF0OiBNYW51YWxEZXNrdG9wRm9ybWF0XCk6IHN0cmluZyBce1xyP1xuXHMqcmV0dXJuIGBcJFx7VVBEQVRFX0JBU0VfVVJMXH1cL1wkXHt2ZXJzaW9uXH1cL1wkXHtmb3JtYXRcfWA7XHI/XG5cfS8sCiAgImV4cG9ydCBmdW5jdGlvbiBidWlsZE1hbnVhbFZlcnNpb25Eb3dubG9hZFVybCh2ZXJzaW9uOiBzdHJpbmcsIGZvcm1hdDogTWFudWFsRGVza3RvcEZvcm1hdCk6IHN0cmluZyB7XG4iICsKICAgICJcdHZvaWQgdmVyc2lvbjtcbiIgKwogICAgIlx0dm9pZCBmb3JtYXQ7XG4iICsKICAgICJcdHJldHVybiBET1dOTE9BRF9QQUdFX1VSTDtcbiIgKwogICAgIn0iLAogICdtYW51YWwgZmFsbGJhY2sgVVJMJywKKTsKCmRvd25sb2FkcyA9IHJlcGxhY2VSZWdleE9uY2UoCiAgZG93bmxvYWRzLAogIC91cmw6XHMqYnVpbGRNYW51YWxWZXJzaW9uRG93bmxvYWRVcmxcKGluZm9cLnZlcnNpb24sXHMqZm9ybWF0XCksLywKICAidXJsOiBmaWxlPy51cmwgPz8gYnVpbGRNYW51YWxWZXJzaW9uRG93bmxvYWRVcmwoaW5mby52ZXJzaW9uLCBmb3JtYXQpLCIsCiAgJ21hbnVhbCBhc3NldCBVUkwnLAopOwoKaWYgKGRvd25sb2Fkcy5pbmNsdWRlcygncGtncy5mbHV4ZXIuY29tJykpIHsKICB0aHJvdyBuZXcgRXJyb3IoCiAgICAncGtncy5mbHV4ZXIuY29tIGlzIHN0aWxsIHByZXNlbnQgaW4gVXBkYXRlckRvd25sb2Fkcy50cycsCiAgKTsKfQoKaWYgKAogICFkb3dubG9hZHMuaW5jbHVkZXMoCiAgICAnaHR0cHM6Ly9naXQuZ2FuZGMucnUvZ3Njb3JkL2dzY29yZC1kZXNrdG9wL3JlbGVhc2VzJywKICApCikgewogIHRocm93IG5ldyBFcnJvcignR1NDT1JEIHJlbGVhc2VzIFVSTCB3YXMgbm90IGluc3RhbGxlZCcpOwp9Cgpmcy53cml0ZUZpbGVTeW5jKGRvd25sb2Fkc1BhdGgsIGRvd25sb2FkcywgJ3V0ZjgnKTsKCmxldCB1cGRhdGVyID0gZnMucmVhZEZpbGVTeW5jKHVwZGF0ZXJQYXRoLCAndXRmOCcpOwoKdXBkYXRlciA9IHJlcGxhY2VSZWdleE9uY2UoCiAgdXBkYXRlciwKICAvY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmZXRjaFwoYFwkXHtVUERBVEVfQkFTRV9VUkxcfVwvbGF0ZXN0YCwgXHsvLAogICJjb25zdCByZXNwb25zZSA9IGF3YWl0IGZldGNoKFxuIiArCiAgICAiXHRcdCdodHRwczovL2dpdC5nYW5kYy5ydS9hcGkvdjEvcmVwb3MvZ3Njb3JkL2dzY29yZC1kZXNrdG9wL3JlbGVhc2VzL2xhdGVzdCcsXG4iICsKICAgICJcdFx0eyIsCiAgJ0dpdGVhIGxhdGVzdCByZWxlYXNlIFVSTCcsCik7Cgpjb25zdCBnaXRlYVBhcnNlciA9IGAJY29uc3QgcGF5bG9hZCA9IChhd2FpdCByZXNwb25zZS5qc29uKCkpIGFzIHsKCQl0YWdfbmFtZT86IHVua25vd247CgkJcHVibGlzaGVkX2F0PzogdW5rbm93bjsKCQljcmVhdGVkX2F0PzogdW5rbm93bjsKCQlhc3NldHM/OiB1bmtub3duOwoJfTsKCglpZiAoCgkJdHlwZW9mIHBheWxvYWQudGFnX25hbWUgIT09ICdzdHJpbmcnIHx8CgkJcGF5bG9hZC50YWdfbmFtZS50cmltKCkubGVuZ3RoID09PSAwCgkpIHsKCQl0aHJvdyBuZXcgRXJyb3IoJ0dTQ09SRCBsYXRlc3QgcmVsZWFzZSByZXNwb25zZSBtaXNzaW5nIHRhZ19uYW1lJyk7Cgl9CgoJY29uc3QgdmVyc2lvbiA9IHBheWxvYWQudGFnX25hbWUudHJpbSgpLnJlcGxhY2UoL152LywgJycpOwoJY29uc3QgYXNzZXRzID0gQXJyYXkuaXNBcnJheShwYXlsb2FkLmFzc2V0cykgPyBwYXlsb2FkLmFzc2V0cyA6IFtdOwoJY29uc3QgZmlsZXM6IFBhcnRpYWw8CgkJUmVjb3JkPE1hbnVhbERlc2t0b3BGb3JtYXQsIE1hbnVhbExhdGVzdEZpbGU+Cgk+ID0ge307CgoJY29uc3QgaXNBcm02NCA9IHByb2Nlc3MuYXJjaCA9PT0gJ2FybTY0JzsKCglmb3IgKGNvbnN0IHJhd0Fzc2V0IG9mIGFzc2V0cykgewoJCWlmICghaXNSZWNvcmQocmF3QXNzZXQpKSB7CgkJCWNvbnRpbnVlOwoJCX0KCgkJY29uc3QgbmFtZSA9CgkJCXR5cGVvZiByYXdBc3NldC5uYW1lID09PSAnc3RyaW5nJwoJCQkJPyByYXdBc3NldC5uYW1lCgkJCQk6ICcnOwoKCQljb25zdCB1cmwgPQoJCQl0eXBlb2YgcmF3QXNzZXQuYnJvd3Nlcl9kb3dubG9hZF91cmwgPT09ICdzdHJpbmcnCgkJCQk/IHJhd0Fzc2V0LmJyb3dzZXJfZG93bmxvYWRfdXJsCgkJCQk6ICcnOwoKCQlpZiAoIW5hbWUgfHwgIXVybCkgewoJCQljb250aW51ZTsKCQl9CgoJCWNvbnN0IGxvd2VyTmFtZSA9IG5hbWUudG9Mb3dlckNhc2UoKTsKCgkJaWYgKGlzQXJtNjQpIHsKCQkJaWYgKAoJCQkJIWxvd2VyTmFtZS5pbmNsdWRlcygnYXJtNjQnKSAmJgoJCQkJIWxvd2VyTmFtZS5pbmNsdWRlcygnYWFyY2g2NCcpCgkJCSkgewoJCQkJY29udGludWU7CgkJCX0KCQl9IGVsc2UgaWYgKAoJCQlsb3dlck5hbWUuaW5jbHVkZXMoJ2FybTY0JykgfHwKCQkJbG93ZXJOYW1lLmluY2x1ZGVzKCdhYXJjaDY0JykKCQkpIHsKCQkJY29udGludWU7CgkJfQoKCQlpZiAoL2xpLine truncated
|
||||
base64 -d > "$PATCH_PATH"
|
||||
|
||||
node "$PATCH_PATH"
|
||||
|
||||
grep -n 'git.gandc.ru/gscord/gscord-desktop/releases' fluxer-src/fluxer_desktop/src/main/UpdaterDownloads.ts
|
||||
|
||||
grep -n 'api/v1/repos/gscord/gscord-desktop/releases/latest' fluxer-src/fluxer_desktop/src/main/Updater.ts
|
||||
|
||||
- name: Apply Electron LiveKit compatibility fixes
|
||||
shell: bash
|
||||
run: |
|
||||
set -euxo pipefail
|
||||
|
||||
python3 - <<'PY'
|
||||
from pathlib import Path
|
||||
import base64
|
||||
|
||||
path = Path(
|
||||
"fluxer-src/fluxer_desktop/"
|
||||
"src/preload/index.ts"
|
||||
)
|
||||
|
||||
if not path.is_file():
|
||||
raise SystemExit(
|
||||
f"Desktop preload not found: {path}"
|
||||
)
|
||||
|
||||
data = path.read_text(
|
||||
encoding="utf-8"
|
||||
)
|
||||
|
||||
anchor = "import {contextBridge, ipcRenderer, webFrame} from 'electron';"
|
||||
|
||||
if anchor not in data:
|
||||
raise SystemExit(
|
||||
"Unable to locate Electron preload import"
|
||||
)
|
||||
|
||||
if "installForceAllIceTransportPolicy" in data:
|
||||
raise SystemExit(
|
||||
"WebRTC ICE policy patch is already present"
|
||||
)
|
||||
|
||||
patch = base64.b64decode(
|
||||
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKZnVuY3Rpb24gaW5zdGFsbERpc2FibGVMaXZlS2l0T2ZmZXJXaXRoSm9pbigpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVdlYlNvY2tldCA9IHdpbmRvdy5XZWJTb2NrZXQ7CgkJCWNvbnN0IGNvbXByZXNzaW9uRGVzY3JpcHRvciA9IE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoCgkJCQl3aW5kb3csCgkJCQknQ29tcHJlc3Npb25TdHJlYW0nLAoJCQkpOwoKCQkJbGV0IGNvbXByZXNzaW9uU3VwcHJlc3NlZCA9IGZhbHNlOwoKCQkJY29uc3Qgc3VwcHJlc3NDb21wcmVzc2lvblN0cmVhbSA9ICgpOiB2b2lkID0+IHsKCQkJCWlmIChjb21wcmVzc2lvblN1cHByZXNzZWQpIHsKCQkJCQlyZXR1cm47CgkJCQl9CgoJCQkJT2JqZWN0LmRlZmluZVByb3BlcnR5KHdpbmRvdywgJ0NvbXByZXNzaW9uU3RyZWFtJywgewoJCQkJCWNvbmZpZ3VyYWJsZTogdHJ1ZSwKCQkJCQl3cml0YWJsZTogdHJ1ZSwKCQkJCQl2YWx1ZTogdW5kZWZpbmVkLAoJCQkJfSk7CgoJCQkJY29tcHJlc3Npb25TdXBwcmVzc2VkID0gdHJ1ZTsKCQkJfTsKCgkJCWNvbnN0IHJlc3RvcmVDb21wcmVzc2lvblN0cmVhbSA9ICgpOiB2b2lkID0+IHsKCQkJCWlmICghY29tcHJlc3Npb25TdXBwcmVzc2VkKSB7CgkJCQkJcmV0dXJuOwoJCQkJfQoKCQkJCWlmIChjb21wcmVzc2lvbkRlc2NyaXB0b3IpIHsKCQkJCQlPYmplY3QuZGVmaW5lUHJvcGVydHkoCgkJCQkJCXdpbmRvdywKCQkJCQkJJ0NvbXByZXNzaW9uU3RyZWFtJywKCQkJCQkJY29tcHJlc3Npb25EZXNjcmlwdG9yLAoJCQkJCSk7CgkJCQl9IGVsc2UgewoJCQkJCWRlbGV0ZSAod2luZG93IGFzIHR5cGVvZiB3aW5kb3cgJiB7CgkJCQkJCUNvbXByZXNzaW9uU3RyZWFtPzogdHlwZW9mIENvbXByZXNzaW9uU3RyZWFtOwoJCQkJCX0pLkNvbXByZXNzaW9uU3RyZWFtOwoJCQkJfQoKCQkJCWNvbXByZXNzaW9uU3VwcHJlc3NlZCA9IGZhbHNlOwoJCQl9OwoKCQkJY29uc3QgaXNMaXZlS2l0UnRjU29ja2V0ID0gKHZhbHVlOiBzdHJpbmcgfCBVUkwpOiBib29sZWFuID0+IHsKCQkJCXRyeSB7CgkJCQkJY29uc3QgdXJsID0gbmV3IFVSTChTdHJpbmcodmFsdWUpLCB3aW5kb3cubG9jYXRpb24uaHJlZik7CgkJCQkJcmV0dXJuIC9cL3J0Y1wvdjFcLz8kLy50ZXN0KHVybC5wYXRobmFtZSk7CgkJCQl9IGNhdGNoIHsKCQkJCQlyZXR1cm4gZmFsc2U7CgkJCQl9CgkJCX07CgoJCQl3aW5kb3cuV2ViU29ja2V0ID0gbmV3IFByb3h5KE5hdGl2ZVdlYlNvY2tldCwgewoJCQkJY29uc3RydWN0KFRhcmdldCwgYXJncykgewoJCQkJCWNvbnN0IGlzTGl2ZUtpdFJ0YyA9IGlzTGl2ZUtpdFJ0Y1NvY2tldCgKCQkJCQkJYXJnc1swXSBhcyBzdHJpbmcgfCBVUkwsCgkJCQkJKTsKCgkJCQkJaWYgKGlzTGl2ZUtpdFJ0YykgewoJCQkJCQlyZXN0b3JlQ29tcHJlc3Npb25TdHJlYW0oKTsKCQkJCQl9CgoJCQkJCWxldCBzb2NrZXQ6IFdlYlNvY2tldDsKCgkJCQkJdHJ5IHsKCQkJCQkJc29ja2V0ID0gUmVmbGVjdC5jb25zdHJ1Y3QoVGFyZ2V0LCBhcmdzLCBUYXJnZXQpOwoJCQkJCX0gY2F0Y2ggKGVycm9yKSB7CgkJCQkJCWlmIChpc0xpdmVLaXRSdGMpIHsKCQkJCQkJCXN1cHByZXNzQ29tcHJlc3Npb25TdHJlYW0oKTsKCQkJCQkJfQoJCQkJCQl0aHJvdyBlcnJvcjsKCQkJCQl9CgoJCQkJCWlmIChpc0xpdmVLaXRSdGMpIHsKCQkJCQkJc29ja2V0LmFkZEV2ZW50TGlzdGVuZXIoCgkJCQkJCQknY2xvc2UnLAoJCQkJCQkJKCkgPT4gc3VwcHJlc3NDb21wcmVzc2lvblN0cmVhbSgpLAoJCQkJCQkJe29uY2U6IHRydWV9LAoJCQkJCQkpOwoJCQkJCX0KCgkJCQkJcmV0dXJuIHNvY2tldDsKCQkJCX0sCgkJCX0pIGFzIHR5cGVvZiBXZWJTb2NrZXQ7CgoJCQlzdXBwcmVzc0NvbXByZXNzaW9uU3RyZWFtKCk7CgoJCQljb25zb2xlLmluZm8oCgkJCQknW0ZsdXhlciBEZXNrdG9wXSBMaXZlS2l0IHB1Ymxpc2hlciBvZmZlci13aXRoLWpvaW4gZGlzYWJsZWQnLAoJCQkpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7Cmluc3RhbGxEaXNhYmxlTGl2ZUtpdE9mZmVyV2l0aEpvaW4oKTsK"
|
||||
).decode("utf-8")
|
||||
|
||||
data = data.replace(
|
||||
anchor,
|
||||
patch,
|
||||
1,
|
||||
)
|
||||
|
||||
path.write_text(
|
||||
data,
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
result = path.read_text(
|
||||
encoding="utf-8"
|
||||
)
|
||||
|
||||
if "installForceAllIceTransportPolicy" not in result:
|
||||
raise SystemExit(
|
||||
"WebRTC ICE policy patch verification failed"
|
||||
)
|
||||
|
||||
if "installDisableLiveKitOfferWithJoin" not in result:
|
||||
raise SystemExit(
|
||||
"LiveKit offer-with-join workaround verification failed"
|
||||
)
|
||||
|
||||
print(
|
||||
"Installed Electron WebRTC and LiveKit compatibility fixes"
|
||||
)
|
||||
PY
|
||||
|
||||
grep -n \
|
||||
-E 'installForceAllIceTransportPolicy|installDisableLiveKitOfferWithJoin|iceTransportPolicy forced to all|LiveKit publisher offer-with-join disabled' \
|
||||
fluxer-src/fluxer_desktop/src/preload/index.ts
|
||||
|
||||
- name: Install dependencies
|
||||
shell: bash
|
||||
run: |
|
||||
@@ -794,122 +941,6 @@ jobs:
|
||||
pnpm install --frozen-lockfile
|
||||
|
||||
|
||||
- name: Force LiveKit ICE policy to all
|
||||
shell: bash
|
||||
run: |
|
||||
set -euxo pipefail
|
||||
|
||||
cd fluxer-src
|
||||
|
||||
python3 <<'PY'
|
||||
from pathlib import Path
|
||||
import json
|
||||
import re
|
||||
|
||||
pnpm_root = Path("node_modules/.pnpm")
|
||||
|
||||
if not pnpm_root.is_dir():
|
||||
raise SystemExit(
|
||||
"pnpm node_modules directory not found"
|
||||
)
|
||||
|
||||
packages = sorted(
|
||||
path / "node_modules/livekit-client"
|
||||
for path in pnpm_root.glob(
|
||||
"livekit-client@*"
|
||||
)
|
||||
if (
|
||||
path / "node_modules/livekit-client"
|
||||
).is_dir()
|
||||
)
|
||||
|
||||
if not packages:
|
||||
raise SystemExit(
|
||||
"livekit-client package not found"
|
||||
)
|
||||
|
||||
pattern = re.compile(
|
||||
r"(iceTransportPolicy\s*=\s*['\"])"
|
||||
r"relay"
|
||||
r"(['\"])"
|
||||
)
|
||||
|
||||
total_replacements = 0
|
||||
|
||||
for package in packages:
|
||||
print(
|
||||
f"Patching LiveKit package: {package}"
|
||||
)
|
||||
|
||||
package_json = (
|
||||
package / "package.json"
|
||||
)
|
||||
|
||||
if package_json.is_file():
|
||||
package_info = json.loads(
|
||||
package_json.read_text(
|
||||
encoding="utf-8"
|
||||
)
|
||||
)
|
||||
|
||||
print(
|
||||
"livekit-client version:",
|
||||
package_info.get(
|
||||
"version",
|
||||
"unknown",
|
||||
),
|
||||
)
|
||||
|
||||
for path in package.rglob("*"):
|
||||
if (
|
||||
not path.is_file()
|
||||
or path.suffix
|
||||
not in {
|
||||
".ts",
|
||||
".js",
|
||||
".mjs",
|
||||
".cjs",
|
||||
}
|
||||
):
|
||||
continue
|
||||
|
||||
data = path.read_text(
|
||||
encoding="utf-8"
|
||||
)
|
||||
|
||||
patched, count = pattern.subn(
|
||||
r"\1all\2",
|
||||
data,
|
||||
)
|
||||
|
||||
if count == 0:
|
||||
continue
|
||||
|
||||
path.write_text(
|
||||
patched,
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
total_replacements += count
|
||||
|
||||
print(
|
||||
f"Patched {count} occurrence(s): "
|
||||
f"{path}"
|
||||
)
|
||||
|
||||
if total_replacements < 1:
|
||||
raise SystemExit(
|
||||
"LiveKit relay ICE policy "
|
||||
"assignment was not found"
|
||||
)
|
||||
|
||||
print(
|
||||
"Forced iceTransportPolicy=all "
|
||||
f"in {total_replacements} occurrence(s)"
|
||||
)
|
||||
PY
|
||||
|
||||
|
||||
- name: Build Fluxer Desktop
|
||||
shell: bash
|
||||
env:
|
||||
|
||||
Reference in new issue
Block a user