From dd8f37fe423dc9b7bf0be4d2a2c9b871184a7f7c Mon Sep 17 00:00:00 2001 From: Sunpy Date: Thu, 15 Aug 2019 18:57:50 +0200 Subject: [PATCH] Added manual server emulation and javascript graph --- handlers/mainHandler.py | 8 ++-- serv_emu.py | 104 ++++++++++++++++++++++++++++++++++++++++ www/js/graph.js | 50 +++++++++++++++++++ www/js/struct/LICENSE | 21 -------- www/js/struct/struct.js | 60 ----------------------- www/main.html | 25 ++++++---- 6 files changed, 173 insertions(+), 95 deletions(-) create mode 100644 serv_emu.py create mode 100644 www/js/graph.js delete mode 100644 www/js/struct/LICENSE delete mode 100644 www/js/struct/struct.js diff --git a/handlers/mainHandler.py b/handlers/mainHandler.py index 08a595f..e639233 100644 --- a/handlers/mainHandler.py +++ b/handlers/mainHandler.py @@ -11,8 +11,8 @@ clients = set() STRUCTS = { "start": b"fHB%ds", - "end": b"", "flight_data": b"BBHhHfff", + "end": b"", "server_open": b"", "server_close": b"" } @@ -223,7 +223,7 @@ class DiscoveryProtocol(asyncio.DatagramProtocol): def connection_made(self, transport): self.transport = transport def datagram_received(self, data, addr): - logging.info("Received data from %s:%d" % addr) + logging.debug("Received data from %s:%d" % addr) if len(data) < 4: # Not even a header... smh logging.debug("Noise received: %b" % data) @@ -266,9 +266,9 @@ class DiscoveryProtocol(asyncio.DatagramProtocol): @staticmethod def handle_server_open(_): - pass + logging.info("Received server opened message") @staticmethod def handle_server_close(_): - pass + logging.info("Received server closed message") \ No newline at end of file diff --git a/serv_emu.py b/serv_emu.py new file mode 100644 index 0000000..fe120ca --- /dev/null +++ b/serv_emu.py @@ -0,0 +1,104 @@ +import sys +import socket +import struct +import pathlib +import logging + +from objects import glob +from handlers.mainHandler import STRUCTS + +sock_addr = (glob.config["socket"]["ip"] if glob.config["socket"]["ip"] != "0.0.0.0" else "127.0.0.1", glob.config["socket"]["port"]) + +sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP) +sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) +sock.connect(sock_addr) +sock.setblocking(0) + +def send_packet(type, data = b""): + global sock + packet_id = list(STRUCTS.keys()).index(type) + 1 + data = struct.pack(b"<3sB%ds" % len(data), b"FLY", packet_id, data) + logging.info("<< %s" % data) + sock.send(data) + +def sinput(p = "> "): + s = input(p) + if s in ["exit", "close", "stop"]: + send_packet("server_close") + exit() + return s + +def srvr(): + keys = list(STRUCTS.keys()) + def choose_packetType(): + print("Choose packetID to send") + for i in range(len(keys)): + print(" %d: %s" % (i + 1, keys[i])) + id = 0 + while id > len(keys) or id < 1: + try: + id = int( sinput() ) + except SystemExit or KeyboardInterrupt: + exit() + except: + pass + return id + + def send_data(id): + def _start(): + ret = ( + int( input(" FlightUUID (I) [DWORD] > ") ), + float( input(" VehicleMaxFuel (f) [FLOAT] > ") ), + int( input(" VehicleModelID (H) [WORD] > ") ), + input(" PlayerName (%ds) [STRING] > ").encode() + ) + send_packet("start", + struct.pack(b" ") ), + int( input(" Flags 0-3 (B) [BYTE] > ") ), + int( input(" Satisfaction (B) [BYTE] > ") ), + int( input(" Speed (H) [WORD] > ") ), + int( input(" Altitude (h) [WORD] > ") ), + int( input(" Health (H) [WORD] > ") ), + float( input(" FuelLevel (f) [FLOAT] > ") ), + float( input(" X pos (f) [FLOAT] > ") ), + float( input(" Y pos (f) [FLOAT] > ") ) + ) + send_packet("flight_data", struct.pack(b" ") ), + ) + send_packet("end", struct.pack(b"])?(([1-9]\d*)?([xcbB?hHiIfdsp]))*$/ -const refmt = /([1-9]\d*)?([xcbB?hHiIfdsp])/g -const str = (v,o,c) => String.fromCharCode( - ...new Uint8Array(v.buffer, v.byteOffset + o, c)) -const rts = (v,o,c,s) => new Uint8Array(v.buffer, v.byteOffset + o, c) - .set(s.split('').map(str => str.charCodeAt(0))) -const pst = (v,o,c) => str(v, o + 1, Math.min(v.getUint8(o), c - 1)) -const tsp = (v,o,c,s) => { v.setUint8(o, s.length); rts(v, o + 1, c - 1, s) } -const lut = le => ({ - x: c=>[1,c,0], - c: c=>[c,1,o=>({u:v=>str(v, o, 1) , p:(v,c)=>rts(v, o, 1, c) })], - '?': c=>[c,1,o=>({u:v=>Boolean(v.getUint8(o)),p:(v,B)=>v.setUint8(o,B)})], - b: c=>[c,1,o=>({u:v=>v.getInt8( o ), p:(v,b)=>v.setInt8( o,b )})], - B: c=>[c,1,o=>({u:v=>v.getUint8( o ), p:(v,B)=>v.setUint8( o,B )})], - h: c=>[c,2,o=>({u:v=>v.getInt16( o,le), p:(v,h)=>v.setInt16( o,h,le)})], - H: c=>[c,2,o=>({u:v=>v.getUint16( o,le), p:(v,H)=>v.setUint16( o,H,le)})], - i: c=>[c,4,o=>({u:v=>v.getInt32( o,le), p:(v,i)=>v.setInt32( o,i,le)})], - I: c=>[c,4,o=>({u:v=>v.getUint32( o,le), p:(v,I)=>v.setUint32( o,I,le)})], - f: c=>[c,4,o=>({u:v=>v.getFloat32(o,le), p:(v,f)=>v.setFloat32(o,f,le)})], - d: c=>[c,8,o=>({u:v=>v.getFloat64(o,le), p:(v,d)=>v.setFloat64(o,d,le)})], - s: c=>[1,c,o=>({u:v=>str(v,o,c), p:(v,s)=>rts(v,o,c,s.slice(0,c ) )})], - p: c=>[1,c,o=>({u:v=>pst(v,o,c), p:(v,s)=>tsp(v,o,c,s.slice(0,c - 1) )})] -}) -const errbuf = new RangeError("Structure larger than remaining buffer") -const errval = new RangeError("Not enough values for structure") -const struct = format => { - let fns = [], size = 0, m = rechk.exec(format) - if (!m) { throw new RangeError("Invalid format string") } - const t = lut('<' === m[1]), lu = (n, c) => t[c](n ? parseInt(n, 10) : 1) - while ((m = refmt.exec(format))) { ((r, s, f) => { - for (let i = 0; i < r; ++i, size += s) { if (f) {fns.push(f(size))} } - })(...lu(...m.slice(1)))} - const unpack_from = (arrb, offs) => { - if (arrb.byteLength < (offs|0) + size) { throw errbuf } - let v = new DataView(arrb, offs|0) - return fns.map(f => f.u(v)) - } - const pack_into = (arrb, offs, ...values) => { - if (values.length < fns.length) { throw errval } - if (arrb.byteLength < offs + size) { throw errbuf } - const v = new DataView(arrb, offs) - new Uint8Array(arrb, offs, size).fill(0) - fns.forEach((f, i) => f.p(v, values[i])) - } - const pack = (...values) => { - let b = new ArrayBuffer(size) - pack_into(b, 0, ...values) - return b - } - const unpack = arrb => unpack_from(arrb, 0) - function* iter_unpack(arrb) { - for (let offs = 0; offs + size <= arrb.byteLength; offs += size) { - yield unpack_from(arrb, offs); - } - } - return Object.freeze({ - unpack, pack, unpack_from, pack_into, iter_unpack, format, size}) -} \ No newline at end of file diff --git a/www/main.html b/www/main.html index 04ab29f..8421b27 100644 --- a/www/main.html +++ b/www/main.html @@ -2,8 +2,8 @@ WebSocket DEMO - + @@ -120,10 +119,10 @@
-
-
-
-
+
+
+
+ 

         

@@ -136,6 +135,12 @@