node-switchbot 1.1.3-beta.4 → 1.1.3-beta.5

package/lib/switchbot-advertising.js

@@ -1,7 +1,9 @@
+'use strict';
+
 class SwitchbotAdvertising {
-	constructor() { }
+  constructor() { }
 
-	/* ------------------------------------------------------------------
+  /* ------------------------------------------------------------------
   * parse(peripheral)
   * - Parse advertising packets coming from switchbot devices
   *
@@ -58,222 +60,222 @@ class SwitchbotAdvertising {
   * If the specified `Peripheral` does not represent any switchbot
   * device, this method will return `null`.
   * ---------------------------------------------------------------- */
-	parse(peripheral) {
-		let ad = peripheral.advertisement;
-		if (!ad || !ad.serviceData) {
-			return null;
-		}
-		if (ad.serviceData[0].uuid !== "0d00") {
-			return null;
-		}
-		let buf = ad.serviceData[0].data;
-		if (!buf || !Buffer.isBuffer(buf) || buf.length < 3) {
-			return null;
-		}
+  parse(peripheral) {
+    let ad = peripheral.advertisement;
+    if (!ad || !ad.serviceData) {
+      return null;
+    }
+    if (ad.serviceData[0].uuid !== '0d00') {
+      return null;
+    }
+    let buf = ad.serviceData[0].data;
+    if (!buf || !Buffer.isBuffer(buf) || buf.length < 3) {
+      return null;
+    }
 
-		let model = buf.slice(0, 1).toString("utf8");
-		let sd = null;
+    let model = buf.slice(0, 1).toString('utf8');
+    let sd = null;
 
-		if (model === "H") { // WoHand
-			sd = this._parseServiceDataForWoHand(buf);
-		} else if (model === "e") { // WoHumi
-			sd = this._parseServiceDataForWoHumi(buf);
-		} else if (model === "T") { // WoSensorTH
-			sd = this._parseServiceDataForWoSensorTH(buf);
-		} else if (model === "c") { // WoCurtain
-			sd = this._parseServiceDataForWoCurtain(buf);
-		} else if (model === "s") { // WoMotion
-			sd = this._parseServiceDataForWoPresence(buf);
-		} else if (model === "d") { // WoContact
-			sd = this._parseServiceDataForWoContact(buf);
-		} else {
-			return null;
-		}
+    if (model === 'H') { // WoHand
+      sd = this._parseServiceDataForWoHand(buf);
+    } else if (model === 'e') { // WoHumi
+      sd = this._parseServiceDataForWoHumi(buf);
+    } else if (model === 'T') { // WoSensorTH
+      sd = this._parseServiceDataForWoSensorTH(buf);
+    } else if (model === 'c') { // WoCurtain
+      sd = this._parseServiceDataForWoCurtain(buf);
+    } else if (model === 's') { // WoMotion
+      sd = this._parseServiceDataForWoPresence(buf);
+    } else if (model === 'd') { // WoContact
+      sd = this._parseServiceDataForWoContact(buf);
+    } else {
+      return null;
+    }
 
-		if (!sd) {
-			return null;
-		}
-		let address = peripheral.address || "";
-		if (address === "") {
-			address = peripheral.advertisement.manufacturerData || "";
-			if (address !== "") {
-				const str = peripheral.advertisement.manufacturerData.toString("hex").slice(4);
-				address = str.substr(0, 2);
-				for (var i = 2; i < str.length; i += 2) {
-					address = address + ":" + str.substr(i, 2);
-				}
-				// console.log("address", typeof(address), address);
-			}
-		}
-		else {
-			address = address.replace(/-/g, ":");
-		}
-		let data = {
-			id: peripheral.id,
-			address: address,
-			rssi: peripheral.rssi,
-			serviceData: sd
-		};
-		return data;
-	}
+    if (!sd) {
+      return null;
+    }
+    let address = peripheral.address || '';
+    if (address === '') {
+      address = peripheral.advertisement.manufacturerData || '';
+      if (address !== '') {
+        const str = peripheral.advertisement.manufacturerData.toString('hex').slice(4);
+        address = str.substr(0, 2);
+        for (var i = 2; i < str.length; i += 2) {
+          address = address + ":" + str.substr(i, 2);
+        }
+        // console.log("address", typeof(address), address);
+      }
+    }
+    else {
+      address = address.replace(/-/g, ':');
+    }
+    let data = {
+      id: peripheral.id,
+      address: address,
+      rssi: peripheral.rssi,
+      serviceData: sd
+    };
+    return data;
+  }
 
-	_parseServiceDataForWoHand(buf) {
-		if (buf.length !== 3) {
-			return null;
-		}
-		let byte1 = buf.readUInt8(1);
-		let byte2 = buf.readUInt8(2);
+  _parseServiceDataForWoHand(buf) {
+    if (buf.length !== 3) {
+      return null;
+    }
+    let byte1 = buf.readUInt8(1);
+    let byte2 = buf.readUInt8(2);
 
-		let mode = (byte1 & 0b10000000) ? true : false; // Whether the light switch Add-on is used or not
-		let state = (byte1 & 0b01000000) ? true : false; // Whether the switch status is ON or OFF
-		let battery = byte2 & 0b01111111; // %
+    let mode = (byte1 & 0b10000000) ? true : false; // Whether the light switch Add-on is used or not
+    let state = (byte1 & 0b01000000) ? true : false; // Whether the switch status is ON or OFF
+    let battery = byte2 & 0b01111111; // %
 
-		let data = {
-			model: "H",
-			modelName: "WoHand",
-			mode: mode,
-			state: state,
-			battery: battery
-		};
+    let data = {
+      model: 'H',
+      modelName: 'WoHand',
+      mode: mode,
+      state: state,
+      battery: battery
+    };
 
-		return data;
-	}
+    return data;
+  }
 
-	_parseServiceDataForWoHumi(buf) {
-		if (buf.length !== 8) {
-			return null;
-		}
-		let byte1 = buf.readUInt8(1);
-		// let byte2 = buf.readUInt8(2);
-		let byte3 = buf.readUInt8(3);
-		let byte4 = buf.readUInt8(4);
-		let byte5 = buf.readUInt8(5);
+  _parseServiceDataForWoHumi(buf) {
+    if (buf.length !== 8) {
+      return null;
+    }
+    let byte1 = buf.readUInt8(1);
+    // let byte2 = buf.readUInt8(2);
+    let byte3 = buf.readUInt8(3);
+    let byte4 = buf.readUInt8(4);
+    let byte5 = buf.readUInt8(5);
 
-		let onState = (byte1 & 0b10000000) ? true : false; // 1 - on
-		let autoMode = (byte4 & 0b10000000) ? true : false; // 1 - auto
-		let percentage = byte4 & 0b01111111; // 0-100%, 101/102/103 - Quick gear 1/2/3
+    let onState = (byte1 & 0b10000000) ? true : false; // 1 - on
+    let autoMode = (byte4 & 0b10000000) ? true : false; // 1 - auto
+    let percentage = byte4 & 0b01111111; // 0-100%, 101/102/103 - Quick gear 1/2/3
 
-		let data = {
-			model: "e",
-			modelName: "WoHumi",
-			onState: onState,
-			autoMode: autoMode,
-			percentage: autoMode ? 0 : percentage,
-		};
+    let data = {
+      model: 'e',
+      modelName: 'WoHumi',
+      onState: onState,
+      autoMode: autoMode,
+      percentage: autoMode ? 0 : percentage,
+    };
 
-		return data;
-	}
+    return data;
+  }
 
-	_parseServiceDataForWoSensorTH(buf) {
-		if (buf.length !== 6) {
-			return null;
-		}
-		let byte2 = buf.readUInt8(2);
-		let byte3 = buf.readUInt8(3);
-		let byte4 = buf.readUInt8(4);
-		let byte5 = buf.readUInt8(5);
+  _parseServiceDataForWoSensorTH(buf) {
+    if (buf.length !== 6) {
+      return null;
+    }
+    let byte2 = buf.readUInt8(2);
+    let byte3 = buf.readUInt8(3);
+    let byte4 = buf.readUInt8(4);
+    let byte5 = buf.readUInt8(5);
 
-		let temp_sign = (byte4 & 0b10000000) ? 1 : -1;
-		let temp_c = temp_sign * ((byte4 & 0b01111111) + (byte3 / 10));
-		let temp_f = (temp_c * 9 / 5) + 32;
-		temp_f = Math.round(temp_f * 10) / 10;
+    let temp_sign = (byte4 & 0b10000000) ? 1 : -1;
+    let temp_c = temp_sign * ((byte4 & 0b01111111) + (byte3 / 10));
+    let temp_f = (temp_c * 9 / 5) + 32;
+    temp_f = Math.round(temp_f * 10) / 10;
 
-		let data = {
-			model: "T",
-			modelName: "WoSensorTH",
-			temperature: {
-				c: temp_c,
-				f: temp_f
-			},
-			fahrenheit: (byte5 & 0b10000000) ? true : false,
-			humidity: byte5 & 0b01111111,
-			battery: (byte2 & 0b01111111)
-		};
+    let data = {
+      model: 'T',
+      modelName: 'WoSensorTH',
+      temperature: {
+        c: temp_c,
+        f: temp_f
+      },
+      fahrenheit: (byte5 & 0b10000000) ? true : false,
+      humidity: byte5 & 0b01111111,
+      battery: (byte2 & 0b01111111)
+    };
 
-		return data;
-	}
+    return data;
+  }
 
-	_parseServiceDataForWoPresence(buf) {
-		if (buf.length !== 6) {
-			return null;
-		}
-		let byte1 = buf.readUInt8(1);
-		let byte2 = buf.readUInt8(2);
-		// let byte3 = buf.readUInt8(3);
-		// let byte4 = buf.readUInt8(4);
-		let byte5 = buf.readUInt8(5);
+  _parseServiceDataForWoPresence(buf) {
+    if (buf.length !== 6) {
+      return null;
+    }
+    let byte1 = buf.readUInt8(1);
+    let byte2 = buf.readUInt8(2);
+    // let byte3 = buf.readUInt8(3);
+    // let byte4 = buf.readUInt8(4);
+    let byte5 = buf.readUInt8(5);
 
-		let pirState = (byte1 & 0b01000000) ? true : false; // 1 - Movement detected
-		let battery = byte2 & 0b01111111; // %
-		let lightLevel = byte5 & 0b00000011;
+    let pirState = (byte1 & 0b01000000) ? true : false; // 1 - Movement detected
+    let battery = byte2 & 0b01111111; // %
+    let lightLevel = byte5 & 0b00000011;
 
-		let data = {
-			model: "s",
-			modelName: "WoMotion",
-			movement: pirState,
-			battery: battery,
-			lightLevel: (lightLevel == 1) ? "dark" : ((lightLevel == 2) ? "bright" : "unknown"),
-		};
+    let data = {
+      model: 's',
+      modelName: 'WoMotion',
+      movement: pirState,
+      battery: battery,
+      lightLevel: (lightLevel == 1) ? 'dark' : ((lightLevel == 2) ? 'bright' : 'unknown'),
+    };
 
-		return data;
-	}
+    return data;
+  }
 
-	_parseServiceDataForWoContact(buf) {
-		if (buf.length !== 9) {
-			return null;
-		}
+  _parseServiceDataForWoContact(buf) {
+    if (buf.length !== 9) {
+      return null;
+    }
 
-		let byte1 = buf.readUInt8(1);
-		let byte2 = buf.readUInt8(2);
-		let byte3 = buf.readUInt8(3);
-		// let byte4 = buf.readUInt8(4);
-		// let byte5 = buf.readUInt8(5);
-		// let byte6 = buf.readUInt8(6);
-		// let byte7 = buf.readUInt8(7);
-		// let byte8 = buf.readUInt8(8);
+    let byte1 = buf.readUInt8(1);
+    let byte2 = buf.readUInt8(2);
+    let byte3 = buf.readUInt8(3);
+    // let byte4 = buf.readUInt8(4);
+    // let byte5 = buf.readUInt8(5);
+    // let byte6 = buf.readUInt8(6);
+    // let byte7 = buf.readUInt8(7);
+    // let byte8 = buf.readUInt8(8);
 
-		let pirState = (byte1 & 0b01000000) ? true : false; // 1 - Movement detected
-		let battery = byte2 & 0b01111111; // %
-		let hallState = (byte3 >> 1) & 0b00000011;
-		let lightLevel = byte3 & 0b00000001;
+    let pirState = (byte1 & 0b01000000) ? true : false; // 1 - Movement detected
+    let battery = byte2 & 0b01111111; // %
+    let hallState = (byte3 >> 1) & 0b00000011;
+    let lightLevel = byte3 & 0b00000001;
 
-		let data = {
-			model: "d",
-			modelName: "WoContact",
-			movement: pirState,
-			battery: battery,
-			doorState: (hallState == 0) ? "close" : ((hallState == 1) ? "open" : "timeout no closed"),
-			lightLevel: (lightLevel == 0) ? "dark" : "bright",
-		};
+    let data = {
+      model: 'd',
+      modelName: 'WoContact',
+      movement: pirState,
+      battery: battery,
+      doorState: (hallState == 0) ? 'close' : ((hallState == 1) ? 'open' : 'timeout no closed'),
+      lightLevel: (lightLevel == 0) ? 'dark' : 'bright',
+    };
 
-		return data;
-	}
+    return data;
+  }
 
-	_parseServiceDataForWoCurtain(buf) {
-		if (buf.length !== 5) {
-			return null;
-		}
-		let byte1 = buf.readUInt8(1);
-		let byte2 = buf.readUInt8(2);
-		let byte3 = buf.readUInt8(3);
-		let byte4 = buf.readUInt8(4);
+  _parseServiceDataForWoCurtain(buf) {
+    if (buf.length !== 5) {
+      return null;
+    }
+    let byte1 = buf.readUInt8(1);
+    let byte2 = buf.readUInt8(2);
+    let byte3 = buf.readUInt8(3);
+    let byte4 = buf.readUInt8(4);
 
-		let calibration = (byte1 & 0b01000000) ? true : false; // Whether the calibration is completed
-		let battery = byte2 & 0b01111111; // %
-		let currPosition = byte3 & 0b01111111; // current positon %
-		let lightLevel = (byte4 >> 4) & 0b00001111; // light sensor level (1-10)
+    let calibration = (byte1 & 0b01000000) ? true : false; // Whether the calibration is completed
+    let battery = byte2 & 0b01111111; // %
+    let currPosition = byte3 & 0b01111111; // current positon %
+    let lightLevel = (byte4 >> 4) & 0b00001111; // light sensor level (1-10)
 
-		let data = {
-			model: "c",
-			modelName: "WoCurtain",
-			calibration: calibration,
-			battery: battery,
-			position: currPosition,
-			lightLevel: lightLevel
-		};
+    let data = {
+      model: 'c',
+      modelName: 'WoCurtain',
+      calibration: calibration,
+      battery: battery,
+      position: currPosition,
+      lightLevel: lightLevel
+    };
 
-		return data;
-	}
+    return data;
+  }
 }
 
 module.exports = new SwitchbotAdvertising();

