all: Refactor the protocol/model interface a bit (ref #8981) #9007
Conversation
This file contains hidden or 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
imsodin
reviewed
Jul 27, 2023
Member
imsodin
left a comment
There was a problem hiding this comment.
Definitely very helpful to separate this large code churn from the large behaviour change - looks mostly good on a skim.
Co-authored-by: Simon Frei <freisim93@gmail.com>
imsodin
approved these changes
Jul 29, 2023
Member
imsodin
left a comment
There was a problem hiding this comment.
Unrelated: A filesystem watcher test times out on macos - maybe truly a (flaky) hangup or possibly just need to extend the timeout as GHA macos FS might just be super slow.
Member
Author
|
Yeah it's super flaky, I have on my mental todo list to go through and unflake all the stuff that keeps randomly failing. |
Member
|
The ref at #8981 seems like a typo. |
Member
|
Yep, should have been #8918 - I just assumed it was without checking. Bad reviewer, assuming is no good there :) |
calmh
added a commit
to calmh/syncthing
that referenced
this pull request
Jul 30, 2023
* main: all: Refactor the protocol/model interface a bit (ref syncthing#8981) (syncthing#9007) lib/connections: Fix building with `-tags noquic` (syncthing#9009) gui: Fix tooltips on buttons inside button groups (ref syncthing#7984) (syncthing#9008)
calmh
added a commit
to calmh/syncthing
that referenced
this pull request
Aug 3, 2023
* main: build: Increase Go version to 1.20.7 lib/config: Allow sharing already encrypted folder with untrusted devices (fixes syncthing#8965) (syncthing#9012) gui: Use case-insensive and backslash-agnostic versions filter (fixes syncthing#7973) (syncthing#8995) gui, man, authors: Update docs, translations, and contributors build: Run govulncheck (fixes syncthing#8983) build: Run build & tests on main branch nightly build: Send test logs to Grafana Loki for statistics all: Refactor the protocol/model interface a bit (ref syncthing#8981) (syncthing#9007) lib/connections: Fix building with `-tags noquic` (syncthing#9009) gui: Fix tooltips on buttons inside button groups (ref syncthing#7984) (syncthing#9008) cmd/strelaysrv: Handle accept error with debug set (fixes syncthing#9001) (syncthing#9004) lib/api: Fix data race in TestCSRFRequired (syncthing#9006) gui: Show full error for failed items (syncthing#9005) lib/api: Allow `Bearer` authentication style with API key (syncthing#9002)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
These are refactoring changes made in the multiple-connection PR (#8918), broken out to reduce the noise there. Hence reviewing it requires some suspension of disbelief in terms of whether these changes are necessary -- they are, over there, but not necessarily by themselves over here... :) The changes are:
lib/protocol,func (Connection) ID() DeviceIDis now calledfunc (Connection) DeviceID() DeviceID()to disambiguate it from future other kind of IDs (the connection ID).lib/protocol, all the callbacks used to take the device ID as the first parameter to explain where they came from. These now get the actual Connection instead, which is more specific and enables things like replying on the same connection. There's some juggling to accomplish this, because the actual protocol code that does the callbacks (rawConnection) doesn't have a clue about a "connection", it just has a reader and a writer for the bytes. Thus the callback interface is split up -- inside the protocol, it doesn't take a connection or device ID as parameter (contextLessModel), it is assumed that whoever created the connection knows what the callbacks refer to. Then there is a small wrapper (connectionWrappingModel) struct that does precisely this: intercepts the callbacks, adds the connection info, and then calls them again upwards.