From 24e9a576ce916e35aeb41f46797ce900f94d481d Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 14 Jul 2022 20:03:19 +0800 Subject: [PATCH] [add] refactor socket client --- tests/scripts/socket.js | 34 +++++++++++++++++++++++++++++ tests/servers/rfid.sock.json | 15 ++++++++----- tests/servers/rfid_client.sock.json | 17 ++++++++++----- 3 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 tests/scripts/socket.js diff --git a/tests/scripts/socket.js b/tests/scripts/socket.js new file mode 100644 index 00000000..c22fc669 --- /dev/null +++ b/tests/scripts/socket.js @@ -0,0 +1,34 @@ +function onData(data, recvLen) { + console.log(`Data: ${data} ${recvLen}`); + log.Trace("onData: %v %v", data, recvLen); +} + +function onError(err) { + console.log(`Error: ${err} `); +} + +function onClosed(data, err) { + console.log(`Closed: ${data} ${err} `); +} + +function onConnected(option) { + console.log("onConnected", option); +} + +// Convert a hex string to a byte array +function hexToBytes(hex) { + for (var bytes = [], c = 0; c < hex.length; c += 2) { + bytes.push(parseInt(hex.substr(c, 2), 16)); + } + return bytes; +} + +// Convert a byte array to a hex string +function bytesToHex(bytes) { + for (var hex = [], i = 0; i < bytes.length; i++) { + var current = bytes[i] < 0 ? bytes[i] + 256 : bytes[i]; + hex.push((current >>> 4).toString(16)); + hex.push((current & 0xf).toString(16)); + } + return hex.join(""); +} diff --git a/tests/servers/rfid.sock.json b/tests/servers/rfid.sock.json index e2716f16..1da22f0a 100644 --- a/tests/servers/rfid.sock.json +++ b/tests/servers/rfid.sock.json @@ -1,12 +1,17 @@ { "name": "RFID Receiver (Server Mode)", - "description": "RFID Receiver (Server Mode)", + "description": "RFID Receiver", "mode": "server", - "version": "0.9.2", + "version": "0.0.1", "protocol": "tcp", "host": "0.0.0.0", "port": "3019", - "process": "flows.rfid.read", - "buffer": 60, - "keep": 0 + "event": { + "data": "scripts.socket.onData", + "closed": "scripts.socket.onClosed", + "connected": "scripts.socket.onConnected", + "error": "scripts.socket.onError" + }, + "keep": 0, + "buffer": 60 } diff --git a/tests/servers/rfid_client.sock.json b/tests/servers/rfid_client.sock.json index 7889de6e..a66fdda7 100644 --- a/tests/servers/rfid_client.sock.json +++ b/tests/servers/rfid_client.sock.json @@ -1,12 +1,19 @@ { "name": "RFID Receiver (Client Mode)", - "description": "RFID Receiver (Client Mode)", + "description": "RFID Receiver", "mode": "client", "version": "0.9.2", "protocol": "tcp", - "host": "192.168.1.192", - "port": "6000", - "process": "flows.rfid.read", + "host": "192.168.31.33", + "port": "3019", + "event": { + "data": "scripts.socket.onData", + "closed": "scripts.socket.onClosed", + "connected": "scripts.socket.onConnected", + "error": "scripts.socket.onError" + }, "buffer": 60, - "keep": 0 + "keep": 0, + "attempts": 9, + "attempt_after": 10 }