@switchbot/homebridge-switchbot 1.15.1-beta.0 → 1.15.1-beta.10

package/.github/ISSUE_TEMPLATE/bug-report.yml

@@ -8,6 +8,7 @@ assignees:
   - SwitchBot-Wonderlabs
   - Minsheng
   - Devin-Wonderlabs
+  - chenliuyun
 body:
   - type: markdown
     attributes:

package/.github/ISSUE_TEMPLATE/feature-request.yml

@@ -8,6 +8,7 @@ assignees:
   - SwitchBot-Wonderlabs
   - Minsheng
   - Devin-Wonderlabs
+  - chenliuyun
 body:
   - type: markdown
     attributes:

package/.github/ISSUE_TEMPLATE/support-request.yml

@@ -8,6 +8,7 @@ assignees:
   - SwitchBot-Wonderlabs
   - Minsheng
   - Devin-Wonderlabs
+  - chenliuyun
 body:
   - type: markdown
     attributes:

package/.prettierrc

@@ -1,6 +1,6 @@
 {
   "semi": true,
-  "singleQuote": true,
+  "singleQuote": false,
   "bracketSameLine": true,
   "printWidth": 150,
   "tabWidth": 2,

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. This project uses [Semantic Versioning](https://semver.org/)
 
+## [Beta - Version 2.0.0](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v2.0.0) (2022-XX-XX)
+
+## What's Changed
+
+- Moved from v1.0 to v1.1 of [OpenAPI](https://github.com/OpenWonderLabs/SwitchBotAPI)
+- Housekeeping and updated dependencies.
+
+**Full Changelog**: https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v1.15.0...v2.0.0
+
 ## [Version 1.15.0](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.15.0) (2022-08-27)
 
 ## What's Changed

package/config.schema.json

@@ -16,20 +16,27 @@
       "credentials": {
         "type": "object",
         "properties": {
-          "openToken": {
+          "token": {
             "title": "Token",
             "type": "string",
             "x-schema-form": {
               "type": "password"
             }
           },
+          "secret": {
+            "title": "Secret",
+            "type": "string",
+            "x-schema-form": {
+              "type": "password"
+            }
+          },
           "notice": {
             "title": "Notice",
             "type": "string",
-            "default": "Keep your token a secret!"
+            "default": "Keep your Token & Secret a secret!"
           }
         },
-        "required": ["openToken", "notice"]
+        "required": ["token", "secret", "notice"]
       },
       "options": {
         "type": "object",
@@ -861,7 +868,7 @@
       "title": "SwitchBot Account Info",
       "expandable": true,
       "expanded": false,
-      "items": ["credentials.openToken"]
+      "items": ["credentials.token","credentials.secret"]
     },
     {
       "type": "fieldset",

package/dist/device/bot.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="node" />
-import { AxiosResponse } from 'axios';
+/// <reference types="node" />
+import { Context } from 'vm';
+import { IncomingMessage } from 'http';
 import { Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, serviceData, ad, switchbot, deviceStatusResponse, deviceStatus } from '../settings';
-import { Context } from 'vm';
+import { device, devicesConfig, deviceStatus, ad, serviceData, switchbot } from '../settings';
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
@@ -30,7 +31,7 @@ export declare class Bot {
     BatteryLevel: CharacteristicValue;
     StatusLowBattery: CharacteristicValue;
     power: deviceStatus['power'];
-    deviceStatus: deviceStatusResponse;
+    deviceStatus: any;
     connected?: boolean;
     switchbot: switchbot;
     SwitchToOpenAPI?: boolean;
@@ -77,9 +78,9 @@ export declare class Bot {
      */
     updateHomeKitCharacteristics(): Promise<void>;
     apiError(e: any): Promise<void>;
-    statusCode(push: AxiosResponse<{
-        statusCode: number;
-    }>): Promise<void>;
+    statusCode({ res }: {
+        res: IncomingMessage;
+    }): Promise<void>;
     offlineOff(): Promise<void>;
     /**
      * Handle requests to set the "On" characteristic

package/dist/device/bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../../src/device/bot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../../src/device/bot.ts"],"names":[],"mappings":"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"}

package/dist/device/bot.js

@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bot = void 0;
+const https_1 = __importDefault(require("https"));
+const crypto_1 = __importDefault(require("crypto"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const settings_1 = require("../settings");
@@ -350,7 +355,7 @@ class Bot {
         if (this.device.ble) {
             this.SwitchToOpenAPI = false;
         }
-        if (this.platform.config.credentials?.openToken) {
+        if (this.platform.config.credentials?.token) {
             this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI parseStatus`);
             if (this.botMode === 'press') {
                 this.On = false;
@@ -444,7 +449,7 @@ class Bot {
             }
             else {
                 this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-                if (this.platform.config.credentials?.openToken) {
+                if (this.platform.config.credentials?.token) {
                     this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
                     this.SwitchToOpenAPI = true;
                     await this.openAPIRefreshStatus();
@@ -456,7 +461,7 @@ class Bot {
             if (this.deviceLogging.includes('debug')) {
                 this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
             }
-            if (this.platform.config.credentials?.openToken) {
+            if (this.platform.config.credentials?.token) {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
                 this.SwitchToOpenAPI = true;
                 await this.openAPIRefreshStatus();
@@ -482,14 +487,52 @@ class Bot {
         }
     }
     async openAPIRefreshStatus() {
-        if (this.platform.config.credentials?.openToken) {
+        if (this.platform.config.credentials?.token) {
             this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI refreshStatus`);
             try {
-                this.deviceStatus = (await this.platform.axios.get(`${settings_1.DeviceURL}/${this.device.deviceId}/status`)).data;
-                this.debugLog(`Bot: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
-                this.power = this.deviceStatus.body.power;
-                this.parseStatus();
-                this.updateHomeKitCharacteristics();
+                const t = Date.now();
+                const nonce = 'requestID';
+                const data = this.platform.config.credentials?.token + t + nonce;
+                const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
+                const sign = signTerm.toString('base64');
+                this.debugLog(`Bot: ${this.accessory.displayName} sign: ${sign}`);
+                const options = {
+                    hostname: settings_1.HostDomain,
+                    port: 443,
+                    path: `${settings_1.DevicePath}/${this.device.deviceId}/status`,
+                    method: 'GET',
+                    headers: {
+                        Authorization: this.platform.config.credentials?.token,
+                        sign: sign,
+                        nonce: nonce,
+                        t: t,
+                        'Content-Type': 'application/json',
+                    },
+                };
+                const req = https_1.default.request(options, (res) => {
+                    this.debugLog(`Bot: ${this.accessory.displayName} Refresh statusCode: ${res.statusCode}`);
+                    let rawData = '';
+                    res.on('data', (d) => {
+                        rawData += d;
+                        this.debugLog(`d: ${d}`);
+                    });
+                    res.on('end', () => {
+                        try {
+                            this.deviceStatus = JSON.parse(rawData);
+                            this.debugLog(`Bot: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+                            this.power = this.deviceStatus.body.power;
+                            this.parseStatus();
+                            this.updateHomeKitCharacteristics();
+                        }
+                        catch (e) {
+                            this.errorLog(`Bot: ${this.accessory.displayName} error message: ${e.message}`);
+                        }
+                    });
+                });
+                req.on('error', (e) => {
+                    this.errorLog(`Bot: ${this.accessory.displayName} error message: ${e.message}`);
+                });
+                req.end();
             }
             catch (e) {
                 this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
@@ -566,7 +609,7 @@ class Bot {
                     if (this.platform.debugMode) {
                         this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
                     }
-                    if (this.platform.config.credentials?.openToken) {
+                    if (this.platform.config.credentials?.token) {
                         this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
                         await this.openAPIpushChanges();
                     }
@@ -594,7 +637,7 @@ class Bot {
                     if (this.platform.debugMode) {
                         this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
                     }
-                    if (this.platform.config.credentials?.openToken) {
+                    if (this.platform.config.credentials?.token) {
                         this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
                         await this.openAPIpushChanges();
                     }
@@ -622,38 +665,71 @@ class Bot {
         });
     }
     async openAPIpushChanges() {
-        if (this.platform.config.credentials?.openToken) {
+        if (this.platform.config.credentials?.token) {
             try {
                 if (this.On !== this.OnCached || this.allowPush) {
                     this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI pushChanges`);
-                    const payload = {
-                        commandType: 'command',
-                        parameter: 'default',
-                    };
+                    // Make Push On request to the API
+                    const t = Date.now();
+                    const nonce = 'requestID';
+                    const data = this.platform.config.credentials?.token + t + nonce;
+                    const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret)
+                        .update(Buffer.from(data, 'utf-8'))
+                        .digest();
+                    const sign = signTerm.toString('base64');
+                    this.debugLog(`Bot: ${this.accessory.displayName} sign: ${sign}`);
+                    let command = '';
                     if (this.botMode === 'switch' && this.On) {
-                        payload.command = 'turnOn';
+                        command = 'turnOn';
                         this.On = true;
                         this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
                     }
                     else if (this.botMode === 'switch' && !this.On) {
-                        payload.command = 'turnOff';
+                        command = 'turnOff';
                         this.On = false;
                         this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
                     }
                     else if (this.botMode === 'press') {
-                        payload.command = 'press';
+                        command = 'press';
                         this.debugLog(`Bot: ${this.accessory.displayName} Press Mode`);
                         this.On = false;
                     }
                     else {
                         throw new Error(`Bot: ${this.accessory.displayName} Device Paramters not set for this Bot.`);
                     }
-                    this.infoLog(`Bot: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-                        ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
-                    // Make the API request
-                    const push = await this.platform.axios.post(`${settings_1.DeviceURL}/${this.device.deviceId}/commands`, payload);
-                    this.debugLog(`Bot: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
-                    this.statusCode(push);
+                    const body = JSON.stringify({
+                        'command': `${command}`,
+                        'parameter': 'default',
+                        'commandType': 'command',
+                    });
+                    this.infoLog(`Bot: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                    const options = {
+                        hostname: settings_1.HostDomain,
+                        port: 443,
+                        path: `${settings_1.DevicePath}/${this.device.deviceId}/commands`,
+                        method: 'POST',
+                        headers: {
+                            'Authorization': this.platform.config.credentials?.token,
+                            'sign': sign,
+                            'nonce': nonce,
+                            't': t,
+                            'Content-Type': 'application/json',
+                            'Content-Length': body.length,
+                        },
+                    };
+                    const req = https_1.default.request(options, res => {
+                        this.debugLog(`Bot: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                        this.statusCode({ res });
+                        res.on('data', d => {
+                            this.debugLog(`Bot: ${this.accessory.displayName} d: ${d}`);
+                        });
+                    });
+                    req.on('error', (e) => {
+                        this.errorLog(`Bot: ${this.accessory.displayName} error message: ${e.message}`);
+                    });
+                    req.write(body);
+                    req.end();
+                    this.debugLog(`Bot: ${this.accessory.displayName} openAPIpushChanges: ${JSON.stringify(req)}`);
                     this.OnCached = this.On;
                     this.accessory.context.On = this.OnCached;
                 }
@@ -902,8 +978,8 @@ class Bot {
         }
         //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
     }
-    async statusCode(push) {
-        switch (push.data.statusCode) {
+    async statusCode({ res }) {
+        switch (res.statusCode) {
             case 151:
                 this.errorLog(`Bot: ${this.accessory.displayName} Command not supported by this device type.`);
                 break;
@@ -923,7 +999,7 @@ class Bot {
                 break;
             case 190:
                 this.errorLog(`Bot: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-                    ` Or command: ${JSON.stringify(push.data)} format is invalid`);
+                    ` Or command: ${JSON.stringify(res)} format is invalid`);
                 break;
             case 100:
                 this.debugLog(`Bot: ${this.accessory.displayName} Command successfully sent.`);