From c372acafa70beb037d7b06f0bf002fc68ef21bee Mon Sep 17 00:00:00 2001
From: Mike Blackstock <mike@mblackstock.com>
Date: Fri, 23 Oct 2020 21:02:03 -0700
Subject: [PATCH] validation on config version, remove repeated code

---
 influxdb.html | 126 +++++++++++++-------
 influxdb.js   | 313 +++++++++++++++++++++++++-------------------------
 2 files changed, 241 insertions(+), 198 deletions(-)

diff --git a/influxdb.html b/influxdb.html
index 0d3af71..3c4f0fe 100755
--- a/influxdb.html
+++ b/influxdb.html
@@ -52,6 +52,9 @@
 </script>
 
 <script type="text/javascript">
+    function getVersion() {
+        return $("#node-config-input-influxdbVersion option:selected").val();
+    }
     RED.nodes.registerType('influxdb', {
         category: 'config',
         color: "rgb(218, 196, 180)",
@@ -59,12 +62,28 @@
             hostname: {value: "127.0.0.1", required: true},
             port: {value: 8086, required: true},            
 			protocol: {value: "http", required: true},
-            database: {value: "database", required: true},
+            database: {value: "database",
+                validate:function(db) {
+                    let version = getVersion();
+                    if (!version || version === '1.x') {
+                        return db.length > 0;
+                    }
+                    return true;
+                }
+            },
             name: {value: ""},
             usetls: {value: false},
             tls: {type:"tls-config",required: false},
             influxdbVersion: {value: "1.x", required: false},
-            url: {value: "http://localhost:8086", required: true},
+            url: {value: "http://localhost:8086",
+                validate:function(url) {
+                    let version = getVersion();
+                    if (version === '1.8-flux' || version === '2.0') {
+                        return url.length > 0;
+                    }
+                    return true;
+                }
+            },
             rejectUnauthorized: {value: true}
         },
         credentials: {
@@ -73,13 +92,11 @@
             token: {type: "password"}
         },
         label: function () {
-            if (!this.influxdbVersion || this.influxdbVersion === '1.x') {
+            if (this.influxdbVersion === '1.8-flux' || this.influxdbVersion === '2.0') {
+                return this.name || "[v"+this.influxdbVersion+"] " + this.url;
+            } else {
                 return this.name || "[v1.x] " + this.hostname + ":" + this.port + "/" + this.database;
-            } else if (this.influxdbVersion === '1.8-flux') {
-                return this.name || "[v1.8-flux] " + this.url;
-            } else if (this.influxdbVersion === '2.0') {
-                return this.name || "[v2.0] " + this.url;
-            }         
+            }
         },
         oneditprepare: function () {
             function updateTLSOptions() {
@@ -139,7 +156,6 @@
                         $("#node-config-input-usetls").on("click", function () {
                             updateTLSOptions();
                         });
-                        break;
                 }   
             });
             // if version not set assume 1.x to support older flows
@@ -237,6 +253,17 @@
 </script>
 
 <script type="text/javascript">
