myenergi-api 0.0.4-0 → 0.0.7-0

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "myenergi-api",
-    "version": "0.0.4-0",
+    "version": "0.0.7-0",
     "description": "NodeJS implementation of MyEnergi API for controlling Zappi, Eddi and other MyEnergi products",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
         "build": "tsc",
-        "test": "echo \"Error: no test specified\" && exit 1"
+        "test": "env TS_NODE_PROJECT='tsconfig.testing.json' mocha -r ts-node/register tests/**/*-spec.ts"
     },
     "repository": {
         "type": "git",
@@ -24,11 +24,18 @@
         "url": "https://github.com/bisand/myenergi-api/issues"
     },
     "homepage": "https://github.com/bisand/myenergi-api#readme",
+    "dependencies": {
+        "dotenv": "^10.0.0",
+        "node-digest-auth-client": "^1.0.6"
+    },
     "devDependencies": {
-        "@types/node": "^16.11.8",
+        "@types/mocha": "^9.0.0",
+        "@types/node": "^16.11.9",
+        "assert": "^2.0.0",
+        "chai": "^4.3.4",
+        "mocha": "^9.1.3",
+        "ts-node": "^10.4.0",
+        "tslint": "^6.1.3",
         "typescript": "^4.5.2"
-    },
-    "dependencies": {
-        "digest-fetch": "^1.2.1"
     }
 }

package/src/Digest.ts

@@ -0,0 +1,138 @@
+import * as https from 'https';
+import * as crypto from 'crypto';
+import { RequestOptions } from 'https';
+import * as url from "url";
+
+export class Digest {
+    private _username: string;
+    private _password: string;
+    private _authorization: string | undefined;
+
+    constructor(username: string, password: string) {
+        this._username = username;
+        this._password = password;
+        this._authorization = '';
+    }
+
+    private md5(data: string) {
+        let md5 = crypto.createHash('md5');
+        let result = md5.update(data).digest('hex');
+        return result;
+    }
+
+    private request(options: RequestOptions, data?: any): Promise<any> {
+        return new Promise<any>((resolve, reject) => {
+            const req = https.request(options, (res: any) => {
+                let resData: string = '';
+
+                res.setEncoding('utf8');
+                res.on('data', (chunk: string) => {
+                    resData += chunk;
+                });
+                res.on('end', () => {
+                    resolve(resData);
+                });
+            });
+
+            req.on('error', (e: any) => {
+                console.error(`problem with request: ${e.message}`);
+                reject(e);
+            });
+
+            if (data) {
+                req.write(data);
+            }
+
+            req.end();
+        });
+    }
+
+    private requestDigest(options: RequestOptions, data?: any): Promise<any> {
+        return new Promise<any>((resolve, reject) => {
+            let resData: string = '';
+            const req = https.request(options, (res: any) => {
+
+                if (res.statusCode == 401) {
+                    let cnonce = this.md5(String(new Date().getTime()));
+                    let auth = res.headers["www-authenticate"];
+                    let realm, nonce, qop;
+                    let authSplit = auth?.split(",") as string[];
+
+                    for (let item of authSplit) {
+                        if (item.indexOf("realm=") >= 0) {
+                            let realmSplit = item.split("=\"");
+                            realm = realmSplit[realmSplit.length - 1];
+                            realm = realm.substring(0, realm.length - 1);
+                        }
+
+                        if (item.indexOf("nonce=") >= 0) {
+                            let nonceSplit = item.split("=\"");
+                            nonce = nonceSplit[nonceSplit.length - 1];
+                            nonce = nonce.substring(0, nonce.length - 1);
+                        }
+
+                        if (item.indexOf("qop=") >= 0) {
+                            let qopSplit = item.split("=\"");
+                            qop = qopSplit[qopSplit.length - 1];
+                            qop = qop.substring(0, qop.length - 1);
+                        }
+                    }
+
+                    let HA1 = this.md5(this._username + ":" + realm + ":" + this._password);
+                    let HA2 = this.md5(options.method + ":" + options.path);
+                    let response = this.md5(HA1 + ":" + nonce + ":00000001:" + cnonce + ":" + qop + ":" + HA2);
+                    if (!options.headers)
+                        options.headers = {};
+                    this._authorization = "Digest username=\"" + this._username + "\",realm=\"" + realm + "\",nonce=\"" + nonce + "\",uri=\"" + options.path + "\",cnonce=\"" + cnonce + "\",nc=00000001,algorithm=MD5,response=\"" + response + "\",qop=\"" + qop + "\"";
+                    options.headers.Authorization = this._authorization;
+                    return this.requestDigest(options, data).then(value => {
+                        resolve(value);
+                    }).catch(resaon => {
+                        reject(resaon);
+                    });
+                } else if (res.statusCode >= 200 && res.statusCode < 300) {
+                    res.setEncoding('utf8');
+                    res.on('data', (chunk: string) => {
+                        resData += chunk;
+                    });
+                    res.on('end', () => {
+                        resolve(resData);
+                    });
+                } else {
+                    console.error("status code failed!!");
+                    reject("status code failed!!");
+                    return;
+                }
+            });
+
+            req.on('error', (e: any) => {
+                console.error(`problem with request: ${e.message}`);
+                reject(e);
+            });
+
+            if (data) {
+                req.write(data);
+            }
+
+            req.end();
+        });
+    }
+
+    public get(requestUrl: string, data?: any): Promise<any> {
+        const uri = url.parse(requestUrl);
+        const options: RequestOptions = {
+            hostname: uri.hostname,
+            port: uri.port,
+            path: uri.pathname,
+            method: 'GET',
+            headers: {
+                'Connection': 'Keep-Alive',
+                'Content-Type': 'text/plain',
+                'Host': uri.hostname as string,
+                'Authorization': this._authorization
+            }
+        };
+        return this.requestDigest(options, data);
+    }
+
+}

