Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
20d41eb
fix(vehicles): honor SummonPos placement and implement slave equipment
stsiakal Oct 22, 2026
5fa05b6
fix(vehicles): validate and spawn slave equipment visuals
stsiakal Oct 22, 2026
71d9dfd
feat(vehicles): man ship cannons
stsiakal Oct 22, 2026
201975b
fix(vehicles): use upstream collision masks for the summon placement …
stsiakal Oct 22, 2026
868d4cd
fix(characters): save the starting items with the new character row
stsiakal Oct 22, 2026
7d7d8bf
fix(commons): guard packet reads and cover protocol boundaries
NickMesser Oct 23, 2026
4796cad
fix(xtask): run ratchet unit tests in local CI
NickMesser Oct 23, 2026
94dc9c5
Merge fork/rust-rewrite into protocol-tests before PR39 fixes
NickMesser Oct 23, 2026
31b0902
Merge PR39 atomic character and starter inventory persistence for rev…
NickMesser Oct 23, 2026
8b4b3d5
merge: bring PR33 global cooldown fixes into vehicle review lane
NickMesser Oct 23, 2026
e444699
merge: bring PR38 vehicle placement equipment and cannon changes into…
NickMesser Oct 23, 2026
c9da5b6
fix(vehicles): preserve legacy parts and validate cannon gunners
NickMesser Oct 23, 2026
27e7680
fix(game): roll back starter inventory and verify fresh creation
NickMesser Oct 23, 2026
41fa612
fix(testclient): avoid deprecated atomic update for fresh names
NickMesser Oct 23, 2026
ab763c7
fix(physics): detach sleeping users before static collider reclamation
NickMesser Oct 23, 2026
4df0649
test(game): align creation coverage with rollback cleanup
NickMesser Oct 23, 2026
299b527
Merge reviewed character persistence and protocol tests before vehicl…
NickMesser Oct 23, 2026
bd77ac7
Merge branch 'fix/protocol-tests' into rust-rewrite
NickMesser Oct 23, 2026
55dfbc1
Merge branch 'rust-rewrite' into fix/vehicle-pr-review
NickMesser Oct 23, 2026
bf16c45
Merge branch 'fix/vehicle-pr-review' into rust-rewrite
NickMesser Oct 23, 2026
1e359be
fix(music): serve native uncached note requests
NickMesser Oct 23, 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
2 changes: 1 addition & 1 deletion rust/PORT-AUDIT.md
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ Public methods with no Rust counterpart by name, and their verdicts:
| `CSChangeMateNamePacket.cs` | CSChangeMateNamePacket | ported | `CSChangeMateNamePacket` → `aaemu-game/src/systems/vehicles/packets.rs` |
| `CSChangeMateTargetPacket.cs` | CSChangeMateTargetPacket | ported | `CSChangeMateTargetPacket` → `aaemu-game/src/systems/vehicles/packets.rs` |
| `CSChangeMateUserStatePacket.cs` | CSChangeMateUserStatePacket | ported | `CSChangeMateUserStatePacket` → `aaemu-game/src/systems/vehicles/packets.rs` |
| `CSChangeSlaveEquipmentPacket.cs` | CSChangeSlaveEquipmentPacket | ported | `CSChangeSlaveEquipmentPacket` → `aaemu-game/src/systems/economy/mate_equipment.rs` |
| `CSChangeSlaveEquipmentPacket.cs` | CSChangeSlaveEquipmentPacket | ported | `CSChangeSlaveEquipmentPacket` → `aaemu-game/src/systems/vehicles/packets.rs` |
| `CSChangeSlaveNamePacket.cs` | CSChangeSlaveNamePacket | ported | `CSChangeSlaveNamePacket` → `aaemu-game/src/systems/vehicles/packets.rs` |
| `CSChangeSlaveTargetPacket.cs` | CSChangeSlaveTargetPacket | ported | `CSChangeSlaveTargetPacket` → `aaemu-game/src/packets/c2g_misc.rs` |
| `CSChangeTargetPacket.cs` | CSChangeTargetPacket | ported | `CSChangeTargetPacket` → `aaemu-game/src/systems/skills/handlers.rs` |
Expand Down
105 changes: 105 additions & 0 deletions rust/crates/aaemu-commons/src/net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,109 @@ mod tests {
assert_eq!(c.decode(&mut buf).unwrap(), Some(vec![9]));
assert_eq!(c.decode(&mut buf).unwrap(), None);
}

