@stoprocent/noble 1.10.2 → 1.11.0

package/test/lib/webbluetooth/bindings.test.js

@@ -97,7 +97,7 @@ describe('webbluetooth bindings', () => {
           uuid: device.id,
           address: device.id,
           advertisement: { localName: device.name }, // advertisement,
-          device: device,
+          device,
           cachedServices: {},
           localName: device.name,
           serviceUuids: options.services
@@ -128,7 +128,7 @@ describe('webbluetooth bindings', () => {
           uuid: device.id,
           address: device.id,
           advertisement: { localName: device.name }, // advertisement,
-          device: device,
+          device,
           cachedServices: {},
           localName: device.name,
           serviceUuids: [4660, 22136, 'service'],

package/test/lib/websocket/bindings.test.js

@@ -145,8 +145,8 @@ describe('webbluetooth bindings', () => {
 
     const startCommand = {
       action: 'startScanning',
-      serviceUuids: serviceUuids,
-      allowDuplicates: allowDuplicates
+      serviceUuids,
+      allowDuplicates
     };
     assert.calledOnceWithExactly(callback);
     assert.calledOnceWithExactly(bindings._sendCommand, startCommand);

package/test/noble.test.js

@@ -563,7 +563,7 @@ describe('noble', () => {
       should(noble._services).have.keys(uuid);
       should(noble._characteristics).have.keys(uuid);
       should(noble._descriptors).have.keys(uuid);
-      should(noble._discoveredPeripheralUUids).deepEqual([uuid]);
+      should(noble._discoveredPeripheralUUids).deepEqual({ uuid: true });
 
       assert.calledOnceWithExactly(eventCallback, peripheral);
     });
@@ -613,7 +613,7 @@ describe('noble', () => {
       should(noble._services).be.empty();
       should(noble._characteristics).be.empty();
       should(noble._descriptors).be.empty();
-      should(noble._discoveredPeripheralUUids).deepEqual([uuid]);
+      should(noble._discoveredPeripheralUUids).deepEqual({ uuid: true });
 
       assert.calledOnceWithExactly(eventCallback, peripheral);
     });
@@ -627,7 +627,7 @@ describe('noble', () => {
       const rssi = 'rssi';
 
       // register peripheral
-      noble._discoveredPeripheralUUids = [uuid];
+      noble._discoveredPeripheralUUids = { uuid: true };
       noble._allowDuplicates = true;
 
       const eventCallback = sinon.spy();
@@ -654,7 +654,7 @@ describe('noble', () => {
       const rssi = 'rssi';
 
       // register peripheral
-      noble._discoveredPeripheralUUids = [uuid];
+      noble._discoveredPeripheralUUids = { uuid: true };
 
       const eventCallback = sinon.spy();
       noble.on('discover', eventCallback);
@@ -1508,25 +1508,26 @@ describe('noble', () => {
     });
   });
 
-  it('onMtu - should update peripheral mtu', () => {
+  it('onMtu - should update peripheral mtu when set before already', () => {
     const peripheral = {
-      mtu: 'nan'
+      mtu: 234
     };
 
     noble._peripherals = { uuid: peripheral };
-    noble.onMtu('uuid', 'mtu');
+    noble.onMtu('uuid', 123);
 
-    should(peripheral).deepEqual({ mtu: 'mtu' });
+    should(peripheral).deepEqual({ mtu: 123 });
   });
 
-  it('onMtu - should not update peripheral mtu', () => {
+  it('onMtu - should update peripheral mtu too when empty', () => {
     const peripheral = {
+      mtu: null
     };
 
     noble._peripherals = { uuid: peripheral };
-    noble.onMtu('uuid', 'mtu');
+    noble.onMtu('uuid', 123);
 
-    should(peripheral).deepEqual({ });
+    should(peripheral).deepEqual({ mtu: 123 });
   });
 
   describe('onIncludedServicesDiscover', () => {

package/test.custom.js

@@ -0,0 +1,131 @@
+const noble = require('./with-custom-binding')({ extended: true });
+
+console.log('noble');
+
+noble.on('stateChange', function (state) {
+  console.log('on -> stateChange: ' + state);
+
+  if (state === 'poweredOn') {
+    noble.startScanning([], true);
+  } else {
+    noble.stopScanning();
+  }
+});
+
+noble.on('scanStart', function () {
+  console.log('on -> scanStart');
+});
+
+noble.on('scanStop', function () {
+  console.log('on -> scanStop');
+});
+
+noble.on('discover', function (peripheral) {
+  console.log('on -> discover: ' + peripheral);
+
+  noble.stopScanning();
+
+  peripheral.on('connect', function () {
+    console.log('on -> connect');
+    this.updateRssi();
+  });
+
+  peripheral.on('disconnect', function () {
+    console.log('on -> disconnect');
+  });
+
+  peripheral.on('rssiUpdate', function (rssi) {
+    console.log('on -> RSSI update ' + rssi);
+    this.discoverServices();
+  });
+
+  peripheral.on('servicesDiscover', function (services) {
+    console.log('on -> peripheral services discovered ' + services);
+
+    const serviceIndex = 0;
+
+    services[serviceIndex].on(
+      'includedServicesDiscover',
+      function (includedServiceUuids) {
+        console.log(
+          'on -> service included services discovered ' + includedServiceUuids
+        );
+        this.discoverCharacteristics();
+      }
+    );
+
+    services[serviceIndex].on(
+      'characteristicsDiscover',
+      function (characteristics) {
+        console.log(
+          'on -> service characteristics discovered ' + characteristics
+        );
+
+        const characteristicIndex = 0;
+
+        characteristics[characteristicIndex].on(
+          'read',
+          function (data, isNotification) {
+            console.log(
+              'on -> characteristic read ' + data + ' ' + isNotification
+            );
+            console.log(data);
+
+            peripheral.disconnect();
+          }
+        );
+
+        characteristics[characteristicIndex].on('write', function () {
+          console.log('on -> characteristic write ');
+
+          peripheral.disconnect();
+        });
+
+        characteristics[characteristicIndex].on('broadcast', function (state) {
+          console.log('on -> characteristic broadcast ' + state);
+
+          peripheral.disconnect();
+        });
+
+        characteristics[characteristicIndex].on('notify', function (state) {
+          console.log('on -> characteristic notify ' + state);
+
+          peripheral.disconnect();
+        });
+
+        characteristics[characteristicIndex].on(
+          'descriptorsDiscover',
+          function (descriptors) {
+            console.log('on -> descriptors discover ' + descriptors);
+
+            const descriptorIndex = 0;
+
+            descriptors[descriptorIndex].on('valueRead', function (data) {
+              console.log('on -> descriptor value read ' + data);
+              console.log(data);
+              peripheral.disconnect();
+            });
+
+            descriptors[descriptorIndex].on('valueWrite', function () {
+              console.log('on -> descriptor value write ');
+              peripheral.disconnect();
+            });
+
+            descriptors[descriptorIndex].readValue();
+            // descriptors[descriptorIndex].writeValue(new Buffer([0]));
+          }
+        );
+
+        characteristics[characteristicIndex].read();
+        // characteristics[characteristicIndex].write(new Buffer('hello'));
+        // characteristics[characteristicIndex].broadcast(true);
+        // characteristics[characteristicIndex].notify(true);
+        // characteristics[characteristicIndex].discoverDescriptors();
+      }
+    );
+
+    services[serviceIndex].discoverIncludedServices();
+  });
+
+  peripheral.connect();
+});

package/test.js

@@ -1,4 +1,4 @@
-const noble = require('./index')({ extended: false });
+const noble = require('./index');
 
 console.log('noble');
 

package/with-custom-binding.js

@@ -0,0 +1,6 @@
+module.exports = function (options) {
+  const Noble = require('./lib/noble');
+  const bindings = require('./lib/resolve-bindings')(options);
+
+  return new Noble(bindings);
+};

package/ws-slave.js

@@ -31,7 +31,7 @@ if (serverMode) {
     noble.on('stateChange', function (state) {
       sendEvent({
         type: 'stateChange',
-        state: state
+        state
       });
     });
 
@@ -204,7 +204,7 @@ noble.on('discover', function (peripheral) {
     sendEvent({
       type: 'rssiUpdate',
       peripheralUuid: this.uuid,
-      rssi: rssi
+      rssi
     });
   });
 
@@ -217,7 +217,7 @@ noble.on('discover', function (peripheral) {
         type: 'includedServicesDiscover',
         peripheralUuid: peripheral.uuid,
         serviceUuid: this.uuid,
-        includedServiceUuids: includedServiceUuids
+        includedServiceUuids
       });
     };
 
@@ -234,7 +234,7 @@ noble.on('discover', function (peripheral) {
           serviceUuid: service.uuid,
           characteristicUuid: characteristic.uuid,
           data: data.toString('hex'),
-          isNotification: isNotification
+          isNotification
         });
       };
 
@@ -257,7 +257,7 @@ noble.on('discover', function (peripheral) {
           peripheralUuid: peripheral.uuid,
           serviceUuid: service.uuid,
           characteristicUuid: characteristic.uuid,
-          state: state
+          state
         });
       };
 
@@ -269,7 +269,7 @@ noble.on('discover', function (peripheral) {
           peripheralUuid: peripheral.uuid,
           serviceUuid: service.uuid,
           characteristicUuid: characteristic.uuid,
-          state: state
+          state
         });
       };
 
@@ -356,7 +356,7 @@ noble.on('discover', function (peripheral) {
     sendEvent({
       type: 'servicesDiscover',
       peripheralUuid: this.uuid,
-      serviceUuids: serviceUuids
+      serviceUuids
     });
   });
 
@@ -364,7 +364,7 @@ noble.on('discover', function (peripheral) {
     sendEvent({
       type: 'handleRead',
       peripheralUuid: this.uuid,
-      handle: handle,
+      handle,
       data: data.toString('hex')
     });
   });
@@ -373,7 +373,7 @@ noble.on('discover', function (peripheral) {
     sendEvent({
       type: 'handleWrite',
       peripheralUuid: this.uuid,
-      handle: handle
+      handle
     });
   });
 
@@ -381,7 +381,7 @@ noble.on('discover', function (peripheral) {
     sendEvent({
       type: 'handleNotify',
       peripheralUuid: this.uuid,
-      handle: handle,
+      handle,
       data: data.toString('hex')
     });
   });

package/lib/manufacture.js

@@ -1,48 +0,0 @@
-const path = require('path');
-
-const tryRequire = modulePath => {
-  try {
-    return require(modulePath);
-  } catch (e) {
-    console.error(`ERROR:\tCould not load manufacturer list from "${modulePath}".`);
-    console.error(`\tPlease see "${path.join(__dirname, '..', 'scripts', 'manufactures', 'README.md')}" for instructions.`);
-    return {};
-  }
-};
-
-const hexValues = tryRequire('./manufactures-hex.json');
-const decValues = tryRequire('./manufactures-dec.json');
-
-function Manufacture (noble, data) {
-  this._noble = noble;
-
-  this.name = null;
-  this.data = data;
-
-  try {
-    const tmp = JSON.parse(JSON.stringify(data)).data;
-
-    if (Array.isArray(tmp)) {
-      this.name = decValues[tmp[0]];
-    }
-  } catch (e) {
-    console.error(e);
-  }
-}
-
-Manufacture.prototype.toString = function () {
-  return JSON.stringify({
-    name: this.name,
-    data: JSON.parse(JSON.stringify(this.data))
-  });
-};
-
-Manufacture.nameFromHex = function (hexValue) {
-  return hexValues[hexValue] || undefined;
-};
-
-Manufacture.nameFromDec = function (decValue) {
-  return decValues[decValue] || undefined;
-};
-
-module.exports = Manufacture;

package/test/lib/manufacture.test.js

@@ -1,77 +0,0 @@
-const should = require('should');
-const proxyquire = require('proxyquire').noCallThru();
-
-const decValues = {
-  135: 'DEC name'
-};
-
-const hexValues = {
-  135: 'HEX name'
-};
-
-const Manufacture = proxyquire('../../lib/manufacture', {
-  './manufactures-dec.json': decValues,
-  './manufactures-hex.json': hexValues
-});
-
-describe('manufacture', () => {
-  it('should have only data, no name', () => {
-    const noble = 'fake_noble';
-    const data = 'not_a_json';
-    const manufacture = new Manufacture(noble, data);
-
-    should(manufacture._noble).eql(noble);
-    should(manufacture.data).eql(data);
-    should(manufacture.name).eql(null);
-
-    should(manufacture.toString()).eql('{"name":null,"data":"not_a_json"}');
-  });
-
-  it('should have data and name', () => {
-    const noble = 'fake_noble';
-    const data = Buffer.from([0x87, 0x00, 0x0d, 0x9c], 'hex');
-    const manufacture = new Manufacture(noble, data);
-
-    should(manufacture._noble).eql(noble);
-    should(manufacture.data).eql(data);
-    should(manufacture.name).eql('DEC name');
-
-    should(manufacture.toString()).eql(
-      '{"name":"DEC name","data":{"type":"Buffer","data":[135,0,13,156]}}'
-    );
-  });
-
-  it('should have no array data', () => {
-    const noble = 'fake_noble';
-    const data = '{type: "not an array"}';
-    const manufacture = new Manufacture(noble, data);
-
-    should(manufacture._noble).eql(noble);
-    should(manufacture.data).eql(data);
-    should(manufacture.name).eql(null);
-
-    should(manufacture.toString()).eql(
-      '{"name":null,"data":"{type: \\"not an array\\"}"}'
-    );
-  });
-
-  it('get existing name from HEX', () => {
-    const name = Manufacture.nameFromHex(135);
-    should(name).eql('HEX name');
-  });
-
-  it('get unknown name from HEX', () => {
-    const name = Manufacture.nameFromHex(1);
-    should(name).eql(undefined);
-  });
-
-  it('get existing name from DEC', () => {
-    const name = Manufacture.nameFromDec(135);
-    should(name).eql('DEC name');
-  });
-
-  it('get unknown name from DEC', () => {
-    const name = Manufacture.nameFromDec(1);
-    should(name).eql(undefined);
-  });
-});