package/src/MyEnergi.ts

@@ -1,5 +1,16 @@
-import DigestFetch from 'digest-fetch';
+import { Digest } from './Digest';
 
+export enum ZappiChargeMode {
+    Off = 4,
+    Fast = 1,
+    Eco = 2,
+    EcoPlus = 3
+}
+export enum ZappiBoostMode {
+    Fast = 0,
+    Eco = 1,
+    EcoPlus = 2
+}
 export class MyEnergi {
     private _config = {
         username: '',
@@ -8,12 +19,35 @@ export class MyEnergi {
         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-'
+        dayhour_url: 'https://s18.myenergi.net/cgi-jdayhour-',
+        zappi_mode_url: 'https://s18.myenergi.net/cgi-zappi-mode-Z'
         //https://s18.myenergi.net/cgi-jdayhour-Znnnnnnnn-YYYY-MM-DD
     }
+    private _client: any;
+    private _asn: any;
 
     constructor(username: string, password: string) {
         this._config.username = username;
         this._config.password = password;
     }
+
+    public async getStatus(): Promise<any> {
+        const digest = new Digest(this._config.username, this._config.password);
+        const data = await digest.get(this._config.status_url);
+        return data;
+    }
+
+    public async getZappi(): Promise<any> {
+        const digest = new Digest(this._config.username, this._config.password);
+        const data = await digest.get(this._config.zappi_url);
+        return data;
+    }
+
+    public async setZappiChargeMode(serialNo: string, chargeMode: ZappiChargeMode): Promise<any> {
+        const digest = new Digest(this._config.username, this._config.password);
+        const url = `${this._config.zappi_mode_url}${serialNo}-${chargeMode}-0-0-0000`;
+        const data = await digest.get(url);
+        return data;
+    }
+
 }

package/tests/MyEnergi-spec.ts

@@ -0,0 +1,13 @@
+import { MyEnergi } from '../src/MyEnergi'
+import { equal } from "assert";
+import { expect } from 'chai'
+
+describe("MyEnergi Tests", () => {
+  it("should be able to test", () => {
+    equal(true, true);
+  });
+  it("should be able to create instance", () => {
+    const myenergi = new MyEnergi('test', 'pwd');
+    expect(myenergi).to.be.instanceOf(MyEnergi);
+  });
+});

package/tests/debug.ts

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

package/tsconfig.testing.json

@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "target": "es2015",
+      "lib": ["es2017"],
+      "outDir": "./dist",
+      "declaration": false,
+      "noImplicitAny": false,
+      "removeComments": true,
+      "inlineSourceMap": true,
+      "moduleResolution": "node",
+    },
+    "include": ["src/**/*.ts", "src/**/*.d.ts", "tests/**/*.ts"]
+  }

