lnbits-exts/nostrrelay
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

test: more fixtures

Browse source
This commit is contained in:
Vlad Stan 2023-02-02 16:27:06 +02:00
parent f6c92a5ccf
commit 841b8d6ea4
2 changed files with 65 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client_manager.py
View file

@ -38,13 +38,14 @@ class NostrClientConnection:
await self.websocket.accept() await self.websocket.accept()
while True: while True:
json_data = await self.websocket.receive_text() json_data = await self.websocket.receive_text()
print('### received', json_data)
try: try:
data = json.loads(json_data) data = json.loads(json_data)
resp = await self.__handle_message(data) resp = await self.__handle_message(data)
if resp: for r in resp:
for r in resp: print('### sent query', json.dumps(r))
await self.websocket.send_text(json.dumps(r)) await self.websocket.send_text(json.dumps(r))
except Exception as e: except Exception as e:
logger.warning(e) logger.warning(e)
@ -52,29 +53,28 @@ class NostrClientConnection:
for filter in self.filters: for filter in self.filters:
if filter.matches(event): if filter.matches(event):
resp = event.serialize_response(filter.subscription_id) resp = event.serialize_response(filter.subscription_id)
for i in range(0, 100): print('### sent notify', json.dumps(resp))
await self.websocket.send_text(json.dumps(resp)) await self.websocket.send_text(json.dumps(resp))
await asyncio.sleep(1)
return True return True
return False return False
async def __handle_message(self, data: List) -> Union[None, List]: async def __handle_message(self, data: List) -> List:
if len(data) < 2: if len(data) < 2:
return None return []
message_type = data[0] message_type = data[0]
if message_type == NostrEventType.EVENT: if message_type == NostrEventType.EVENT:
await self.__handle_event(NostrEvent.parse_obj(data[1])) await self.__handle_event(NostrEvent.parse_obj(data[1]))
return None return []
if message_type == NostrEventType.REQ: if message_type == NostrEventType.REQ:
if len(data) != 3: if len(data) != 3:
return None return []
return await self.__handle_request(data[1], NostrFilter.parse_obj(data[2])) return await self.__handle_request(data[1], NostrFilter.parse_obj(data[2]))
if message_type == NostrEventType.CLOSE: if message_type == NostrEventType.CLOSE:
self.__handle_close(data[1]) self.__handle_close(data[1])
return None return []
async def __handle_event(self, e: "NostrEvent"): async def __handle_event(self, e: "NostrEvent"):
resp_nip20: List[Any] = ["ok", e.id] resp_nip20: List[Any] = ["ok", e.id]
@ -84,7 +84,7 @@ class NostrClientConnection:
await self.broadcast_event(self, e) await self.broadcast_event(self, e)
resp_nip20 += [True, ""] resp_nip20 += [True, ""]
except Exception as ex: except Exception as ex:
resp_nip20 += [False, f"error: {ex}"] resp_nip20 += [False, f"error: failed to create event"]
await self.websocket.send_text(json.dumps(resp_nip20)) await self.websocket.send_text(json.dumps(resp_nip20))

89
tests/test_clients.py
View file

