- added blink() and reset() methods to device

- added fix for empty addresses on discovery

- changed noble links to abandonware

Author: Chris

README.md

@@ -1,12 +1,12 @@
 # miflora
 
-Node.js package for the Xiaomi Mi Flora Plant Sensor built on top of [noble](https://github.com/noble/noble).
+Node.js package for the Xiaomi Mi Flora Plant Sensor built on top of [noble](https://github.com/abandonware/noble) (maintained by [abandonware](https://abandonware.github.io/)).
 
 [![npm](https://img.shields.io/npm/v/miflora.svg)](https://www.npmjs.com/package/miflora)
 ![language](https://img.shields.io/github/languages/top/ChrisScheffler/miflora.svg)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/xojs/xo)
 ![commit](https://img.shields.io/github/last-commit/ChrisScheffler/miflora.svg)
-![firmware](https://img.shields.io/badge/firmware-3.1.9-brightgreen.svg)
+![firmware](https://img.shields.io/badge/firmware-3.2.1-brightgreen.svg)
 [![licence](https://img.shields.io/npm/l/miflora.svg)](LICENSE)
 
 Have a look in the [Wiki](https://github.com/ChrisScheffler/miflora/wiki) for more information on the sensor.
@@ -15,7 +15,7 @@ Have a look in the [Wiki](https://github.com/ChrisScheffler/miflora/wiki) for mo
 
 ## Prerequisites
 
-Please see [the Prerequisites section for noble](https://github.com/noble/noble#prerequisites).
+Please see [the Prerequisites section for noble](https://github.com/abandonware/noble#prerequisites).
 
 ## Install
 

lib/miflora-device.js

@@ -2,18 +2,6 @@
 
 const debug = require('debug');
 
-const UUID_SERVICE_XIAOMI = 'fe95';
-const UUID_SERVICE_DATA = '0000120400001000800000805f9b34fb';
-const UUID_CHARACTERISTIC_MODE = '00001a0000001000800000805f9b34fb';
-const UUID_CHARACTERISTIC_DATA = '00001a0100001000800000805f9b34fb';
-const UUID_CHARACTERISTIC_FIRMWARE = '00001a0200001000800000805f9b34fb';
-
-const MODE_BUFFER_SERIAL = Buffer.from('b0ff', 'hex');
-const MODE_BUFFER_REALTIME = {
-	Enable: Buffer.from('a01f', 'hex'),
-	Disable: Buffer.from('c01f', 'hex')
-};
-
 const timeout = (timeout, promiseFuncs) => {
 	const promises = [new Promise(promiseFuncs)];
 	if (timeout > 0) {
@@ -29,6 +17,20 @@ const timeout = (timeout, promiseFuncs) => {
 	return Promise.race(promises);
 };
 
+const UUID_SERVICE_XIAOMI = 'fe95';
+const UUID_SERVICE_DATA = '0000120400001000800000805f9b34fb';
+const UUID_CHARACTERISTIC_MODE = '00001a0000001000800000805f9b34fb';
+const UUID_CHARACTERISTIC_DATA = '00001a0100001000800000805f9b34fb';
+const UUID_CHARACTERISTIC_FIRMWARE = '00001a0200001000800000805f9b34fb';
+
+const MODE_BUFFER_SERIAL = Buffer.from('b0ff', 'hex');
+const MODE_BUFFER_BLINK = Buffer.from('fdff', 'hex');
+const MODE_BUFFER_RESET = Buffer.from('d0aa', 'hex');
+const MODE_BUFFER_REALTIME = {
+	Enable: Buffer.from('a01f', 'hex'),
+	Disable: Buffer.from('c01f', 'hex')
+};
+
 /**
  * Represents a Mi Flora device
  * @public
@@ -80,11 +82,13 @@ class MiFloraDevice {
 	connect() {
 		return timeout(10000, (resolve, reject) => {
 			if (this._peripheral.state === 'connected') {
+				this.logDebug('already connected');
 				return resolve();
 			}
 
 			this._peripheral.once('connect', async () => {
 				try {
+					this.logDebug('connected, resolving chars');
 					await this._resolveCharacteristics();
 					return resolve();
 				} catch (error) {
@@ -192,6 +196,32 @@ class MiFloraDevice {
 		});
 	}
 
+	blink() {
+		return timeout(10000, async (resolve, reject) => {
+			this.logDebug('requesting device to blink');
+			try {
+				await this.connect();
+				this._setDeviceMode(MODE_BUFFER_BLINK);
+				return resolve();
+			} catch (error) {
+				return reject();
+			}
+		});
+	}
+
+	reset() {
+		return timeout(10000, async (resolve, reject) => {
+			this.logDebug('requesting device to forget setting');
+			try {
+				await this.connect();
+				this._setDeviceMode(MODE_BUFFER_RESET);
+				return resolve();
+			} catch (error) {
+				return reject();
+			}
+		});
+	}
+
 	/**
 	 * @private
 	 * @param {ByteBuffer} buffer Bytes to write
@@ -230,7 +260,7 @@ class MiFloraDevice {
 	}
 
 	_resolveCharacteristics() {
-		return timeout(10004, async (resolve, reject) => {
+		return timeout(10000, async (resolve, reject) => {
 			try {
 				this.logDebug('resolving characteristic');
 				this._peripheral.discoverAllServicesAndCharacteristics((error, services, characteristics) => {
@@ -303,9 +333,9 @@ class MiFloraDevice {
 			if (dataItem) {
 				const productId = dataItem.data.readUInt16LE(2);
 				switch (productId) {
-					case 152:
+					case 0x98:
 						return new MiFloraDevice(peripheral, 'MiFloraMonitor');
-					case 349:
+					case 0x015D:
 						return new MiFloraDevice(peripheral, 'MiFloraPot');
 					default:
 				}

lib/miflora.js

@@ -2,14 +2,19 @@
 
 const noble = require('@abandonware/noble');
 const logDebug = require('debug')('miflora');
-const MiFloraDevice = require('./miflora-device.js');
-
-const UUID_SERVICE_XIAOMI = 'fe95';
+const MiFloraDevice = require('./miflora-device');
 
 const getOpt = (options, value, def) => {
 	return (options && typeof options[value] !== 'undefined') ? options[value] : def;
 };
 
+const intToHex = num => {
+	const res = num.toString(16);
+	return (res.length % 2 === 1) ? '0' + res : res;
+};
+
+const UUID_SERVICE_XIAOMI = 'fe95';
+
 class MiFlora {
 	constructor() {
 		this._devices = {};
@@ -68,7 +73,7 @@ class MiFlora {
 	 * @private
 	 */
 	_ensurePowerOnState() {
-		return new Promise(async resolve => {
+		return new Promise(resolve => {
 			if (noble.state === 'poweredOn') {
 				return resolve();
 			}
@@ -113,10 +118,28 @@ class MiFlora {
 				return resolve();
 			}, duration);
 			noble.on('discover', peripheral => {
-				const deviceAddress = MiFloraDevice.normaliseAddress(peripheral.address);
+				let deviceAddress = peripheral.address;
+				if (deviceAddress === '') {
+					const serviceData = peripheral.advertisement.serviceData.find(item => item.uuid === UUID_SERVICE_XIAOMI);
+					if (serviceData && serviceData.data && serviceData.data.length > 10) {
+						for (let i = 10; i > 4; i--) {
+							deviceAddress += intToHex(serviceData.data.readUInt8(i));
+							if (i > 5) {
+								deviceAddress += ':';
+							}
+						}
+
+						logDebug('fixing peripheral with address %s', deviceAddress);
+						peripheral.address = deviceAddress;
+					} else {
+						logDebug('skipping unknown advertisment %o', peripheral.advertisement);
+						return;
+					}
+				}
+
+				deviceAddress = MiFloraDevice.normaliseAddress(peripheral.address);
 				if (ignoreUnknown && !addresses.find(addr => addr === deviceAddress)) {
 					logDebug('ignoring device with address %s', deviceAddress);
-
 					return;
 				}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "miflora",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Node.js package for the Xiaomi Plant Sensor Flower Care (Mi Flora)",
   "main": "./lib/miflora.js",
   "scripts": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/ChrisScheffler/miflora#readme",
   "dependencies": {
-    "@abandonware/noble": "^1.9.2-5",
+    "@abandonware/noble": "^1.9.2-8",
     "debug": "^4.1.1"
   },
   "devDependencies": {
-    "xo": "^0.26.1"
+    "xo": "^0.29.0"
   }
 }