refactor: use unified connection [WPB-23775] by coriolinus · Pull Request #2303 · wireapp/core-crypto

coriolinus · 2026-07-02T14:52:53Z

What's new in this PR

Partially implements 23775. This accomplishes most of that PR, except for two more steps:

Rename all Unified* entity trait family traits to rm the Unified prefix
Fix all the errors which fall out of this API changes in CC.

One issue I see right away: this new Database wraps a connection directly, where the old one wrapped a Mutex<Option<Connection>>. This means we can no longer use the Database::close method, because it consumes self and consumers all always have an Arc<Database>.

Whoever picks this up will need to either adjust that and all the access patterns, or determine that we can omit close methods entirely now.

PR Submission Checklist for internal contributors

The PR Title
- conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
- contains a reference JIRA issue number like SQPIT-764
- answers the question: If merged, this PR will: ... ³

https://sparkbox.com/foundry/semantic_commit_messages
https://github.com/wireapp/.github#usage
E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

SimonThormeyer

I am amazed that this actually works. This is the greatest improvement to the keystore crate this year, if not ever.

Great work @fewerner @coriolinus!

We are now deprecating the old connection module in favor of the unified connection, and removing platform-specific code from the entity implementations. Unfortunately, we need to retain sufficient wasm code that we can still run enough of a migration to upgrade into the new unified entity database, and that means that we've got a whole rump of otherwise- useless code sitting in the legacy module. Can't be helped, unfortunately.

We're deprecating those in favor of the new `UnifiedEntity` traits and will eventually update the names to remove the `Unified*` prefix. The old traits still exist and are implemented in the `idb_migration::legacy` module.

We only need the new stuff now. Old implementations can live in the legacy module.

Just keeping things in parity with the old `Database` impl.

- rm now-obsolete trait implementations - move certain implementations out of the platform module - in general make the entities implement what they need inline

`Database` needs to be able to manage the `KeystoreTransaction` lifecycle, so we organize these methods centrally here.

Committing a transaction will now take the transaction and end it, no matter what the outcome is. Thus, it can't be rolled back here.

This test passes now on wasm using the same sql implementation.

Previously, this was implemented on the old connections.

An explicit close method used to be required to ensure that indexeddb would persist its final changes; it had no automatic sync-on-drop behavior. Now that the unified database has Sqlite behavior in all contexts, it finalizes on drop. At the same time, supporting a close method requires a design in which the internal connection can be taken out and dropped. So, as the initial need has vanished, and eliminating the close method means we can have a simpler internal implementation, we just do that.

pathStr start with`/private/var/` but location just starts with `/var/`

`getLocation` now returns the absolute path to the db file.

We successfully moved to a unified database layer and no longer distinguish between unified and not unified.

Previously this was doing the wrong thing when upgrading an old wasm database to bytes. This fixes it.

…r-provided relative path

We don't support that function internally at all anymore, but in order to prevent breaking changes we retain the stub as a noop.

coriolinus requested a review from a team July 2, 2026 14:52

fewerner force-pushed the prgn/refactor/23775-use-unified-connection branch 8 times, most recently from 924d5dd to 6410221 Compare July 15, 2026 07:08

coriolinus force-pushed the prgn/refactor/23775-use-unified-connection branch 2 times, most recently from 22f14e4 to d793639 Compare July 21, 2026 16:08