myenergi-api 0.0.8-0 → 0.3.0

package/package.json

@@ -1,12 +1,17 @@
 {
     "name": "myenergi-api",
-    "version": "0.0.8-0",
+    "version": "0.3.0",
     "description": "NodeJS implementation of MyEnergi API for controlling Zappi, Eddi and other MyEnergi products",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
+    "files": [
+        "dist/**/*"
+    ],
     "scripts": {
         "build": "tsc",
-        "test": "env TS_NODE_PROJECT='tsconfig.testing.json' mocha -r ts-node/register tests/**/*-spec.ts"
+        "test": "env TS_NODE_PROJECT='tsconfig.testing.json' mocha -r ts-node/register tests/**/*-spec.ts",
+        "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
+        "lint": "tslint -p tsconfig.json"
     },
     "repository": {
         "type": "git",
@@ -25,15 +30,15 @@
     },
     "homepage": "https://github.com/bisand/myenergi-api#readme",
     "dependencies": {
-        "dotenv": "^10.0.0",
-        "node-digest-auth-client": "^1.0.6"
+        "dotenv": "^10.0.0"
     },
     "devDependencies": {
+        "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.9",
-        "assert": "^2.0.0",
         "chai": "^4.3.4",
         "mocha": "^9.1.3",
+        "prettier": "^2.4.1",
         "ts-node": "^10.4.0",
         "tslint": "^6.1.3",
         "typescript": "^4.5.2"

package/src/AuthDigest.ts

@@ -1,119 +0,0 @@
-import * as crypto from 'crypto';
-
-export class AuthDigest {
-    private _password?: string | undefined;
-    private _username?: string | undefined;
-    private _initialized: boolean;
-
-    public get username(): string | undefined {
-        return this._username;
-    }
-    private _realm?: string | undefined;
-    public get realm(): string | undefined {
-        return this._realm;
-    }
-    private _nonce?: string | undefined;
-    public get nonce(): string | undefined {
-        return this._nonce;
-    }
-    private _uri?: string | undefined;
-    public get uri(): string | undefined {
-        return this._uri;
-    }
-    private _algorithm?: string | undefined;
-    public get algorithm(): string | undefined {
-        return this._algorithm;
-    }
-    private _response?: string | undefined;
-    public get response(): string | undefined {
-        return this._response;
-    }
-    private _opaque?: string | undefined;
-    public get opaque(): string | undefined {
-        return this._opaque;
-    }
-    private _qop?: string | undefined;
-    public get qop(): string | undefined {
-        return this._qop;
-    }
-    private _nc: number;
-    public get nc(): string | undefined {
-        this._nc++;
-        var myHex = ("0000000" + this._nc?.toString(16)).substr(-8);
-        return myHex;
-    }
-    private _cnonce?: string | undefined;
-    public get cnonce(): string | undefined {
-        this._cnonce = this.md5(String(new Date().getTime()));
-        return this._cnonce;
-    }
-
-    private md5(data: string) {
-        let md5 = crypto.createHash('md5');
-        let result = md5.update(data).digest('hex');
-        return result;
-    }
-
-    constructor(username: string, password: string) {
-        this._username = username;
-        this._password = password;
-        this._nc = 0;
-        this._initialized = false;
-    }
-
-    public init(wwwAuthHeader: string) {
-
-        //let realm, nonce, qop, opaque;
-        let authSplit = wwwAuthHeader.split(',') as string[];
-
-        for (let item of authSplit) {
-            if (item.indexOf('realm=') >= 0) {
-                let 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('="');
-                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('="');
-                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('="');
-                this._opaque = opaqueSplit[opaqueSplit.length - 1];
-                this._opaque = this._opaque.substring(0, this._opaque.length - 1);
-            }
-        }
-        this._initialized = true;
-    }
-
-    public getAuthorization(httpMethod: string, path: string): string {
-        if(!this._initialized)
-            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);
-
-        let res = `Digest username="${this._username}",`;
-        res += `realm="${this.realm}",`;
-        res += `nonce="${this.nonce}",`;
-        res += `uri="${path}",`;
-        res += `cnonce="${cnonce}",`;
-        res += `nc=${nc},`;
-        res += `algorithm=MD5,`;
-        res += `response="${response}",`;
-        res += `qop="${this.qop}",`;
-        res += `opaque="${this.opaque}"`;
-        return res;
-    }
-}

package/src/Digest.ts

@@ -1,81 +0,0 @@
-import * as https from 'https';
-import { RequestOptions } from 'https';
-import * as url from "url";
-import { AuthDigest } from './AuthDigest';
-
-export class Digest {
-    private _authorization?: AuthDigest;
-
-    constructor(username: string, password: string) {
-        this._authorization = new AuthDigest(username, password);
-    }
-
-    private request(options: RequestOptions, data?: any, retryCount: number = 0): Promise<any> {
-        return new Promise<any>((resolve, reject) => {
-            let resData: string = '';
-            if (!options.headers)
-                options.headers = {};
-            options.headers.Authorization = this._authorization?.getAuthorization(options.method as string, options.path as string);
-            const req = https.request(options, (res: any) => {
-
-                if (res.statusCode == 401) {
-                    if (retryCount > 1) {
-                        reject("Authentication failed");
-                        return;
-                    }
-                    retryCount++;
-                    let auth = res.headers["www-authenticate"];
-                    this._authorization?.init(auth);
-                    if (!options.headers)
-                        options.headers = {};
-                    options.headers.Authorization = this._authorization?.getAuthorization(options.method as string, options.path as string);
-                    return this.request(options, data, retryCount).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, true);
-        const options: RequestOptions = {
-            hostname: uri.hostname,
-            port: uri.port,
-            path: uri.pathname,
-            method: 'GET',
-            headers: {
-                'Connection': 'Keep-Alive',
-                'Content-Type': 'application/json',
-                'Host': uri.hostname as string,
-            }
-        };
-        return this.request(options, data);
-    }
-
-}

package/src/MyEnergi.ts

@@ -1,51 +0,0 @@
-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: '',
-        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-',
-        zappi_mode_url: 'https://s18.myenergi.net/cgi-zappi-mode-Z'
-        //https://s18.myenergi.net/cgi-jdayhour-Znnnnnnnn-YYYY-MM-DD
-    }
-
-    private _digest: Digest;
-
-    constructor(username: string, password: string) {
-        this._config.username = username;
-        this._config.password = password;
-        this._digest = new Digest(this._config.username, this._config.password);
-    }
-
-    public async getStatus(): Promise<any> {
-        const data = await this._digest.get(this._config.status_url);
-        return data;
-    }
-
-    public async getZappi(): Promise<any> {
-        const data = await this._digest.get(this._config.zappi_url);
-        return data;
-    }
-
-    public async setZappiChargeMode(serialNo: string, chargeMode: ZappiChargeMode): Promise<any> {
-        const url = `${this._config.zappi_mode_url}${serialNo}-${chargeMode}-0-0-0000`;
-        const data = await this._digest.get(url);
-        return data;
-    }
-
-}

package/src/index.ts

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

package/tests/MyEnergi-spec.ts

@@ -1,13 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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();
-        }).catch(err => {
-            console.error(err);
-            exit();
-        });
-    }).catch(err => {
-        console.error(err);
-        exit();
-    });
-}).catch(err => {
-    console.error(err);
-    exit();
-});

package/tsconfig.testing.json

@@ -1,14 +0,0 @@
-{
-    "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"]
-  }