myenergi-api 0.4.0 → 0.8.0

package/dist/Digest.d.ts

@@ -1,6 +1,7 @@
 export declare class Digest {
     private _authDigest?;
-    constructor(username: string, password: string);
+    private _baseUrl;
+    constructor(baseUrl: string, username: string, password: string);
     private request;
     get(requestUrl: string, data?: any): Promise<any>;
 }

package/dist/Digest.js

@@ -24,12 +24,13 @@ const https = __importStar(require("https"));
 const url = __importStar(require("url"));
 const AuthDigest_1 = require("./AuthDigest");
 class Digest {
-    constructor(username, password) {
+    constructor(baseUrl, username, password) {
+        this._baseUrl = url.parse(baseUrl, true);
         this._authDigest = new AuthDigest_1.AuthDigest(username, password, (err) => {
             console.error(err);
         });
     }
-    request(options, data, retryCount = 0) {
+    request(options, data, retryCount = 0, redirectCount = 0) {
         return new Promise((resolve, reject) => {
             var _a;
             let resData = '';
@@ -62,6 +63,27 @@ class Digest {
                     });
                 }
                 else if (res.statusCode >= 200 && res.statusCode < 300) {
+                    // myenergi asn redirect handler.
+                    const myenergiAsn = res.headers['x_myenergi-asn'];
+                    if (myenergiAsn && myenergiAsn !== 'undefined' && myenergiAsn !== this._baseUrl.host) {
+                        if (redirectCount > 2) {
+                            reject(`Too many redirects: ${myenergiAsn}`);
+                            return;
+                        }
+                        this._baseUrl.host = myenergiAsn;
+                        this._baseUrl.hostname = myenergiAsn;
+                        options.host = myenergiAsn;
+                        options.hostname = myenergiAsn;
+                        redirectCount++;
+                        return this.request(options, data, retryCount, redirectCount)
+                            .then((value) => {
+                            resolve(value);
+                        })
+                            .catch((resaon) => {
+                            reject(resaon);
+                        });
+                    }
+                    // Plain 200 handling
                     res.setEncoding('utf8');
                     res.on('data', (chunk) => {
                         resData += chunk;
@@ -70,6 +92,25 @@ class Digest {
                         resolve(resData);
                     });
                 }
+                else if (res.statusCode >= 300 && res.statusCode < 400) {
+                    if (redirectCount > 2) {
+                        reject(`Too many redirects: ${res.headers['location']}`);
+                        return;
+                    }
+                    const location = res.headers['location'];
+                    const uri = url.parse(location, true);
+                    if (uri.host !== this._baseUrl.host) {
+                        this._baseUrl.host = uri.host;
+                    }
+                    redirectCount++;
+                    return this.request(options, data, retryCount, redirectCount)
+                        .then((value) => {
+                        resolve(value);
+                    })
+                        .catch((resaon) => {
+                        reject(resaon);
+                    });
+                }
                 else {
                     console.error('status code failed!!');
                     reject('status code failed!!');
@@ -89,9 +130,10 @@ class Digest {
     get(requestUrl, data) {
         const uri = url.parse(requestUrl, true);
         const options = {
-            hostname: uri.hostname,
-            port: uri.port,
-            path: uri.pathname,
+            hostname: this._baseUrl.hostname,
+            host: this._baseUrl.host,
+            port: this._baseUrl.port,
+            path: uri.path,
             method: 'GET',
             headers: {
                 Connection: 'Keep-Alive',

package/dist/MyEnergi.d.ts

@@ -1,15 +1,7 @@
+import { Eddi } from './models/Eddi';
+import { Harvi } from './models/Harvi';
+import { EddiBoost, EddiMode, ZappiBoostMode, ZappiChargeMode } from './models/Types';
 import { Zappi } from './models/Zappi';
-export declare enum ZappiChargeMode {
-    Off = 4,
-    Fast = 1,
-    Eco = 2,
-    EcoPlus = 3
-}
-export declare enum ZappiBoostMode {
-    Manual = 10,
-    Smart = 11,
-    Stop = 2
-}
 export declare class MyEnergi {
     private _config;
     private _digest;
@@ -20,4 +12,10 @@ export declare class MyEnergi {
     setZappiChargeMode(serialNo: string, chargeMode: ZappiChargeMode): Promise<any>;
     setZappiBoostMode(serialNo: string, boostMode: ZappiBoostMode, kwh?: number, completeTime?: string): Promise<any>;
     setZappiGreenLevel(serialNo: string, percentage: number): Promise<any>;
+    getStatusEddiAll(): Promise<Eddi[]>;
+    getStatusEddi(serialNumber: string): Promise<Eddi | null>;
+    setEddiMode(serialNo: string, mode: EddiMode): Promise<any>;
+    setEddiBoost(serialNo: string, boost: EddiBoost, minutes?: number): Promise<any>;
+    getStatusHarviAll(): Promise<Harvi[]>;
+    getStatusHarvi(serialNumber: string): Promise<Harvi | null>;
 }

package/dist/MyEnergi.js

@@ -9,43 +9,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MyEnergi = exports.ZappiBoostMode = exports.ZappiChargeMode = void 0;
+exports.MyEnergi = void 0;
 const Digest_1 = require("./Digest");
-var ZappiChargeMode;
-(function (ZappiChargeMode) {
-    ZappiChargeMode[ZappiChargeMode["Off"] = 4] = "Off";
-    ZappiChargeMode[ZappiChargeMode["Fast"] = 1] = "Fast";
-    ZappiChargeMode[ZappiChargeMode["Eco"] = 2] = "Eco";
-    ZappiChargeMode[ZappiChargeMode["EcoPlus"] = 3] = "EcoPlus";
-})(ZappiChargeMode = exports.ZappiChargeMode || (exports.ZappiChargeMode = {}));
-var ZappiBoostMode;
-(function (ZappiBoostMode) {
-    ZappiBoostMode[ZappiBoostMode["Manual"] = 10] = "Manual";
-    ZappiBoostMode[ZappiBoostMode["Smart"] = 11] = "Smart";
-    ZappiBoostMode[ZappiBoostMode["Stop"] = 2] = "Stop";
-})(ZappiBoostMode = exports.ZappiBoostMode || (exports.ZappiBoostMode = {}));
+const Types_1 = require("./models/Types");
 class MyEnergi {
     constructor(username, password) {
         this._config = {
             username: '',
             password: '',
-            eddi_url: 'https://s18.myenergi.net/cgi-jstatus-E',
-            zappi_url: 'https://s18.myenergi.net/cgi-jstatus-Z',
-            harvi_url: 'https://s18.myenergi.net/cgi-jstatus-H',
-            status_url: 'https://s18.myenergi.net/cgi-jstatus-*',
-            dayhour_url: 'https://s18.myenergi.net/cgi-jdayhour-',
-            zappi_mode_url: 'https://s18.myenergi.net/cgi-zappi-mode-Z',
-            zappi_min_green_url: 'https://s18.myenergi.net/cgi-set-min-green-Z',
+            base_url: 'https://s18.myenergi.net',
+            eddi_url: '/cgi-jstatus-E',
+            zappi_url: '/cgi-jstatus-Z',
+            harvi_url: '/cgi-jstatus-H',
+            status_url: '/cgi-jstatus-*',
+            dayhour_url: '/cgi-jdayhour-',
+            zappi_mode_url: '/cgi-zappi-mode-Z',
+            zappi_min_green_url: '/cgi-set-min-green-Z',
+            eddi_mode_url: '/cgi-eddi-mode-E',
+            eddi_boost_url: '/cgi-eddi-boost-E'
             //https://s18.myenergi.net/cgi-jdayhour-Znnnnnnnn-YYYY-MM-DD
         };
         this._config.username = username;
         this._config.password = password;
-        this._digest = new Digest_1.Digest(this._config.username, this._config.password);
+        this._digest = new Digest_1.Digest(this._config.base_url, this._config.username, this._config.password);
     }
     getStatusAll() {
         return __awaiter(this, void 0, void 0, function* () {
             const data = yield this._digest.get(this._config.status_url);
-            return data;
+            const jsonData = JSON.parse(data);
+            return jsonData;
         });
     }
     getStatusZappiAll() {
@@ -79,25 +71,98 @@ class MyEnergi {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this._config.zappi_mode_url}${serialNo}-${chargeMode}-0-0-0000`;
             const data = yield this._digest.get(url);
-            return data;
+            const jsonData = JSON.parse(data);
+            return jsonData;
         });
     }
     setZappiBoostMode(serialNo, boostMode, kwh = 0, completeTime = '0000') {
         return __awaiter(this, void 0, void 0, function* () {
-            if (boostMode === ZappiBoostMode.Stop) {
+            if (boostMode === Types_1.ZappiBoostMode.Stop) {
                 kwh = 0;
                 completeTime = '0000';
             }
             const url = `${this._config.zappi_mode_url}${serialNo}-0-${boostMode}-${kwh}-${completeTime}`;
             const data = yield this._digest.get(url);
-            return data;
+            const jsonData = JSON.parse(data);
+            return jsonData;
         });
     }
     setZappiGreenLevel(serialNo, percentage) {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this._config.zappi_min_green_url}${serialNo}-${percentage}`;
             const data = yield this._digest.get(url);
-            return data;
+            const jsonData = JSON.parse(data);
+            return jsonData;
+        });
+    }
+    getStatusEddiAll() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = yield this._digest.get(this._config.eddi_url);
+            const jsonData = JSON.parse(data);
+            if (jsonData.eddi)
+                return Object.assign([], jsonData.eddi);
+            else
+                return [];
+        });
+    }
+    getStatusEddi(serialNumber) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = yield this._digest.get(this._config.eddi_url);
+            const jsonData = JSON.parse(data);
+            if (jsonData.eddi) {
+                const eddi = Object.assign([], jsonData.eddi).find((eddi) => {
+                    return eddi.sno === serialNumber;
+                });
+                if (eddi)
+                    return Object.assign({}, eddi);
+                else
+                    return null;
+            }
+            else
+                return null;
+        });
+    }
+    setEddiMode(serialNo, mode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = `${this._config.eddi_mode_url}${serialNo}-${mode}`;
+            const data = yield this._digest.get(url);
+            const jsonData = JSON.parse(data);
+            return jsonData;
+        });
+    }
+    setEddiBoost(serialNo, boost, minutes = 0) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = `${this._config.eddi_boost_url}${serialNo}-${boost}-${minutes}`;
+            const data = yield this._digest.get(url);
+            const jsonData = JSON.parse(data);
+            return jsonData;
+        });
+    }
+    getStatusHarviAll() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = yield this._digest.get(this._config.harvi_url);
+            const jsonData = JSON.parse(data);
+            if (jsonData.harvi)
+                return Object.assign([], jsonData.harvi);
+            else
+                return [];
+        });
+    }
+    getStatusHarvi(serialNumber) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = yield this._digest.get(this._config.harvi_url);
+            const jsonData = JSON.parse(data);
+            if (jsonData.harvi) {
+                const harvi = Object.assign([], jsonData.harvi).find((harvi) => {
+                    return harvi.sno === serialNumber;
+                });
+                if (harvi)
+                    return Object.assign({}, harvi);
+                else
+                    return null;
+            }
+            else
+                return null;
         });
     }
 }

