nodejs-poolcontroller 7.7.0 → 8.0.1

package/web/interfaces/baseInterface.ts

@@ -1,9 +1,52 @@
+import * as fs from "fs";
+import * as path from "path";
 import extend = require("extend");
 import { logger } from "../../logger/Logger";
 import { sys as sysAlias } from "../../controller/Equipment";
 import { state as stateAlias} from "../../controller/State";
 import { webApp as webAppAlias } from '../Server';
-import { utils, Timestamp } from "../../controller/Constants";
+import { config } from "../../config/Config";
+export class BindingsFile {
+    public static async fromBuffer(filename: string, buff: Buffer) {
+        try {
+            let bf = new BindingsFile();
+            bf.filename = filename;
+            bf.filePath = path.join(process.cwd(), 'web/bindings/custom', bf.filename);
+            bf.options = await bf.extractBindingOptions(buff);
+            return typeof bf.options !== 'undefined' ? bf : undefined;
+        } catch (err) { logger.error(`Error creating buffered backup file: ${filename}`); }
+    }
+    public static async fromFile(pathName: string, fileName: string) {
+        try {
+            let bf = new BindingsFile();
+            bf.filePath = path.posix.join(pathName, fileName);
+            bf.filename = fileName;
+            bf.options = await bf.extractBindingOptions(bf.filePath);
+            return typeof bf.options !== 'undefined' ? bf : undefined;
+        } catch (err) { logger.error(`Error creating bindings file from file ${pathName}${fileName}`); }
+    }
+    public filename: string;
+    public filePath: string;
+    public options: any;
+    protected async extractBindingOptions(file: string | Buffer) {
+        try {
+            let buff = Buffer.isBuffer(file) ? file.toString() : fs.readFileSync(file, 'utf8');
+            let bindings = JSON.parse(buff);
+            let interfaces = config.getSection('web.interfaces');
+            let ass = [];
+            for (let ifname in interfaces) {
+                let iface = interfaces[ifname]
+                if (typeof iface !== 'undefined' && typeof iface.fileName !== 'undefined')
+                    if (iface.fileName.endsWith(`custom/${this.filename}`)) ass.push(ifname);
+            }
+            if (typeof bindings.context !== 'undefined')
+                return {
+                    filename: this.filename, filepath: this.filePath, name: bindings.context.name || name, type: bindings.context.type || undefined, assoc: ass
+                };
+            return this.options;
+        } catch (err) { logger.error(`Error extracting binding options from ${Buffer.isBuffer(file) ? 'Buffer' : file}: ${err.message}`); }
+    }
+}
 
 export class BaseInterfaceBindings {
     constructor(cfg) {
@@ -13,10 +56,10 @@ export class BaseInterfaceBindings {
     public cfg;
     public events: InterfaceEvent[];
     public bindEvent(evt: string, ...data: any) { };
-    protected bindVarTokens(e: InterfaceEvent, evt: string, ...data: any) {
+    public bindVarTokens(e: IInterfaceEvent, evt: string, ...data: any) {
         let v = {};
         let toks = {};
-        let vars = extend(true, {}, this.cfg.vars, this.context.vars, typeof e !== 'undefined' && e.vars ? e.vars : {});
+        let vars = extend(true, {}, this.context.vars, typeof e !== 'undefined' && e.vars ? e.vars : {}, this.cfg.vars || {});
         for (var s in vars) {
             let ovalue = vars[s];
             if (typeof ovalue === 'string') {
@@ -32,7 +75,7 @@ export class BaseInterfaceBindings {
         //console.log(v);
         return v;
     }
-    protected matchTokens(input: string, eventName: string, toks: any, e: InterfaceEvent, data, vars): any {
+    protected matchTokens(input: string, eventName: string, toks: any, e: IInterfaceEvent, data, vars): any {
         toks = toks || [];
         let s = input;
         let regx = /(?<=@bind\=\s*).*?(?=\;)/g;
@@ -58,7 +101,7 @@ export class BaseInterfaceBindings {
         return toks;
 
     }
-    protected buildTokens(input: string, eventName: string, toks: any, e: InterfaceEvent, data): any {
+    protected buildTokens(input: string, eventName: string, toks: any, e: IInterfaceEvent, data): any {
         toks = toks || [];
         let s = input;
         let regx = /(?<=@bind\=\s*).*?(?=\;)/g;
@@ -111,6 +154,7 @@ export class BaseInterfaceBindings {
             else if (typeof tok.value === 'undefined') s = s.replace(tok.reg, 'null');
             else return tok.value;
         }
+        return s;
     }
     protected tokensReplacer(input: string, eventName: string, toks: any, e: InterfaceEvent, data): any{
         this.buildTokens(input, eventName, toks, e, data);
@@ -118,8 +162,15 @@ export class BaseInterfaceBindings {
     }
     public async stopAsync() { }
 }
-
-export class InterfaceEvent {
+export interface IInterfaceEvent {
+    enabled: boolean;
+    filter?: string;
+    options?: any;
+    body?: any;
+    vars?: any;
+    processor?: string[]
+}
+export class InterfaceEvent implements IInterfaceEvent {
     public name: string;
     public enabled: boolean = true;
     public filter: string;

package/web/interfaces/httpInterface.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+Russell Goldin, tagyoureit.  russ.goldin@gmail.com
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as
@@ -112,7 +113,9 @@ export class HttpInterfaceBindings extends BaseInterfaceBindings {
                             //console.log(response.statusCode);
                         });
                     }
-                    req.on('error', (err, req, res) => { logger.error(err); });
+                    req.on('error', (err, req, res) => {
+                        logger.error(`Error sending request for event ${evt}: ${err.message}`);
+                    });
                     if (typeof sbody !== 'undefined') {
                         req.write(sbody);
                     }

package/web/interfaces/influxInterface.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+Russell Goldin, tagyoureit.  russ.goldin@gmail.com
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as
@@ -94,13 +95,19 @@ export class InfluxInterfaceBindings extends BaseInterfaceBindings {
             writeFailed: function(error, lines, failedAttempts){
                 /** return promise or void */
                 logger.error(`InfluxDB batch write failed writing ${lines.length} lines with ${failedAttempts} failed attempts.  ${error.message}`);
+                //console.log(lines);
             },
             writeSuccess: function(lines){
                 logger.silly(`InfluxDB successfully wrote ${lines.length} lines.`)
             },
+            writeRetrySkipped: function(entry){
+                logger.silly(`Influx write retry skipped ${JSON.stringify(entry)}`);
+            },
             maxRetryTime: DEFAULT_WriteOptions.maxRetryTime,
             exponentialBase: DEFAULT_WriteOptions.exponentialBase,
-            randomRetry: DEFAULT_WriteOptions.randomRetry
+            randomRetry: DEFAULT_WriteOptions.randomRetry,
+            maxBatchBytes: 4096
+           
         }
         this.writeApi = influxDB.getWriteApi(org, bucket, 'ms', writeOptions);