Renamed controller.controller field to controller.id (future proofing)

uhppoted · Jun 12, 2024 · 05699af · 05699af
1 parent 5fc615a
commit 05699af
Show file tree

Hide file tree

Showing 79 changed files with 1,346 additions and 1,354 deletions.
diff --git a/README.md b/README.md
@@ -105,13 +105,13 @@ All nodes (other than `get-devices`) expect a controller in the input message pa
 ```
 {
     "controller": {
-        "controller": 405419896,
+        "id": 405419896,
         "address": "192.168.1.100",
         "protocol": "tcp"
     }
 }
 
-- controller: controller serial number
+- id: controller serial number
 - address: controller IPv4 address (optional)
 - protocol: 'udp' or 'tcp' (optional)
 

diff --git a/examples/basic/10-tasklist.json b/examples/basic/10-tasklist.json
@@ -201,7 +201,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"task\":{\"task\":5,\"door\":3,\"valid\":{\"from\":\"2021-01-01\",\"to\":\"2021-12-31\"},\"weekdays\":[\"Monday\",\"Wednesday\",\"Friday\"],\"start\":\"08:30\",\"cards\":7}}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"task\":{\"task\":5,\"door\":3,\"valid\":{\"from\":\"2021-01-01\",\"to\":\"2021-12-31\"},\"weekdays\":[\"Monday\",\"Wednesday\",\"Friday\"],\"start\":\"08:30\",\"cards\":7}}",
         "payloadType": "json",
         "x": 130,
         "y": 260,
@@ -260,7 +260,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"task\":{\"task\":\"enable time profile\",\"door\":3,\"valid\":{\"from\":\"2021-01-01\",\"to\":\"2021-12-31\"},\"weekdays\":[\"Monday\",\"Wednesday\",\"Friday\"],\"start\":\"08:30\",\"cards\":7}}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"task\":{\"task\":\"enable time profile\",\"door\":3,\"valid\":{\"from\":\"2021-01-01\",\"to\":\"2021-12-31\"},\"weekdays\":[\"Monday\",\"Wednesday\",\"Friday\"],\"start\":\"08:30\",\"cards\":7}}",
         "payloadType": "json",
         "x": 130,
         "y": 380,
@@ -413,7 +413,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
         "payloadType": "json",
         "x": 130,
         "y": 140,
@@ -471,7 +471,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
         "payloadType": "json",
         "x": 130,
         "y": 500,

diff --git a/examples/basic/11-events.json b/examples/basic/11-events.json
@@ -397,7 +397,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"enable\":true}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"enable\":true}",
         "payloadType": "json",
         "x": 130,
         "y": 140,
@@ -455,8 +455,6 @@
             "06c6c0cbc28d7a2b",
             "5cc40db6d9f925d3",
             "5f4fe1a469cb67c5",
-            "93720d51e19ed5ef",
-            "ac4d232bf71b7dd9",
             "add09a1b97f51d1e"
         ],
         "x": 655,
@@ -502,7 +500,6 @@
         "name": "get-event-index",
         "mode": "link",
         "links": [
-            "1d3b15ec44a91b94",
             "b990cf094cd11447"
         ],
         "x": 495,
@@ -528,7 +525,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
         "payloadType": "json",
         "x": 130,
         "y": 260,
@@ -560,7 +557,6 @@
         "name": "get-event-index",
         "mode": "link",
         "links": [
-            "1d3b15ec44a91b94",
             "b990cf094cd11447"
         ],
         "x": 495,
@@ -600,7 +596,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"index\":14}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"index\":14}",
         "payloadType": "json",
         "x": 130,
         "y": 380,
@@ -710,7 +706,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"index\":17}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"index\":17}",
         "payloadType": "json",
         "x": 130,
         "y": 500,

diff --git a/examples/basic/12-set-pc-control.json b/examples/basic/12-set-pc-control.json
@@ -348,7 +348,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"enable\":true}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"enable\":true}",
         "payloadType": "json",
         "x": 130,
         "y": 140,

diff --git a/examples/basic/13-restore-default-parameters.json b/examples/basic/13-restore-default-parameters.json
@@ -152,7 +152,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
         "payloadType": "json",
         "x": 130,
         "y": 140,

diff --git a/examples/basic/2-get-device.json b/examples/basic/2-get-device.json
@@ -228,7 +228,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
         "payloadType": "json",
         "x": 130,
         "y": 140,

diff --git a/examples/basic/3-set-ip.json b/examples/basic/3-set-ip.json
@@ -85,7 +85,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "set-address",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"address\":\"192.168.1.125\",\"netmask\":\"255.255.255.0\",\"gateway\":\"192.168.1.1\"}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"address\":\"192.168.1.125\",\"netmask\":\"255.255.255.0\",\"gateway\":\"192.168.1.1\"}",
         "payloadType": "json",
         "x": 130,
         "y": 140,

diff --git a/examples/basic/4-event-listener.json b/examples/basic/4-event-listener.json
@@ -193,7 +193,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"}}",
         "payloadType": "json",
         "x": 130,
         "y": 220,
@@ -252,7 +252,7 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "set-listener",
-        "payload": "{\"controller\":{\"controller\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"address\":\"192.168.1.100\",\"port\":60001}",
+        "payload": "{\"controller\":{\"id\":405419896,\"address\":\"192.168.1.100\",\"protocol\":\"tcp\"},\"address\":\"192.168.1.100\",\"port\":60001}",
         "payloadType": "json",
         "x": 130,
         "y": 340,