myenergi-api 0.0.8-0 → 0.0.9-0

package/package.json

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

package/src/AuthDigest.ts

@@ -63,7 +63,6 @@ export class AuthDigest {
 
     public init(wwwAuthHeader: string) {
 
-        //let realm, nonce, qop, opaque;
         let authSplit = wwwAuthHeader.split(',') as string[];
 
         for (let item of authSplit) {
@@ -104,7 +103,7 @@ export class AuthDigest {
         let HA2 = this.md5(httpMethod + ":" + path);
         let response = this.md5(HA1 + ":" + this.nonce + ":" + nc + ":" + cnonce + ":" + this.qop + ":" + HA2);
 
-        let res = `Digest username="${this._username}",`;
+        let res = `Digest username="${this.username}",`;
         res += `realm="${this.realm}",`;
         res += `nonce="${this.nonce}",`;
         res += `uri="${path}",`;

package/src/Digest.ts

@@ -4,10 +4,10 @@ import * as url from "url";
 import { AuthDigest } from './AuthDigest';
 
 export class Digest {
-    private _authorization?: AuthDigest;
+    private _authDigest?: AuthDigest;
 
     constructor(username: string, password: string) {
-        this._authorization = new AuthDigest(username, password);
+        this._authDigest = new AuthDigest(username, password);
     }
 
     private request(options: RequestOptions, data?: any, retryCount: number = 0): Promise<any> {
@@ -15,7 +15,7 @@ export class Digest {
             let resData: string = '';
             if (!options.headers)
                 options.headers = {};
-            options.headers.Authorization = this._authorization?.getAuthorization(options.method as string, options.path as string);
+            options.headers.Authorization = this._authDigest?.getAuthorization(options.method as string, options.path as string);
             const req = https.request(options, (res: any) => {
 
                 if (res.statusCode == 401) {
@@ -24,11 +24,16 @@ export class Digest {
                         return;
                     }
                     retryCount++;
-                    let auth = res.headers["www-authenticate"];
-                    this._authorization?.init(auth);
+                    const wwwAuth = res.headers["www-authenticate"] as string;
+                    if(!wwwAuth.startsWith('Digest'))
+                    {
+                        reject('Unsupported authentication method. Supported authentication schemes: Digest');
+                        return;
+                    }
+                    this._authDigest?.init(wwwAuth);
                     if (!options.headers)
                         options.headers = {};
-                    options.headers.Authorization = this._authorization?.getAuthorization(options.method as string, options.path as string);
+                    options.headers.Authorization = this._authDigest?.getAuthorization(options.method as string, options.path as string);
                     return this.request(options, data, retryCount).then(value => {
                         resolve(value);
                     }).catch(resaon => {
@@ -72,6 +77,7 @@ export class Digest {
             headers: {
                 'Connection': 'Keep-Alive',
                 'Content-Type': 'application/json',
+                'Accept': 'application/json',
                 'Host': uri.hostname as string,
             }
         };

package/src/MyEnergi.ts

@@ -6,11 +6,13 @@ export enum ZappiChargeMode {
     Eco = 2,
     EcoPlus = 3
 }
+
 export enum ZappiBoostMode {
-    Fast = 0,
-    Eco = 1,
-    EcoPlus = 2
+    Manual = 10,
+    Smart = 11,
+    Stop = 2
 }
+
 export class MyEnergi {
     private _config = {
         username: '',
@@ -20,7 +22,8 @@ export class MyEnergi {
         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_mode_url: 'https://s18.myenergi.net/cgi-zappi-mode-Z',
+        zappi_min_green_url: 'https://s18.myenergi.net/cgi-set-min-green-Z'
         //https://s18.myenergi.net/cgi-jdayhour-Znnnnnnnn-YYYY-MM-DD
     }
 
@@ -48,4 +51,20 @@ export class MyEnergi {
         return data;
     }
 
+    public async setZappiBoostMode(serialNo: string, boostMode: ZappiBoostMode, kwh: number = 0, completeTime: string = '0000'): Promise<any> {
+        if (boostMode === ZappiBoostMode.Stop) {
+            kwh = 0;
+            completeTime = '0000';
+        }
+        const url = `${this._config.zappi_mode_url}${serialNo}-0-${boostMode}-${kwh}-${completeTime}`;
+        const data = await this._digest.get(url);
+        return data;
+    }
+
+    public async setZappiGreenLevel(serialNo: string, percentage: number): Promise<any> {
+        const url = `${this._config.zappi_min_green_url}${serialNo}-${percentage}`;
+        const data = await this._digest.get(url);
+        return data;
+    }
+
 }

package/tests/debug.ts

@@ -1,7 +1,7 @@
 import { exit } from 'process';
 import { MyEnergi } from '../src';
 import * as dotenv from 'dotenv';
-import { ZappiChargeMode } from '../src/MyEnergi';
+import { ZappiBoostMode, ZappiChargeMode } from '../src/MyEnergi';
 
 dotenv.config();
 const myenergi = new MyEnergi(process.env.USERNAME as string, process.env.PASSWORD as string);
@@ -12,7 +12,19 @@ myenergi.getStatus().then(val => {
         const sno: string = JSON.parse(v).zappi[0].sno;
         myenergi.setZappiChargeMode(sno, ZappiChargeMode.Fast).then(x => {
             console.log(x);
-            exit();
+            myenergi.setZappiBoostMode(sno, ZappiBoostMode.Stop).then(x => {
+                console.log(x);
+                myenergi.setZappiGreenLevel(sno, 0).then(x => {
+                    console.log(x);
+                    exit();
+                }).catch(err => {
+                    console.error(err);
+                    exit();
+                });
+            }).catch(err => {
+                console.error(err);
+                exit();
+            });
         }).catch(err => {
             console.error(err);
             exit();