package/dist/index.d.ts

@@ -1,2 +1,6 @@
+import { Eddi } from './models/Eddi';
+import { Harvi } from './models/Harvi';
+import { EddiBoost, EddiMode, ZappiBoostMode, ZappiChargeMode } from './models/Types';
+import { Zappi } from './models/Zappi';
 import { MyEnergi } from './MyEnergi';
-export { MyEnergi };
+export { MyEnergi, Eddi, Zappi, Harvi, EddiBoost, EddiMode, ZappiBoostMode, ZappiChargeMode };

package/dist/index.js

@@ -1,5 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MyEnergi = void 0;
+exports.ZappiChargeMode = exports.ZappiBoostMode = exports.EddiMode = exports.EddiBoost = exports.MyEnergi = void 0;
+const Types_1 = require("./models/Types");
+Object.defineProperty(exports, "EddiBoost", { enumerable: true, get: function () { return Types_1.EddiBoost; } });
+Object.defineProperty(exports, "EddiMode", { enumerable: true, get: function () { return Types_1.EddiMode; } });
+Object.defineProperty(exports, "ZappiBoostMode", { enumerable: true, get: function () { return Types_1.ZappiBoostMode; } });
+Object.defineProperty(exports, "ZappiChargeMode", { enumerable: true, get: function () { return Types_1.ZappiChargeMode; } });
 const MyEnergi_1 = require("./MyEnergi");
 Object.defineProperty(exports, "MyEnergi", { enumerable: true, get: function () { return MyEnergi_1.MyEnergi; } });