package/lib/switchbot-device-wocontact.js

@@ -1,8 +1,9 @@
-import SwitchbotDevice from "./switchbot-device.js";
+'use strict';
+const SwitchbotDevice = require('./switchbot-device.js');
 
 class SwitchbotDeviceWoContact extends SwitchbotDevice {
 
 
 }
 
-export default SwitchbotDeviceWoContact;
+module.exports = SwitchbotDeviceWoContact;

package/lib/switchbot-device-wocurtain.js

@@ -1,8 +1,9 @@
-import SwitchbotDevice from "./switchbot-device.js";
+'use strict';
+const SwitchbotDevice = require('./switchbot-device.js');
 
 class SwitchbotDeviceWoCurtain extends SwitchbotDevice {
 
-	/* ------------------------------------------------------------------
+    /* ------------------------------------------------------------------
     * open()
     * - Open the curtain
     *
@@ -13,11 +14,11 @@ class SwitchbotDeviceWoCurtain extends SwitchbotDevice {
     * - Promise object
     *   Nothing will be passed to the `resolve()`.
     * ---------------------------------------------------------------- */
-	open() {
-		return this._operateCurtain([0x57, 0x0f, 0x45, 0x01, 0x05, 0xff, 0x00]);
-	}
+    open() {
+        return this._operateCurtain([0x57, 0x0f, 0x45, 0x01, 0x05, 0xff, 0x00]);
+    }
 
-	/* ------------------------------------------------------------------
+    /* ------------------------------------------------------------------
     * close()
     * - close the curtain
     *
@@ -28,11 +29,11 @@ class SwitchbotDeviceWoCurtain extends SwitchbotDevice {
     * - Promise object
     *   Nothing will be passed to the `resolve()`.
     * ---------------------------------------------------------------- */
-	close() {
-		return this._operateCurtain([0x57, 0x0f, 0x45, 0x01, 0x05, 0xff, 0x64]);
-	}
+    close() {
+        return this._operateCurtain([0x57, 0x0f, 0x45, 0x01, 0x05, 0xff, 0x64]);
+    }
 
-	/* ------------------------------------------------------------------
+    /* ------------------------------------------------------------------
     * pause()
     * - pause the curtain
     *
@@ -43,11 +44,11 @@ class SwitchbotDeviceWoCurtain extends SwitchbotDevice {
     * - Promise object
     *   Nothing will be passed to the `resolve()`.
     * ---------------------------------------------------------------- */
-	pause() {
-		return this._operateCurtain([0x57, 0x0f, 0x45, 0x01, 0x00, 0xff]);
-	}
+    pause() {
+        return this._operateCurtain([0x57, 0x0f, 0x45, 0x01, 0x00, 0xff]);
+    }
 
-	/* ------------------------------------------------------------------
+    /* ------------------------------------------------------------------
     * runToPos()
     * - run to the targe position
     *
@@ -58,44 +59,44 @@ class SwitchbotDeviceWoCurtain extends SwitchbotDevice {
     * - Promise object
     *   Nothing will be passed to the `resolve()`.
     * ---------------------------------------------------------------- */
-	runToPos(percent, mode) {
+    runToPos(percent, mode) {
 
-		if (typeof percent != "number") {
-			return new Promise((resolve, reject) => {
-				reject(new Error("The type of target position percentage is incorrent: " + typeof percent));
-			});
-		}
-		if (mode == null) {
-			mode = 0xff;
-		}
-		else {
-			if (typeof mode != "number") {
-				return new Promise((resolve, reject) => {
-					reject(new Error("The type of running mode is incorrent: " + typeof mode));
-				});
-			}
-			if (mode > 1) { mode = 0xff; }
-		}
-		if (percent > 100) { percent = 100; }
-		else if (percent < 0) { percent = 0; }
-		return this._operateCurtain([0x57, 0x0f, 0x45, 0x01, 0x05, mode, percent]);
-	}
+        if (typeof percent != 'number') {
+            return new Promise((resolve, reject) => {
+                reject(new Error('The type of target position percentage is incorrent: ' + typeof percent));
+            });
+        }
+        if (mode == null) {
+            mode = 0xff;
+        }
+        else {
+            if (typeof mode != 'number') {
+                return new Promise((resolve, reject) => {
+                    reject(new Error('The type of running mode is incorrent: ' + typeof mode));
+                });
+            }
+            if (mode > 1) { mode = 0xff; }
+        }
+        if (percent > 100) { percent = 100; }
+        else if (percent < 0) { percent = 0; }
+        return this._operateCurtain([0x57, 0x0f, 0x45, 0x01, 0x05, mode, percent]);
+    }
 
-	_operateCurtain(bytes) {
-		return new Promise((resolve, reject) => {
-			let req_buf = Buffer.from(bytes);
-			this._command(req_buf).then((res_buf) => {
-				let code = res_buf.readUInt8(0);
-				if (res_buf.length === 3 && code === 0x01) {
-					resolve();
-				} else {
-					reject(new Error("The device returned an error: 0x" + res_buf.toString("hex")));
-				}
-			}).catch((error) => {
-				reject(error);
-			});
-		});
-	}
+    _operateCurtain(bytes) {
+        return new Promise((resolve, reject) => {
+            let req_buf = Buffer.from(bytes);
+            this._command(req_buf).then((res_buf) => {
+                let code = res_buf.readUInt8(0);
+                if (res_buf.length === 3 && code === 0x01) {
+                    resolve();
+                } else {
+                    reject(new Error('The device returned an error: 0x' + res_buf.toString('hex')));
+                }
+            }).catch((error) => {
+                reject(error);
+            });
+        });
+    }
 }
 
-export default SwitchbotDeviceWoCurtain;
+module.exports = SwitchbotDeviceWoCurtain;