adam/Remote-Terminal-for-MeshCore
1
0
Fork 0
mirror of https://github.com/jkingsman/Remote-Terminal-for-MeshCore.git synced 2026-08-09 02:03:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix same-second same-message collision in room servers with per-sender disambiguation at DB level

Browse Source
This commit is contained in:
Jack Kingsman
2026-04-10 15:36:53 -07:00
parent a7258c120e
commit 8cc542ce23
6 changed files with 257 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_echo_dedup.py
+106
View File
@@ -1286,3 +1286,109 @@ class TestMessageAckedBroadcastShape:
assert isinstance(payload["ack_count"], int)
assert payload["ack_count"] == 0 # Outgoing DM duplicates no longer count as delivery
assert payload["packet_id"] == pkt1
class TestRoomServerMessageDedup:
"""Test that room-server posts from different authors are not collapsed.
Room messages are PRIV type sharing one conversation_key (the room contact's
pubkey). The dedup index includes sender_key so that two different room
participants sending identical text in the same clock second are stored as
separate messages.
"""
ROOM_PUB = "bb" * 32 # Room contact public key
SENDER_A_KEY = "aa" * 32
SENDER_B_KEY = "cc" * 32
@pytest.mark.asyncio
async def test_distinct_room_authors_same_text_same_second_stored_separately(self, test_db):
"""Two room users sending identical text in the same second produce two rows."""
msg_id_a = await MessageRepository.create(
msg_type="PRIV",
text="ok",
conversation_key=self.ROOM_PUB,
sender_timestamp=SENDER_TIMESTAMP,
received_at=SENDER_TIMESTAMP,
outgoing=False,
sender_key=self.SENDER_A_KEY,
sender_name="Alice",
)
assert msg_id_a is not None
msg_id_b = await MessageRepository.create(
msg_type="PRIV",
text="ok",
conversation_key=self.ROOM_PUB,
sender_timestamp=SENDER_TIMESTAMP,
received_at=SENDER_TIMESTAMP + 1,
outgoing=False,
sender_key=self.SENDER_B_KEY,
sender_name="Bob",
)
assert msg_id_b is not None, (
"Second room post with different sender_key should not be deduped"
)
assert msg_id_a != msg_id_b
messages = await MessageRepository.get_all(
msg_type="PRIV", conversation_key=self.ROOM_PUB, limit=10
)
assert len(messages) == 2
@pytest.mark.asyncio
async def test_same_room_author_same_text_same_second_still_deduped(self, test_db):
"""True echo from the same room author is still collapsed (same sender_key)."""
msg_id_1 = await MessageRepository.create(
msg_type="PRIV",
text="ok",
conversation_key=self.ROOM_PUB,
sender_timestamp=SENDER_TIMESTAMP,
received_at=SENDER_TIMESTAMP,
outgoing=False,
sender_key=self.SENDER_A_KEY,
sender_name="Alice",
)
assert msg_id_1 is not None
msg_id_2 = await MessageRepository.create(
msg_type="PRIV",
text="ok",
conversation_key=self.ROOM_PUB,
sender_timestamp=SENDER_TIMESTAMP,
received_at=SENDER_TIMESTAMP + 1,
outgoing=False,
sender_key=self.SENDER_A_KEY,
sender_name="Alice",
)
assert msg_id_2 is None, "Same sender_key should still be deduped"
messages = await MessageRepository.get_all(
msg_type="PRIV", conversation_key=self.ROOM_PUB, limit=10
)
assert len(messages) == 1
@pytest.mark.asyncio
async def test_null_sender_key_still_dedupes_normally(self, test_db):
"""Non-room incoming DMs (sender_key=None) still dedupe on content."""
msg_id_1 = await MessageRepository.create(
msg_type="PRIV",
text="hello",
conversation_key=CONTACT_PUB.lower(),
sender_timestamp=SENDER_TIMESTAMP,
received_at=SENDER_TIMESTAMP,
outgoing=False,
sender_key=None,
)
assert msg_id_1 is not None
msg_id_2 = await MessageRepository.create(
msg_type="PRIV",
text="hello",
conversation_key=CONTACT_PUB.lower(),
sender_timestamp=SENDER_TIMESTAMP,
received_at=SENDER_TIMESTAMP + 1,
outgoing=False,
sender_key=None,
)
assert msg_id_2 is None, "Both NULL sender_key should still collide"
tests/test_migrations.py
+26 -19
View File
@@ -7,6 +7,12 @@ import pytest
from app.migrations import get_version, run_migrations, set_version
# Updated automatically when a new migration is added. Migration tests that
# run ``run_migrations`` to completion assert ``get_version == LATEST`` and
# ``applied == LATEST - starting_version`` so only this constant needs to
# change, not every individual assertion.
LATEST_SCHEMA_VERSION = 56
class TestMigration001:
"""Test migration 001: add last_read_at columns."""
@@ -833,9 +839,9 @@ class TestMigration044:
assert [row["message_id"] for row in await cursor.fetchall()] == [1, 1]
cursor = await conn.execute(
"INSERT OR IGNORE INTO messages (type, conversation_key, text, sender_timestamp, received_at, outgoing) "
"VALUES (?, ?, ?, ?, ?, ?)",
("PRIV", "abc123", "hello", 0, 9999, 0),
"INSERT OR IGNORE INTO messages (type, conversation_key, text, sender_timestamp, received_at, outgoing, sender_key) "
"VALUES (?, ?, ?, ?, ?, ?, ?)",
("PRIV", "abc123", "hello", 0, 9999, 0, "abc123"),
)
assert cursor.rowcount == 0
@@ -844,6 +850,7 @@ class TestMigration044:
)
index_sql = (await cursor.fetchone())["sql"]
assert "WHERE type = 'PRIV' AND outgoing = 0" in index_sql
assert "sender_key" in index_sql
finally:
await conn.close()
@@ -1224,8 +1231,8 @@ class TestMigration039:
applied = await run_migrations(conn)
assert applied == 17
assert await get_version(conn) == 55
assert applied == LATEST_SCHEMA_VERSION - 38
assert await get_version(conn) == LATEST_SCHEMA_VERSION
cursor = await conn.execute(
"""
@@ -1296,8 +1303,8 @@ class TestMigration039:
applied = await run_migrations(conn)
assert applied == 17
assert await get_version(conn) == 55
assert applied == LATEST_SCHEMA_VERSION - 38
assert await get_version(conn) == LATEST_SCHEMA_VERSION
cursor = await conn.execute(
"""
@@ -1363,8 +1370,8 @@ class TestMigration039:
applied = await run_migrations(conn)
assert applied == 11
assert await get_version(conn) == 55
assert applied == LATEST_SCHEMA_VERSION - 44
assert await get_version(conn) == LATEST_SCHEMA_VERSION
cursor = await conn.execute(
"""
@@ -1416,8 +1423,8 @@ class TestMigration040:
applied = await run_migrations(conn)
assert applied == 16
assert await get_version(conn) == 55
assert applied == LATEST_SCHEMA_VERSION - 39
assert await get_version(conn) == LATEST_SCHEMA_VERSION
await conn.execute(
"""
@@ -1478,8 +1485,8 @@ class TestMigration041:
applied = await run_migrations(conn)
assert applied == 15
assert await get_version(conn) == 55
assert applied == LATEST_SCHEMA_VERSION - 40
assert await get_version(conn) == LATEST_SCHEMA_VERSION
await conn.execute(
"""
@@ -1531,8 +1538,8 @@ class TestMigration042:
applied = await run_migrations(conn)
assert applied == 14
assert await get_version(conn) == 55
assert applied == LATEST_SCHEMA_VERSION - 41
assert await get_version(conn) == LATEST_SCHEMA_VERSION
await conn.execute(
"""
@@ -1671,8 +1678,8 @@ class TestMigration046:
applied = await run_migrations(conn)
assert applied == 10
assert await get_version(conn) == 55
assert applied == LATEST_SCHEMA_VERSION - 45
assert await get_version(conn) == LATEST_SCHEMA_VERSION
cursor = await conn.execute(
"""
@@ -1765,8 +1772,8 @@ class TestMigration047:
applied = await run_migrations(conn)
assert applied == 9
assert await get_version(conn) == 55
assert applied == LATEST_SCHEMA_VERSION - 46
assert await get_version(conn) == LATEST_SCHEMA_VERSION
cursor = await conn.execute(
"""