Released v0.0.3

Author: futomi

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Futomi Hatano
+Copyright (c) 2019-2020 Futomi Hatano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -750,6 +750,9 @@ The `battery` is *experimental* for now. I'm not sure whether the value is corre
 ---------------------------------------
 ## <a id="Release-Note">Release Note</a>
 
+* v0.0.3 (2020-02-10)
+  * Now the characteristic UUID `0x2a00` (Device Name) is not mandatory. Some models of Bot don't seem to support the characteristic.
+  * Fixed the bug that the `turnOn()` method returns an error if the "Light switch Add-on" is set to "Disabled" on the Bot.
 * v0.0.2 (2019-11-20)
   * First public release
 
@@ -764,7 +767,7 @@ The `battery` is *experimental* for now. I'm not sure whether the value is corre
 
 The MIT License (MIT)
 
-Copyright (c) 2019 Futomi Hatano
+Copyright (c) 2019-2020 Futomi Hatano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

lib/switchbot-device-wohand.js

@@ -1,9 +1,9 @@
 /* ------------------------------------------------------------------
 * node-linking - switchbot-device-wohand.js
 *
-* Copyright (c) 2019, Futomi Hatano, All rights reserved.
+* Copyright (c) 2019-2020, Futomi Hatano, All rights reserved.
 * Released under the MIT license
-* Date: 2019-11-20
+* Date: 2020-02-10
 * ---------------------------------------------------------------- */
 'use strict';
 const SwitchbotDevice = require('./switchbot-device.js');
@@ -89,10 +89,11 @@ class SwitchbotDeviceWoHand extends SwitchbotDevice {
     return new Promise((resolve, reject) => {
       let req_buf = Buffer.from(bytes);
       this._command(req_buf).then((res_buf) => {
-        if (res_buf.length === 3 && res_buf.readUInt8(0) === 0x01) {
+        let code = res_buf.readUInt8(0);
+        if (res_buf.length === 3 && (code === 0x01 || code === 0x05)) {
           resolve();
         } else {
-          reject(new Error('The device returned an error: 0x' + hex));
+          reject(new Error('The device returned an error: 0x' + res_buf.toString('hex')));
         }
       }).catch((error) => {
         reject(error);

lib/switchbot-device.js

@@ -1,9 +1,9 @@
 /* ------------------------------------------------------------------
 * node-linking - switchbot-device.js
 *
-* Copyright (c) 2019, Futomi Hatano, All rights reserved.
+* Copyright (c) 2019-2020, Futomi Hatano, All rights reserved.
 * Released under the MIT license
-* Date: 2019-11-20
+* Date: 2020-02-10
 * ---------------------------------------------------------------- */
 'use strict';
 const parameterChecker = require('./parameter-checker.js');
@@ -188,11 +188,12 @@ class SwitchbotDevice {
           } else if (c.uuid === this._CHAR_UUID_NOTIFY) {
             char_notify = c;
           } else if (c.uuid === this._CHAR_UUID_DEVICE) {
+            // Some models of Bot don't seem to support this characteristic UUID
             char_device = c;
           }
         });
-        if (!(char_write && char_notify && char_device)) {
-          reject(new Error('No characteristic was found'));
+        if (!(char_write && char_notify)) {
+          reject(new Error('No characteristic was found.'));
           return;
         }
 
@@ -298,6 +299,10 @@ class SwitchbotDevice {
     return new Promise((resolve, reject) => {
       let name = '';
       this._connect().then(() => {
+        if (!this._chars.device) {
+          // Some models of Bot don't seem to support this characteristic UUID
+          throw new Error('The device does not support the characteristic UUID 0x' + this._CHAR_UUID_DEVICE + '.');
+        }
         return this._read(this._chars.device);
       }).then((buf) => {
         name = buf.toString('utf8');
@@ -336,6 +341,10 @@ class SwitchbotDevice {
 
       let buf = Buffer.from(name, 'utf8');
       this._connect().then(() => {
+        if (!this._chars.device) {
+          // Some models of Bot don't seem to support this characteristic UUID
+          throw new Error('The device does not support the characteristic UUID 0x' + this._CHAR_UUID_DEVICE + '.');
+        }
         return this._write(this._chars.device, buf);
       }).then(() => {
         return this._disconnect();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "The node-switchbot is a Node.js module which allows you to move your Switchbot (Bot)'s arm and to monitor the temperature/humidity from SwitchBot Thermometer & Hygrometer (Meter).",
   "main": "./lib/switchbot.js",
   "files": [