bugfix nodered timeserver
This commit is contained in:
Klaus K Wilting
parent
cf29505c84
commit
27dfdadd71
@ -1,93 +1,10 @@
|
|||||||
[
|
[
|
||||||
{
|
|
||||||
"id": "9c105726.613a58",
|
|
||||||
"type": "mqtt in",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"name": "listen",
|
|
||||||
"topic": "+/devices/+/up",
|
|
||||||
"qos": "2",
|
|
||||||
"broker": "2a15ab6f.ab2244",
|
|
||||||
"x": 90,
|
|
||||||
"y": 127,
|
|
||||||
"wires": [
|
|
||||||
[
|
|
||||||
"113ef524.57edeb"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "113ef524.57edeb",
|
|
||||||
"type": "json",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"name": "Convert",
|
|
||||||
"property": "payload",
|
|
||||||
"action": "",
|
|
||||||
"pretty": false,
|
|
||||||
"x": 240,
|
|
||||||
"y": 127,
|
|
||||||
"wires": [
|
|
||||||
[
|
|
||||||
"120561a.088359e"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "120561a.088359e",
|
|
||||||
"type": "switch",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"name": "Timeport",
|
|
||||||
"property": "payload.port",
|
|
||||||
"propertyType": "msg",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"t": "eq",
|
|
||||||
"v": "9",
|
|
||||||
"vt": "num"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"checkall": "true",
|
|
||||||
"repair": false,
|
|
||||||
"outputs": 1,
|
|
||||||
"x": 400,
|
|
||||||
"y": 127,
|
|
||||||
"wires": [
|
|
||||||
[
|
|
||||||
"d6f27e8e.93242"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "d6f27e8e.93242",
|
|
||||||
"type": "base64",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"name": "Decode",
|
|
||||||
"action": "",
|
|
||||||
"property": "payload.payload_raw",
|
|
||||||
"x": 560,
|
|
||||||
"y": 127,
|
|
||||||
"wires": [
|
|
||||||
[
|
|
||||||
"b8bd33fd.61caa",
|
|
||||||
"cc245719.3c4cd8"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "15980d22.6f4663",
|
|
||||||
"type": "comment",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"name": "LoRaWAN Timeserver v1.3",
|
|
||||||
"info": "PLEASE NOTE: There is a patent filed for the time sync algorithm used in the\ncode of this file. The shown implementation example is covered by the\nrepository's licencse, but you may not be eligible to deploy the applied\nalgorithm in applications without granted license by the patent holder.",
|
|
||||||
"x": 150,
|
|
||||||
"y": 47,
|
|
||||||
"wires": []
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "b8bd33fd.61caa",
|
"id": "b8bd33fd.61caa",
|
||||||
"type": "function",
|
"type": "function",
|
||||||
"z": "449c1517.e25f4c",
|
"z": "449c1517.e25f4c",
|
||||||
"name": "Timeserver Logic",
|
"name": "Timeserver Logic",
|
||||||
"func": "/* LoRaWAN Timeserver\n\nVERSION: 1.3\n\nconstruct 6 byte timesync_answer from gateway timestamp and node's time_sync_req\n\nbyte meaning\n1 sequence number (taken from node's time_sync_req)\n2..5 current second (from GPS epoch starting 1980)\n6 1/250ths fractions of current second\n\n*/\n\nfunction timecompare(a, b) {\n \n const timeA = a.time;\n const timeB = b.time;\n\n let comparison = 0;\n if (timeA > timeB) {\n comparison = 1;\n } else if (timeA < timeB) {\n comparison = -1;\n }\n return comparison;\n}\n\nlet confidence = 1000; // max millisecond diff gateway time to server time\n\n// guess if we have received a valid time_sync_req command\nif (msg.payload.payload_raw.length != 1)\n return;\n\nvar deviceMsg = { payload: msg.payload.dev_id };\nvar seqNo = msg.payload.payload_raw[0];\nvar seqNoMsg = { payload: seqNo };\nvar gateway_list = msg.payload.metadata.gateways;\n\n// filter all gateway timestamps that have milliseconds part (which we assume have a \".\")\nvar gateways = gateway_list.filter(function (element) {\n return (element.time.includes(\".\"));\n});\n\nvar gateway_time = gateways.map(gw => {\n return {\n time: new Date(gw.time),\n eui: gw.gtw_id,\n }\n });\nvar server_time = new Date(msg.payload.metadata.time);\n\n// validate all gateway timestamps against lorawan server_time (which is assumed to be recent)\nvar gw_timestamps = gateway_time.filter(function (element) {\n return ((element.time > (server_time - confidence) && element.time <= server_time));\n});\n\n// if no timestamp left, we have no valid one and exit\nif (gw_timestamps.length === 0) {\n var notavailMsg = { payload: \"n/a\" };\n var notimeMsg = { payload: 0xff }; \n var buf2 = Buffer.alloc(1);\n msg.payload = new Buffer(buf2.fill(0xff));\n msg.port = 9; // Paxcounter TIMEPORT\n return [notavailMsg, notavailMsg, deviceMsg, seqNoMsg, msg];}\n\n// sort time array in ascending order to find most recent timestamp for time answer\ngw_timestamps.sort(timecompare);\n\nvar timestamp = gw_timestamps[0].time;\nvar eui = gw_timestamps[0].eui;\nvar offset = server_time - timestamp;\n\nvar seconds = Math.floor(timestamp/1000);\nvar fractions = (timestamp % 1000) / 4;\n\nlet buf = new ArrayBuffer(6);\nnew DataView(buf).setUint8(0, seqNo);\n// Timezone (in 15min steps) -> deprecated\n//var timezone = 8; // CET = UTC+2h\n//new DataView(buf).setUint8(1, timezone);\nnew DataView(buf).setUint32(2, seconds);\nnew DataView(buf).setUint8(6, fractions);\n\nmsg.payload = new Buffer(new Uint8Array(buf));\nmsg.port = 9; // Paxcounter TIMEPORT\nvar euiMsg = { payload: eui };\nvar offsetMsg = { payload: offset };\n\nreturn [euiMsg, offsetMsg, deviceMsg, seqNoMsg, msg];",
|
"func": "/* LoRaWAN Timeserver\n\nVERSION: 1.3\n\nconstruct 6 byte timesync_answer from gateway timestamp and node's time_sync_req\n\nbyte meaning\n1 sequence number (taken from node's time_sync_req)\n2..5 current second (from GPS epoch starting 1980)\n6 1/250ths fractions of current second\n\n*/\n\nfunction timecompare(a, b) {\n \n const timeA = a.time;\n const timeB = b.time;\n\n let comparison = 0;\n if (timeA > timeB) {\n comparison = 1;\n } else if (timeA < timeB) {\n comparison = -1;\n }\n return comparison;\n}\n\nlet confidence = 1000; // max millisecond diff gateway time to server time\n\n// guess if we have received a valid time_sync_req command\nif (msg.payload.payload_raw.length != 1)\n return;\n\nvar deviceMsg = { payload: msg.payload.dev_id };\nvar seqNo = msg.payload.payload_raw[0];\nvar seqNoMsg = { payload: seqNo };\nvar gateway_list = msg.payload.metadata.gateways;\n\n// filter all gateway timestamps that have milliseconds part (which we assume have a \".\")\nvar gateways = gateway_list.filter(function (element) {\n return (element.time.includes(\".\"));\n});\n\nvar gateway_time = gateways.map(gw => {\n return {\n time: new Date(gw.time),\n eui: gw.gtw_id,\n }\n });\nvar server_time = new Date(msg.payload.metadata.time);\n\n// validate all gateway timestamps against lorawan server_time (which is assumed to be recent)\nvar gw_timestamps = gateway_time.filter(function (element) {\n return ((element.time > (server_time - confidence) && element.time <= server_time));\n});\n\n// if no timestamp left, we have no valid one and exit\nif (gw_timestamps.length === 0) {\n var notavailMsg = { payload: \"n/a\" };\n var notimeMsg = { payload: 0xff }; \n var buf2 = Buffer.alloc(1);\n msg.payload = new Buffer(buf2.fill(0xff));\n msg.port = 9; // Paxcounter TIMEPORT\n return [notavailMsg, notavailMsg, deviceMsg, seqNoMsg, msg];}\n\n// sort time array in ascending order to find most recent timestamp for time answer\ngw_timestamps.sort(timecompare);\n\nvar timestamp = gw_timestamps[0].time;\nvar eui = gw_timestamps[0].eui;\nvar offset = server_time - timestamp;\n\nvar seconds = Math.floor(timestamp/1000);\nvar fractions = (timestamp % 1000) / 4;\n\nlet buf = new ArrayBuffer(6);\nnew DataView(buf).setUint8(0, seqNo);\nnew DataView(buf).setUint32(1, seconds);\nnew DataView(buf).setUint8(5, fractions);\n\nmsg.payload = new Buffer(new Uint8Array(buf));\nmsg.port = 9; // Paxcounter TIMEPORT\nvar euiMsg = { payload: eui };\nvar offsetMsg = { payload: offset };\n\nreturn [euiMsg, offsetMsg, deviceMsg, seqNoMsg, msg];",
|
||||||
"outputs": 5,
|
"outputs": 5,
|
||||||
"noerr": 0,
|
"noerr": 0,
|
||||||
"x": 330,
|
"x": 330,
|
||||||
@ -119,83 +36,6 @@
|
|||||||
"time_sync_ans"
|
"time_sync_ans"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "c9a83ac9.50fd18",
|
|
||||||
"type": "debug",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"name": "Timeserver Gw",
|
|
||||||
"active": true,
|
|
||||||
"tosidebar": false,
|
|
||||||
"console": false,
|
|
||||||
"tostatus": true,
|
|
||||||
"complete": "payload",
|
|
||||||
"x": 680,
|
|
||||||
"y": 247,
|
|
||||||
"wires": [],
|
|
||||||
"icon": "node-red/bridge.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "247204ab.a9f83c",
|
|
||||||
"type": "ui_text",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"group": "edb7cc8d.a3817",
|
|
||||||
"order": 3,
|
|
||||||
"width": 0,
|
|
||||||
"height": 0,
|
|
||||||
"name": "Recent time",
|
|
||||||
"label": "Last answer at:",
|
|
||||||
"format": "{{msg.payload}}",
|
|
||||||
"layout": "col-center",
|
|
||||||
"x": 790,
|
|
||||||
"y": 307,
|
|
||||||
"wires": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "6aeb3720.a89618",
|
|
||||||
"type": "ui_text",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"group": "edb7cc8d.a3817",
|
|
||||||
"order": 1,
|
|
||||||
"width": 0,
|
|
||||||
"height": 0,
|
|
||||||
"name": "Recent server",
|
|
||||||
"label": "Gateway",
|
|
||||||
"format": "{{msg.payload}}",
|
|
||||||
"layout": "col-center",
|
|
||||||
"x": 680,
|
|
||||||
"y": 347,
|
|
||||||
"wires": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "6ac55bbe.12ac54",
|
|
||||||
"type": "function",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"name": "Time",
|
|
||||||
"func": "msg.payload = new Date().toLocaleString('en-GB', {timeZone: 'Europe/Berlin'});\nreturn msg;",
|
|
||||||
"outputs": 1,
|
|
||||||
"noerr": 0,
|
|
||||||
"x": 650,
|
|
||||||
"y": 307,
|
|
||||||
"wires": [
|
|
||||||
[
|
|
||||||
"247204ab.a9f83c"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "cc245719.3c4cd8",
|
|
||||||
"type": "debug",
|
|
||||||
"z": "449c1517.e25f4c",
|
|
||||||
"name": "",
|
|
||||||
"active": true,
|
|
||||||
"tosidebar": true,
|
|
||||||
"console": false,
|
|
||||||
"tostatus": false,
|
|
||||||
"complete": "true",
|
|
||||||
"x": 860,
|
|
||||||
"y": 140,
|
|
||||||
"wires": []
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "9b4f492d.fbfd18",
|
"id": "9b4f492d.fbfd18",
|
||||||
"type": "change",
|
"type": "change",
|
||||||
@ -253,6 +93,22 @@
|
|||||||
]
|
]
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "9c105726.613a58",
|
||||||
|
"type": "mqtt in",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"name": "listen",
|
||||||
|
"topic": "+/devices/+/up",
|
||||||
|
"qos": "2",
|
||||||
|
"broker": "2a15ab6f.ab2244",
|
||||||
|
"x": 90,
|
||||||
|
"y": 127,
|
||||||
|
"wires": [
|
||||||
|
[
|
||||||
|
"113ef524.57edeb"
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "1c9a7438.6e38ec",
|
"id": "1c9a7438.6e38ec",
|
||||||
"type": "mqtt out",
|
"type": "mqtt out",
|
||||||
@ -266,6 +122,47 @@
|
|||||||
"y": 520,
|
"y": 520,
|
||||||
"wires": []
|
"wires": []
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "113ef524.57edeb",
|
||||||
|
"type": "json",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"name": "Convert",
|
||||||
|
"property": "payload",
|
||||||
|
"action": "",
|
||||||
|
"pretty": false,
|
||||||
|
"x": 240,
|
||||||
|
"y": 127,
|
||||||
|
"wires": [
|
||||||
|
[
|
||||||
|
"120561a.088359e"
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "120561a.088359e",
|
||||||
|
"type": "switch",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"name": "Timeport",
|
||||||
|
"property": "payload.port",
|
||||||
|
"propertyType": "msg",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"t": "eq",
|
||||||
|
"v": "9",
|
||||||
|
"vt": "num"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"checkall": "true",
|
||||||
|
"repair": false,
|
||||||
|
"outputs": 1,
|
||||||
|
"x": 400,
|
||||||
|
"y": 127,
|
||||||
|
"wires": [
|
||||||
|
[
|
||||||
|
"d6f27e8e.93242"
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "90e76b02.6298f8",
|
"id": "90e76b02.6298f8",
|
||||||
"type": "json",
|
"type": "json",
|
||||||
@ -282,6 +179,22 @@
|
|||||||
]
|
]
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "d6f27e8e.93242",
|
||||||
|
"type": "base64",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"name": "Decode",
|
||||||
|
"action": "",
|
||||||
|
"property": "payload.payload_raw",
|
||||||
|
"x": 560,
|
||||||
|
"y": 127,
|
||||||
|
"wires": [
|
||||||
|
[
|
||||||
|
"b8bd33fd.61caa",
|
||||||
|
"cc245719.3c4cd8"
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "53a85e2c.2728d",
|
"id": "53a85e2c.2728d",
|
||||||
"type": "base64",
|
"type": "base64",
|
||||||
@ -297,6 +210,47 @@
|
|||||||
]
|
]
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "15980d22.6f4663",
|
||||||
|
"type": "comment",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"name": "LoRaWAN Timeserver v1.3",
|
||||||
|
"info": "PLEASE NOTE: There is a patent filed for the time sync algorithm used in the\ncode of this file. The shown implementation example is covered by the\nrepository's licencse, but you may not be eligible to deploy the applied\nalgorithm in applications without granted license by the patent holder.",
|
||||||
|
"x": 150,
|
||||||
|
"y": 47,
|
||||||
|
"wires": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "c9a83ac9.50fd18",
|
||||||
|
"type": "debug",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"name": "Timeserver Gw",
|
||||||
|
"active": true,
|
||||||
|
"tosidebar": false,
|
||||||
|
"console": false,
|
||||||
|
"tostatus": true,
|
||||||
|
"complete": "payload",
|
||||||
|
"x": 680,
|
||||||
|
"y": 247,
|
||||||
|
"wires": [],
|
||||||
|
"icon": "node-red/bridge.png"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "247204ab.a9f83c",
|
||||||
|
"type": "ui_text",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"group": "edb7cc8d.a3817",
|
||||||
|
"order": 3,
|
||||||
|
"width": 0,
|
||||||
|
"height": 0,
|
||||||
|
"name": "Recent time",
|
||||||
|
"label": "Last answer at:",
|
||||||
|
"format": "{{msg.payload}}",
|
||||||
|
"layout": "col-center",
|
||||||
|
"x": 790,
|
||||||
|
"y": 307,
|
||||||
|
"wires": []
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "de908e66.b6fd3",
|
"id": "de908e66.b6fd3",
|
||||||
"type": "ui_gauge",
|
"type": "ui_gauge",
|
||||||
@ -323,6 +277,38 @@
|
|||||||
"y": 387,
|
"y": 387,
|
||||||
"wires": []
|
"wires": []
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "6aeb3720.a89618",
|
||||||
|
"type": "ui_text",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"group": "edb7cc8d.a3817",
|
||||||
|
"order": 1,
|
||||||
|
"width": 0,
|
||||||
|
"height": 0,
|
||||||
|
"name": "Recent server",
|
||||||
|
"label": "Gateway",
|
||||||
|
"format": "{{msg.payload}}",
|
||||||
|
"layout": "col-center",
|
||||||
|
"x": 680,
|
||||||
|
"y": 347,
|
||||||
|
"wires": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "6ac55bbe.12ac54",
|
||||||
|
"type": "function",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"name": "Time",
|
||||||
|
"func": "msg.payload = new Date().toLocaleString('en-GB', {timeZone: 'Europe/Berlin'});\nreturn msg;",
|
||||||
|
"outputs": 1,
|
||||||
|
"noerr": 0,
|
||||||
|
"x": 650,
|
||||||
|
"y": 307,
|
||||||
|
"wires": [
|
||||||
|
[
|
||||||
|
"247204ab.a9f83c"
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "d5a35bab.44cb18",
|
"id": "d5a35bab.44cb18",
|
||||||
"type": "ui_text",
|
"type": "ui_text",
|
||||||
@ -355,6 +341,20 @@
|
|||||||
"y": 467,
|
"y": 467,
|
||||||
"wires": []
|
"wires": []
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "cc245719.3c4cd8",
|
||||||
|
"type": "debug",
|
||||||
|
"z": "449c1517.e25f4c",
|
||||||
|
"name": "",
|
||||||
|
"active": false,
|
||||||
|
"tosidebar": true,
|
||||||
|
"console": false,
|
||||||
|
"tostatus": false,
|
||||||
|
"complete": "true",
|
||||||
|
"x": 860,
|
||||||
|
"y": 140,
|
||||||
|
"wires": []
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "2a15ab6f.ab2244",
|
"id": "2a15ab6f.ab2244",
|
||||||
"type": "mqtt-broker",
|
"type": "mqtt-broker",
|
||||||
|
|||||||
@ -75,11 +75,8 @@ var fractions = (timestamp % 1000) / 4;
|
|||||||
|
|
||||||
let buf = new ArrayBuffer(6);
|
let buf = new ArrayBuffer(6);
|
||||||
new DataView(buf).setUint8(0, seqNo);
|
new DataView(buf).setUint8(0, seqNo);
|
||||||
// Timezone (in 15min steps) -> deprecated
|
new DataView(buf).setUint32(1, seconds);
|
||||||
//var timezone = 8; // CET = UTC+2h
|
new DataView(buf).setUint8(5, fractions);
|
||||||
//new DataView(buf).setUint8(1, timezone);
|
|
||||||
new DataView(buf).setUint32(2, seconds);
|
|
||||||
new DataView(buf).setUint8(6, fractions);
|
|
||||||
|
|
||||||
msg.payload = new Buffer(new Uint8Array(buf));
|
msg.payload = new Buffer(new Uint8Array(buf));
|
||||||
msg.port = 9; // Paxcounter TIMEPORT
|
msg.port = 9; // Paxcounter TIMEPORT
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user