package/dist/models/Eddi.d.ts

@@ -0,0 +1,31 @@
+export interface Eddi {
+    sno: string;
+    bsm: number;
+    che: number;
+    cmt: number;
+    dat: string;
+    div: number;
+    dst: number;
+    ectp1: number;
+    ectp2: number;
+    ectt1: string;
+    ectt2: string;
+    frq: number;
+    fwv: number;
+    gen: number;
+    grd: number;
+    hno: number;
+    ht1: string;
+    ht2: string;
+    pha: number;
+    pri: number;
+    r1a: number;
+    r2a: number;
+    r2b: number;
+    rbt: number;
+    sta: number;
+    tim: string;
+    tp: number;
+    tp2: number;
+    vol: number;
+}

package/dist/models/Eddi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/models/Harvi.d.ts

@@ -0,0 +1,15 @@
+export interface Harvi {
+    sno: string;
+    dat: string;
+    tim: string;
+    ectp1: number;
+    ectp2: number;
+    ectp3: number;
+    ectt1: string;
+    ectt2: string;
+    ectt3: string;
+    ect1p: number;
+    ect2p: number;
+    ect3p: number;
+    fwv: string;
+}

package/dist/models/Harvi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/models/Types.d.ts

@@ -0,0 +1,25 @@
+export declare enum EddiBoost {
+    CancelHeater1 = "1-1",
+    CancelHeater2 = "1-1",
+    CancelRelay1 = "1-11",
+    CancelRelay2 = "1-12",
+    ManualHeater1 = "10-1",
+    ManualHeater2 = "10-1",
+    ManualRelay1 = "10-11",
+    ManualRelay2 = "10-12"
+}
+export declare enum EddiMode {
+    Off = 0,
+    On = 1
+}
+export declare enum ZappiBoostMode {
+    Manual = 10,
+    Smart = 11,
+    Stop = 2
+}
+export declare enum ZappiChargeMode {
+    Off = 4,
+    Fast = 1,
+    Eco = 2,
+    EcoPlus = 3
+}

