This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 828
MSC3575 (Sliding Sync) add well-known proxy support #12307
Merged
t3chguy
merged 108 commits into
matrix-org:develop
from
EdGeraghty:edg/msc3575-native-support
Apr 30, 2024
+154
−171
Merged
Changes from all commits
Commits
Show all changes
108 commits
Select commit
Hold shift + click to select a range
9d73b7c
Initial commit
EdGeraghty 876f59c
Remove commented code
EdGeraghty c65b22b
Change function to reflect it's proxy not native support
EdGeraghty e99ef75
Re-add check for servers with native support
EdGeraghty 6adac18
Add native support check back in
EdGeraghty 065e255
Re-add endpoint health check function
EdGeraghty 1345379
Use inbuilt `getWellKnown` function
EdGeraghty 7736582
Change the error message to the correct function
EdGeraghty 4f2c1f2
Stop storing the proxyurl in the settings for now
EdGeraghty cb78747
Make the logger messages more useful
EdGeraghty 10095b6
Start moving the checking logic directly into the controller
EdGeraghty 5ef62f3
Add missing import
EdGeraghty 0ac51af
Get the client rather than passing it in to the functions
EdGeraghty bc73cd8
remove invalid `function` keyword
EdGeraghty 1118135
Fix imports
EdGeraghty 8185c08
Our new functions are private
EdGeraghty e782249
Change our proxy check function to return a boolean
EdGeraghty 2fdab77
Make `nativeSlidingSyncSupport` also return boolean, add in health check
EdGeraghty 0a87ebc
Disable the sliding sync option if the server doesn't support
EdGeraghty 740a28f
Only enable the setting if it passes (again)
EdGeraghty a034550
Update our comments to better match what's going on
EdGeraghty 24424e6
Remove unused dialog
EdGeraghty dfd4ced
Add a well-known check on start-up, if sliding sync has been enabled
EdGeraghty be0e4d3
Check against the correct endpoint...
EdGeraghty dbbdc8a
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty 43e3341
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty b3ebb8a
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty f43cd19
Extract baseUrl as we'll reuse it
EdGeraghty 2e4f110
Make the logs differentiate between the types of proxy
EdGeraghty c32ea33
Grab the client well-known directly for use
EdGeraghty 9d831b1
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty 16522ae
Add myself to the copyright assignation
EdGeraghty f4f8463
Only return `true` if it's actually there
EdGeraghty 0417265
Correct the `proxySlidingSyncSupport` function comment to match the code
EdGeraghty d9199e4
Correct the `nativeSlidingSyncSupport`function comment to match the code
EdGeraghty 229b8d8
Another comment/functionality paring
EdGeraghty 672b003
Remove duplicated types from the doc
EdGeraghty 7cdab7b
Move await to the previous line
EdGeraghty 2f45ddb
use `waitForClientWellKnown` to avoid a race condition with the request
EdGeraghty 23b026f
Move getting the client out of the `if`, use `waitForClientWellKnown`
EdGeraghty e1d28ec
Remove `beforeChange` override
EdGeraghty 5f7b513
Move proxy setup logic into `SlidingSyncManager`
EdGeraghty c80a00b
Swap `configure` to private, we call it from `setup` which handles proxy
EdGeraghty ef1da4a
Promises are always `true`
EdGeraghty 71e5d60
use `timeoutSignal`
EdGeraghty e150b05
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty 2095501
Change message when there's no server support
EdGeraghty 629d5bb
Refactor `slidingSyncHealthCheck`
EdGeraghty 8edc6c1
Refactor `nativeSlidingSyncSupport` with try/catch
EdGeraghty bca3aa2
Change comment to hotlink
EdGeraghty 9d735cf
Try and make the toggle disabled when there's no endpoint
EdGeraghty 9bae69d
Move the if statement outside the refactored fn to avoid an await
EdGeraghty eb60521
Revert "Swap `configure` to private, we call it from `setup` which ha…
EdGeraghty 9defa25
Remove unused import
EdGeraghty 3b1e87e
Further refactor `slidingSyncHealthCheck`
EdGeraghty 0aa46c3
Make `proxySlidingSyncSupport` log on success
EdGeraghty 8397e2e
Clarify log message for proxy being up
EdGeraghty 98674c5
Move the logic into SlidingSyncManager
EdGeraghty c75ed4c
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty 7ddec2b
Obviously this isn't a return so don't overwrite with false!
EdGeraghty cfc48bb
Remove outdated comment
EdGeraghty a09b1b2
No need to pass in the client
EdGeraghty aab3e51
Activating SS should probably be info level logs
EdGeraghty 40ca313
If we've not enabled sliding sync, push the logs down a bit
EdGeraghty efeb2ae
Update i18n error message
EdGeraghty 51660ff
Remove unused i18n strings
EdGeraghty 2b41e0c
Correct log message
EdGeraghty 90f96e6
Prettier
EdGeraghty 90b9876
Remove many of the log messages
EdGeraghty 7bc854e
Short out of `checkSupport` if it's `true`
EdGeraghty 1a342d6
Add the endpoint back into the log when we're enabling it
EdGeraghty 79b45b7
Note in the comment that `feature_sliding_sync_proxy_url` is legacy
EdGeraghty 7b4d4f2
Expand the well-known liveness check log
EdGeraghty 99c10f6
No need to stall the client waiting for sliding sync support
EdGeraghty 77d41c1
`AutoDiscovery.findClientConfig` throws if the baseUrl is blank
EdGeraghty d7d2f8b
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty ac4de59
Fix `getProxyFromWellKnown` (?)
EdGeraghty 9cd4ac4
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty a0e2f63
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty 9fe4e9a
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty f99dc79
Add missing semicolon
EdGeraghty 0b04649
Pass our `MatrixClient` through instead of trying to grab it
EdGeraghty 0eee348
Add missing return in function comment
EdGeraghty 061041b
Actually pass through our Client, not the Peg object
EdGeraghty 2ea8e47
Remove SonarCube smell complaint
EdGeraghty 6682690
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty 490092c
Neew to make our other two methods public to test
EdGeraghty fcca43f
First passing test
EdGeraghty c1670f4
Two more tests, this time on `checkSupport`
EdGeraghty 9d20b46
Merge branch 'edg/msc3575-native-support' of https://github.com/EdGer…
EdGeraghty 9178ab4
Reset our `serverSupportsSlidingSync` between tests
EdGeraghty 3785b89
Check the static member is being set
EdGeraghty ac18bdb
Move the static assignation down to the relevant tests
EdGeraghty 4637b3d
Pull getProxyFromWellKnown mocking up
EdGeraghty 15ac5b0
Check we /haven't/ shorted out
EdGeraghty db5a374
Move our spy up so we can reuse it
EdGeraghty a98552c
Check spidering is being called
EdGeraghty 298cb8f
Test the proxy is declared
EdGeraghty f840249
Test entered manually
EdGeraghty 4494079
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty 58f0d90
Sorry, linter
EdGeraghty 27830f8
Merge branch 'edg/msc3575-native-support' of github.com:EdGeraghty/ma…
EdGeraghty e01fa3d
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty 0a00a29
I guess these strings are wrong?
EdGeraghty 48b361a
Merge branch 'edg/msc3575-native-support' of github.com:EdGeraghty/ma…
EdGeraghty 2e1bb20
Merge branch 'develop' into edg/msc3575-native-support
t3chguy 0288e89
Replace any with string
EdGeraghty 3cbc39a
Merge branch 'develop' into edg/msc3575-native-support
EdGeraghty File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
142 changes: 0 additions & 142 deletions
142
src/components/views/dialogs/SlidingSyncOptionsDialog.tsx
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is unsafe. It will cause the Sliding Sync proxy to start polling with our access token, which means that the SS proxy will receive our to-device messages, causing decryption errors.