Release v4.0.0

main.js

@@ -75,7 +75,8 @@ class eWeLink {
    * @returns {string}
    */
   getApiUrl() {
-    return `https://${this.region}-api.coolkit.cc:8080/api`;
+    const domain = this.region === 'cn' ? 'cn' : 'cc';
+    return `https://${this.region}-apia.coolkit.${domain}`;
   }
 
   /**
@@ -95,6 +96,11 @@ class eWeLink {
     return `wss://${this.region}-pconnect3.coolkit.cc:8080/api/ws`;
   }
 
+  getDispatchServiceUrl() {
+    const domain = this.region === 'cn' ? 'cn' : 'cc';
+    return `https://${this.region}-dispa.coolkit.${domain}`;
+  }
+
   /**
    * Generate Zeroconf URL
    * @param device

package.json

@@ -41,27 +41,28 @@
   },
   "dependencies": {
     "arpping": "github:skydiver/arpping",
+    "compare-versions": "^3.6.0",
     "crypto-js": "^4.0.0",
     "delay": "^4.4.0",
     "node-fetch": "^2.6.1",
     "random": "^2.2.0",
     "websocket": "^1.0.32",
-    "websocket-as-promised": "^1.0.1"
+    "websocket-as-promised": "^1.1.0"
   },
   "devDependencies": {
     "babel-eslint": "^10.1.0",
-    "eslint": "^7.11.0",
+    "eslint": "^7.12.0",
     "eslint-config-airbnb": "^18.2.0",
-    "eslint-config-prettier": "^6.12.0",
-    "eslint-config-wesbos": "0.0.19",
+    "eslint-config-prettier": "^6.14.0",
+    "eslint-config-wesbos": "1.0.1",
     "eslint-plugin-html": "^6.1.0",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.3.1",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "^7.21.4",
-    "eslint-plugin-react-hooks": "^4.1.2",
-    "jest": "^26.5.3",
-    "nock": "^12.0.3",
-    "prettier": "^1.19.1"
+    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "jest": "^26.6.1",
+    "nock": "^13.0.4",
+    "prettier": "^2.1.2"
   }
 }

src/data/errors.js

@@ -5,16 +5,19 @@ const errors = {
   403: 'Forbidden',
   404: 'Device does not exist',
   406: 'Authentication failed',
-  503: 'Service Temporarily Unavailable or Device is offline'
+  503: 'Service Temporarily Unavailable or Device is offline',
 };
 
 const customErrors = {
   ch404: 'Device channel does not exist',
   unknown: 'An unknown error occurred',
+  noARP: 'No ARP information found. You need to generate the ARP file.',
+  noDevice: 'No device found',
   noDevices: 'No devices found',
   noPower: 'No power usage data found',
   noSensor: "Can't read sensor data from device",
   noFirmware: "Can't get model or firmware version",
+  noFirmwares: "Can't find firmware update information",
   invalidAuth: 'Library needs to be initialized using email and password',
   invalidCredentials: 'Invalid credentials provided',
   invalidPowerState: 'Invalid power state. Expecting: "on", "off" or "toggle"',

src/mixins/checkDeviceUpdate.js

@@ -1,5 +1,4 @@
-const { _get } = require('../helpers/utilities');
-const parseFirmwareUpdates = require('../parsers/parseFirmwareUpdates');
+const errors = require('../data/errors');
 
 module.exports = {
   /**
@@ -10,39 +9,14 @@ module.exports = {
    * @returns {Promise<{msg: string, version: *}|{msg: string, error: number}|{msg: string, error: *}|Device|{msg: string}>}
    */
   async checkDeviceUpdate(deviceId) {
-    const device = await this.getDevice(deviceId);
+    const updates = await this.checkDevicesUpdates();
 
-    const error = _get(device, 'error', false);
+    const update = updates.find((device) => device.deviceId === deviceId);
 
-    if (error) {
-      return device;
+    if (!update) {
+      throw new Error(`${errors.noFirmware}`);
     }
 
-    const deviceInfoList = parseFirmwareUpdates([device]);
-
-    const deviceInfoListError = _get(deviceInfoList, 'error', false);
-
-    if (deviceInfoListError) {
-      return deviceInfoList;
-    }
-
-    const update = await this.makeRequest({
-      method: 'post',
-      url: this.getOtaUrl(),
-      uri: '/app',
-      body: { deviceInfoList },
-    });
-
-    const isUpdate = _get(update, 'upgradeInfoList.0.version', false);
-
-    if (!isUpdate) {
-      return { status: 'ok', msg: 'No update available' };
-    }
-
-    return {
-      status: 'ok',
-      msg: 'Update available',
-      version: isUpdate,
-    };
+    return update;
   },
 };

src/mixins/checkDevicesUpdates.js

@@ -1,53 +1,42 @@
-const { _get } = require('../helpers/utilities');
+const compareVersions = require('compare-versions');
 const parseFirmwareUpdates = require('../parsers/parseFirmwareUpdates');
+const errors = require('../data/errors');
 
 module.exports = {
   async checkDevicesUpdates() {
     const devices = await this.getDevices();
 
-    const error = _get(devices, 'error', false);
-
-    if (error) {
-      return devices;
-    }
-
     const deviceInfoList = parseFirmwareUpdates(devices);
 
-    const deviceInfoListError = _get(deviceInfoList, 'error', false);
-
-    if (deviceInfoListError) {
-      return deviceInfoList;
-    }
-
     const updates = await this.makeRequest({
       method: 'post',
-      url: this.getOtaUrl(),
-      uri: '/app',
+      uri: '/v2/device/ota/query',
       body: { deviceInfoList },
     });
 
-    const upgradeInfoList = _get(updates, 'upgradeInfoList', false);
+    const { otaInfoList } = updates;
 
-    if (!upgradeInfoList) {
-      return { error: "Can't find firmware update information" };
+    if (!otaInfoList) {
+      throw new Error(`${errors.noFirmwares}`);
     }
 
-    return upgradeInfoList.map(device => {
-      const upd = _get(device, 'version', false);
+    /** Get current versions */
+    const currentVersions = {};
+    deviceInfoList.forEach((device) => {
+      currentVersions[device.deviceid] = device.version;
+    });
 
-      if (!upd) {
-        return {
-          status: 'ok',
-          deviceId: device.deviceid,
-          msg: 'No update available',
-        };
-      }
+    return otaInfoList.map((device) => {
+      const current = currentVersions[device.deviceid];
+      const { version } = device;
+      const outdated = compareVersions(version, current);
 
       return {
-        status: 'ok',
+        update: !!outdated,
         deviceId: device.deviceid,
-        msg: 'Update available',
-        version: upd,
+        msg: outdated ? 'Update available' : 'No update available',
+        current,
+        version,
       };
     });
   },

src/mixins/getCredentials.js

@@ -1,54 +1,46 @@
 const fetch = require('node-fetch');
 
 const { _get } = require('../helpers/utilities');
-const credentialsPayload = require('../payloads/credentialsPayload');
 const { makeAuthorizationSign } = require('../helpers/ewelink');
-const errors = require('../data/errors');
 
 module.exports = {
   /**
    * Returns user credentials information
-   *
-   * @returns {Promise<{msg: string, error: *}>}
    */
   async getCredentials() {
     const { APP_ID, APP_SECRET } = this;
 
-    const body = credentialsPayload({
-      appid: APP_ID,
+    const body = {
+      countryCode: '+1',
       email: this.email,
-      phoneNumber: this.phoneNumber,
       password: this.password,
-    });
+    };
+
+    if (this.phoneNumber) {
+      body.phoneNumber = this.phoneNumber;
+    }
 
-    const request = await fetch(`${this.getApiUrl()}/user/login`, {
+    const request = await fetch(`${this.getApiUrl()}/v2/user/login`, {
       method: 'post',
       headers: {
         Authorization: `Sign ${makeAuthorizationSign(APP_SECRET, body)}`,
+        'Content-Type': 'application/json',
+        'X-CK-Appid': APP_ID,
       },
       body: JSON.stringify(body),
     });
 
-    let response = await request.json();
+    const response = await request.json();
 
     const error = _get(response, 'error', false);
-    const region = _get(response, 'region', false);
 
-    if (error && [400, 401, 404].indexOf(parseInt(error)) !== -1) {
-      return { error: 406, msg: errors['406'] };
+    if (error) {
+      throw new Error(`[${error}] ${response.msg}`);
     }
 
-    if (error && parseInt(error) === 301 && region) {
-      if (this.region !== region) {
-        this.region = region;
-        response = await this.getCredentials();
-        return response;
-      }
-      return { error, msg: 'Region does not exist' };
-    }
+    this.apiKey = _get(response, 'data.user.apikey', '');
+    this.at = _get(response, 'data.at', '');
 
-    this.apiKey = _get(response, 'user.apikey', '');
-    this.at = _get(response, 'at', '');
-    return response;
+    return response.data;
   },
 };

src/mixins/getDevice.js

@@ -1,4 +1,4 @@
-const { nonce, timestamp, _get } = require('../helpers/utilities');
+const { _get } = require('../helpers/utilities');
 const errors = require('../data/errors');
 
 module.exports = {
@@ -10,28 +10,27 @@ module.exports = {
    */
   async getDevice(deviceId) {
     if (this.devicesCache) {
-      return this.devicesCache.find(dev => dev.deviceid === deviceId) || null;
+      return this.devicesCache.find((dev) => dev.deviceid === deviceId) || null;
     }
 
-    const { APP_ID } = this;
-
     const device = await this.makeRequest({
-      uri: `/user/device/${deviceId}`,
-      qs: {
-        deviceid: deviceId,
-        appid: APP_ID,
-        nonce,
-        ts: timestamp,
-        version: 8,
+      method: 'post',
+      uri: `/v2/device/thing/`,
+      body: {
+        thingList: [{ id: deviceId, itemType: 1 }],
       },
     });
 
     const error = _get(device, 'error', false);
 
     if (error) {
-      return { error, msg: errors[error] };
+      throw new Error(`[${error}] ${errors[error]}`);
+    }
+
+    if (device.thingList.length === 0) {
+      throw new Error(`${errors.noDevice}`);
     }
 
-    return device;
+    return device.thingList.shift().itemData;
   },
 };

src/mixins/getDeviceChannelCount.js

@@ -1,7 +1,4 @@
 const { _get } = require('../helpers/utilities');
-const errors = require('../data/errors');
-
-const { getDeviceChannelCount } = require('../helpers/ewelink');
 
 module.exports = {
   /**
@@ -13,12 +10,18 @@ module.exports = {
    */
   async getDeviceChannelCount(deviceId) {
     const device = await this.getDevice(deviceId);
-    const error = _get(device, 'error', false);
-    const uiid = _get(device, 'extra.extra.uiid', false);
-    const switchesAmount = getDeviceChannelCount(uiid);
 
-    if (error) {
-      return { error, msg: errors[error] };
+    const paramSwitch = _get(device, 'params.switch', false);
+    const paramSwitches = _get(device, 'params.switches', false);
+
+    let switchesAmount;
+
+    if (paramSwitches) {
+      switchesAmount = paramSwitches.length;
+    }
+
+    if (!paramSwitches && paramSwitch) {
+      switchesAmount = 1;
     }
 
     return { status: 'ok', switchesAmount };

src/mixins/getDeviceCurrentTH.js

@@ -10,16 +10,12 @@ module.exports = {
    */
   async getDeviceCurrentTH(deviceId, type = '') {
     const device = await this.getDevice(deviceId);
-    const error = _get(device, 'error', false);
+
     const temperature = _get(device, 'params.currentTemperature', false);
     const humidity = _get(device, 'params.currentHumidity', false);
 
-    if (error) {
-      return device;
-    }
-
     if (!temperature || !humidity) {
-      return { error: 404, msg: errors.noSensor };
+      throw new Error(`${errors.noSensor}`);
     }
 
     const data = { status: 'ok', temperature, humidity };

src/mixins/getDeviceIP.js

@@ -1,3 +1,5 @@
+const errors = require('../data/errors');
+
 module.exports = {
   /**
    * Get local IP address from a given MAC
@@ -6,10 +8,16 @@ module.exports = {
    * @returns {Promise<string>}
    */
   getDeviceIP(device) {
-    const mac = device.extra.extra.staMac;
+    if (!this.arpTable) {
+      throw new Error(errors.noARP);
+    }
+
+    const mac = device.extra.staMac;
+
     const arpItem = this.arpTable.find(
-      item => item.mac.toLowerCase() === mac.toLowerCase()
+      (item) => item.mac.toLowerCase() === mac.toLowerCase()
     );
+
     return arpItem.ip;
   },
 };