myenergi-api 2.2.0 → 2.4.0-beta.0

package/dist/src/Digest.d.ts

@@ -3,6 +3,7 @@ export declare class Digest {
     private _baseUrl;
     private _maxRedirectCount;
     private _maxRetryCount;
+    private _etags;
     constructor(baseUrl: string, username: string, password: string);
     private request;
     get(requestUrl: URL, data?: unknown): Promise<string>;

package/dist/src/Digest.js

@@ -28,6 +28,7 @@ const https = __importStar(require("https"));
 const AuthDigest_1 = require("./AuthDigest");
 class Digest {
     constructor(baseUrl, username, password) {
+        this._etags = {};
         this._maxRedirectCount = 3;
         this._maxRetryCount = 2;
         this._baseUrl = new URL(baseUrl);
@@ -42,9 +43,13 @@ class Digest {
             if (!options.headers)
                 options.headers = {};
             options.headers.Authorization = (_a = this._authDigest) === null || _a === void 0 ? void 0 : _a.getAuthorization(options.method, options.path);
+            const etag = this._etags[options.path];
+            if (etag)
+                options.headers["If-None-Match"] = etag;
             const req = https.request(options, (res) => {
                 var _a, _b;
                 if (res.statusCode == 401) {
+                    this._etags[options.path] = res.headers.etag;
                     const myenergiAsn = res.headers["x_myenergi-asn"];
                     if (myenergiAsn && myenergiAsn !== "undefined" && myenergiAsn !== this._baseUrl.host) {
                         if (redirectCount > this._maxRedirectCount) {
@@ -115,6 +120,10 @@ class Digest {
                     });
                 }
                 else if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400) {
+                    if (res.statusCode == 304) {
+                        resolve("{}");
+                        return;
+                    }
                     if (redirectCount > this._maxRedirectCount) {
                         reject(`Too many redirects: ${res.headers["location"]}`);
                         return;
@@ -134,13 +143,11 @@ class Digest {
                     });
                 }
                 else {
-                    console.error("status code failed!!");
                     reject("status code failed!!");
                     return;
                 }
             });
             req.on("error", (e) => {
-                console.error(`problem with request: ${e.message}`);
                 reject(e);
             });
             if (data) {

package/dist/src/MyEnergi.d.ts

@@ -1,3 +1,4 @@
+import { AppKeyValues } from './models/AppKeyValues';
 import { Eddi } from "./models/Eddi";
 import { Harvi } from "./models/Harvi";
 import { KeyValue } from './models/KeyValue';
@@ -19,6 +20,7 @@ export declare class MyEnergi {
     setEddiBoost(serialNo: string, boost: EddiBoost, minutes?: number): Promise<any>;
     getStatusHarviAll(): Promise<Harvi[]>;
     getStatusHarvi(serialNumber: string): Promise<Harvi | null>;
+    getAppKeyFull(key: string): Promise<AppKeyValues | null>;
     getAppKey(key: string): Promise<KeyValue[] | null>;
     setAppKey(key: string, val: string): Promise<KeyValue[] | null>;
 }

package/dist/src/MyEnergi.js

@@ -228,6 +228,22 @@ class MyEnergi {
             }
         });
     }
+    getAppKeyFull(key) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const data = yield this._digest.get(new URL(`${this._config.get_app_key_url}-${key}`, this._config.base_url));
+                const jsonData = JSON.parse(data);
+                if (jsonData) {
+                    const result = Object.assign({}, jsonData);
+                    return result;
+                }
+            }
+            catch (error) {
+                return null;
+            }
+            return null;
+        });
+    }
     getAppKey(key) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/package.json

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