Firepup650/python-talk
2
1
Fork 1
Code Issues Pull requests Activity Actions

S2S protocol work, other small changes

Browse source
This commit is contained in:
Firepup Sixfifty 2024-07-05 00:31:47 -05:00
parent 2c3d9f15eb
commit d740b26e2b
Signed by: Firepup650
GPG key ID: 7C92E2ABBBFAB9BA
1 changed files with 92 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
server.py
View file

@ -8,7 +8,9 @@ class Globals: ...
G = Globals() G = Globals()
G.uniqueClients = 0 G.uniqueClients = 0
G.linked = [] G.serverLinks = 0
G.servers = {}
G.clientsConnected = []
port = 65048 port = 65048
G.msgs = [] G.msgs = []
G.remoteID = "firepi" G.remoteID = "firepi"
@ -43,14 +45,22 @@ except Exception:
raise ValueError("Invalid arguments. Please refer to -? for usage.") from None raise ValueError("Invalid arguments. Please refer to -? for usage.") from None
def raw(string: str) -> str:
s = string.strip()
return f"{s!r}"[1:-1].replace("\\\\", "\\")
def fmt(msg: str, name: str = "", action: bool = False) -> str:
if action:
return f"* {name}{' '*(20-len(name))} {msg}"
else:
return f" {name}{' '*(20-len(name))}: {msg}"
async def handle_client(reader, writer): async def handle_client(reader, writer):
try: try:
global G global G
writer.write(b"Pleass identify yourself. Nick limit is 20 chars.\n") writer.write(b"Please identify yourself. Nick limit is 20 chars.\n")
await writer.drain() await writer.drain()
name = repr((await reader.read(20)).decode("utf8").strip())[1:-1].replace( name = raw((await reader.read(20)).decode("utf8"))
"\\\\", "\\"
)
if len(name) > 20: if len(name) > 20:
name = name[ name = name[
:19 :19
@ -67,49 +77,90 @@ async def handle_client(reader, writer):
writer.close() writer.close()
await writer.wait_closed() await writer.wait_closed()
return return
if name in G.linked: if name in G.clientsConnected:
writer.write(f"Nick ({name}) in use\n".encode("utf8")) writer.write(f"Nick ({name}) in use\n".encode("utf8"))
await writer.drain() await writer.drain()
writer.close() writer.close()
await writer.wait_closed() await writer.wait_closed()
return return
G.linked.extend([name]) if not name.startswith("S2S-"):
msgIndex = 0 G.clientsConnected.extend([name])
G.uniqueClients += 1 msgIndex = 0
G.msgs.extend([log(f"{name} has connected to the server.")]) G.uniqueClients += 1
while 1: G.msgs.extend([log(f"{name} has connected to the server.")])
try: while 1:
buffer = await asyncio.wait_for(reader.read(970), 0.1) try:
request = repr(buffer.decode("utf8").strip())[1:-1].replace( buffer = await asyncio.wait_for(reader.read(967), 0.1)
"\\\\", "\\" request = raw(buffer.decode("utf8"))
) response = None
response = None if request.startswith("/mes "):
if request.startswith("/mes "): response = log(f"* {name}'s {request[5:]}")
response = log(f"* {name}'s {request[4:]}") elif request.startswith("/me "):
elif request.startswith("/me "): response = log(f"* {name} {request[4:]}")
response = log(f"* {name} {request[3:]}") elif request.startswith("/h"):
elif request.startswith("/h"): writer.write(b"TODO: Command listing\n")
writer.write(b"TODO: Command listing\n") await writer.drain()
await writer.drain() elif request.startswith("/quit"):
elif request.startswith("/quit"): break
break elif request:
elif request: response = log(f" {name}: {request}")
response = log(f" {name}: {request}") if response:
if response: G.msgs.extend([response])
G.msgs.extend([response]) except asyncio.TimeoutError:
except asyncio.TimeoutError: pass
pass if msgIndex < len(G.msgs):
if msgIndex < len(G.msgs): writer.writelines(G.msgs[msgIndex:])
writer.writelines(G.msgs[msgIndex:]) msgIndex = len(G.msgs)
msgIndex = len(G.msgs)
await writer.drain() await writer.drain()
writer.close() writer.close()
await writer.wait_closed() await writer.wait_closed()
G.msgs.extend([log(f"{name} has disconnected from the server.")]) G.uniqueClients -= 1
G.linked.remove(name) G.msgs.extend([log(f"{name} has disconnected from the server.")])
G.clientsConnected.remove(name)
else: # This is... probably a server?
sName = name[4:] # Trim off the S2S label
log(f"Server link! Link from {sName}")
G.serverLinks += 1
G.servers[sName] = []
msgIndex = 0
while 1:
client = await reader.read(967)
if client == f"END OF CLIENT LISTING FROM {sName}":
break
G.msgs.extend([log(f"{client} has connected from {sName}")])
G.servers[sName].append(client)
G.clientsConnected.extend(G.servers[sName])
while 1:
buffer = await asyncio.wait_for(reader.read(967), 0.1)
request = raw(buffer.decode("utf8"))
match buffer[0]:
case "S": # Server notice
G.msgs.extend([log(buffer[2:])])
writer.write(b"I Mmm... Blueberries\n")
await writer.drain()
case "I":
pass
case "+":
cName = buffer[2:]
G.msgs.extend([log(f"{cName} has connected from {sName}")])
G.clientsConnected.extend([cName])
writer.write(b"I Mmm... Pineapples"\n")
await writer.drain()
case "-":
cName = buffer[2:]
G.clientsConnected.remove(cName)
await writer.drain()
except ConnectionResetError: except ConnectionResetError:
G.msgs.extend([log(f"{name} has disconnected from the server.")]) if not name.startswith("S2S-"):
G.linked.remove(name) G.msgs.extend([log(f"{name} has disconnected from the server.")])
G.clientsConnected.remove(name)
else:
for cName in G.serverLinks[name[4:]]:
G.msgs.extend([log(f"{cName}'s server is going down")])
G.clientsConnected.remove(cName)
G.serverLinks -= 1
G.servers.remove(name[4:])
G.msgs.extend([log(f"{name[4:]} has de-linked from the network")])
async def run_server(port): async def run_server(port):