node-red-contrib-antenna-genius 0.2.5-beta → 0.3.0

package/antenna-genius-band-labels.js

@@ -3,41 +3,56 @@ module.exports = (RED) => {
         constructor(config) {
             RED.nodes.createNode(this, config);
 
-            var node = this;
+            let node = this;
             this.bandNameA = "";
             this.bandNameB = "";
             this.server = RED.nodes.getNode(config.server);
 
+            if(this.server == null) {
+                this.status({
+                    fill: "red",
+                    shape: "ring",
+                    text: "disconnected",
+                });
+                return;
+            }
+
             this.server.updatesEventEmitter.on("connected", () => {
-                if(this.server.info.name) {
-                    this.status({ fill: "green", shape: "dot", text: this.server.info.name });
+                if (this.server.info.name) {
+                    this.status({
+                        fill: "green",
+                        shape: "dot",
+                        text: this.server.info.name,
+                    });
                 }
             });
 
-            this.server.updatesEventEmitter.on('closed', () => {
-                this.status({ fill: "red", shape: "ring", text: "disconnected" });
+            this.server.updatesEventEmitter.on("closed", () => {
+                this.status({
+                    fill: "red",
+                    shape: "ring",
+                    text: "disconnected",
+                });
             });
 
             this.server.updatesEventEmitter.on("status", (forceUpdate) => {
                 let bandIndexA = this.server.status.portA_band;
                 let bandIndexB = this.server.status.portB_band;
 
-                if(bandIndexA === undefined || bandIndexB === undefined) {
+                if (bandIndexA === undefined || bandIndexB === undefined) {
                     return;
                 }
 
-                if(bandIndexA < 0 || bandIndexA >= this.server.bands.length)
-                {
+                if (bandIndexA < 0 || bandIndexA >= this.server.bands.length) {
                     return;
                 }
 
-                if(bandIndexB < 0 || bandIndexB >= this.server.bands.length)
-                {
+                if (bandIndexB < 0 || bandIndexB >= this.server.bands.length) {
                     return;
                 }
 
-                let bandNameA = this.server.bands[bandIndexA].band_name;
-                let bandNameB = this.server.bands[bandIndexB].band_name;
+                let bandNameA = this.server.bands[bandIndexA].name;
+                let bandNameB = this.server.bands[bandIndexB].name;
 
                 let changed = forceUpdate;
                 if (bandNameA !== this.bandNameA) {
@@ -49,13 +64,30 @@ module.exports = (RED) => {
                     this.bandNameB = bandNameB;
                 }
                 if (changed) {
-                    node.send({ payload: { bandLabelA: bandNameA, bandLabelB: bandNameB } });
-                    this.status({ fill: "green", shape: "dot", text: this.server.info.name + " - " + bandNameA + "/" + bandNameB });
+                    node.send({
+                        payload: {
+                            bandLabelA: bandNameA,
+                            bandLabelB: bandNameB,
+                        },
+                    });
+                    this.status({
+                        fill: "green",
+                        shape: "dot",
+                        text:
+                            this.server.info.name +
+                            " - " +
+                            bandNameA +
+                            "/" +
+                            bandNameB,
+                    });
                 }
             });
 
             this.server.connect();
         }
     }
-    RED.nodes.registerType("antenna-genius-band-labels", AntennaGeniusBandLabels);
-}
+    RED.nodes.registerType(
+        "antenna-genius-band-labels",
+        AntennaGeniusBandLabels
+    );
+};

package/antenna-genius-server.html

@@ -1,41 +1,55 @@
 <script type="text/javascript">
-    RED.nodes.registerType('antenna-genius-server',{
-        category: 'config',
-        color: '#FFF0F0',
+    RED.nodes.registerType("antenna-genius-server", {
+        category: "config",
+        color: "#FFF0F0",
         defaults: {
-            host: {value:"localhost",required:true},
-            port: {value:9007,required:true,validate:RED.validators.number()},
-            disabledColor: {value:"Black", required:true},
-            activeColor: {value:"Green", required:true},
-            selectedColor: {value:"Blue", required:true},
-            autoConnect: {value:true},
+            host: { value: "localhost", required: true },
+            port: {
+                value: 9007,
+                required: true,
+                validate: RED.validators.number(),
+            },
+            disabledColor: { value: "Black", required: true },
+            activeColor: { value: "Green", required: true },
+            selectedColor: { value: "Blue", required: true },
+            autoConnect: { value: true },
         },
-        label: function() {
+        label: function () {
             return "antenna genius at " + this.host + ":" + this.port;
-        }
+        },
     });
 </script>
 
 <script type="text/html" data-template-name="antenna-genius-server">
     <div class="form-row">
-        <label for="node-config-input-host"><i class="fa fa-bookmark"></i> Host</label>
-        <input type="text" id="node-config-input-host">
+        <label for="node-config-input-host"
+            ><i class="fa fa-bookmark"></i> Host</label
+        >
+        <input type="text" id="node-config-input-host" />
     </div>
     <div class="form-row">
-        <label for="node-config-input-port"><i class="fa fa-bookmark"></i> Port</label>
-        <input type="text" id="node-config-input-port">
+        <label for="node-config-input-port"
+            ><i class="fa fa-bookmark"></i> Port</label
+        >
+        <input type="text" id="node-config-input-port" />
     </div>
     <div class="form-row">
-        <label for="node-config-input-disabledColor"><i class="fa fa-bookmark"></i> Disabled Background</label>
-        <input type="text" id="node-config-input-disabledColor">
+        <label for="node-config-input-disabledColor"
+            ><i class="fa fa-bookmark"></i> Disabled Background</label
+        >
+        <input type="text" id="node-config-input-disabledColor" />
     </div>
     <div class="form-row">
-        <label for="node-config-input-activeColor"><i class="fa fa-bookmark"></i> Active Background</label>
-        <input type="text" id="node-config-input-activeColor">
+        <label for="node-config-input-activeColor"
+            ><i class="fa fa-bookmark"></i> Active Background</label
+        >
+        <input type="text" id="node-config-input-activeColor" />
     </div>
     <div class="form-row">
-        <label for="node-config-input-selectedColor"><i class="fa fa-bookmark"></i> Selected Background</label>
-        <input type="text" id="node-config-input-selectedColor">
+        <label for="node-config-input-selectedColor"
+            ><i class="fa fa-bookmark"></i> Selected Background</label
+        >
+        <input type="text" id="node-config-input-selectedColor" />
     </div>
 </script>
 

package/antenna-genius-server.js

@@ -1,7 +1,7 @@
-const Net = require('net');
-const {PromiseSocket} = require("promise-socket");
-const EventEmitter = require('events');
-const Utils = require('./Utils');
+const Net = require("net");
+const { PromiseSocket } = require("promise-socket");
+const EventEmitter = require("events");
+const Utils = require("./Utils");
 
 class UpdatesEventEmitter extends EventEmitter {}
 
@@ -22,7 +22,7 @@ module.exports = (RED) => {
             this.bands = [];
             this.interval = null;
             this.timer = null;
-            this.refresh = 0;
+            this.refresh = -1;
 
             this.updatesEventEmitter = new UpdatesEventEmitter();
             this.updatesEventEmitter.setMaxListeners(0);
@@ -30,30 +30,34 @@ module.exports = (RED) => {
             this.client = new Net.Socket();
             this.connected = false;
 
-            this.client.on('close', () => {
-                this.log('TCP connection disconnected with the server.');
+            this.client.on("close", () => {
+                this.log("TCP connection disconnected with the server.");
                 clearInterval(this.interval);
                 clearTimeout(this.timer);
 
-                if(this.updatesEventEmitter.listenerCount('closed') == 0) {
-                    this.log('Stop retrying. No nodes are refering this connection anymore.');
+                if (this.updatesEventEmitter.listenerCount("closed") == 0) {
+                    this.log(
+                        "Stop retrying. No nodes are refering this connection anymore."
+                    );
                     return;
                 }
 
-                if(this.autoConnect) {
-                    this.log('TCP connection failed with the server. Will try to reconnect in 5 seconds');
+                if (this.autoConnect) {
+                    this.log(
+                        "TCP connection failed with the server. Will try to reconnect in 5 seconds"
+                    );
                     this.timer = setTimeout(() => {
-                        this.log('Reconnecting...');
+                        this.log("Reconnecting...");
                         this.connect();
                     }, 5000);
                     this.updatesEventEmitter.emit("closed");
                 }
             });
 
-            this.client.on('connect', async () => {
-                this.log('TCP connection established with the server.');
+            this.client.on("connect", async () => {
+                this.log("TCP connection established with the server.");
                 this.connected = true;
-    
+
                 const promiseClient = new PromiseSocket(this.client);
 
                 let command = Utils.encode(0, 0, 401, 0, "");
@@ -66,7 +70,7 @@ module.exports = (RED) => {
                 packet = await promiseClient.read();
                 this.info = Utils.decode(packet);
 
-                var numAntennas = 8 * this.status.stackReach;
+                let numAntennas = 8 * this.status.stackReach;
                 for (let index = 1; index <= numAntennas; ++index) {
                     let command = Utils.encode(0, 0, 412, 0, index.toString());
                     await promiseClient.write(command);
@@ -85,12 +89,18 @@ module.exports = (RED) => {
                 }
                 this.updatesEventEmitter.emit("bands");
 
-                this.client.on('data', (packet) => {
+                this.client.on("data", (packet) => {
                     let decoded = Utils.decode(packet);
-                    if(decoded.command == 401) {
-                        this.status = { ...this.status, ...Utils.decode(packet) };
+                    if (decoded.command == 401) {
+                        this.status = {
+                            ...this.status,
+                            ...Utils.decode(packet),
+                        };
                         this.refresh = (this.refresh + 1) % 1500;
-                        this.updatesEventEmitter.emit("status", this.refresh == 0);
+                        this.updatesEventEmitter.emit(
+                            "status",
+                            this.refresh == 0
+                        );
                     }
                 });
 
@@ -102,24 +112,25 @@ module.exports = (RED) => {
 
                 this.forceUpdate();
                 this.updatesEventEmitter.emit("connected");
-            })
+            });
 
-            this.client.on('error', (err) => {
+            this.client.on("error", (err) => {
                 this.warn(err);
             });
 
-            this.on('close', (done) => {
+            this.on("close", (done) => {
                 clearInterval(this.interval);
                 clearTimeout(this.timer);
                 this.autoConnect = false;
                 this.connected = false;
                 this.client.end();
+                this.forceUpdate();
                 done();
             });
         }
 
         connect() {
-            if(this.autoConnect && !this.connected & !this.client.connecting) {
+            if (this.autoConnect && !this.connected & !this.client.connecting) {
                 this.client.connect(this.port, this.host);
             }
         }
@@ -129,5 +140,5 @@ module.exports = (RED) => {
         }
     }
 
-    RED.nodes.registerType("antenna-genius-server",AntennaGeniusServerNode);
-}
+    RED.nodes.registerType("antenna-genius-server", AntennaGeniusServerNode);
+};

package/examples/Antenna Genius.json

@@ -0,0 +1,229 @@
+[
+    {
+        "id": "dae0c396900b679c",
+        "type": "tab",
+        "label": "Flow 1",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
+    {
+        "id": "490d38d6edc8b3d3",
+        "type": "ui_button",
+        "z": "dae0c396900b679c",
+        "name": "A",
+        "group": "c4ec36e264004fa8",
+        "order": 4,
+        "width": "2",
+        "height": "1",
+        "passthru": false,
+        "label": "{{payload.name}}",
+        "tooltip": "",
+        "color": "",
+        "bgcolor": "{{payload.background}}",
+        "className": "",
+        "icon": "",
+        "payload": "true",
+        "payloadType": "bool",
+        "topic": "topic",
+        "topicType": "msg",
+        "x": 650,
+        "y": 160,
+        "wires": [
+            [
+                "21cbfe61e047667a"
+            ]
+        ]
+    },
+    {
+        "id": "4ce85a4a6d600cbb",
+        "type": "ui_button",
+        "z": "dae0c396900b679c",
+        "name": "B",
+        "group": "c4ec36e264004fa8",
+        "order": 6,
+        "width": "2",
+        "height": "1",
+        "passthru": false,
+        "label": "{{payload.name}}",
+        "tooltip": "",
+        "color": "",
+        "bgcolor": "{{payload.background}}",
+        "className": "",
+        "icon": "",
+        "payload": "true",
+        "payloadType": "bool",
+        "topic": "topic",
+        "topicType": "msg",
+        "x": 730,
+        "y": 200,
+        "wires": [
+            [
+                "21cbfe61e047667a"
+            ]
+        ]
+    },
+    {
+        "id": "4fbaa2cf09147758",
+        "type": "ui_text",
+        "z": "dae0c396900b679c",
+        "group": "c4ec36e264004fa8",
+        "order": 2,
+        "width": 0,
+        "height": 0,
+        "name": "",
+        "label": "Radio A  |  Radio B",
+        "format": "{{msg.payload.bandLabelA}} | {{msg.payload.bandLabelB}}",
+        "layout": "col-center",
+        "className": "",
+        "x": 690,
+        "y": 100,
+        "wires": []
+    },
+    {
+        "id": "8f71346072320a9f",
+        "type": "ui_button",
+        "z": "dae0c396900b679c",
+        "name": "A",
+        "group": "c4ec36e264004fa8",
+        "order": 8,
+        "width": "2",
+        "height": "1",
+        "passthru": false,
+        "label": "{{payload.name}}",
+        "tooltip": "",
+        "color": "",
+        "bgcolor": "{{payload.background}}",
+        "className": "",
+        "icon": "",
+        "payload": "true",
+        "payloadType": "bool",
+        "topic": "topic",
+        "topicType": "msg",
+        "x": 650,
+        "y": 240,
+        "wires": [
+            [
+                "21cbfe61e047667a"
+            ]
+        ]
+    },
+    {
+        "id": "68254444f1308033",
+        "type": "ui_button",
+        "z": "dae0c396900b679c",
+        "name": "B",
+        "group": "c4ec36e264004fa8",
+        "order": 10,
+        "width": "2",
+        "height": "1",
+        "passthru": false,
+        "label": "{{payload.name}}",
+        "tooltip": "",
+        "color": "",
+        "bgcolor": "{{payload.background}}",
+        "className": "",
+        "icon": "",
+        "payload": "true",
+        "payloadType": "bool",
+        "topic": "topic",
+        "topicType": "msg",
+        "x": 730,
+        "y": 280,
+        "wires": [
+            [
+                "21cbfe61e047667a"
+            ]
+        ]
+    },
+    {
+        "id": "78617c107783edfa",
+        "type": "antenna-genius-band-labels",
+        "z": "dae0c396900b679c",
+        "name": "",
+        "server": "",
+        "x": 400,
+        "y": 100,
+        "wires": [
+            [
+                "4fbaa2cf09147758"
+            ]
+        ]
+    },
+    {
+        "id": "c273fac278c6addb",
+        "type": "antenna-genius-antenna-status",
+        "z": "dae0c396900b679c",
+        "name": "",
+        "server": "",
+        "antennaNb": "1",
+        "x": 390,
+        "y": 200,
+        "wires": [
+            [
+                "490d38d6edc8b3d3"
+            ],
+            [
+                "4ce85a4a6d600cbb"
+            ]
+        ]
+    },
+    {
+        "id": "21cbfe61e047667a",
+        "type": "antenna-genius-activate-antenna",
+        "z": "dae0c396900b679c",
+        "name": "",
+        "server": "",
+        "x": 1080,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "9efa627cb00ca277",
+        "type": "antenna-genius-antenna-status",
+        "z": "dae0c396900b679c",
+        "name": "",
+        "server": "",
+        "antennaNb": "2",
+        "x": 390,
+        "y": 280,
+        "wires": [
+            [
+                "8f71346072320a9f"
+            ],
+            [
+                "68254444f1308033"
+            ]
+        ]
+    },
+    {
+        "id": "8233785eeb4f52ab",
+        "type": "comment",
+        "z": "dae0c396900b679c",
+        "name": "Antennas",
+        "info": "",
+        "x": 660,
+        "y": 40,
+        "wires": []
+    },
+    {
+        "id": "c4ec36e264004fa8",
+        "type": "ui_group",
+        "name": "Antenna Genius",
+        "tab": "ac6e9d7b975180d8",
+        "order": 1,
+        "disp": false,
+        "width": "4",
+        "collapse": false,
+        "className": ""
+    },
+    {
+        "id": "ac6e9d7b975180d8",
+        "type": "ui_tab",
+        "name": "Antenna Genius",
+        "icon": "dashboard",
+        "order": 1,
+        "disabled": false,
+        "hidden": false
+    }
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-antenna-genius",
-  "version": "0.2.5-beta",
+  "version": "0.3.0",
   "description": "Antenna Genius Control and Monitoring Nodes",
   "keywords": [
     "node-red"