LiveKit Electron offer-with-join workaround v3 and change app update source
This commit is contained in:
1 file changed
+57
-12
@@ -240,7 +240,36 @@ jobs:
|
|||||||
-Pattern "sso.gandc.ru|will-redirect|allowTrustedOrSsoNavigation"
|
-Pattern "sso.gandc.ru|will-redirect|allowTrustedOrSsoNavigation"
|
||||||
|
|
||||||
|
|
||||||
- name: Apply Electron LiveKit compatibility workarounds
|
- name: Configure GSCORD update source
|
||||||
|
shell: powershell
|
||||||
|
run: |
|
||||||
|
$ErrorActionPreference = "Stop"
|
||||||
|
|
||||||
|
$PatchScript = [Text.Encoding]::UTF8.GetString(
|
||||||
|
[Convert]::FromBase64String(
|
||||||
|
"CmNvbnN0IGZzID0gcmVxdWlyZSgnZnMnKTsKCmNvbnN0IGRvd25sb2Fkc1BhdGggPSAnZmx1eGVyLXNyYy9mbHV4ZXJfZGVza3RvcC9zcmMvbWFpbi9VcGRhdGVyRG93bmxvYWRzLnRzJzsKY29uc3QgdXBkYXRlclBhdGggPSAnZmx1eGVyLXNyYy9mbHV4ZXJfZGVza3RvcC9zcmMvbWFpbi9VcGRhdGVyLnRzJzsKCmZ1bmN0aW9uIHJlcGxhY2VPbmNlKGlucHV0LCBwYXR0ZXJuLCByZXBsYWNlbWVudCwgbGFiZWwpIHsKICBjb25zdCBvdXRwdXQgPSBpbnB1dC5yZXBsYWNlKHBhdHRlcm4sIHJlcGxhY2VtZW50KTsKICBpZiAob3V0cHV0ID09PSBpbnB1dCkgewogICAgdGhyb3cgbmV3IEVycm9yKGBVbmFibGUgdG8gcGF0Y2ggJHtsYWJlbH1gKTsKICB9CiAgcmV0dXJuIG91dHB1dDsKfQoKbGV0IGRvd25sb2FkcyA9IGZzLnJlYWRGaWxlU3luYyhkb3dubG9hZHNQYXRoLCAndXRmOCcpOwoKZG93bmxvYWRzID0gcmVwbGFjZU9uY2UoCiAgZG93bmxvYWRzLAogIC9jb25zdCBQS0dTX0JBU0VfVVJMID0gJ2h0dHBzOlwvXC9wa2dzXC5mbHV4ZXJcLmNvbSc7XHI/XG5leHBvcnQgY29uc3QgVVBEQVRFX0JBU0VfVVJMID0gYFwkXHtQS0dTX0JBU0VfVVJMXH1cL2Rlc2t0b3BcL1wkXHtCVUlMRF9DSEFOTkVMXH1cL1wkXHtwcm9jZXNzXC5wbGF0Zm9ybVx9XC9cJFx7REVTS1RPUF9ET1dOTE9BRF9BUkNIXH1gO1xyP1xuZXhwb3J0IGNvbnN0IERPV05MT0FEX1BBR0VfVVJMID1ccj9cblxzKkJVSUxEX0NIQU5ORUwgPT09ICdjYW5hcnknIFw/ICdodHRwczpcL1wvY2FuYXJ5XC5mbHV4ZXJcLmFwcFwvZG93bmxvYWQnIDogJ2h0dHBzOlwvXC9mbHV4ZXJcLmFwcFwvZG93bmxvYWQnOy8sCiAgYGV4cG9ydCBjb25zdCBVUERBVEVfQkFTRV9VUkwgPSAnaHR0cHM6Ly9naXQuZ2FuZGMucnUvZ3Njb3JkL2dzY29yZC1kZXNrdG9wL3JlbGVhc2VzJzsKZXhwb3J0IGNvbnN0IERPV05MT0FEX1BBR0VfVVJMID0gVVBEQVRFX0JBU0VfVVJMO2AsCiAgJ1VwZGF0ZXJEb3dubG9hZHMgdXBkYXRlIHNvdXJjZScsCik7Cgpkb3dubG9hZHMgPSByZXBsYWNlT25jZSgKICBkb3dubG9hZHMsCiAgL2V4cG9ydCBmdW5jdGlvbiBidWlsZE1hbnVhbFZlcnNpb25Eb3dubG9hZFVybFwodmVyc2lvbjogc3RyaW5nLCBmb3JtYXQ6IE1hbnVhbERlc2t0b3BGb3JtYXRcKTogc3RyaW5nIFx7XHI/XG5ccypyZXR1cm4gYFwkXHtVUERBVEVfQkFTRV9VUkxcfVwvXCRce3ZlcnNpb25cfVwvXCRce2Zvcm1hdFx9YDtccj9cblx9LywKICBgZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkTWFudWFsVmVyc2lvbkRvd25sb2FkVXJsKHZlcnNpb246IHN0cmluZywgZm9ybWF0OiBNYW51YWxEZXNrdG9wRm9ybWF0KTogc3RyaW5nIHsKCXZvaWQgdmVyc2lvbjsKCXZvaWQgZm9ybWF0OwoJcmV0dXJuIERPV05MT0FEX1BBR0VfVVJMOwp9YCwKICAnbWFudWFsIGZhbGxiYWNrIFVSTCcsCik7Cgpkb3dubG9hZHMgPSByZXBsYWNlT25jZSgKICBkb3dubG9hZHMsCiAgL2V4cG9ydCBmdW5jdGlvbiBnZXRNYW51YWxEb3dubG9hZE9wdGlvbnNcKGluZm86IE1hbnVhbExhdGVzdEluZm9cKTogQXJyYXk8VXBkYXRlckRvd25sb2FkT3B0aW9uPiBce1tcc1xTXSo/XHI/XG5cfVxyP1xuZXhwb3J0IGZ1bmN0aW9uIGdldE1hbnVhbERvd25sb2FkVXJsLywKICBgZXhwb3J0IGZ1bmN0aW9uIGdldE1hbnVhbERvd25sb2FkT3B0aW9ucyhpbmZvOiBNYW51YWxMYXRlc3RJbmZvKTogQXJyYXk8VXBkYXRlckRvd25sb2FkT3B0aW9uPiB7CglpZiAocHJvY2Vzcy5wbGF0Zm9ybSAhPT0gJ2xpbnV4JykgewoJCXJldHVybiBbXTsKCX0KCXJldHVybiBnZXRNYW51YWxEb3dubG9hZEZvcm1hdFByZWZlcmVuY2UoKQoJCS5maWx0ZXIoaXNMaW51eE1hbnVhbERlc2t0b3BGb3JtYXQpCgkJLmZsYXRNYXAoKGZvcm1hdCkgPT4gewoJCQljb25zdCBmaWxlID0gaW5mby5maWxlc1tmb3JtYXRdOwoJCQlpZiAoIWZpbGU/LnVybCkgewoJCQkJcmV0dXJuIFtdOwoJCQl9CgkJCXJldHVybiBbCgkJCQl7CgkJCQkJZm9ybWF0LAoJCQkJCWxhYmVsOiBMSU5VWF9NQU5VQUxfRk9STUFUX0xBQkVMU1tmb3JtYXRdLAoJCQkJCXVybDogZmlsZS51cmwsCgkJCQkJc3VnZ2VzdGVkTmFtZTogZ2V0TWFudWFsVXBkYXRlU3VnZ2VzdGVkTmFtZShmb3JtYXQsIGluZm8udmVyc2lvbiksCgkJCQkJc2hhMjU2OiBmaWxlLnNoYTI1NiwKCQkJCX0sCgkJCV07CgkJfSk7Cn0KZXhwb3J0IGZ1bmN0aW9uIGdldE1hbnVhbERvd25sb2FkVXJsYCwKICAnbWFudWFsIGRvd25sb2FkIGFzc2V0IFVSTHMnLAopOwoKaWYgKGRvd25sb2Fkcy5pbmNsdWRlcygncGtncy5mbHV4ZXIuY29tJykpIHsKICB0aHJvdyBuZXcgRXJyb3IoJ3BrZ3MuZmx1eGVyLmNvbSBpcyBzdGlsbCBwcmVzZW50IGluIFVwZGF0ZXJEb3dubG9hZHMudHMnKTsKfQppZiAoIWRvd25sb2Fkcy5pbmNsdWRlcygnaHR0cHM6Ly9naXQuZ2FuZGMucnUvZ3Njb3JkL2dzY29yZC1kZXNrdG9wL3JlbGVhc2VzJykpIHsKICB0aHJvdyBuZXcgRXJyb3IoJ0dTQ09SRCByZWxlYXNlcyBVUkwgd2FzIG5vdCBpbnN0YWxsZWQnKTsKfQoKZnMud3JpdGVGaWxlU3luYyhkb3dubG9hZHNQYXRoLCBkb3dubG9hZHMsICd1dGY4Jyk7CgpsZXQgdXBkYXRlciA9IGZzLnJlYWRGaWxlU3luYyh1cGRhdGVyUGF0aCwgJ3V0ZjgnKTsKCmNvbnN0IGdpdGVhRmV0Y2hGdW5jdGlvbiA9IGBhc3luYyBmdW5jdGlvbiBmZXRjaE1hbnVhbExhdGVzdChvcHRpb25zOiB7Zm9yY2VSZWZyZXNoPzogYm9vbGVhbn0gPSB7fSk6IFByb21pc2U8TWFudWFsTGF0ZXN0SW5mbz4gewoJY29uc3Qgbm93ID0gRGF0ZS5ub3coKTsKCWlmICghb3B0aW9ucy5mb3JjZVJlZnJlc2ggJiYgbWFudWFsTGF0ZXN0Q2FjaGUgJiYgbm93IC0gbWFudWFsTGF0ZXN0Q2FjaGUuYXQgPCBNQU5VQUxfQ0FDSEVfVFRMX01TKSB7CgkJcmV0dXJuIG1hbnVhbExhdGVzdENhY2hlLmluZm87Cgl9CgoJY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmZXRjaCgKCQknaHR0cHM6Ly9naXQuZ2FuZGMucnUvYXBpL3YxL3JlcG9zL2dzY29yZC9nc2NvcmQtZGVza3RvcC9yZWxlYXNlcy9sYXRlc3QnLAoJCXsKCQkJY2FjaGU6ICduby1zdG9yZScsCgkJCWhlYWRlcnM6IHsKCQkJCUFjY2VwdDogJ2FwcGxpY2F0aW9uL2pzb24nLAoJCQkJJ0NhY2hlLUNvbnRyb2wnOiAnbm8tY2FjaGUnLAoJCQkJUHJhZ21hOiAnbm8tY2FjaGUnLAoJCQl9LAoJCX0sCgkpOwoKCWlmICghcmVzcG9uc2Uub2spIHsKCQl0aHJvdyBuZXcgRXJyb3IoXGBHU0NPUkQgbGF0ZXN0IHJlbGVhc2UgcmVxdWVzdCBmYWlsZWQ6IFwke3Jlc3BvbnNlLnN0YXR1c31cYCk7Cgl9CgoJY29uc3QgcGF5bG9hZCA9IChhd2FpdCByZXNwb25zZS5qc29uKCkpIGFzIHsKCQl0YWdfbmFtZT86IHVua25vd247CgkJcHVibGlzaGVkX2F0PzogdW5rbm93bjsKCQljcmVhdGVkX2F0PzogdW5rbm93bjsKCQlhc3NldHM/OiB1bmtub3duOwoJfTsKCglpZiAodHlwZW9mIHBheWxvYWQudGFnX25hbWUgIT09ICdzdHJpbmcnIHx8IHBheWxvYWQudGFnX25hbWUudHJpbSgpLmxlbmd0aCA9PT0gMCkgewoJCXRocm93IG5ldyBFcnJvcignR1NDT1JEIGxhdGVzdCByZWxlYXNlIHJlc3BvbnNlIG1pc3NpbmcgdGFnX25hbWUnKTsKCX0KCgljb25zdCB2ZXJzaW9uID0gcGF5bG9hZC50YWdfbmFtZS50cmltKCkucmVwbGFjZSgvXnYvLCAnJyk7Cgljb25zdCBhc3NldHMgPSBBcnJheS5pc0FycmF5KHBheWxvYWQuYXNzZXRzKSA/IHBheWxvYWQuYXNzZXRzIDogW107Cgljb25zdCBmaWxlLine 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
|
shell: powershell
|
||||||
run: |
|
run: |
|
||||||
$ErrorActionPreference = "Stop"
|
$ErrorActionPreference = "Stop"
|
||||||
@@ -264,7 +293,7 @@ jobs:
|
|||||||
|
|
||||||
$Patch = [Text.Encoding]::UTF8.GetString(
|
$Patch = [Text.Encoding]::UTF8.GetString(
|
||||||
[Convert]::FromBase64String(
|
[Convert]::FromBase64String(
|
||||||
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKZnVuY3Rpb24gaW5zdGFsbExpdmVLaXRFbGVjdHJvbk9mZmVyV2l0aEpvaW5Xb3JrYXJvdW5kKCk6IHZvaWQgewoJY29udGV4dEJyaWRnZS5leGVjdXRlSW5NYWluV29ybGQoewoJCWZ1bmM6ICgpID0+IHsKCQkJY29uc3Qgb3JpZ2luYWxVc2VyQWdlbnQgPSBuYXZpZ2F0b3IudXNlckFnZW50OwoKCQkJaWYgKG9yaWdpbmFsVXNlckFnZW50LmluY2x1ZGVzKCdGaXJlZm94LycpKSB7CgkJCQlyZXR1cm47CgkJCX0KCgkJCU9iamVjdC5kZWZpbmVQcm9wZXJ0eShuYXZpZ2F0b3IsICd1c2VyQWdlbnQnLCB7CgkJCQljb25maWd1cmFibGU6IHRydWUsCgkJCQlnZXQ6ICgpID0+IGAke29yaWdpbmFsVXNlckFnZW50fSBGaXJlZm94LzE1MC4wYCwKCQkJfSk7CgoJCQljb25zb2xlLmluZm8oCgkJCQknW0ZsdXhlciBEZXNrdG9wXSBMaXZlS2l0IEVsZWN0cm9uIG9mZmVyLXdpdGgtam9pbiB3b3JrYXJvdW5kIGVuYWJsZWQnLAoJCQkpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7Cmluc3RhbGxMaXZlS2l0RWxlY3Ryb25PZmZlcldpdGhKb2luV29ya2Fyb3VuZCgpOwo="
|
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKZnVuY3Rpb24gaW5zdGFsbERpc2FibGVMaXZlS2l0T2ZmZXJXaXRoSm9pbigpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVdlYlNvY2tldCA9IHdpbmRvdy5XZWJTb2NrZXQ7CgkJCWNvbnN0IGNvbXByZXNzaW9uRGVzY3JpcHRvciA9IE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoCgkJCQl3aW5kb3csCgkJCQknQ29tcHJlc3Npb25TdHJlYW0nLAoJCQkpOwoKCQkJbGV0IGNvbXByZXNzaW9uU3VwcHJlc3NlZCA9IGZhbHNlOwoKCQkJY29uc3Qgc3VwcHJlc3NDb21wcmVzc2lvblN0cmVhbSA9ICgpOiB2b2lkID0+IHsKCQkJCWlmIChjb21wcmVzc2lvblN1cHByZXNzZWQpIHsKCQkJCQlyZXR1cm47CgkJCQl9CgoJCQkJT2JqZWN0LmRlZmluZVByb3BlcnR5KHdpbmRvdywgJ0NvbXByZXNzaW9uU3RyZWFtJywgewoJCQkJCWNvbmZpZ3VyYWJsZTogdHJ1ZSwKCQkJCQl3cml0YWJsZTogdHJ1ZSwKCQkJCQl2YWx1ZTogdW5kZWZpbmVkLAoJCQkJfSk7CgoJCQkJY29tcHJlc3Npb25TdXBwcmVzc2VkID0gdHJ1ZTsKCQkJfTsKCgkJCWNvbnN0IHJlc3RvcmVDb21wcmVzc2lvblN0cmVhbSA9ICgpOiB2b2lkID0+IHsKCQkJCWlmICghY29tcHJlc3Npb25TdXBwcmVzc2VkKSB7CgkJCQkJcmV0dXJuOwoJCQkJfQoKCQkJCWlmIChjb21wcmVzc2lvbkRlc2NyaXB0b3IpIHsKCQkJCQlPYmplY3QuZGVmaW5lUHJvcGVydHkoCgkJCQkJCXdpbmRvdywKCQkJCQkJJ0NvbXByZXNzaW9uU3RyZWFtJywKCQkJCQkJY29tcHJlc3Npb25EZXNjcmlwdG9yLAoJCQkJCSk7CgkJCQl9IGVsc2UgewoJCQkJCWRlbGV0ZSAod2luZG93IGFzIHR5cGVvZiB3aW5kb3cgJiB7CgkJCQkJCUNvbXByZXNzaW9uU3RyZWFtPzogdHlwZW9mIENvbXByZXNzaW9uU3RyZWFtOwoJCQkJCX0pLkNvbXByZXNzaW9uU3RyZWFtOwoJCQkJfQoKCQkJCWNvbXByZXNzaW9uU3VwcHJlc3NlZCA9IGZhbHNlOwoJCQl9OwoKCQkJY29uc3QgaXNMaXZlS2l0UnRjU29ja2V0ID0gKHZhbHVlOiBzdHJpbmcgfCBVUkwpOiBib29sZWFuID0+IHsKCQkJCXRyeSB7CgkJCQkJY29uc3QgdXJsID0gbmV3IFVSTChTdHJpbmcodmFsdWUpLCB3aW5kb3cubG9jYXRpb24uaHJlZik7CgkJCQkJcmV0dXJuIC9cL3J0Y1wvdjFcLz8kLy50ZXN0KHVybC5wYXRobmFtZSk7CgkJCQl9IGNhdGNoIHsKCQkJCQlyZXR1cm4gZmFsc2U7CgkJCQl9CgkJCX07CgoJCQl3aW5kb3cuV2ViU29ja2V0ID0gbmV3IFByb3h5KE5hdGl2ZVdlYlNvY2tldCwgewoJCQkJY29uc3RydWN0KFRhcmdldCwgYXJncykgewoJCQkJCWNvbnN0IGlzTGl2ZUtpdFJ0YyA9IGlzTGl2ZUtpdFJ0Y1NvY2tldCgKCQkJCQkJYXJnc1swXSBhcyBzdHJpbmcgfCBVUkwsCgkJCQkJKTsKCgkJCQkJaWYgKGlzTGl2ZUtpdFJ0YykgewoJCQkJCQlyZXN0b3JlQ29tcHJlc3Npb25TdHJlYW0oKTsKCQkJCQl9CgoJCQkJCWxldCBzb2NrZXQ6IFdlYlNvY2tldDsKCgkJCQkJdHJ5IHsKCQkJCQkJc29ja2V0ID0gUmVmbGVjdC5jb25zdHJ1Y3QoVGFyZ2V0LCBhcmdzLCBUYXJnZXQpOwoJCQkJCX0gY2F0Y2ggKGVycm9yKSB7CgkJCQkJCWlmIChpc0xpdmVLaXRSdGMpIHsKCQkJCQkJCXN1cHByZXNzQ29tcHJlc3Npb25TdHJlYW0oKTsKCQkJCQkJfQoJCQkJCQl0aHJvdyBlcnJvcjsKCQkJCQl9CgoJCQkJCWlmIChpc0xpdmVLaXRSdGMpIHsKCQkJCQkJc29ja2V0LmFkZEV2ZW50TGlzdGVuZXIoCgkJCQkJCQknY2xvc2UnLAoJCQkJCQkJKCkgPT4gc3VwcHJlc3NDb21wcmVzc2lvblN0cmVhbSgpLAoJCQkJCQkJe29uY2U6IHRydWV9LAoJCQkJCQkpOwoJCQkJCX0KCgkJCQkJcmV0dXJuIHNvY2tldDsKCQkJCX0sCgkJCX0pIGFzIHR5cGVvZiBXZWJTb2NrZXQ7CgoJCQlzdXBwcmVzc0NvbXByZXNzaW9uU3RyZWFtKCk7CgoJCQljb25zb2xlLmluZm8oCgkJCQknW0ZsdXhlciBEZXNrdG9wXSBMaXZlS2l0IHB1Ymxpc2hlciBvZmZlci13aXRoLWpvaW4gZGlzYWJsZWQnLAoJCQkpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7Cmluc3RhbGxEaXNhYmxlTGl2ZUtpdE9mZmVyV2l0aEpvaW4oKTsK"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -285,15 +314,15 @@ jobs:
|
|||||||
throw "WebRTC ICE policy patch verification failed"
|
throw "WebRTC ICE policy patch verification failed"
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($Result -notmatch "installLiveKitElectronOfferWithJoinWorkaround") {
|
if ($Result -notmatch "installDisableLiveKitOfferWithJoin") {
|
||||||
throw "LiveKit Electron workaround verification failed"
|
throw "LiveKit offer-with-join workaround verification failed"
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host "Installed preload WebRTC ICE policy override"
|
Write-Host "Installed Electron WebRTC and LiveKit compatibility fixes"
|
||||||
|
|
||||||
Select-String `
|
Select-String `
|
||||||
-Path $Path `
|
-Path $Path `
|
||||||
-Pattern "installForceAllIceTransportPolicy|installLiveKitElectronOfferWithJoinWorkaround|iceTransportPolicy forced to all|offer-with-join workaround enabled"
|
-Pattern "installForceAllIceTransportPolicy|installDisableLiveKitOfferWithJoin|iceTransportPolicy forced to all|LiveKit publisher offer-with-join disabled"
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
shell: powershell
|
shell: powershell
|
||||||
@@ -813,7 +842,23 @@ jobs:
|
|||||||
fluxer-src/fluxer_desktop/src/main/Window.ts
|
fluxer-src/fluxer_desktop/src/main/Window.ts
|
||||||
|
|
||||||
|
|
||||||
- name: Apply Electron LiveKit compatibility workarounds
|
- name: Configure GSCORD update source
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euxo pipefail
|
||||||
|
|
||||||
|
PATCH_PATH="$(mktemp --suffix=.cjs)"
|
||||||
|
|
||||||
|
printf '%s' 'CmNvbnN0IGZzID0gcmVxdWlyZSgnZnMnKTsKCmNvbnN0IGRvd25sb2Fkc1BhdGggPSAnZmx1eGVyLXNyYy9mbHV4ZXJfZGVza3RvcC9zcmMvbWFpbi9VcGRhdGVyRG93bmxvYWRzLnRzJzsKY29uc3QgdXBkYXRlclBhdGggPSAnZmx1eGVyLXNyYy9mbHV4ZXJfZGVza3RvcC9zcmMvbWFpbi9VcGRhdGVyLnRzJzsKCmZ1bmN0aW9uIHJlcGxhY2VPbmNlKGlucHV0LCBwYXR0ZXJuLCByZXBsYWNlbWVudCwgbGFiZWwpIHsKICBjb25zdCBvdXRwdXQgPSBpbnB1dC5yZXBsYWNlKHBhdHRlcm4sIHJlcGxhY2VtZW50KTsKICBpZiAob3V0cHV0ID09PSBpbnB1dCkgewogICAgdGhyb3cgbmV3IEVycm9yKGBVbmFibGUgdG8gcGF0Y2ggJHtsYWJlbH1gKTsKICB9CiAgcmV0dXJuIG91dHB1dDsKfQoKbGV0IGRvd25sb2FkcyA9IGZzLnJlYWRGaWxlU3luYyhkb3dubG9hZHNQYXRoLCAndXRmOCcpOwoKZG93bmxvYWRzID0gcmVwbGFjZU9uY2UoCiAgZG93bmxvYWRzLAogIC9jb25zdCBQS0dTX0JBU0VfVVJMID0gJ2h0dHBzOlwvXC9wa2dzXC5mbHV4ZXJcLmNvbSc7XHI/XG5leHBvcnQgY29uc3QgVVBEQVRFX0JBU0VfVVJMID0gYFwkXHtQS0dTX0JBU0VfVVJMXH1cL2Rlc2t0b3BcL1wkXHtCVUlMRF9DSEFOTkVMXH1cL1wkXHtwcm9jZXNzXC5wbGF0Zm9ybVx9XC9cJFx7REVTS1RPUF9ET1dOTE9BRF9BUkNIXH1gO1xyP1xuZXhwb3J0IGNvbnN0IERPV05MT0FEX1BBR0VfVVJMID1ccj9cblxzKkJVSUxEX0NIQU5ORUwgPT09ICdjYW5hcnknIFw/ICdodHRwczpcL1wvY2FuYXJ5XC5mbHV4ZXJcLmFwcFwvZG93bmxvYWQnIDogJ2h0dHBzOlwvXC9mbHV4ZXJcLmFwcFwvZG93bmxvYWQnOy8sCiAgYGV4cG9ydCBjb25zdCBVUERBVEVfQkFTRV9VUkwgPSAnaHR0cHM6Ly9naXQuZ2FuZGMucnUvZ3Njb3JkL2dzY29yZC1kZXNrdG9wL3JlbGVhc2VzJzsKZXhwb3J0IGNvbnN0IERPV05MT0FEX1BBR0VfVVJMID0gVVBEQVRFX0JBU0VfVVJMO2AsCiAgJ1VwZGF0ZXJEb3dubG9hZHMgdXBkYXRlIHNvdXJjZScsCik7Cgpkb3dubG9hZHMgPSByZXBsYWNlT25jZSgKICBkb3dubG9hZHMsCiAgL2V4cG9ydCBmdW5jdGlvbiBidWlsZE1hbnVhbFZlcnNpb25Eb3dubG9hZFVybFwodmVyc2lvbjogc3RyaW5nLCBmb3JtYXQ6IE1hbnVhbERlc2t0b3BGb3JtYXRcKTogc3RyaW5nIFx7XHI/XG5ccypyZXR1cm4gYFwkXHtVUERBVEVfQkFTRV9VUkxcfVwvXCRce3ZlcnNpb25cfVwvXCRce2Zvcm1hdFx9YDtccj9cblx9LywKICBgZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkTWFudWFsVmVyc2lvbkRvd25sb2FkVXJsKHZlcnNpb246IHN0cmluZywgZm9ybWF0OiBNYW51YWxEZXNrdG9wRm9ybWF0KTogc3RyaW5nIHsKCXZvaWQgdmVyc2lvbjsKCXZvaWQgZm9ybWF0OwoJcmV0dXJuIERPV05MT0FEX1BBR0VfVVJMOwp9YCwKICAnbWFudWFsIGZhbGxiYWNrIFVSTCcsCik7Cgpkb3dubG9hZHMgPSByZXBsYWNlT25jZSgKICBkb3dubG9hZHMsCiAgL2V4cG9ydCBmdW5jdGlvbiBnZXRNYW51YWxEb3dubG9hZE9wdGlvbnNcKGluZm86IE1hbnVhbExhdGVzdEluZm9cKTogQXJyYXk8VXBkYXRlckRvd25sb2FkT3B0aW9uPiBce1tcc1xTXSo/XHI/XG5cfVxyP1xuZXhwb3J0IGZ1bmN0aW9uIGdldE1hbnVhbERvd25sb2FkVXJsLywKICBgZXhwb3J0IGZ1bmN0aW9uIGdldE1hbnVhbERvd25sb2FkT3B0aW9ucyhpbmZvOiBNYW51YWxMYXRlc3RJbmZvKTogQXJyYXk8VXBkYXRlckRvd25sb2FkT3B0aW9uPiB7CglpZiAocHJvY2Vzcy5wbGF0Zm9ybSAhPT0gJ2xpbnV4JykgewoJCXJldHVybiBbXTsKCX0KCXJldHVybiBnZXRNYW51YWxEb3dubG9hZEZvcm1hdFByZWZlcmVuY2UoKQoJCS5maWx0ZXIoaXNMaW51eE1hbnVhbERlc2t0b3BGb3JtYXQpCgkJLmZsYXRNYXAoKGZvcm1hdCkgPT4gewoJCQljb25zdCBmaWxlID0gaW5mby5maWxlc1tmb3JtYXRdOwoJCQlpZiAoIWZpbGU/LnVybCkgewoJCQkJcmV0dXJuIFtdOwoJCQl9CgkJCXJldHVybiBbCgkJCQl7CgkJCQkJZm9ybWF0LAoJCQkJCWxhYmVsOiBMSU5VWF9NQU5VQUxfRk9STUFUX0xBQkVMU1tmb3JtYXRdLAoJCQkJCXVybDogZmlsZS51cmwsCgkJCQkJc3VnZ2VzdGVkTmFtZTogZ2V0TWFudWFsVXBkYXRlU3VnZ2VzdGVkTmFtZShmb3JtYXQsIGluZm8udmVyc2lvbiksCgkJCQkJc2hhMjU2OiBmaWxlLnNoYTI1NiwKCQkJCX0sCgkJCV07CgkJfSk7Cn0KZXhwb3J0IGZ1bmN0aW9uIGdldE1hbnVhbERvd25sb2FkVXJsYCwKICAnbWFudWFsIGRvd25sb2FkIGFzc2V0IFVSTHMnLAopOwoKaWYgKGRvd25sb2Fkcy5pbmNsdWRlcygncGtncy5mbHV4ZXIuY29tJykpIHsKICB0aHJvdyBuZXcgRXJyb3IoJ3BrZ3MuZmx1eGVyLmNvbSBpcyBzdGlsbCBwcmVzZW50IGluIFVwZGF0ZXJEb3dubG9hZHMudHMnKTsKfQppZiAoIWRvd25sb2Fkcy5pbmNsdWRlcygnaHR0cHM6Ly9naXQuZ2FuZGMucnUvZ3Njb3JkL2dzY29yZC1kZXNrdG9wL3JlbGVhc2VzJykpIHsKICB0aHJvdyBuZXcgRXJyb3IoJ0dTQ09SRCByZWxlYXNlcyBVUkwgd2FzIG5vdCBpbnN0YWxsZWQnKTsKfQoKZnMud3JpdGVGaWxlU3luYyhkb3dubG9hZHNQYXRoLCBkb3dubG9hZHMsICd1dGY4Jyk7CgpsZXQgdXBkYXRlciA9IGZzLnJlYWRGaWxlU3luYyh1cGRhdGVyUGF0aCwgJ3V0ZjgnKTsKCmNvbnN0IGdpdGVhRmV0Y2hGdW5jdGlvbiA9IGBhc3luYyBmdW5jdGlvbiBmZXRjaE1hbnVhbExhdGVzdChvcHRpb25zOiB7Zm9yY2VSZWZyZXNoPzogYm9vbGVhbn0gPSB7fSk6IFByb21pc2U8TWFudWFsTGF0ZXN0SW5mbz4gewoJY29uc3Qgbm93ID0gRGF0ZS5ub3coKTsKCWlmICghb3B0aW9ucy5mb3JjZVJlZnJlc2ggJiYgbWFudWFsTGF0ZXN0Q2FjaGUgJiYgbm93IC0gbWFudWFsTGF0ZXN0Q2FjaGUuYXQgPCBNQU5VQUxfQ0FDSEVfVFRMX01TKSB7CgkJcmV0dXJuIG1hbnVhbExhdGVzdENhY2hlLmluZm87Cgl9CgoJY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmZXRjaCgKCQknaHR0cHM6Ly9naXQuZ2FuZGMucnUvYXBpL3YxL3JlcG9zL2dzY29yZC9nc2NvcmQtZGVza3RvcC9yZWxlYXNlcy9sYXRlc3QnLAoJCXsKCQkJY2FjaGU6ICduby1zdG9yZScsCgkJCWhlYWRlcnM6IHsKCQkJCUFjY2VwdDogJ2FwcGxpY2F0aW9uL2pzb24nLAoJCQkJJ0NhY2hlLUNvbnRyb2wnOiAnbm8tY2FjaGUnLAoJCQkJUHJhZ21hOiAnbm8tY2FjaGUnLAoJCQl9LAoJCX0sCgkpOwoKCWlmICghcmVzcG9uc2Uub2spIHsKCQl0aHJvdyBuZXcgRXJyb3IoXGBHU0NPUkQgbGF0ZXN0IHJlbGVhc2UgcmVxdWVzdCBmYWlsZWQ6IFwke3Jlc3BvbnNlLnN0YXR1c31cYCk7Cgl9CgoJY29uc3QgcGF5bG9hZCA9IChhd2FpdCByZXNwb25zZS5qc29uKCkpIGFzIHsKCQl0YWdfbmFtZT86IHVua25vd247CgkJcHVibGlzaGVkX2F0PzogdW5rbm93bjsKCQljcmVhdGVkX2F0PzogdW5rbm93bjsKCQlhc3NldHM/OiB1bmtub3duOwoJfTsKCglpZiAodHlwZW9mIHBheWxvYWQudGFnX25hbWUgIT09ICdzdHJpbmcnIHx8IHBheWxvYWQudGFnX25hbWUudHJpbSgpLmxlbmd0aCA9PT0gMCkgewoJCXRocm93IG5ldyBFcnJvcignR1NDT1JEIGxhdGVzdCByZWxlYXNlIHJlc3BvbnNlIG1pc3NpbmcgdGFnX25hbWUnKTsKCX0KCgljb25zdCB2ZXJzaW9uID0gcGF5bG9hZC50YWdfbmFtZS50cmltKCkucmVwbGFjZSgvXnYvLCAnJyk7Cgljb25zdCBhc3NldHMgPSBBcnJheS5pc0FycmF5KHBheWxvYWQuYXNzZXRzKSA/IHBheWxvYWQuYXNzZXRzIDogW107Cgljb25zLine 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
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euxo pipefail
|
set -euxo pipefail
|
||||||
@@ -849,7 +894,7 @@ jobs:
|
|||||||
)
|
)
|
||||||
|
|
||||||
patch = base64.b64decode(
|
patch = base64.b64decode(
|
||||||
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKZnVuY3Rpb24gaW5zdGFsbExpdmVLaXRFbGVjdHJvbk9mZmVyV2l0aEpvaW5Xb3JrYXJvdW5kKCk6IHZvaWQgewoJY29udGV4dEJyaWRnZS5leGVjdXRlSW5NYWluV29ybGQoewoJCWZ1bmM6ICgpID0+IHsKCQkJY29uc3Qgb3JpZ2luYWxVc2VyQWdlbnQgPSBuYXZpZ2F0b3IudXNlckFnZW50OwoKCQkJaWYgKG9yaWdpbmFsVXNlckFnZW50LmluY2x1ZGVzKCdGaXJlZm94LycpKSB7CgkJCQlyZXR1cm47CgkJCX0KCgkJCU9iamVjdC5kZWZpbmVQcm9wZXJ0eShuYXZpZ2F0b3IsICd1c2VyQWdlbnQnLCB7CgkJCQljb25maWd1cmFibGU6IHRydWUsCgkJCQlnZXQ6ICgpID0+IGAke29yaWdpbmFsVXNlckFnZW50fSBGaXJlZm94LzE1MC4wYCwKCQkJfSk7CgoJCQljb25zb2xlLmluZm8oCgkJCQknW0ZsdXhlciBEZXNrdG9wXSBMaXZlS2l0IEVsZWN0cm9uIG9mZmVyLXdpdGgtam9pbiB3b3JrYXJvdW5kIGVuYWJsZWQnLAoJCQkpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7Cmluc3RhbGxMaXZlS2l0RWxlY3Ryb25PZmZlcldpdGhKb2luV29ya2Fyb3VuZCgpOwo="
|
"aW1wb3J0IHtjb250ZXh0QnJpZGdlLCBpcGNSZW5kZXJlciwgd2ViRnJhbWV9IGZyb20gJ2VsZWN0cm9uJzsKCmZ1bmN0aW9uIGluc3RhbGxGb3JjZUFsbEljZVRyYW5zcG9ydFBvbGljeSgpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVJUQ1BlZXJDb25uZWN0aW9uID0gd2luZG93LlJUQ1BlZXJDb25uZWN0aW9uOwoKCQkJaWYgKHR5cGVvZiBOYXRpdmVSVENQZWVyQ29ubmVjdGlvbiAhPT0gJ2Z1bmN0aW9uJykgewoJCQkJcmV0dXJuOwoJCQl9CgoJCQl3aW5kb3cuUlRDUGVlckNvbm5lY3Rpb24gPSBuZXcgUHJveHkoTmF0aXZlUlRDUGVlckNvbm5lY3Rpb24sIHsKCQkJCWNvbnN0cnVjdChUYXJnZXQsIGFyZ3MsIG5ld1RhcmdldCkgewoJCQkJCWNvbnN0IGNvbmZpZyA9IGFyZ3NbMF0gYXMgUlRDQ29uZmlndXJhdGlvbiB8IHVuZGVmaW5lZDsKCgkJCQkJaWYgKGNvbmZpZz8uaWNlVHJhbnNwb3J0UG9saWN5ID09PSAncmVsYXknKSB7CgkJCQkJCWFyZ3NbMF0gPSB7CgkJCQkJCQkuLi5jb25maWcsCgkJCQkJCQlpY2VUcmFuc3BvcnRQb2xpY3k6ICdhbGwnLAoJCQkJCQl9OwoJCQkJCX0KCgkJCQkJcmV0dXJuIFJlZmxlY3QuY29uc3RydWN0KFRhcmdldCwgYXJncywgbmV3VGFyZ2V0KTsKCQkJCX0sCgkJCX0pOwoKCQkJY29uc29sZS5pbmZvKCdbRmx1eGVyIERlc2t0b3BdIFdlYlJUQyBpY2VUcmFuc3BvcnRQb2xpY3kgZm9yY2VkIHRvIGFsbCcpOwoJCX0sCgl9KTsKfQoKZnVuY3Rpb24gaW5zdGFsbERpc2FibGVMaXZlS2l0T2ZmZXJXaXRoSm9pbigpOiB2b2lkIHsKCWNvbnRleHRCcmlkZ2UuZXhlY3V0ZUluTWFpbldvcmxkKHsKCQlmdW5jOiAoKSA9PiB7CgkJCWNvbnN0IE5hdGl2ZVdlYlNvY2tldCA9IHdpbmRvdy5XZWJTb2NrZXQ7CgkJCWNvbnN0IGNvbXByZXNzaW9uRGVzY3JpcHRvciA9IE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoCgkJCQl3aW5kb3csCgkJCQknQ29tcHJlc3Npb25TdHJlYW0nLAoJCQkpOwoKCQkJbGV0IGNvbXByZXNzaW9uU3VwcHJlc3NlZCA9IGZhbHNlOwoKCQkJY29uc3Qgc3VwcHJlc3NDb21wcmVzc2lvblN0cmVhbSA9ICgpOiB2b2lkID0+IHsKCQkJCWlmIChjb21wcmVzc2lvblN1cHByZXNzZWQpIHsKCQkJCQlyZXR1cm47CgkJCQl9CgoJCQkJT2JqZWN0LmRlZmluZVByb3BlcnR5KHdpbmRvdywgJ0NvbXByZXNzaW9uU3RyZWFtJywgewoJCQkJCWNvbmZpZ3VyYWJsZTogdHJ1ZSwKCQkJCQl3cml0YWJsZTogdHJ1ZSwKCQkJCQl2YWx1ZTogdW5kZWZpbmVkLAoJCQkJfSk7CgoJCQkJY29tcHJlc3Npb25TdXBwcmVzc2VkID0gdHJ1ZTsKCQkJfTsKCgkJCWNvbnN0IHJlc3RvcmVDb21wcmVzc2lvblN0cmVhbSA9ICgpOiB2b2lkID0+IHsKCQkJCWlmICghY29tcHJlc3Npb25TdXBwcmVzc2VkKSB7CgkJCQkJcmV0dXJuOwoJCQkJfQoKCQkJCWlmIChjb21wcmVzc2lvbkRlc2NyaXB0b3IpIHsKCQkJCQlPYmplY3QuZGVmaW5lUHJvcGVydHkoCgkJCQkJCXdpbmRvdywKCQkJCQkJJ0NvbXByZXNzaW9uU3RyZWFtJywKCQkJCQkJY29tcHJlc3Npb25EZXNjcmlwdG9yLAoJCQkJCSk7CgkJCQl9IGVsc2UgewoJCQkJCWRlbGV0ZSAod2luZG93IGFzIHR5cGVvZiB3aW5kb3cgJiB7CgkJCQkJCUNvbXByZXNzaW9uU3RyZWFtPzogdHlwZW9mIENvbXByZXNzaW9uU3RyZWFtOwoJCQkJCX0pLkNvbXByZXNzaW9uU3RyZWFtOwoJCQkJfQoKCQkJCWNvbXByZXNzaW9uU3VwcHJlc3NlZCA9IGZhbHNlOwoJCQl9OwoKCQkJY29uc3QgaXNMaXZlS2l0UnRjU29ja2V0ID0gKHZhbHVlOiBzdHJpbmcgfCBVUkwpOiBib29sZWFuID0+IHsKCQkJCXRyeSB7CgkJCQkJY29uc3QgdXJsID0gbmV3IFVSTChTdHJpbmcodmFsdWUpLCB3aW5kb3cubG9jYXRpb24uaHJlZik7CgkJCQkJcmV0dXJuIC9cL3J0Y1wvdjFcLz8kLy50ZXN0KHVybC5wYXRobmFtZSk7CgkJCQl9IGNhdGNoIHsKCQkJCQlyZXR1cm4gZmFsc2U7CgkJCQl9CgkJCX07CgoJCQl3aW5kb3cuV2ViU29ja2V0ID0gbmV3IFByb3h5KE5hdGl2ZVdlYlNvY2tldCwgewoJCQkJY29uc3RydWN0KFRhcmdldCwgYXJncykgewoJCQkJCWNvbnN0IGlzTGl2ZUtpdFJ0YyA9IGlzTGl2ZUtpdFJ0Y1NvY2tldCgKCQkJCQkJYXJnc1swXSBhcyBzdHJpbmcgfCBVUkwsCgkJCQkJKTsKCgkJCQkJaWYgKGlzTGl2ZUtpdFJ0YykgewoJCQkJCQlyZXN0b3JlQ29tcHJlc3Npb25TdHJlYW0oKTsKCQkJCQl9CgoJCQkJCWxldCBzb2NrZXQ6IFdlYlNvY2tldDsKCgkJCQkJdHJ5IHsKCQkJCQkJc29ja2V0ID0gUmVmbGVjdC5jb25zdHJ1Y3QoVGFyZ2V0LCBhcmdzLCBUYXJnZXQpOwoJCQkJCX0gY2F0Y2ggKGVycm9yKSB7CgkJCQkJCWlmIChpc0xpdmVLaXRSdGMpIHsKCQkJCQkJCXN1cHByZXNzQ29tcHJlc3Npb25TdHJlYW0oKTsKCQkJCQkJfQoJCQkJCQl0aHJvdyBlcnJvcjsKCQkJCQl9CgoJCQkJCWlmIChpc0xpdmVLaXRSdGMpIHsKCQkJCQkJc29ja2V0LmFkZEV2ZW50TGlzdGVuZXIoCgkJCQkJCQknY2xvc2UnLAoJCQkJCQkJKCkgPT4gc3VwcHJlc3NDb21wcmVzc2lvblN0cmVhbSgpLAoJCQkJCQkJe29uY2U6IHRydWV9LAoJCQkJCQkpOwoJCQkJCX0KCgkJCQkJcmV0dXJuIHNvY2tldDsKCQkJCX0sCgkJCX0pIGFzIHR5cGVvZiBXZWJTb2NrZXQ7CgoJCQlzdXBwcmVzc0NvbXByZXNzaW9uU3RyZWFtKCk7CgoJCQljb25zb2xlLmluZm8oCgkJCQknW0ZsdXhlciBEZXNrdG9wXSBMaXZlS2l0IHB1Ymxpc2hlciBvZmZlci13aXRoLWpvaW4gZGlzYWJsZWQnLAoJCQkpOwoJCX0sCgl9KTsKfQoKaW5zdGFsbEZvcmNlQWxsSWNlVHJhbnNwb3J0UG9saWN5KCk7Cmluc3RhbGxEaXNhYmxlTGl2ZUtpdE9mZmVyV2l0aEpvaW4oKTsK"
|
||||||
).decode("utf-8")
|
).decode("utf-8")
|
||||||
|
|
||||||
data = data.replace(
|
data = data.replace(
|
||||||
@@ -872,18 +917,18 @@ jobs:
|
|||||||
"WebRTC ICE policy patch verification failed"
|
"WebRTC ICE policy patch verification failed"
|
||||||
)
|
)
|
||||||
|
|
||||||
if "installLiveKitElectronOfferWithJoinWorkaround" not in result:
|
if "installDisableLiveKitOfferWithJoin" not in result:
|
||||||
raise SystemExit(
|
raise SystemExit(
|
||||||
"LiveKit Electron workaround verification failed"
|
"LiveKit offer-with-join workaround verification failed"
|
||||||
)
|
)
|
||||||
|
|
||||||
print(
|
print(
|
||||||
"Installed preload WebRTC ICE policy override"
|
"Installed Electron WebRTC and LiveKit compatibility fixes"
|
||||||
)
|
)
|
||||||
PY
|
PY
|
||||||
|
|
||||||
grep -n \
|
grep -n \
|
||||||
-E 'installForceAllIceTransportPolicy|installLiveKitElectronOfferWithJoinWorkaround|iceTransportPolicy forced to all|offer-with-join workaround enabled' \
|
-E 'installForceAllIceTransportPolicy|installDisableLiveKitOfferWithJoin|iceTransportPolicy forced to all|LiveKit publisher offer-with-join disabled' \
|
||||||
fluxer-src/fluxer_desktop/src/preload/index.ts
|
fluxer-src/fluxer_desktop/src/preload/index.ts
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
|||||||
Reference in new issue
Block a user