@ -96,6 +96,12 @@ fixtures = {
"sig": "52b142eb5bf95e46424d8f146a0efcfd1be35ec2ae446152ccc875bc82eee66bef6df1af9a4456ec8984540ac4e21905544b5291334e2b18a24e534b788b2d81", "sig": "52b142eb5bf95e46424d8f146a0efcfd1be35ec2ae446152ccc875bc82eee66bef6df1af9a4456ec8984540ac4e21905544b5291334e2b18a24e534b788b2d81",
}, },
], ],
"meta_response": [
"ok",
"a3591f44f9f12e8d745a79c19affc1f9ea267a716981116835ddb7b327096be5",
True,
"",
],
"request_meta_alice": [ "request_meta_alice": [
"REQ", "REQ",
"profile", "profile",
@ -106,19 +112,6 @@ fixtures = {
], ],
}, },
], ],
"meta_alice": [
"EVENT",
"profile",
{
"id": "9d4883c31d6ae3d80fd8882a248cc193800a096d87bd55d5c1df8a237e78ca09",
"pubkey": "0b29ecc73ba400e5b4bd1e4cb0d8f524e9958345749197ca21c8da38d0622816",
"created_at": 1675332095,
"kind": 0,
"tags": [],
"content": '{"name":"Alice"}',
"sig": "95c30b6bbc70f3777d2b2b47ae3961e196eae0df72f3ae301ff1009cdabf9c50bb0eb7825891c842fc6ca5cb268342cc486850a6127ab40df871bd3e1fd0b0d7",
},
],
"request_posts_alice": [ "request_posts_alice": [
"REQ", "REQ",
"sub0", "sub0",
@ -192,7 +185,8 @@ fixtures = {
class MockWebSocket(WebSocket): class MockWebSocket(WebSocket):
def __init__(self): def __init__(self):
self.sent_messages = [] self.sent_messages = []
self.received_messages: asyncio.Queue[str] = asyncio.Queue(0) self.received_messages = []
self.fake_wire: asyncio.Queue[str] = asyncio.Queue(0)
pass pass
async def accept(self): async def accept(self):
@ -200,51 +194,74 @@ class MockWebSocket(WebSocket):
async def receive_text(self) -> str: async def receive_text(self) -> str:
# print("### mock receive_text") # print("### mock receive_text")
return await self.received_messages.get() data = await self.fake_wire.get()
self.received_messages.append(data)
return data
async def send_text(self, data: str): async def send_text(self, data: str):
self.sent_messages.append(data) self.sent_messages.append(data)
# print("### mock send_text", data) # print("### mock send_text", data)
async def mock_new_message(self, data: str): async def wire_mock_message(self, data: str):
# print("#### mock_new_message", data) # print("#### wire_mock_message", data)
await self.received_messages.put(data) await self.fake_wire.put(data)
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_xxx(): async def test_xxx():
client_manager = NostrClientManager() client_manager = NostrClientManager()
websocket_alice = MockWebSocket() ws_alice = MockWebSocket()
client_alice = NostrClientConnection(websocket=websocket_alice) client_alice = NostrClientConnection(websocket=ws_alice)
client_manager.add_client(client_alice) client_manager.add_client(client_alice)
asyncio.create_task(client_alice.start()) asyncio.create_task(client_alice.start())
websocket_bob = MockWebSocket() ws_bob = MockWebSocket()
client_bob = NostrClientConnection(websocket=websocket_bob) client_bob = NostrClientConnection(websocket=ws_bob)
client_manager.add_client(client_bob) client_manager.add_client(client_bob)
asyncio.create_task(client_bob.start()) asyncio.create_task(client_bob.start())
await asyncio.sleep(1) await asyncio.sleep(1)
await websocket_alice.mock_new_message(json.dumps(fixtures["alice"]["meta"])) await ws_alice.wire_mock_message(json.dumps(fixtures["alice"]["meta"]))
await websocket_alice.mock_new_message(json.dumps(fixtures["alice"]["post01"])) await ws_alice.wire_mock_message(json.dumps(fixtures["alice"]["post01"]))
await websocket_alice.mock_new_message(json.dumps(fixtures["alice"]["post01"])) await ws_alice.wire_mock_message(json.dumps(fixtures["alice"]["post01"]))
await asyncio.sleep(0.1) await asyncio.sleep(0.5)
assert ( assert (
len(websocket_alice.sent_messages) == 3 len(ws_alice.sent_messages) == 3
), "Expected 3 confirmations to be sent" ), "Alice: Expected 3 confirmations to be sent"
assert websocket_alice.sent_messages[0] == json.dumps( assert ws_alice.sent_messages[0] == json.dumps(
fixtures["alice"]["meta_response"] fixtures["alice"]["meta_response"]
), "Wrong confirmation for meta" ), "Alice: Wrong confirmation for meta"
assert websocket_alice.sent_messages[1] == json.dumps( assert ws_alice.sent_messages[1] == json.dumps(
fixtures["alice"]["post01_response_ok"] fixtures["alice"]["post01_response_ok"]
), "Wrong confirmation for post01" ), "Alice: Wrong confirmation for post01"
assert websocket_alice.sent_messages[2] == json.dumps( assert ws_alice.sent_messages[2] == json.dumps(
fixtures["alice"]["post01_response_duplicate"] fixtures["alice"]["post01_response_duplicate"]
), "Expected failure for double posting" ), "Alice: Expected failure for double posting"
print("### websocket_alice.sent_messages", websocket_alice.sent_messages) await ws_bob.wire_mock_message(json.dumps(fixtures["bob"]["meta"]))
print("### websocket_bob.sent_messages", websocket_bob.sent_messages) await ws_bob.wire_mock_message(
json.dumps(fixtures["bob"]["request_meta_alice"])
)
await asyncio.sleep(0.5)
print("### ws_alice.sent_messages", ws_alice.sent_messages)
# print("### ws_alice.received_messages", ws_alice.received_messages)
print("### ws_bob.sent_messages", ws_bob.sent_messages)
print("### ws_bob.received_messages", ws_bob.received_messages)
assert (
len(ws_bob.sent_messages) == 3
), "Bob: Expected 3 confirmations to be sent"
assert ws_bob.sent_messages[0] == json.dumps(
fixtures["bob"]["meta_response"]
), "Bob: Wrong confirmation for meta"
assert ws_bob.sent_messages[1] == json.dumps(
["EVENT", "profile", fixtures["alice"]["meta"][1]]
), "Bob: Wrong confirmation for Alice's meta"
assert ws_bob.sent_messages[2] == json.dumps(
["EOSE", "profile"]
), "Bob: Wrong End Of Straming Event"
await asyncio.sleep(1) await asyncio.sleep(1)