myenergi-api 1.1.0 → 2.1.0

package/dist/AuthDigest.js

@@ -62,7 +62,7 @@ class AuthDigest {
     get nc() {
         var _a;
         this._nc++;
-        var myHex = ("0000000" + ((_a = this._nc) === null || _a === void 0 ? void 0 : _a.toString(16))).substr(-8);
+        const myHex = ("0000000" + ((_a = this._nc) === null || _a === void 0 ? void 0 : _a.toString(16))).substr(-8);
         return myHex;
     }
     get cnonce() {
@@ -70,35 +70,37 @@ class AuthDigest {
         return this._cnonce;
     }
     md5(data) {
-        let md5 = crypto.createHash("md5");
-        let result = md5.update(data).digest("hex");
+        const md5 = crypto.createHash("md5");
+        const result = md5.update(data).digest("hex");
         return result;
     }
     init(wwwAuthHeader) {
-        let authSplit = wwwAuthHeader.split(",");
-        for (let item of authSplit) {
-            if (item.indexOf("realm=") >= 0) {
-                let realmSplit = item.split('="');
+        if (!wwwAuthHeader)
+            return;
+        const authSplit = wwwAuthHeader === null || wwwAuthHeader === void 0 ? void 0 : wwwAuthHeader.split(",");
+        for (const item of authSplit) {
+            if (item && item.indexOf("realm=") >= 0) {
+                const realmSplit = item.split('="');
                 this._realm = realmSplit[realmSplit.length - 1];
                 this._realm = this._realm.substring(0, this._realm.length - 1);
             }
-            if (item.indexOf("nonce=") >= 0) {
-                let nonceSplit = item.split('="');
+            if (item && item.indexOf("nonce=") >= 0) {
+                const nonceSplit = item.split('="');
                 this._nonce = nonceSplit[nonceSplit.length - 1];
                 this._nonce = this._nonce.substring(0, this._nonce.length - 1);
             }
-            if (item.indexOf("qop=") >= 0) {
-                let qopSplit = item.split('="');
+            if (item && item.indexOf("qop=") >= 0) {
+                const qopSplit = item.split('="');
                 this._qop = qopSplit[qopSplit.length - 1];
                 this._qop = this._qop.substring(0, this._qop.length - 1);
             }
-            if (item.indexOf("opaque=") >= 0) {
-                let opaqueSplit = item.split('="');
+            if (item && item.indexOf("opaque=") >= 0) {
+                const opaqueSplit = item.split('="');
                 this._opaque = opaqueSplit[opaqueSplit.length - 1];
                 this._opaque = this._opaque.substring(0, this._opaque.length - 1);
             }
-            if (item.indexOf("algorithm=") >= 0) {
-                let algorithmSplit = item.split("=");
+            if (item && item.indexOf("algorithm=") >= 0) {
+                const algorithmSplit = item.split("=");
                 this._algorithm = algorithmSplit[algorithmSplit.length - 1];
                 this._algorithm = this._algorithm.substring(0, this._algorithm.length);
                 if (this._onError && this.algorithm !== "MD5") {
@@ -113,9 +115,9 @@ class AuthDigest {
             return "";
         const nc = this.nc;
         const cnonce = this.cnonce;
-        let HA1 = this.md5(this.username + ":" + this.realm + ":" + this._password);
-        let HA2 = this.md5(httpMethod + ":" + path);
-        let response = this.md5(HA1 + ":" + this.nonce + ":" + nc + ":" + cnonce + ":" + this.qop + ":" + HA2);
+        const HA1 = this.md5(this.username + ":" + this.realm + ":" + this._password);
+        const HA2 = this.md5(httpMethod + ":" + path);
+        const response = this.md5(HA1 + ":" + this.nonce + ":" + nc + ":" + cnonce + ":" + this.qop + ":" + HA2);
         let res = `Digest username="${this.username}",`;
         res += `realm="${this.realm}",`;
         res += `nonce="${this.nonce}",`;

package/dist/Digest.d.ts

@@ -5,5 +5,5 @@ export declare class Digest {
     private _maxRetryCount;
     constructor(baseUrl: string, username: string, password: string);
     private request;
-    get(requestUrl: string, data?: any): Promise<any>;
+    get(requestUrl: URL, data?: unknown): Promise<string>;
 }

package/dist/Digest.js

@@ -25,13 +25,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Digest = void 0;
 const https = __importStar(require("https"));
-const url = __importStar(require("url"));
 const AuthDigest_1 = require("./AuthDigest");
 class Digest {
     constructor(baseUrl, username, password) {
         this._maxRedirectCount = 3;
         this._maxRetryCount = 2;
-        this._baseUrl = url.parse(baseUrl, true);
+        this._baseUrl = new URL(baseUrl);
         this._authDigest = new AuthDigest_1.AuthDigest(username, password, (err) => {
             console.error(err);
         });
@@ -87,7 +86,7 @@ class Digest {
                         reject(resaon);
                     });
                 }
-                else if (res.statusCode >= 200 && res.statusCode < 300) {
+                else if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
                     const myenergiAsn = res.headers["x_myenergi-asn"];
                     if (myenergiAsn && myenergiAsn !== "undefined" && myenergiAsn !== this._baseUrl.host) {
                         if (redirectCount > this._maxRedirectCount) {
@@ -115,13 +114,13 @@ class Digest {
                         resolve(resData);
                     });
                 }
-                else if (res.statusCode >= 300 && res.statusCode < 400) {
+                else if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400) {
                     if (redirectCount > this._maxRedirectCount) {
                         reject(`Too many redirects: ${res.headers["location"]}`);
                         return;
                     }
                     const location = res.headers["location"];
-                    const uri = url.parse(location, true);
+                    const uri = new URL(location);
                     if (uri.host !== this._baseUrl.host) {
                         this._baseUrl.host = uri.host;
                     }
@@ -151,18 +150,17 @@ class Digest {
         });
     }
     get(requestUrl, data) {
-        const uri = url.parse(requestUrl, true);
         const options = {
             hostname: this._baseUrl.hostname,
             host: this._baseUrl.host,
             port: this._baseUrl.port,
-            path: uri.path,
+            path: requestUrl.pathname,
             method: "GET",
             headers: {
                 Connection: "Keep-Alive",
                 "Content-Type": "application/json",
                 Accept: "application/json",
-                Host: uri.hostname,
+                Host: requestUrl.hostname,
             },
         };
         return this.request(options, data);

package/dist/MyEnergi.d.ts

@@ -6,16 +6,16 @@ export declare class MyEnergi {
     private _config;
     private _digest;
     constructor(username: string, password: string, apiBaseUrl?: string);
-    getStatusAll(): Promise<any>;
+    getStatusAll(): Promise<unknown>;
     getStatusZappiAll(): Promise<Zappi[]>;
     getStatusZappi(serialNumber: string): Promise<Zappi | null>;
-    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>;
+    setZappiChargeMode(serialNo: string, chargeMode: ZappiChargeMode): Promise<unknown>;
+    setZappiBoostMode(serialNo: string, boostMode: ZappiBoostMode, kwh?: number, completeTime?: string): Promise<unknown>;
+    setZappiGreenLevel(serialNo: string, percentage: number): Promise<unknown>;
     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>;
+    setEddiMode(serialNo: string, mode: EddiMode): Promise<unknown>;
+    setEddiBoost(serialNo: string, boost: EddiBoost, minutes?: number): Promise<unknown>;
     getStatusHarviAll(): Promise<Harvi[]>;
     getStatusHarvi(serialNumber: string): Promise<Harvi | null>;
 }

package/dist/MyEnergi.js

@@ -36,134 +36,194 @@ class MyEnergi {
     }
     getStatusAll() {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = yield this._digest.get(this._config.status_url);
-            const jsonData = JSON.parse(data);
-            return jsonData;
+            try {
+                const data = yield this._digest.get(new URL(this._config.status_url, this._config.base_url));
+                const jsonData = JSON.parse(data);
+                return jsonData;
+            }
+            catch (error) {
+                return [];
+            }
         });
     }
     getStatusZappiAll() {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = yield this._digest.get(this._config.zappi_url);
-            const jsonData = JSON.parse(data);
-            if (jsonData.zappi)
-                return Object.assign([], jsonData.zappi);
-            else
+            try {
+                const data = yield this._digest.get(new URL(this._config.zappi_url, this._config.base_url));
+                const jsonData = JSON.parse(data);
+                if (jsonData.zappi)
+                    return Object.assign([], jsonData.zappi);
+                else
+                    return [];
+            }
+            catch (error) {
                 return [];
+            }
         });
     }
     getStatusZappi(serialNumber) {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = yield this._digest.get(this._config.zappi_url);
-            const jsonData = JSON.parse(data);
-            if (jsonData.zappi) {
-                const zappi = Object.assign([], jsonData.zappi).find((zappi) => {
-                    return zappi.sno === serialNumber;
-                });
-                if (zappi)
-                    return Object.assign({}, zappi);
+            try {
+                const data = yield this._digest.get(new URL(this._config.zappi_url, this._config.base_url));
+                const jsonData = JSON.parse(data);
+                if (jsonData.zappi) {
+                    const zappi = Object.assign([], jsonData.zappi).find((zappi) => {
+                        return zappi.sno == serialNumber;
+                    });
+                    if (zappi)
+                        return Object.assign({}, zappi);
+                    else
+                        return null;
+                }
                 else
                     return null;
             }
-            else
+            catch (error) {
                 return null;
+            }
         });
     }
     setZappiChargeMode(serialNo, chargeMode) {
         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);
-            const jsonData = JSON.parse(data);
-            return jsonData;
+            try {
+                const url = new URL(`${this._config.zappi_mode_url}${serialNo}-${chargeMode}-0-0-0000`, this._config.base_url);
+                const data = yield this._digest.get(url);
+                const jsonData = JSON.parse(data);
+                return jsonData;
+            }
+            catch (error) {
+                return {};
+            }
         });
     }
     setZappiBoostMode(serialNo, boostMode, kwh = 0, completeTime = "0000") {
         return __awaiter(this, void 0, void 0, function* () {
-            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);
-            const jsonData = JSON.parse(data);
-            return jsonData;
+            try {
+                if (boostMode === Types_1.ZappiBoostMode.Stop) {
+                    kwh = 0;
+                    completeTime = "0000";
+                }
+                const url = new URL(`${this._config.zappi_mode_url}${serialNo}-0-${boostMode}-${kwh}-${completeTime}`, this._config.base_url);
+                const data = yield this._digest.get(url);
+                const jsonData = JSON.parse(data);
+                return jsonData;
+            }
+            catch (error) {
+                return {};
+            }
         });
     }
     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);
-            const jsonData = JSON.parse(data);
-            return jsonData;
+            try {
+                const url = new URL(`${this._config.zappi_min_green_url}${serialNo}-${percentage}`, this._config.base_url);
+                const data = yield this._digest.get(url);
+                const jsonData = JSON.parse(data);
+                return jsonData;
+            }
+            catch (error) {
+                return {};
+            }
         });
     }
     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
+            try {
+                const data = yield this._digest.get(new URL(this._config.eddi_url, this._config.base_url));
+                const jsonData = JSON.parse(data);
+                if (jsonData.eddi)
+                    return Object.assign([], jsonData.eddi);
+                else
+                    return [];
+            }
+            catch (error) {
                 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);
+            try {
+                const data = yield this._digest.get(new URL(this._config.eddi_url, this._config.base_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;
             }
-            else
+            catch (error) {
                 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;
+            try {
+                const url = new URL(`${this._config.eddi_mode_url}${serialNo}-${mode}`, this._config.base_url);
+                const data = yield this._digest.get(url);
+                const jsonData = JSON.parse(data);
+                return jsonData;
+            }
+            catch (error) {
+                return {};
+            }
         });
     }
     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;
+            try {
+                const url = new URL(`${this._config.eddi_boost_url}${serialNo}-${boost}-${minutes}`, this._config.base_url);
+                const data = yield this._digest.get(url);
+                const jsonData = JSON.parse(data);
+                return jsonData;
+            }
+            catch (error) {
+                return {};
+            }
         });
     }
     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
