continuwuation/continuwuity
continuwuation/continuwuity
15
84
Fork 97
Code Issues 127 Pull requests 23 Releases 28 Packages 3 Activity Actions 5

Rewrite resolver service #1505

Open
s1lv3r wants to merge 15 commits from s1lv3r/continuwuity:rewrite-resolver into main
pull from: s1lv3r/continuwuity:rewrite-resolver
merge into: continuwuation:main
Conversation 13 Commits 15 Files changed 17 +309 -605
s1lv3r commented 2026-03-08 03:54:09 +00:00
Contributor
Copy link

Rewrites the resolver service in preparation of removing the overrides system, making the entire service more readable. Have flattened out nested match+if statements, added comments, and removed redundant functions.

Pull request checklist:

  • This pull request targets the main branch, and the branch is named something other than
    main.
  • I have written an appropriate pull request title and my description is clear.
  • I understand I am responsible for the contents of this pull request.
  • I have followed the contributing guidelines:
Rewrites the resolver service in preparation of removing the overrides system, making the entire service more readable. Have flattened out nested match+if statements, added comments, and removed redundant functions. <!-- In order to help reviewers know what your pull request does at a glance, you should ensure that 1. Your PR title is a short, single sentence describing what you changed 2. You have described in more detail what you have changed, why you have changed it, what the intended effect is, and why you think this will be beneficial to the project. If you have made any potentially strange/questionable design choices, but didn't feel they'd benefit from code comments, please don't mention them here - after opening your pull request, go to "files changed", and click on the "+" symbol in the line number gutter, and attach comments to the lines that you think would benefit from some clarification. --> <!-- Example: This pull request allows us to warp through time and space ten times faster than before by double-inverting the warp drive with hyperheated jump fluid, both making the drive faster and more efficient. This resolves the common issue where we have to wait more than 10 milliseconds to engage, use, and disengage the warp drive when travelling between galaxies. --> <!-- Closes: #... --> <!-- Fixes: #... --> <!-- Uncomment the above line(s) if your pull request fixes an issue or closes another pull request by superseding it. Replace `#...` with the issue/pr number, such as `#123`. --> **Pull request checklist:** <!-- You need to complete these before your PR can be considered. If you aren't sure about some, feel free to ask for clarification in #dev:continuwuity.org. --> - [x] This pull request targets the `main` branch, and the branch is named something other than `main`. - [x] I have written an appropriate pull request title and my description is clear. - [x] I understand I am responsible for the contents of this pull request. - I have followed the [contributing guidelines][c1]: - [x] My contribution follows the [code style][c2], if applicable. - [x] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [x] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [x] My commit messages follow the [commit message format][c1cm] and are descriptive. - [x] I have written a [news fragment][n1] for this PR, if applicable<!--(can be done after hitting open!)-->. <!-- Notes on these requirements: - While not required, we encourage you to sign your commits with GPG or SSH to attest the authenticity of your changes. - While we allow LLM-assisted contributions, we do not appreciate contributions that are low quality, which is typical of machine-generated contributions that have not had a lot of love and care from a human. Please do not open a PR if all you have done is asked ChatGPT to tidy up the codebase with a +-100,000 diff. - In the case of code style violations, reviewers may leave review comments/change requests indicating what the ideal change would look like. For example, a reviewer may suggest you lower a log level, or use `match` instead of `if/else` etc. - In the case of code style violations, pre-commit check failures, minor things like typos/spelling errors, and in some cases commit format violations, reviewers may modify your branch directly, typically by making changes and adding a commit. Particularly in the latter case, a reviewer may rebase your commits to squash "spammy" ones (like "fix", "fix", "actually fix"), and reword commit messages that don't satisfy the format. - Pull requests MUST pass the `Checks` CI workflows to be capable of being merged. This can only be bypassed in exceptional circumstances. If your CI flakes, let us know in matrix:r/dev:continuwuity.org. - Pull requests have to be based on the latest `main` commit before being merged. If the main branch changes while you're making your changes, you should make sure you rebase on main before opening a PR. Your branch will be rebased on main before it is merged if it has fallen behind. - We typically only do fast-forward merges, so your entire commit log will be included. Once in main, it's difficult to get out cleanly, so put on your best dress, smile for the cameras! --> [c1]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md [c2]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/docs/development/code_style.mdx [c1pc]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#pre-commit-checks [c1t]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#running-tests-locally [c1cm]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#commit-messages [n1]: https://towncrier.readthedocs.io/en/stable/tutorial.html#creating-news-fragments
s1lv3r force-pushed rewrite-resolver from 7661e3c2ec
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m52s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m49s
Details
to 491a3b83a5
Some checks are pending
Documentation / Build and Deploy Documentation (pull_request) Waiting to run
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Waiting to run
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Waiting to run
Details
2026-03-08 15:05:09 +00:00 Compare
fix: Ensure codeflow returns at correct locations
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m49s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m45s
Details
6126e67f76
fix: Improve splitting of hostname:port, fixed returns
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m47s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 9m18s
Details
1ca3630f43
s1lv3r commented 2026-03-09 17:05:11 +00:00
Author
Contributor
Copy link

