myenergi-api 1.0.2 → 1.0.3

package/dist/AuthDigest.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/Digest.d.ts

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

package/dist/Digest.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -25,6 +29,8 @@ 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._authDigest = new AuthDigest_1.AuthDigest(username, password, (err) => {
             console.error(err);
@@ -40,7 +46,26 @@ class Digest {
             const req = https.request(options, (res) => {
                 var _a, _b;
                 if (res.statusCode == 401) {
-                    if (retryCount > 1) {
+                    const myenergiAsn = res.headers["x_myenergi-asn"];
+                    if (myenergiAsn && myenergiAsn !== "undefined" && myenergiAsn !== this._baseUrl.host) {
+                        if (redirectCount > this._maxRedirectCount) {
+                            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);
+                        });
+                    }
+                    if (retryCount > this._maxRetryCount) {
                         reject("Authentication failed");
                         return;
                     }
@@ -65,7 +90,7 @@ class Digest {
                 else if (res.statusCode >= 200 && res.statusCode < 300) {
                     const myenergiAsn = res.headers["x_myenergi-asn"];
                     if (myenergiAsn && myenergiAsn !== "undefined" && myenergiAsn !== this._baseUrl.host) {
-                        if (redirectCount > 2) {
+                        if (redirectCount > this._maxRedirectCount) {
                             reject(`Too many redirects: ${myenergiAsn}`);
                             return;
                         }
@@ -91,7 +116,7 @@ class Digest {
                     });
                 }
                 else if (res.statusCode >= 300 && res.statusCode < 400) {
-                    if (redirectCount > 2) {
+                    if (redirectCount > this._maxRedirectCount) {
                         reject(`Too many redirects: ${res.headers["location"]}`);
                         return;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "myenergi-api",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "NodeJS implementation of MyEnergi API for controlling Zappi, Eddi and other MyEnergi products",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -36,14 +36,14 @@
     "dependencies": {},
     "devDependencies": {
         "@types/chai": "^4.3.0",
-        "@types/mocha": "^9.0.0",
+        "@types/mocha": "^9.1.0",
         "@types/node": "^16.11.12",
-        "dotenv": "^10.0.0",
-        "chai": "^4.3.4",
-        "mocha": "^9.1.3",
+        "dotenv": "^16.0.0",
+        "chai": "^4.3.6",
+        "mocha": "^9.2.1",
         "prettier": "^2.5.1",
-        "ts-node": "^10.4.0",
+        "ts-node": "^10.7.0",
         "tslint": "^6.1.3",
-        "typescript": "^4.5.3"
+        "typescript": "^4.6.2"
     }
 }