#[test]
fn frame_lengths_have_exact_wire_bytes() {
for (len, header) in [(0, [0, 0]), (258, [2, 1]), (65_535, [0xff, 0xff])] {
let payload: Vec<u8> = (0..len).map(|i| (i % 251) as u8).collect();
let mut c = FrameCodec;
let mut buf = BytesMut::new();
c.encode(&payload, &mut buf).unwrap();
assert_eq!(&buf[..2], &header);
assert_eq!(&buf[2..], payload);
assert_eq!(c.decode(&mut buf).unwrap(), Some(payload));
assert!(buf.is_empty());
assert_eq!(c.decode(&mut buf).unwrap(), None);
}
}

#[test]
fn decodes_at_every_fragmentation_point() {
let payload: Vec<u8> = (0..258).map(|i| (i % 251) as u8).collect();
let mut wire = vec![2, 1];
wire.extend_from_slice(&payload);
for split in 0..=wire.len() {
let mut c = FrameCodec;
let mut buf = BytesMut::from(&wire[..split]);
if split < wire.len() {
for _ in 0..2 {
assert_eq!(c.decode(&mut buf).unwrap(), None, "split {split}");
assert_eq!(&buf[..], &wire[..split], "split {split}");
}
}
buf.extend_from_slice(&wire[split..]);
assert_eq!(c.decode(&mut buf).unwrap(), Some(payload.clone()));
assert!(buf.is_empty());
assert_eq!(c.decode(&mut buf).unwrap(), None);
}
}

#[test]
fn coalesced_frames_preserve_incomplete_trailing_frame() {
let cases: &[(&[u8], &[u8], &[u8])] = &[
(&[3], &[0, 9, 8, 7], &[9, 8, 7]),
(&[3, 0, 9], &[8, 7], &[9, 8, 7]),
];
for &(trailing, rest, payload) in cases {
let mut c = FrameCodec;
let mut buf = BytesMut::from(&[0, 0, 2, 0, 0x10, 0x20][..]);
buf.extend_from_slice(trailing);
assert_eq!(c.decode(&mut buf).unwrap(), Some(vec![]));
assert_eq!(c.decode(&mut buf).unwrap(), Some(vec![0x10, 0x20]));
assert_eq!(c.decode(&mut buf).unwrap(), None);
assert_eq!(&buf[..], trailing);
buf.extend_from_slice(rest);
assert_eq!(c.decode(&mut buf).unwrap(), Some(payload.to_vec()));
assert!(buf.is_empty());
}
}

#[test]
fn decode_eof_rejects_every_truncated_frame() {
let wire = [3, 0, 1, 2, 3];
for end in 1..wire.len() {
let mut c = FrameCodec;
let mut buf = BytesMut::from(&wire[..end]);
let err = c.decode_eof(&mut buf).unwrap_err();
assert_eq!(err.kind(), std::io::ErrorKind::Other);
assert_eq!(&buf[..], &wire[..end]);
}
}

#[test]
fn decode_eof_drains_complete_frames_before_truncated_tail() {
let mut c = FrameCodec;
let mut buf = BytesMut::from(&[0, 0, 1, 0, 9, 2][..]);
assert_eq!(c.decode_eof(&mut buf).unwrap(), Some(vec![]));
assert_eq!(c.decode_eof(&mut buf).unwrap(), Some(vec![9]));
assert!(c.decode_eof(&mut buf).is_err());
assert_eq!(&buf[..], &[2]);
}

#[test]
fn decode_eof_accepts_complete_frame_and_empty_buffer() {
let mut c = FrameCodec;
let mut buf = BytesMut::new();
assert_eq!(c.decode_eof(&mut buf).unwrap(), None);
buf.extend_from_slice(&[1, 0, 9]);
assert_eq!(c.decode_eof(&mut buf).unwrap(), Some(vec![9]));
assert!(buf.is_empty());
assert_eq!(c.decode_eof(&mut buf).unwrap(), None);
}

#[test]
fn oversized_encode_preserves_destination() {
let mut c = FrameCodec;
let mut buf = BytesMut::from(&[1, 0, 9][..]);
let before = buf.clone();
let payload = vec![0; usize::from(u16::MAX) + 1];
let err = c.encode(&payload, &mut buf).unwrap_err();
assert_eq!(err.kind(), std::io::ErrorKind::InvalidInput);
assert_eq!(buf, before);
c.encode([8], &mut buf).unwrap();
assert_eq!(&buf[..], &[1, 0, 9, 1, 0, 8]);
assert_eq!(c.decode(&mut buf).unwrap(), Some(vec![9]));
assert_eq!(c.decode(&mut buf).unwrap(), Some(vec![8]));
assert!(buf.is_empty());
}
}
Loading
Loading