+    function selectedVersion() {
+        // use prefix to update UI when version of config node changes
+        var optionSelected = $("#node-input-influxdb option:selected").text();
+        var influxDBVersionMatches = optionSelected.match(/\[(.*?)\]/);
+        var influxDBVersion = '';
+        if (influxDBVersionMatches) {
+            influxDBVersion = influxDBVersionMatches[1];
+        }
+        return influxDBVersion;
+    }
+
     RED.nodes.registerType('influxdb out', {
         category: 'storage-output',
         color: "rgb(218, 196, 180)",
@@ -246,11 +273,33 @@
             measurement: {value: ""},
             precision: {value: ""},
             retentionPolicy: {value: ""},
-            database: {value: "database", required: true},
+            database: {value: "database",
+                validate:function(db) {
+                    if (selectedVersion() === 'v1.8-flux') {
+                        return db.length > 0;
+                    }
+                    return true;
+                }
+            },
             precisionV18FluxV20: {value: "ms"},
             retentionPolicyV18Flux: {value: ""},
-            org: {value: "organisation", required: true},
-            bucket: {value: "bucket", required: true}
+            org: {value: "organisation",
+                validate:function(org) {
+                    if (selectedVersion() === 'v2.0') {
+                        return org.length > 0;
+                    }
+                    return true;
+                }
+            },
+            bucket: {value: "bucket",
+                validate:function(bucket) {
+                    let version = selectedVersion()
+                    if (version === 'v2.0') {
+                        return bucket.length > 0;
+                    }
+                    return true;
+                }
+            }
         },
         inputs: 1,
         outputs: 0,
@@ -312,20 +361,15 @@
             }
 
             $("#node-input-influxdb").change(function () {
-                // use prefix to update UI when version of config node changes
-                var optionSelected = $("#node-input-influxdb option:selected").text();
-                var influxDBVersionMatches = optionSelected.match(/\[(.*?)\]/);
-                var influxDBVersion = '';
-                if (influxDBVersionMatches) {
-                    influxDBVersion = influxDBVersionMatches[1];
-                }
-                
-                if (influxDBVersion === 'v1.x') {
-                    update18Options();
-                } else if (influxDBVersion === 'v1.8-flux') {
-                    update18FluxOptions();                    
-                } else if (influxDBVersion === 'v2.0') {
-                    update20Options();                    
+                switch (selectedVersion()) {
+                    case 'v1.8-flux':
+                        update18FluxOptions();                    
+                        break;
+                    case 'v2.0':
+                        update20Options();                    
+                        break;
+                    default:
+                        update18Options();
                 }
             });
 
@@ -522,7 +566,14 @@
             rawOutput: {value: false},
             precision: {value: ""},
             retentionPolicy: {value: ""},
-            org: {value: "organisation", required: true}
+            org: { value: "organisation",
+                validate:function(org) {
+                    if (selectedVersion() === 'v2.0') {
+                        return org.length > 0;
+                    }
+                    return true;
+                }
+            }
         },
         inputs: 1,
         outputs: 1,
@@ -579,18 +630,15 @@
             }
 
             $("#node-input-influxdb").change(function () {
-                var optionSelected = $("#node-input-influxdb option:selected").text();
-                var influxDBVersionMatches = optionSelected.match(/\[(.*?)\]/);
-                var influxDBVersion = '';
-                if (influxDBVersionMatches) {
-                    var influxDBVersion = influxDBVersionMatches[1];
-                }		    
-                if (influxDBVersion === 'v1.x' || influxDBVersion == '') {
-                    update18Options();
-                } else if (influxDBVersion === 'v1.8-flux') {
-                    update18FluxOptions();                    
-                } else if (influxDBVersion === 'v2.0') {
-                    update20Options();                    
+                switch (selectedVersion()) {
+                    case 'v1.8-flux':
+                        update18FluxOptions();                    
+                        break;
+                    case 'v2.0':
+                        update20Options();                    
+                        break;
+                    default:
+                        update18Options();
                 }
             });
         },
