Skip to content

feat(core): add typed USync query engine #1063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlucaso1 merged 8 commits into from
Jul 21, 2026
Merged

feat(core): add typed USync query engine #1063

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3015133
feat(core): add typed USync query engine
jlucaso1 Jul 21, 2026
f9cff9b
fix(core): harden typed USync parsing
jlucaso1 Jul 21, 2026
4c88d25
fix(core): reject malformed USync records
jlucaso1 Jul 21, 2026
f55a0c2
fix(core): preserve hosted device state
jlucaso1 Jul 21, 2026
0f3089f
fix(core): harden USync identity updates
jlucaso1 Jul 21, 2026
37133ee
fix(core): format USync errors without artifacts
jlucaso1 Jul 21, 2026
63d8315
feat(core): add validated USync serialization
jlucaso1 Jul 21, 2026
4f89c4f
fix(core): harden typed USync contracts
jlucaso1 Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 40 additions & 121 deletions src/client/device_registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ impl Client {
key_index_info: Option<&wacore::stanza::devices::KeyIndexInfo>,
) {
let device_id = device.device_id();
let is_hosted = wacore_binary::JidExt::is_hosted(&device.jid);

let Some(mut record) = self.load_device_record(user).await else {
return;
Expand Down Expand Up @@ -610,18 +611,18 @@ impl Client {
if !record.devices.iter().any(|d| d.device_id == device_id)
&& wacore::adv::is_key_index_valid(device.key_index, &decoded)
{
record.devices.push(wacore::store::traits::DeviceInfo {
device_id,
key_index: device.key_index,
});
record.devices.push(
wacore::store::traits::DeviceInfo::new(device_id, device.key_index)
.with_hosting(is_hosted),
Comment thread
jlucaso1 marked this conversation as resolved.
Outdated
);
}
} else {
warn!("patch_device_add: failed to decode key-index-list for user {user}");
self.append_device_if_new(&mut record, device_id, device.key_index);
self.append_device_if_new(&mut record, device_id, device.key_index, is_hosted);
}
} else {
// No signed bytes — fall back to simple append
self.append_device_if_new(&mut record, device_id, device.key_index);
self.append_device_if_new(&mut record, device_id, device.key_index, is_hosted);
}

// WA Web `AdvDeviceNotificationApi.handleDeviceAddNotification` re-adds the
Expand All @@ -635,10 +636,9 @@ impl Client {
// device 0 regardless and `is_key_index_valid` is not applied to it), so store
// `None` to match how device 0 is recorded everywhere else.
if !record.devices.iter().any(|d| d.device_id == 0) {
record.devices.push(wacore::store::traits::DeviceInfo {
device_id: 0,
key_index: None,
});
record
.devices
.push(wacore::store::traits::DeviceInfo::new(0, None));
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

// New devices are picked up automatically by `resolve_skdm_targets`:
Expand All @@ -656,12 +656,13 @@ impl Client {
record: &mut wacore::store::traits::DeviceListRecord,
device_id: u32,
key_index: Option<u32>,
is_hosted: bool,
) {
if !record.devices.iter().any(|d| d.device_id == device_id) {
record.devices.push(wacore::store::traits::DeviceInfo {
device_id,
key_index,
});
record.devices.push(
wacore::store::traits::DeviceInfo::new(device_id, key_index)
.with_hosting(is_hosted),
Comment thread
jlucaso1 marked this conversation as resolved.
);
}
}

Expand Down Expand Up @@ -934,14 +935,13 @@ impl Client {
}

/// Reconstruct `Vec<Jid>` from a `DeviceListRecord`, using the query JID's
/// user part and server type. This ensures that a PN-typed query always
/// returns PN-typed device JIDs even if the record is stored under a LID key
/// (and vice versa), which matters after PN-to-LID migration.
/// user part and addressing family while honoring each device's hosted bit.
/// This keeps PN/LID selection independent from the registry's storage key.
fn reconstruct_device_jids(
query_jid: &Jid,
record: &wacore::store::traits::DeviceListRecord,
) -> Vec<Jid> {
let user = &query_jid.user;
let base = query_jid.to_non_ad();
record
.devices
.iter()
Expand All @@ -951,12 +951,7 @@ impl Client {
"device_id {} overflows u16",
d.device_id
);
let device = d.device_id as u16;
if query_jid.is_lid() {
Jid::lid_device(user.clone(), device)
} else {
Jid::pn_device(user.clone(), device)
}
base.with_device_hosting(d.device_id as u16, d.is_hosted)
Comment thread
jlucaso1 marked this conversation as resolved.
Outdated
})
.collect()
}
Expand Down Expand Up @@ -1051,10 +1046,7 @@ mod tests {
user: user.into(),
devices: device_ids
.iter()
.map(|&id| wacore::store::traits::DeviceInfo {
device_id: id,
key_index: None,
})
.map(|&id| wacore::store::traits::DeviceInfo::new(id, None))
.collect(),
timestamp: wacore::time::now_secs(),
phash: None,
Expand Down Expand Up @@ -1355,10 +1347,7 @@ mod tests {
client
.update_device_list(wacore::store::traits::DeviceListRecord {
user: pn.into(),
devices: vec![wacore::store::traits::DeviceInfo {
device_id: 0,
key_index: None,
}],
devices: vec![wacore::store::traits::DeviceInfo::new(0, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand All @@ -1380,14 +1369,8 @@ mod tests {
.update_device_list(wacore::store::traits::DeviceListRecord {
user: lid.into(),
devices: vec![
wacore::store::traits::DeviceInfo {
device_id: 0,
key_index: None,
},
wacore::store::traits::DeviceInfo {
device_id: 11,
key_index: None,
},
wacore::store::traits::DeviceInfo::new(0, None),
wacore::store::traits::DeviceInfo::new(11, None),
],
timestamp: wacore::time::now_secs(),
phash: None,
Expand Down Expand Up @@ -1419,10 +1402,7 @@ mod tests {
client
.update_device_list(wacore::store::traits::DeviceListRecord {
user: "5511999990003".into(),
devices: vec![wacore::store::traits::DeviceInfo {
device_id: 0,
key_index: None,
}],
devices: vec![wacore::store::traits::DeviceInfo::new(0, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand All @@ -1438,10 +1418,7 @@ mod tests {
client
.update_device_lists(vec![wacore::store::traits::DeviceListRecord {
user: "5511999990004".into(),
devices: vec![wacore::store::traits::DeviceInfo {
device_id: 0,
key_index: None,
}],
devices: vec![wacore::store::traits::DeviceInfo::new(0, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down Expand Up @@ -1479,10 +1456,7 @@ mod tests {
client
.update_device_list(wacore::store::traits::DeviceListRecord {
user: "5511999990005".into(),
devices: vec![wacore::store::traits::DeviceInfo {
device_id: 0,
key_index: None,
}],
devices: vec![wacore::store::traits::DeviceInfo::new(0, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down Expand Up @@ -1799,14 +1773,8 @@ mod tests {
let record = wacore::store::traits::DeviceListRecord {
user: "15551234567".to_string(),
devices: vec![
wacore::store::traits::DeviceInfo {
device_id: 0,
key_index: None,
},
wacore::store::traits::DeviceInfo {
device_id: 3,
key_index: Some(1),
},
wacore::store::traits::DeviceInfo::new(0, None),
wacore::store::traits::DeviceInfo::new(3, Some(1)),
],
timestamp: 1000,
phash: None,
Expand Down Expand Up @@ -1885,9 +1853,8 @@ mod tests {
user: user.into(),
devices: device_ids
.iter()
.map(|&id| wacore::store::traits::DeviceInfo {
device_id: id,
key_index: if id == 0 { None } else { Some(7) },
.map(|&id| {
wacore::store::traits::DeviceInfo::new(id, if id == 0 { None } else { Some(7) })
})
.collect(),
timestamp: 1000,
Expand Down Expand Up @@ -1998,16 +1965,7 @@ mod tests {
// Store device list under PN in backend
let record = DeviceListRecord {
user: pn.to_string(),
devices: vec![
DeviceInfo {
device_id: 0,
key_index: None,
},
DeviceInfo {
device_id: 39,
key_index: Some(25),
},
],
devices: vec![DeviceInfo::new(0, None), DeviceInfo::new(39, Some(25))],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down Expand Up @@ -2115,10 +2073,7 @@ mod tests {
// Seed backend DB directly (bypassing the in-process cache)
let record = DeviceListRecord {
user: "15551234567".into(),
devices: vec![DeviceInfo {
device_id: 0,
key_index: None,
}],
devices: vec![DeviceInfo::new(0, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down Expand Up @@ -2171,16 +2126,7 @@ mod tests {

let record = DeviceListRecord {
user: "15551234567".into(),
devices: vec![
DeviceInfo {
device_id: 0,
key_index: None,
},
DeviceInfo {
device_id: 3,
key_index: Some(5),
},
],
devices: vec![DeviceInfo::new(0, None), DeviceInfo::new(3, Some(5))],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down Expand Up @@ -2255,16 +2201,7 @@ mod tests {
// Pre-populate device registry with device 0 AND device 3
let record = DeviceListRecord {
user: "15551234567".into(),
devices: vec![
DeviceInfo {
device_id: 0,
key_index: None,
},
DeviceInfo {
device_id: 3,
key_index: Some(5),
},
],
devices: vec![DeviceInfo::new(0, None), DeviceInfo::new(3, Some(5))],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down Expand Up @@ -2358,10 +2295,7 @@ mod tests {
backend
.update_device_list(DeviceListRecord {
user: pn.to_string(),
devices: vec![DeviceInfo {
device_id: 5,
key_index: None,
}],
devices: vec![DeviceInfo::new(5, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand All @@ -2376,10 +2310,7 @@ mod tests {
client
.update_device_list(DeviceListRecord {
user: pn.to_string(),
devices: vec![DeviceInfo {
device_id: 7,
key_index: None,
}],
devices: vec![DeviceInfo::new(7, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down Expand Up @@ -2411,10 +2342,7 @@ mod tests {
backend
.update_device_list(DeviceListRecord {
user: pn.to_string(),
devices: vec![DeviceInfo {
device_id: 0,
key_index: None,
}],
devices: vec![DeviceInfo::new(0, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down Expand Up @@ -2455,10 +2383,7 @@ mod tests {
backend
.update_device_list(DeviceListRecord {
user: user.to_string(),
devices: vec![DeviceInfo {
device_id: 1,
key_index: None,
}],
devices: vec![DeviceInfo::new(1, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down Expand Up @@ -2513,10 +2438,7 @@ mod tests {

let legacy = DeviceListRecord {
user: pn.to_string(),
devices: vec![DeviceInfo {
device_id: 9,
key_index: None,
}],
devices: vec![DeviceInfo::new(9, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand All @@ -2534,10 +2456,7 @@ mod tests {
client
.update_device_list(DeviceListRecord {
user: pn.to_string(),
devices: vec![DeviceInfo {
device_id: 10,
key_index: None,
}],
devices: vec![DeviceInfo::new(10, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down
5 changes: 1 addition & 4 deletions src/client/lid_pn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2093,10 +2093,7 @@ mod tests {
backend
.update_device_list(DeviceListRecord {
user: pn.to_string(),
devices: vec![DeviceInfo {
device_id: 3,
key_index: None,
}],
devices: vec![DeviceInfo::new(3, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down
11 changes: 1 addition & 10 deletions src/features/signal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,16 +1266,7 @@ mod tests {
client
.update_device_list(DeviceListRecord {
user: recipient.user.to_string(),
devices: vec![
DeviceInfo {
device_id: 0,
key_index: None,
},
DeviceInfo {
device_id: 1,
key_index: None,
},
],
devices: vec![DeviceInfo::new(0, None), DeviceInfo::new(1, None)],
timestamp: wacore::time::now_secs(),
phash: None,
raw_id: None,
Expand Down
6 changes: 3 additions & 3 deletions src/handlers/notification/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,9 +615,9 @@ pub(crate) async fn handle_account_sync_devices(
user: from_jid.user.to_string(),
devices: devices
.iter()
.map(|d| DeviceInfo {
device_id: d.jid.device as u32,
key_index: d.key_index,
.map(|d| {
DeviceInfo::new(d.jid.device as u32, d.key_index)
.with_hosting(wacore_binary::JidExt::is_hosted(&d.jid))
})
.collect(),
timestamp,
Expand Down
Loading
Loading