package/dist/MyEnergi.d.ts

@@ -1,4 +0,0 @@
-export declare class MyEnergi {
-    private _config;
-    constructor(username: string, password: string);
-}

package/dist/MyEnergi.js

@@ -1,16 +0,0 @@
-export 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-'
-            //https://s18.myenergi.net/cgi-jdayhour-Znnnnnnnn-YYYY-MM-DD
-        };
-        this._config.username = username;
-        this._config.password = password;
-    }
-}

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-import { MyEnergi } from './MyEnergi';
-export { MyEnergi };

package/dist/index.js

@@ -1,2 +0,0 @@
-import { MyEnergi } from './MyEnergi';
-export { MyEnergi };

package/npm-publish.sh

@@ -1,73 +0,0 @@
-#!/bin/sh
-
-DEV_BRANCH_NAME="develop"
-MASTER_BRANCH_NAME="master"
-RELEASE_TYPE="$1"
-
-confirm() {
-    # call with a prompt string or use a default
-    read -r -p "${1:-Are you sure? [y/N]} " response
-    case "$response" in
-        [yY][eE][sS]|[yY])
-            true
-            ;;
-        *)
-            false
-            ;;
-    esac
-}
-
-execute() {
-    if git checkout ${DEV_BRANCH_NAME} &&
-        git fetch origin ${DEV_BRANCH_NAME} &&
-        # [ `git rev-list HEAD...origin/${DEV_BRANCH_NAME} --count` != 0 ] &&
-        git merge origin/${DEV_BRANCH_NAME}
-    then
-        npm install
-        echo "Performing ${RELEASE_TYPE} release preparations..."
-        if npm version ${RELEASE_TYPE} -m "Release version %s"
-        then
-            echo "NPM version done. Proceeding with git operations..."
-            if git add . &&
-                git push &&
-                git checkout origin/${MASTER_BRANCH_NAME} &&
-                git pull &&
-                git merge ${DEV_BRANCH_NAME} &&
-                git push &&
-                git push --tags
-            then
-                git checkout origin/${DEV_BRANCH_NAME}
-                git merge ${MASTER_BRANCH_NAME}
-                git push
-                echo "Changes merged to ${MASTER_BRANCH_NAME} branch and pushed to origin."
-                true
-            else
-                echo "Failed to merge to ${MASTER_BRANCH_NAME} branch and push to origin."
-                false
-            fi
-        else
-            echo "NPM version failed!"
-            false
-        fi
-    else
-        echo "Could not prepare for new release. Please make sure the repository is up to date with the origin before you continue."
-        false
-    fi
-}
-
-run() {
-    if confirm && execute
-    then
-        echo "Successfully completed!"
-    else
-        echo "Failed to complete!"
-    fi
-}
-
-if [ "${RELEASE_TYPE}" = "patch" ] || [ "${RELEASE_TYPE}" = "minor" ] || [ "${RELEASE_TYPE}" = "major" ] ||
-    [ "${RELEASE_TYPE}" = "prepatch" ] || [ "${RELEASE_TYPE}" = "preminor" ] || [ "${RELEASE_TYPE}" = "premajor" ] || [ "${RELEASE_TYPE}" = "prerelease" ]
-then
-    run
-else
-    echo "'${RELEASE_TYPE}' is not a valid release type. Please use 'patch', 'minor', 'major', 'prepatch', 'preminor' or 'premajor'"
-fi

package/src/types/digest-fetch.d.ts

@@ -1 +0,0 @@
-declare module "digest-fetch";

package/tsconfig.json

@@ -1,15 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "ES2015",
-        "module": "ES2020",
-        "declaration": true,
-        "outDir": "./dist",
-        "forceConsistentCasingInFileNames": true,
-        "moduleResolution": "node",
-        "esModuleInterop": true,
-        "strict": true
-    },
-    "include": [
-        "./src"
-    ]
-}