diff --git a/influxdb.js b/influxdb.js
index 0ebe6dc..7fd2cf5 100755
--- a/influxdb.js
+++ b/influxdb.js
@@ -17,7 +17,7 @@ module.exports = function (RED) {
 
         var clientOptions = null;
         
-        if (n.influxdbVersion === undefined) {
+        if (!n.influxdbVersion) {
             n.influxdbVersion = '1.x'
         }
 
@@ -211,110 +211,108 @@ module.exports = function (RED) {
         this.org = n.org;
         this.bucket = n.bucket;
 
-        if (this.influxdbConfig) {
-            if (this.influxdbConfig.influxdbVersion === '1.x') {
-                var node = this;
-                var client = this.influxdbConfig.client;
-
-                node.on("input", function (msg) {
-                    var measurement;
-                    var writeOptions = {};
-                    var measurement = msg.hasOwnProperty('measurement') ? msg.measurement : node.measurement;
-                    if (!measurement) {
-                        node.error(RED._("influxdb.errors.nomeasurement"), msg);
-                        return;
-                    }
-                    var precision = msg.hasOwnProperty('precision') ? msg.precision : node.precision;
-                    var retentionPolicy = msg.hasOwnProperty('retentionPolicy') ? msg.retentionPolicy : node.retentionPolicy;
+        if (!this.influxdbConfig) {
+            this.error(RED._("influxdb.errors.missingconfig"));
+            return;
+        }
+        let version = this.influxdbConfig.influxdbVersion;
 
-                    if (precision) {
-                        writeOptions.precision = precision;
-                    }
+        if (version === '1.x') {
+            var node = this;
+            var client = this.influxdbConfig.client;
 
-                    if (retentionPolicy) {
-                        writeOptions.retentionPolicy = retentionPolicy;
-                    }
+            node.on("input", function (msg) {
+                var measurement;
+                var writeOptions = {};
+                var measurement = msg.hasOwnProperty('measurement') ? msg.measurement : node.measurement;
+                if (!measurement) {
+                    node.error(RED._("influxdb.errors.nomeasurement"), msg);
+                    return;
+                }
+                var precision = msg.hasOwnProperty('precision') ? msg.precision : node.precision;
+                var retentionPolicy = msg.hasOwnProperty('retentionPolicy') ? msg.retentionPolicy : node.retentionPolicy;
 
-                    // format payload to match new writePoints API
-                    var points = [];
-                    var point;
-                    var timestamp;
-                    if (_.isArray(msg.payload) && msg.payload.length > 0) {
-                        // array of arrays
-                        if (_.isArray(msg.payload[0]) && msg.payload[0].length > 0) {
-                            msg.payload.forEach(function (nodeRedPoint) {
-                                point = {
-                                    measurement: measurement,
-                                    fields: nodeRedPoint[0],
-                                    tags: nodeRedPoint[1]
-                                }
-                                if (point.fields.time) {
-                                    point.timestamp = point.fields.time;
-                                    delete point.fields.time;
-                                }
-                                points.push(point);
-                            });
-                        } else {
-                            // array of non-arrays, assume one point with both fields and tags
+                if (precision) {
+                    writeOptions.precision = precision;
+                }
+
+                if (retentionPolicy) {
+                    writeOptions.retentionPolicy = retentionPolicy;
+                }
+
+                // format payload to match new writePoints API
+                var points = [];
+                var point;
+                var timestamp;
+                if (_.isArray(msg.payload) && msg.payload.length > 0) {
+                    // array of arrays
+                    if (_.isArray(msg.payload[0]) && msg.payload[0].length > 0) {
+                        msg.payload.forEach(function (nodeRedPoint) {
                             point = {
                                 measurement: measurement,
-                                fields: msg.payload[0],
-                                tags: msg.payload[1]
-                            };
+                                fields: nodeRedPoint[0],
+                                tags: nodeRedPoint[1]
+                            }
                             if (point.fields.time) {
                                 point.timestamp = point.fields.time;
                                 delete point.fields.time;
                             }
                             points.push(point);
-                        }
+                        });
                     } else {
-                        if (_.isPlainObject(msg.payload)) {
-                            point = {
-                                measurement: measurement,
-                                fields: msg.payload
-                            };
-                        } else {
-                            // just a value
-                            point = {
-                                measurement: measurement,
-                                fields: { value: msg.payload }
-                            };
-                        }
+                        // array of non-arrays, assume one point with both fields and tags
+                        point = {
+                            measurement: measurement,
+                            fields: msg.payload[0],
+                            tags: msg.payload[1]
+                        };
                         if (point.fields.time) {
                             point.timestamp = point.fields.time;
                             delete point.fields.time;
                         }
                         points.push(point);
                     }
+                } else {
+                    if (_.isPlainObject(msg.payload)) {
+                        point = {
+                            measurement: measurement,
+                            fields: msg.payload
+                        };
+                    } else {
+                        // just a value
+                        point = {
+                            measurement: measurement,
+                            fields: { value: msg.payload }
+                        };
+                    }
+                    if (point.fields.time) {
+                        point.timestamp = point.fields.time;
+                        delete point.fields.time;
+                    }
+                    points.push(point);
+                }
 
-                    client.writePoints(points, writeOptions).catch(function (err) {
-                        msg.influx_error = {
-                            statusCode: err.res ? err.res.statusCode : 503
-                        }
-                        node.error(err, msg);
-                    });
+                client.writePoints(points, writeOptions).catch(function (err) {
+                    msg.influx_error = {
+                        statusCode: err.res ? err.res.statusCode : 503
+                    }
+                    node.error(err, msg);
                 });
-            } else if (this.influxdbConfig.influxdbVersion === '1.8-flux') {
+            });
+        } else if (version === '1.8-flux' || version === '2.0') {
+            let bucket = this.bucket;
+            if (version === '1.8-flux') {
                 let retentionPolicy = this.retentionPolicyV18Flux ? this.retentionPolicyV18Flux : 'autogen';
-                let bucket = `${this.database}/${retentionPolicy}`;
-                this.client = this.influxdbConfig.client.getWriteApi('', bucket, this.precisionV18FluxV20);
-                var node = this;
+                bucket = `${this.database}/${retentionPolicy}`;
+            }
+            let org = version === '1.8-flux' ? '' : this.org;
 
-                node.on("input", function (msg) {
-                    writePoints(msg, node);
-                });
-            } else if (this.influxdbConfig.influxdbVersion === '2.0') {
-                this.client = this.influxdbConfig.client.getWriteApi(this.org, this.bucket, this.precisionV18FluxV20);
-                var node = this;
+            this.client = this.influxdbConfig.client.getWriteApi(org, bucket, this.precisionV18FluxV20);
+            var node = this;
 
-                node.on("input", function (msg) {
-                    writePoints(msg, node);
-                });
-            } else {
-                this.error(RED._("influxdb.errors.invalidconfig"));
-            }
-        } else {
-            this.error(RED._("influxdb.errors.missingconfig"));
+            node.on("input", function (msg) {
+                writePoints(msg, node);
+            });
         }
     }
 
@@ -332,33 +330,35 @@ module.exports = function (RED) {
 
         if (!this.influxdbConfig) {
             this.error(RED._("influxdb.errors.missingconfig"));
-        } else if (this.influxdbConfig.influxdbVersion !== '1.x') {
+            return;
+        }
+        if (this.influxdbConfig.influxdbVersion !== '1.x') {
             this.error(RED._("influxdb.errors.invalidconfig"));
-        } else {
-            var node = this;
-            var client = this.influxdbConfig.client;
+            return;
+        }
+        var node = this;
+        var client = this.influxdbConfig.client;
 
-            node.on("input", function (msg) {
-                var writeOptions = {};
-                var precision = msg.hasOwnProperty('precision') ? msg.precision : node.precision;
-                var retentionPolicy = msg.hasOwnProperty('retentionPolicy') ? msg.retentionPolicy : node.retentionPolicy;
+        node.on("input", function (msg) {
+            var writeOptions = {};
+            var precision = msg.hasOwnProperty('precision') ? msg.precision : node.precision;
+            var retentionPolicy = msg.hasOwnProperty('retentionPolicy') ? msg.retentionPolicy : node.retentionPolicy;
 
-                if (precision) {
-                    writeOptions.precision = precision;
-                }
+            if (precision) {
+                writeOptions.precision = precision;
+            }
 
-                if (retentionPolicy) {
-                    writeOptions.retentionPolicy = retentionPolicy;
-                }
+            if (retentionPolicy) {
+                writeOptions.retentionPolicy = retentionPolicy;
+            }
 
-                client.writePoints(msg.payload, writeOptions).catch(function (err) {
-                    msg.influx_error = {
-                        statusCode: err.res ? err.res.statusCode : 503
-                    }
-                    node.error(err, msg);
-                });
+            client.writePoints(msg.payload, writeOptions).catch(function (err) {
+                msg.influx_error = {
+                    statusCode: err.res ? err.res.statusCode : 503
+                }
+                node.error(err, msg);
             });
-        }
+        });
     }
 
     RED.nodes.registerType("influxdb batch", InfluxBatchNode);
@@ -376,72 +376,67 @@ module.exports = function (RED) {
         this.influxdbConfig = RED.nodes.getNode(this.influxdb);
         this.org = n.org;
 
-        if (this.influxdbConfig) {
-            if (this.influxdbConfig.influxdbVersion === '1.x') {
-                var node = this;
-                var client = this.influxdbConfig.client;
-
-                node.on("input", function (msg) {
-                    var query;
-                    var rawOutput;
-                    var queryOptions = {};
-                    var precision;
-                    var retentionPolicy;
-
-                    query = msg.hasOwnProperty('query') ? msg.query : node.query;
-                    if (!query) {
-                        node.error(RED._("influxdb.errors.noquery"), msg);
-                        return;
-                    }
+        if (!this.influxdbConfig) {
+            this.error(RED._("influxdb.errors.missingconfig"));
+            return;
+        }
 
-                    rawOutput = msg.hasOwnProperty('rawOutput') ? msg.rawOutput : node.rawOutput;
-                    precision = msg.hasOwnProperty('precision') ? msg.precision : node.precision;
-                    retentionPolicy = msg.hasOwnProperty('retentionPolicy') ? msg.retentionPolicy : node.retentionPolicy;
+        let version = this.influxdbConfig.influxdbVersion
+        if (version === '1.x') {
+            var node = this;
+            var client = this.influxdbConfig.client;
 
-                    if (precision) {
-                        queryOptions.precision = precision;
-                    }
+            node.on("input", function (msg) {
+                var query;
+                var rawOutput;
+                var queryOptions = {};
+                var precision;
+                var retentionPolicy;
+
+                query = msg.hasOwnProperty('query') ? msg.query : node.query;
+                if (!query) {
+                    node.error(RED._("influxdb.errors.noquery"), msg);
+                    return;
+                }
 
-                    if (retentionPolicy) {
-                        queryOptions.retentionPolicy = retentionPolicy;
-                    }
+                rawOutput = msg.hasOwnProperty('rawOutput') ? msg.rawOutput : node.rawOutput;
+                precision = msg.hasOwnProperty('precision') ? msg.precision : node.precision;
+                retentionPolicy = msg.hasOwnProperty('retentionPolicy') ? msg.retentionPolicy : node.retentionPolicy;
 
-                    if (rawOutput) {
-                        var queryPromise = client.queryRaw(query, queryOptions);
-                    } else {
-                        var queryPromise = client.query(query, queryOptions);
-                    }
+                if (precision) {
+                    queryOptions.precision = precision;
+                }
 
-                    queryPromise.then(function (results) {
-                        msg.payload = results;
-                        node.send(msg);
-                    }).catch(function (err) {
-                        msg.influx_error = {
-                            statusCode: err.res ? err.res.statusCode : 503
-                        }
-                        node.error(err, msg);
-                    });
-                });
+                if (retentionPolicy) {
+                    queryOptions.retentionPolicy = retentionPolicy;
+                }
 
-            } else if (this.influxdbConfig.influxdbVersion === '1.8-flux') {
-                this.client = this.influxdbConfig.client.getQueryApi('');
-                var node = this;
+                if (rawOutput) {
+                    var queryPromise = client.queryRaw(query, queryOptions);
+                } else {
+                    var queryPromise = client.query(query, queryOptions);
+                }
 
-                node.on("input", function (msg) {
-                    queryRows(msg, node);
+                queryPromise.then(function (results) {
+                    msg.payload = results;
+                    node.send(msg);
+                }).catch(function (err) {
+                    msg.influx_error = {
+                        statusCode: err.res ? err.res.statusCode : 503
+                    }
+                    node.error(err, msg);
                 });
+            });
 
-            } else if (this.influxdbConfig.influxdbVersion === '2.0') {
-                this.client = this.influxdbConfig.client.getQueryApi(this.org);
-                var node = this;
+        } else if (version === '1.8-flux' || version === '2.0') {
+            let org = version === '2.0' ? this.org : ''
+            this.client = this.influxdbConfig.client.getQueryApi(org);
+            var node = this;
 
-                node.on("input", function (msg) {
-                    queryRows(msg, node);
-                });
+            node.on("input", function (msg) {
+                queryRows(msg, node);
+            });
 
-            }
-        } else {
-            this.error(RED._("influxdb.errors.missingconfig"));
         }
     }