nodejs-poolcontroller 7.7.0 → 8.0.1

package/controller/Constants.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
@@ -177,6 +178,8 @@ export class Heliotrope {
     public get calculatedTimes(): any { return { sunrise: this.sunrise, sunset: this.sunset, isValid: this.isValid }; }
 }
 export class Timestamp {
+    private static dateTextISO = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*))(?:Z|(\+|-)([\d|:]*))?$/;
+    private static dateTextAjax = /^\/Date\((d|-|.*)\)[\/|\\]$/;
     private _dt: Date;
     public emitter: EventEmitter;
     constructor(dt?: Date | string) {
@@ -187,8 +190,8 @@ export class Timestamp {
     private _isUpdating: boolean = false;
     public static get now(): Timestamp { return new Timestamp(); }
     public toDate() { return this._dt; }
-    public set isUpdating(val:boolean) {this._isUpdating = val;}
-    public get isUpdating(): boolean { return this._isUpdating;}
+    public set isUpdating(val: boolean) { this._isUpdating = val; }
+    public get isUpdating(): boolean { return this._isUpdating; }
     public get hours(): number { return this._dt.getHours(); }
     public set hours(val: number) {
         if (this.hours !== val) {
@@ -261,8 +264,8 @@ export class Timestamp {
             dt.getFullYear() !== this._dt.getFullYear())
             this.emitter.emit('change');
     }
-    public calcTZOffset(): {tzOffset:number, adjustDST:boolean}{
-        let obj = {tzOffset: 0, adjustDST: false};
+    public calcTZOffset(): { tzOffset: number, adjustDST: boolean } {
+        let obj = { tzOffset: 0, adjustDST: false };
         let dateJan = new Date(this._dt.getFullYear(), 0, 1, 2);
         let dateJul = new Date(this._dt.getFullYear(), 6, 1, 2);
         obj.tzOffset = dateJan.getTimezoneOffset() / 60 * -1;
@@ -293,6 +296,15 @@ export class Timestamp {
     }
     public clone() { return new Timestamp(new Date(this._dt)); }
     public static locale() { return Intl.DateTimeFormat().resolvedOptions().locale; }
+    public static parseISO(val: string): RegExpExecArray { return typeof val !== 'undefined' && val ? Timestamp.dateTextISO.exec(val) : null; }
+    public static parseAjax(val: string): RegExpExecArray { return typeof val !== 'undefined' && val ? Timestamp.dateTextAjax.exec(val) : null; }
+    public static dayOfWeek(time: Timestamp): number {
+        // for IntelliTouch set date/time
+        if (time.toDate().getUTCDay() === 0)
+            return 0;
+        else
+            return Math.pow(2, time.toDate().getUTCDay() - 1);
+    }
 }
 export enum ControllerType {
     IntelliCenter = 'intellicenter',
@@ -300,27 +312,12 @@ export enum ControllerType {
     IntelliCom = 'intellicom',
     EasyTouch = 'easytouch',
     Unknown = 'unknown',
-    Virtual = 'virtual',
+    // Virtual = 'virtual',
     Nixie = 'nixie',
-    AquaLink = 'aqualink'
+    AquaLink = 'aqualink',
+    SunTouch = 'suntouch',
+    None = 'none'
 }
-// export enum VirtualDeviceType {
-//     Pump = 'pump',
-//     Chlorinator = 'chlorinator'
-// }
-//export class Enums {
-//    public static Addresses = {
-//        2: { val: 2, name: 'chlorinator', desc: 'Chlorinator' },
-//        15: { val: 15, name: 'outdoor', desc: 'Main outdoor panel' },
-//        16: { val: 16, name: 'broadcast', desc: 'Broadcast' },
-//        33: { val: 33, name: 'intellitouch', desc: 'Intellitouch Plugin' },
-//        34: { val: 34, name: 'mobi', desc: 'Wireless controller' },
-//        36: { val: 36, name: 'intellicenter', desc: 'Intellicenter Plugin' },
-//        37: { val: 37, name: 'indoor2', desc: 'Indoor panel #2' },
-//        144: { val: 144, name: 'intellichem', desc: 'Intellichem' },
-//        transform: function (byte) { return extend(true, {}, this[byte] || this[0]); }
-//    }
-//}
 
 export class Utils {
     public makeBool(val) {
@@ -345,6 +342,32 @@ export class Utils {
         }
         return false;
     }
+    public static jsonReviver = (key, value) => {
+        if (typeof value === 'string') {
+            let d = Timestamp.parseISO(value);
+            // By parsing the date and then creating a new date from that we will get
+            // the date in the proper timezone.
+            if (d) return new Date(Date.parse(value));
+            d = Timestamp.parseAjax(value);
+            if (d) {
+                // Not sure we will be seeing ajax dates but this is
+                // something that we may see from external sources.
+                let a = d[1].split(/[-+,.]/);
+                return new Date(a[0] ? +a[0] : 0 - +a[1]);
+            }
+        }
+        return value;
+    }
+    public static jsonReplacer = (key, value) => {
+        // Add in code to change Timestamp into a string.
+        if (typeof value !== 'undefined' && value) {
+            if (typeof value.format === 'function') return value.format();
+            else if (typeof value.getTime === 'function') return Timestamp.toISOLocal(value);
+        }
+        return value;
+    }
+    public static parseJSON(json: string) { return JSON.parse(json, Utils.jsonReviver); }
+    public static stringifyJSON(obj: any) { return JSON.stringify(obj, Utils.jsonReplacer); }
     public uuid(a?, b?) { for (b = a = ''; a++ < 36; b += a * 51 & 52 ? (a ^ 15 ? 8 ^ Math.random() * (a ^ 20 ? 16 : 4) : 4).toString(16) : '-'); return b }
     public convert = {
         temperature: {
@@ -570,7 +593,7 @@ export class Utils {
         return seconds;
     }
     public isNullOrEmpty(val: any) { return (typeof val === 'string') ? val === null || val === '' : typeof val === 'undefined' || val === null; }
-    public sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+    // public sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
     // Use this method to get around the circular references for the toJSON function.
     public serialize(obj, fn?: (key, value) => any): string {
         let op = Object.getOwnPropertyNames(obj);
@@ -671,6 +694,16 @@ export class Utils {
         let slope = (points_y[0] - points_y[points_y.length - 1]) / (points_x[0] - points_x[points_x.length - 1]);
         return slope;
     }
+    private random(bounds: number, onlyPositive: boolean = false) {
+        let rand = Math.random() * bounds;
+        if (!onlyPositive) {
+            if (Math.random() <= .5) rand = rand * -1;
+        }
+        return rand;
+    }
+    public dec2bin(dec) {
+        return (dec >>> 0).toString(2).padStart(8, '0');
+    }
 }
 
 export const utils = new Utils();