package/dist/models/Types.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZappiChargeMode = exports.ZappiBoostMode = exports.EddiMode = exports.EddiBoost = void 0;
+var EddiBoost;
+(function (EddiBoost) {
+    EddiBoost["CancelHeater1"] = "1-1";
+    EddiBoost["CancelHeater2"] = "1-1";
+    EddiBoost["CancelRelay1"] = "1-11";
+    EddiBoost["CancelRelay2"] = "1-12";
+    EddiBoost["ManualHeater1"] = "10-1";
+    EddiBoost["ManualHeater2"] = "10-1";
+    EddiBoost["ManualRelay1"] = "10-11";
+    EddiBoost["ManualRelay2"] = "10-12";
+})(EddiBoost = exports.EddiBoost || (exports.EddiBoost = {}));
+var EddiMode;
+(function (EddiMode) {
+    EddiMode[EddiMode["Off"] = 0] = "Off";
+    EddiMode[EddiMode["On"] = 1] = "On";
+})(EddiMode = exports.EddiMode || (exports.EddiMode = {}));
+var ZappiBoostMode;
+(function (ZappiBoostMode) {
+    ZappiBoostMode[ZappiBoostMode["Manual"] = 10] = "Manual";
+    ZappiBoostMode[ZappiBoostMode["Smart"] = 11] = "Smart";
+    ZappiBoostMode[ZappiBoostMode["Stop"] = 2] = "Stop";
+})(ZappiBoostMode = exports.ZappiBoostMode || (exports.ZappiBoostMode = {}));
+var ZappiChargeMode;
+(function (ZappiChargeMode) {
+    ZappiChargeMode[ZappiChargeMode["Off"] = 4] = "Off";
+    ZappiChargeMode[ZappiChargeMode["Fast"] = 1] = "Fast";
+    ZappiChargeMode[ZappiChargeMode["Eco"] = 2] = "Eco";
+    ZappiChargeMode[ZappiChargeMode["EcoPlus"] = 3] = "EcoPlus";
+})(ZappiChargeMode = exports.ZappiChargeMode || (exports.ZappiChargeMode = {}));

package/dist/models/Zappi.d.ts

@@ -14,8 +14,6 @@ export interface Zappi {
     ectt4: string;
     ectt5: string;
     ectt6: string;
-    bsm: number;
-    bst: number;
     cmt: number;
     dst: number;
     div: number;
@@ -23,15 +21,24 @@ export interface Zappi {
     fwv: string;
     gen: number;
     grd: number;
+    mgl: number;
     pha: number;
     pri: number;
     sta: number;
     tz: number;
     vol: number;
     che: number;
-    bss: number;
     lck: number;
     pst: string;
+    bsm: number;
+    bst: number;
+    bss: number;
+    sbh: number;
+    sbk: number;
+    sbm: number;
+    tbh: number;
+    tbk: number;
+    tbm: number;
     zmo: number;
     zs: number;
     rdc: number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "myenergi-api",
-    "version": "0.4.0",
+    "version": "0.8.0",
     "description": "NodeJS implementation of MyEnergi API for controlling Zappi, Eddi and other MyEnergi products",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",