+            try {
+                const data = yield this._digest.get(new URL(this._config.harvi_url, this._config.base_url));
+                const jsonData = JSON.parse(data);
+                if (jsonData.harvi)
+                    return Object.assign([], jsonData.harvi);
+                else
+                    return [];
+            }
+            catch (error) {
                 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);
+            try {
+                const data = yield this._digest.get(new URL(this._config.harvi_url, this._config.base_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;
             }
-            else
+            catch (error) {
                 return null;
+            }
         });
     }
 }

package/dist/models/Zappi.d.ts

@@ -31,8 +31,8 @@ export interface Zappi {
     lck: number;
     pst: string;
     bsm: number;
-    bst: number;
     bss: number;
+    bst: number;
     sbh: number;
     sbk: number;
     sbm: number;
@@ -40,6 +40,7 @@ export interface Zappi {
     tbk: number;
     tbm: number;
     zmo: number;
+    zsh: number;
     rdc: number;
     rac: number;
     rrac: number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "myenergi-api",
-    "version": "1.1.0",
+    "version": "2.1.0",
     "description": "NodeJS implementation of MyEnergi API for controlling Zappi, Eddi and other MyEnergi products",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -9,9 +9,9 @@
     ],
     "scripts": {
         "build": "tsc",
-        "test": "env TS_NODE_PROJECT='tsconfig.testing.json' mocha -r ts-node/register tests/**/*-spec.ts",
+        "test": "jest --runInBand --config jestconfig.json",
         "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\"",
-        "lint": "tslint -p tsconfig.json",
+        "lint": "npx eslint -c .eslintrc.json '**/*.ts'",
         "prepare": "tsc",
         "preversion": "npm test",
         "version": "",
@@ -35,15 +35,19 @@
     "homepage": "https://github.com/bisand/myenergi-api#readme",
     "dependencies": {},
     "devDependencies": {
-        "@types/chai": "^4.3.0",
-        "@types/mocha": "^9.1.0",
-        "@types/node": "^16.11.12",
-        "dotenv": "^16.0.0",
-        "chai": "^4.3.6",
-        "mocha": "^9.2.1",
-        "prettier": "^2.5.1",
-        "ts-node": "^10.7.0",
-        "tslint": "^6.1.3",
-        "typescript": "^4.6.2"
+        "@tsconfig/node12": "^1.0.11",
+        "@jest/test-sequencer": "^28.1.3",
+        "@types/jest": "^28.1.3",
+        "@types/node": "^12",
+        "@typescript-eslint/eslint-plugin": "^5.39.0",
+        "@typescript-eslint/parser": "^5.39.0",
+        "dotenv": "^16.0.3",
+        "jest": "^28.1.3",
+        "nock": "^13.2.9",
+        "prettier": "^2.7.1",
+        "ts-jest": "^28.0.8",
+        "ts-node": "^10.9.1",
+        "typescript": "^4.8.4",
+        "eslint": "^8.24.0"
     }
 }