@switchbot/homebridge-switchbot 1.15.1-beta.6 → 1.15.1-beta.8

package/dist/platform.d.ts

@@ -1,6 +1,5 @@
-import { AxiosInstance } from 'axios';
 import { API, DynamicPlatformPlugin, Logger, PlatformAccessory, Service, Characteristic } from 'homebridge';
-import { irdevice, device, SwitchBotPlatformConfig, deviceResponses, devicesConfig } from './settings';
+import { irdevice, device, SwitchBotPlatformConfig, devicesConfig } from './settings';
 /**
  * HomebridgePlatform
  * This class is the main constructor for your plugin, this is where you should
@@ -13,9 +12,8 @@ export declare class SwitchBotPlatform implements DynamicPlatformPlugin {
     readonly Service: typeof Service;
     readonly Characteristic: typeof Characteristic;
     readonly accessories: PlatformAccessory[];
-    axios: AxiosInstance;
     version: any;
-    deviceStatus: deviceResponses;
+    deviceStatus: any;
     registeringDevice: boolean;
     debugMode: boolean;
     platformLogging?: string;
@@ -71,7 +69,7 @@ export declare class SwitchBotPlatform implements DynamicPlatformPlugin {
     connectionTypeNewIRAccessory(accessory: PlatformAccessory): Promise<void>;
     connectionTypeExistingIRAccessory(existingAccessory: PlatformAccessory): Promise<void>;
     unregisterPlatformAccessories(existingAccessory: PlatformAccessory): void;
-    deviceListInfo(devices: deviceResponses): void;
+    deviceListInfo(devices: any): void;
     deviceInfo(device: (irdevice & devicesConfig) | (device & devicesConfig)): Promise<void>;
     connectBLE(): any;
     /**

package/dist/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAwBA,OAAc,EAAE,aAAa,EAAsB,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5G,OAAO,EAAyC,QAAQ,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE9I;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,qBAAqB;aAmBjC,GAAG,EAAE,MAAM;aAAkB,MAAM,EAAE,uBAAuB;aAAkB,GAAG,EAAE,GAAG;IAlBlH,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IAGpF,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;IAE/C,KAAK,EAAE,aAAa,CAExB;IAEH,OAAO,MAAkD;IACzD,YAAY,EAAG,eAAe,CAAC;IAC/B,iBAAiB,EAAG,OAAO,CAAC;IAC5B,SAAS,EAAG,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,SAAgB,WAAW,EAAE,GAAG,CAAC;gBAEL,GAAG,EAAE,MAAM,EAAkB,MAAM,EAAE,uBAAuB,EAAkB,GAAG,EAAE,GAAG;IAkElH,IAAI;IAoBJ;;;OAGG;IACH,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAO/C;;OAEG;IACG,YAAY;IAyFlB;;;;OAIG;IACG,WAAW;IA6CjB;;OAEG;IACG,eAAe;IA0GrB,WAAW,CAAC,CAAC,EAAE,GAAG;IA0ClB,OAAO,CAAC,YAAY;IAqEpB,OAAO,CAAC,cAAc;IA+DtB,OAAO,CAAC,cAAc;YAiBR,gBAAgB;YAwDhB,SAAS;YA4DT,WAAW;YAuDX,eAAe;YAuDf,YAAY;YAuDZ,aAAa;YAuDb,aAAa;IAkE3B,OAAO,CAAC,gBAAgB;YAeV,UAAU;YAuDV,UAAU;YAuDV,eAAe;YAuDf,gBAAgB;YAuDhB,QAAQ;YAsDR,SAAS;YAwDT,WAAW;YAuDX,oBAAoB;YAuDpB,iBAAiB;YAuDjB,iBAAiB;YAuDjB,mBAAmB;YAuDnB,YAAY;YAuDZ,YAAY;IAuDb,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,SAAS,EAAE,iBAAiB;IAQvF,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,iBAAiB,EAAE,iBAAiB;IAQpG,4BAA4B,CAAC,SAAS,EAAE,iBAAiB;IAIzD,iCAAiC,CAAC,iBAAiB,EAAE,iBAAiB;IAI5E,6BAA6B,CAAC,iBAAiB,EAAE,iBAAiB;IAMlE,cAAc,CAAC,OAAO,EAAE,eAAe;IAMjC,UAAU,CAAC,MAAM,EAAE,CAAC,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,GAAG,aAAa,CAAC;IAcrF,UAAU;IAaV;;;OAGG;IACH,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM5B,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM5B,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7B,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAU7B,uBAAuB,IAAI,OAAO;CAGnC"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5G,OAAO,EAA8B,QAAQ,EAAE,MAAM,EAAE,uBAAuB,EAAE,aAAa,EAA0B,MAAM,YAAY,CAAC;AAE1I;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,qBAAqB;aAejC,GAAG,EAAE,MAAM;aAAkB,MAAM,EAAE,uBAAuB;aAAkB,GAAG,EAAE,GAAG;IAdlH,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IAGpF,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;IAEtD,OAAO,MAAkD;IACzD,YAAY,EAAG,GAAG,CAAC;IACnB,iBAAiB,EAAG,OAAO,CAAC;IAC5B,SAAS,EAAG,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,SAAgB,WAAW,EAAE,GAAG,CAAC;gBAEL,GAAG,EAAE,MAAM,EAAkB,MAAM,EAAE,uBAAuB,EAAkB,GAAG,EAAE,GAAG;IAmDlH,IAAI;IAoBJ;;;OAGG;IACH,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAO/C;;OAEG;IACG,YAAY;IAyFlB;;;;OAIG;IACG,WAAW;IA6CjB;;OAEG;IACG,eAAe;IAgJrB,WAAW,CAAC,CAAC,EAAE,GAAG;IA0ClB,OAAO,CAAC,YAAY;IAqEpB,OAAO,CAAC,cAAc;IA+DtB,OAAO,CAAC,cAAc;YAiBR,gBAAgB;YAwDhB,SAAS;YA4DT,WAAW;YAuDX,eAAe;YAuDf,YAAY;YAuDZ,aAAa;YAuDb,aAAa;IAkE3B,OAAO,CAAC,gBAAgB;YAeV,UAAU;YAuDV,UAAU;YAuDV,eAAe;YAuDf,gBAAgB;YAuDhB,QAAQ;YAsDR,SAAS;YAwDT,WAAW;YAuDX,oBAAoB;YAuDpB,iBAAiB;YAuDjB,iBAAiB;YAuDjB,mBAAmB;YAuDnB,YAAY;YAuDZ,YAAY;IAuDb,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,SAAS,EAAE,iBAAiB;IAQvF,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,iBAAiB,EAAE,iBAAiB;IAQpG,4BAA4B,CAAC,SAAS,EAAE,iBAAiB;IAIzD,iCAAiC,CAAC,iBAAiB,EAAE,iBAAiB;IAI5E,6BAA6B,CAAC,iBAAiB,EAAE,iBAAiB;IAMlE,cAAc,CAAC,OAAO,KAAA;IAMhB,UAAU,CAAC,MAAM,EAAE,CAAC,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,GAAG,aAAa,CAAC;IA6CrF,UAAU;IAaV;;;OAGG;IACH,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM5B,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM5B,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7B,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAU7B,uBAAuB,IAAI,OAAO;CAGnC"}

package/dist/platform.js

@@ -24,11 +24,11 @@ const airpurifier_1 = require("./irdevice/airpurifier");
 const waterheater_1 = require("./irdevice/waterheater");
 const vacuumcleaner_1 = require("./irdevice/vacuumcleaner");
 const airconditioner_1 = require("./irdevice/airconditioner");
+const https_1 = __importDefault(require("https"));
+const crypto_1 = __importDefault(require("crypto"));
 const buffer_1 = require("buffer");
-const crypto_js_1 = __importDefault(require("crypto-js"));
 const fakegato_history_1 = __importDefault(require("fakegato-history"));
 const fs_1 = require("fs");
-const axios_1 = __importDefault(require("axios"));
 const settings_1 = require("./settings");
 /**
  * HomebridgePlatform
@@ -44,16 +44,8 @@ class SwitchBotPlatform {
         this.Characteristic = this.api.hap.Characteristic;
         // this is used to track restored cached accessories
         this.accessories = [];
-        this.axios = axios_1.default.create({
-            responseType: 'json',
-        });
         this.version = require('../package.json').version || '1.12.8'; // eslint-disable-line @typescript-eslint/no-var-requires
         this.logs();
-        const t = (new Date().getTime())?.toString();
-        const nonce = '';
-        const data = this.config.credentials?.token + t + nonce;
-        const Hmac_SHA256 = crypto_js_1.default.HmacSHA256(this.config.credentials?.secret, data).toString();
-        const sign = buffer_1.Buffer.from(Hmac_SHA256, 'binary').toString('base64');
         this.debugLog('Finished initializing platform:', this.config.name);
         // only load if configured
         if (!this.config) {
@@ -75,15 +67,6 @@ class SwitchBotPlatform {
             }
             return;
         }
-        // setup axios interceptor to add headers / api key to each request
-        this.axios.interceptors.request.use((request) => {
-            request.headers.Authorization = this.config.credentials?.token;
-            request.headers.sign = sign;
-            request.headers.t = t;
-            request.headers.nonce = nonce;
-            request.headers['Content-Type'] = 'application/json; charset=utf8';
-            return request;
-        });
         // import fakegato-history module
         this.fakegatoAPI = (0, fakegato_history_1.default)(api);
         // When this event is fired it means Homebridge has restored all cached accessories from disk.
@@ -272,82 +255,120 @@ class SwitchBotPlatform {
     async discoverDevices() {
         try {
             if (this.config.credentials?.token) {
-                const devicesAPI = (await this.axios.get(settings_1.DeviceURL)).data;
-                this.deviceListInfo(devicesAPI);
-                this.debugLog(JSON.stringify(devicesAPI));
-                // SwitchBot Devices
-                if (devicesAPI.body.deviceList.length !== 0) {
-                    this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
-                }
-                else {
-                    this.debugLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
-                }
-                const deviceLists = devicesAPI.body.deviceList;
-                if (!this.config.options?.devices) {
-                    this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
-                    const devices = deviceLists.map((v) => v);
-                    for (const device of devices) {
-                        if (device.deviceType) {
-                            if (device.configDeviceName) {
-                                device.deviceName = device.configDeviceName;
+                const t = Date.now();
+                const nonce = 'requestID';
+                const data = this.config.credentials?.token + t + nonce;
+                const signTerm = crypto_1.default.createHmac('sha256', this.config.credentials?.secret).update(buffer_1.Buffer.from(data, 'utf-8')).digest();
+                const sign = signTerm.toString('base64');
+                this.debugLog(sign);
+                const options = {
+                    hostname: settings_1.HostDomain,
+                    port: 443,
+                    path: settings_1.DevicePath,
+                    method: 'GET',
+                    headers: {
+                        'Authorization': this.config.credentials?.token,
+                        'sign': sign,
+                        'nonce': nonce,
+                        't': t,
+                        'Content-Type': 'application/json',
+                    },
+                };
+                const req = https_1.default.request(options, (res) => {
+                    this.debugLog(`statusCode: ${res.statusCode}`);
+                    this.debugLog(`headers: ${JSON.stringify(res.headers)}`);
+                    let rawData = '';
+                    res.on('data', (d) => {
+                        rawData += d;
+                        this.debugLog(`d: ${d}`);
+                    });
+                    res.on('end', () => {
+                        try {
+                            const devicesAPI = JSON.parse(rawData);
+                            this.debugLog(`devicesAPI: ${JSON.stringify(devicesAPI.body)}`);
+                            // SwitchBot Devices
+                            if (devicesAPI.body.deviceList.length !== 0) {
+                                this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
                             }
-                            this.createDevice(device);
-                        }
-                    }
-                }
-                else if (this.config.credentials.token && this.config.options.devices) {
-                    this.debugLog(`SwitchBot Device Config Set: ${JSON.stringify(this.config.options?.devices)}`);
-                    const deviceConfigs = this.config.options?.devices;
-                    const mergeBydeviceId = (a1, a2) => a1.map((itm) => ({
-                        ...a2.find((item) => item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item),
-                        ...itm,
-                    }));
-                    const devices = mergeBydeviceId(deviceLists, deviceConfigs);
-                    this.debugLog(`SwitchBot Devices: ${JSON.stringify(devices)}`);
-                    for (const device of devices) {
-                        if (device.deviceType) {
-                            if (device.configDeviceName) {
-                                device.deviceName = device.configDeviceName;
+                            else {
+                                this.debugLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
+                            }
+                            const deviceLists = devicesAPI.body.deviceList;
+                            if (!this.config.options?.devices) {
+                                this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
+                                const devices = deviceLists.map((v) => v);
+                                for (const device of devices) {
+                                    if (device.deviceType) {
+                                        if (device.configDeviceName) {
+                                            device.deviceName = device.configDeviceName;
+                                        }
+                                        this.createDevice(device);
+                                    }
+                                }
+                            }
+                            else if (this.config.credentials?.token && this.config.options.devices) {
+                                this.debugLog(`SwitchBot Device Config Set: ${JSON.stringify(this.config.options?.devices)}`);
+                                const deviceConfigs = this.config.options?.devices;
+                                const mergeBydeviceId = (a1, a2) => a1.map((itm) => ({
+                                    ...a2.find((item) => item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item),
+                                    ...itm,
+                                }));
+                                const devices = mergeBydeviceId(deviceLists, deviceConfigs);
+                                this.debugLog(`SwitchBot Devices: ${JSON.stringify(devices)}`);
+                                for (const device of devices) {
+                                    if (device.deviceType) {
+                                        if (device.configDeviceName) {
+                                            device.deviceName = device.configDeviceName;
+                                        }
+                                        this.createDevice(device);
+                                    }
+                                }
+                            }
+                            else {
+                                this.errorLog('SwitchBot Token Supplied, Issue with Auth.');
+                            }
+                            // IR Devices
+                            if (devicesAPI.body.infraredRemoteList.length !== 0) {
+                                this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+                            }
+                            else {
+                                this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+                            }
+                            const irDeviceLists = devicesAPI.body.infraredRemoteList;
+                            if (!this.config.options?.irdevices) {
+                                this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+                                const devices = irDeviceLists.map((v) => v);
+                                for (const device of devices) {
+                                    if (device.remoteType) {
+                                        this.createIRDevice(device);
+                                    }
+                                }
+                            }
+                            else {
+                                this.debugLog(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+                                const irDeviceConfig = this.config.options?.irdevices;
+                                const mergeIRBydeviceId = (a1, a2) => a1.map((itm) => ({
+                                    ...a2.find((item) => item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item),
+                                    ...itm,
+                                }));
+                                const devices = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
+                                this.debugLog(`IR Devices: ${JSON.stringify(devices)}`);
+                                for (const device of devices) {
+                                    if (device.remoteType) {
+                                        this.createIRDevice(device);
+                                    }
+                                }
                             }
-                            this.createDevice(device);
-                        }
-                    }
-                }
-                else {
-                    this.errorLog('Neither SwitchBot Token or Device Config are not set.');
-                }
-                // IR Devices
-                if (devicesAPI.body.infraredRemoteList.length !== 0) {
-                    this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
-                }
-                else {
-                    this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
-                }
-                const irDeviceLists = devicesAPI.body.infraredRemoteList;
-                if (!this.config.options?.irdevices) {
-                    this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
-                    const devices = irDeviceLists.map((v) => v);
-                    for (const device of devices) {
-                        if (device.remoteType) {
-                            this.createIRDevice(device);
                         }
-                    }
-                }
-                else {
-                    this.debugLog(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
-                    const irDeviceConfig = this.config.options?.irdevices;
-                    const mergeIRBydeviceId = (a1, a2) => a1.map((itm) => ({
-                        ...a2.find((item) => item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item),
-                        ...itm,
-                    }));
-                    const devices = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
-                    this.debugLog(`IR Devices: ${JSON.stringify(devices)}`);
-                    for (const device of devices) {
-                        if (device.remoteType) {
-                            this.createIRDevice(device);
+                        catch (e) {
+                            this.errorLog(e.message);
                         }
-                    }
-                }
+                    });
+                });
+                req.on('error', (error) => {
+                    this.errorLog(error);
+                });
+                req.end();
             }
             else if (!this.config.credentials?.token && this.config.options?.devices) {
                 this.debugLog(`SwitchBot Device Manual Config Set: ${JSON.stringify(this.config.options?.devices)}`);
@@ -1647,7 +1668,36 @@ class SwitchBotPlatform {
     async deviceInfo(device) {
         if (this.platformLogging?.includes('debug')) {
             this.warnLog(JSON.stringify(device));
-            this.deviceStatus = (await this.axios.get(`${settings_1.DeviceURL}/${device.deviceId}/status`)).data;
+            const t = Date.now();
+            const nonce = 'requestID';
+            const data = this.config.credentials?.token + t + nonce;
+            const signTerm = crypto_1.default.createHmac('sha256', this.config.credentials?.secret).update(buffer_1.Buffer.from(data, 'utf-8')).digest();
+            const sign = signTerm.toString('base64');
+            this.debugLog(sign);
+            const options = {
+                hostname: settings_1.HostDomain,
+                port: 443,
+                path: `${settings_1.DevicePath}/${device.deviceId}/status`,
+                method: 'GET',
+                headers: {
+                    Authorization: this.config.credentials?.token,
+                    sign: sign,
+                    nonce: nonce,
+                    t: t,
+                    'Content-Type': 'application/json',
+                },
+            };
+            const req = https_1.default.request(options, (res) => {
+                this.debugLog(`statusCode: ${res.statusCode}`);
+                res.on('data', (d) => {
+                    process.stdout.write(d);
+                });
+            });
+            req.on('error', (error) => {
+                this.errorLog(error);
+            });
+            req.end();
+            this.deviceStatus = req;
             if (this.deviceStatus.message === 'success') {
                 this.warnLog(`${device.deviceName} deviceInfoStatus: ${JSON.stringify(this.deviceStatus)}`);
             }