PR is under pause, waiting for feedback if we should extract the resolver to its own library or make a possible PR to ruma

PR is under pause, waiting for feedback if we should extract the resolver to its own library or make a possible PR to [ruma](https://docs.rs/ruma/latest/ruma/) - [c10y dev channel discussion](https://matrix.to/#/!ksTlboXVgcyWjv5GrlEeKyQuJ8ZCprnwQx2b6-BQ44Q/$Oh8r5UvEJrltEVtnc7k70rG7D0lUIOOkbIA2l73X58s?via=continuwuity.org&via=matrix.org&via=starstruck.systems) - [ruma development channel question by jade](https://matrix.to/#/!aFsxHSpFFtAuRqRviy:flipdot.org/%24vAgpcL1KKhDYdR7Sun7YbqzVz1_nmDucq9nMgdckINI?via=wolfgirl.pet&via=flipdot.org&via=matrix.org)
chore: Rename variables, fix comments, misc cleanup
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m47s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m41s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 9m3s
Details
3e28ba622e
s1lv3r commented 2026-03-09 19:56:47 +00:00
Author
Contributor
Copy link

Latest version should be good, just waiting to see what we do with the external library / ruma choice.

Latest version should be good, just waiting to see what we do with the external library / ruma choice.
s1lv3r commented 2026-03-11 16:27:51 +00:00
Author
Contributor
Copy link

PR will be refactored to use standalone crate by @jade when ready: https://matrix.to/#/!ksTlboXVgcyWjv5GrlEeKyQuJ8ZCprnwQx2b6-BQ44Q/%24fStRIsb1B0-g9Kd5dlBQfL9SZWp6XeN1uF1gJ8hqvZs?via=wolfgirl.pet&via=explodie.org&via=matrix.org

PR will be refactored to use standalone crate by @jade when ready: https://matrix.to/#/!ksTlboXVgcyWjv5GrlEeKyQuJ8ZCprnwQx2b6-BQ44Q/%24fStRIsb1B0-g9Kd5dlBQfL9SZWp6XeN1uF1gJ8hqvZs?via=wolfgirl.pet&via=explodie.org&via=matrix.org
fix: Make clippy not be angry
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 10s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m16s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 55s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
eaec02ff3a
chore: Add news fragment
All checks were successful
Check Changelog / Check for changelog (pull_request_target) Successful in 17s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m15s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 55s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 49m45s
Details
38d099e28b
s1lv3r changed title from WIP: Rewrite resolver service to Rewrite resolver service 2026-04-08 11:56:51 +00:00
nex requested review from nex 2026-04-08 17:55:50 +00:00
s1lv3r requested review from Jade 2026-04-08 18:25:16 +00:00
nex reviewed 2026-04-08 20:08:42 +00:00
src/service/resolver/mod.rs Outdated
@ -48,3 +47,2 @@
async fn clear_cache(&self) {
self.resolver.clear_cache();
self.cache.clear().await;
// No ability to clean resolvematrix cache at the moment
nex commented 2026-04-08 20:08:42 +00:00
Owner
Copy link

This PR should probably be blocked until this is possible

This PR should probably be blocked until this is possible
s1lv3r commented 2026-04-08 20:27:02 +00:00
Author
Contributor
Copy link

I can see two possible solutions:

  1. Wait for continuwuation/resolvematrix#3 (pluggable HTTP/DNS/cache), which there is no work on at the moment.
  2. Re-create the resolver object, which would require making the entire resolver service mutable. Likely undesireable
I can see two possible solutions: 1. Wait for https://forgejo.ellis.link/continuwuation/resolvematrix/issues/3 (pluggable HTTP/DNS/cache), which there is no work on at the moment. 2. Re-create the resolver object, which would require making the entire resolver service mutable. Likely undesireable
Jade commented 2026-04-08 20:49:22 +00:00
Owner
Copy link

Alternatively just add a method to resolvematrix's cache.

Alternatively just add a method to resolvematrix's cache.
s1lv3r commented 2026-04-08 20:49:39 +00:00
Author
Contributor
Copy link

that works too, ill do that

that works too, ill do that
s1lv3r commented 2026-04-08 21:17:11 +00:00
Author
Contributor
Copy link

cache clear feat added in continuwuation/resolvematrix#7, waiting on that + v0.0.4 release, then cache clear will be added

cache clear feat added in https://forgejo.ellis.link/continuwuation/resolvematrix/pulls/7, waiting on that + v0.0.4 release, then cache clear will be added
s1lv3r marked this conversation as resolved
nex approved these changes 2026-04-08 20:09:19 +00:00
Dismissed
nex left a comment
Owner
Copy link

lgtm, far easier to read

lgtm, far easier to read
Jade commented 2026-04-08 20:50:47 +00:00
Owner
Copy link

Side note, check #1615 hasn't regressed in a test if possible

Side note, check https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1615 hasn't regressed in a test if possible
s1lv3r commented 2026-04-08 21:16:34 +00:00
Author
Contributor
Copy link

unsure how to test that one specifically, @Aranjedeath might be best for that?

unsure how to test that one specifically, @Aranjedeath might be best for that?
Aranjedeath commented 2026-04-09 21:22:38 +00:00
Owner
Copy link

@s1lv3r wrote in #1505 (comment):

unsure how to test that one specifically, @Aranjedeath might be best for that?

I think it would be testing if srv-only server lookups return correctly ? The bug was we would cache srv-record host information too early so would end up with the wrong port, as an example

@s1lv3r wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1505#issuecomment-27700: > unsure how to test that one specifically, @Aranjedeath might be best for that? I think it would be testing if srv-only server lookups return correctly ? The bug was we would cache srv-record host information too early so would end up with the wrong port, as an example
Jade commented 2026-04-09 22:00:32 +00:00
Owner
Copy link

I don't think I replicated the bug but I also don't think there's a test case for it

I don't think I replicated the bug but I also don't think there's a test case for it
Aranjedeath commented 2026-04-11 14:48:08 +00:00
Owner
Copy link

I posted this in the Dev room (link below) but I tried merging this and got an error about complexity, but only in a newer version of Rust (1.94) than we are using (1.92) by default. I don't know if my merge was bad or this is just an error we will see in 2 versions time.

https://matrix.to/#/!ksTlboXVgcyWjv5GrlEeKyQuJ8ZCprnwQx2b6-BQ44Q/%24_w-O0PtF1AODVKadM84oY4HGa-PTBWI76U123e-WFtg?via=explodie.org&via=gingershaped.computer&via=matrix.org

I posted this in the Dev room (link below) but I tried merging this and got an error about complexity, but only in a newer version of Rust (1.94) than we are using (1.92) by default. I don't know if my merge was bad or this is just an error we will see in 2 versions time. https://matrix.to/#/!ksTlboXVgcyWjv5GrlEeKyQuJ8ZCprnwQx2b6-BQ44Q/%24_w-O0PtF1AODVKadM84oY4HGa-PTBWI76U123e-WFtg?via=explodie.org&via=gingershaped.computer&via=matrix.org
Includes manual `cargo update`
chore: Lockfile update
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 10s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m45s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 3m9s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 3m10s
Details
88f4c25d58
s1lv3r commented 2026-04-11 23:06:30 +00:00
Author
Contributor
Copy link

This is currently blocked by continuwuation/resolvematrix#7, will close the review comment once that's merged, released, and implemented

This is currently blocked by https://forgejo.ellis.link/continuwuation/resolvematrix/pulls/7, will close the review comment once that's merged, released, and implemented
chore: clippy
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 35s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m54s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m46s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 11m33s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 32s
Details
a9432933f1
s1lv3r commented 2026-04-12 14:51:42 +00:00
Author
Contributor
Copy link

Assuming checks go through properly, this should be ready for merge now

Assuming checks go through properly, this should be ready for merge now
s1lv3r requested review from nex 2026-04-12 14:51:56 +00:00
nex approved these changes 2026-04-14 22:45:27 +00:00
chore: Merge branch 'main' into rewrite-resolver
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 35s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m24s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m51s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m5s
Details
192ef8614d
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 35s
Required
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m24s
Required
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m51s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m5s
Required
Details
This pull request is blocked because it's outdated.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u rewrite-resolver:s1lv3r-rewrite-resolver
git switch s1lv3r-rewrite-resolver
Sign in to join this conversation.
Reviewers
No reviewers
Jade
nex
Labels
Clear labels   
Blocked

This pull request or issue is currently blocked from being merged/closed

  
Bug

Something isn't working as intended

  
Changelog
Added
Changelog entry added

  
Changelog
Missing
No changelog when one is needed

  
Changelog
None
Changelog is unnecesary for this change

  
Cherry-picking

Commits picked from other conduit projects

  
Database

This requires or includes changes to the database

  
Dependencies

Something dependency related

  
Dependencies/Renovate

Automatic dependency upgrades by Renovate

  
Difficulty
Easy
Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation

Improvements or additions to documentation

  
Enhancement

New feature or request

  
Good first issue

Good for newcomers

  
Help wanted

Additional eyes and keyboards are required for this one

  
Inherited

Issues that have been inhereted from the project pre-fork

  
Matrix/Administration

Features pertaining to homeserver administration

  
Matrix/Appservices

Features pertaining to the appservice API

  
Matrix/Auth

Features pertaining to authentication

  
Matrix/Client

Features pertaining to client-to-server interactions

  
Matrix/Core

Issues relating to core matrix functionality, such as state resolution and PDU formats

  
Matrix/E2EE

Issues related to end to end encryption

  
Matrix/Federation

Features pertaining to server-to-server interactions

  
Matrix/Hydra

Issues related to room version 12 and related changes (temporary label)

  
Matrix/MSC

Features pertaining to unstable matrix features

  
Matrix/Media

Features pertaining to media interactions

  
Matrix/T&S

Changes or issues related to trust & safety tooling

  
Merge

This PR is ready to be merged

  
Merge/Manual

This PR should be manually merged

  
Merge/Squash

This PR should be squashed when it is merged

  
Meta

Related to housekeeping, maintenance, or other repo-meta.

  
Meta/CI

Issues related to CI changes

  
Meta/Packaging

Packaging

  
Priority
Blocking
This issue is blocking the next release

  
Priority
High
This issue is very important

  
Priority
Low
This issue is of a rather low priority

  
Security

This item is related to general security

  
Status
Confirmed
This issue has enough information and is confirmed

  
Status
Duplicate
This issue or pull request already exists

  
Status
Invalid
This issue doesn't seem right

  
Status
Needs Investigation
This issue needs further investigation

  
Support

Questions or support requests

  
Wont fix

This will not be worked on

  
old/ci/cd

Ci/CD

Archived

  
old/rust

Pull requests that update Rust code

Archived

No labels
Blocked
Bug
Changelog
Added
Changelog
Missing
Changelog
None
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Merge
Merge/Manual
Merge/Squash
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
continuwuation/continuwuity!1505
No description provided.