change for high sierra

Author: jacobrosenthal

lib/mac/highsierra.js

@@ -1,6 +1,6 @@
 /*jshint loopfunc: true */
 
-var debug = require('debug')('yosemite-bindings');
+var debug = require('debug')('highsierra-bindings');
 
 var child_process = require('child_process');
 var events = require('events');
@@ -74,25 +74,18 @@ blenoBindings.init = function() {
       }
     }
 
-    if (osRelease < 13) {
-      debug('bleno warning: OS X < 10.9 detected');
-
-      console.warn('bleno requires OS X 10.9 or higher!');
+    this.sendCBMsg(1, {
+      kCBMsgArgName: 'node-' + (new Date()).getTime(),
+      kCBMsgArgOptions: {
+          kCBInitOptionShowPowerAlert: 1
+      },
+      kCBMsgArgType: 1
+    });
 
-      this.emit('stateChange', 'unsupported');
-    } else {
-      this.sendCBMsg(1, {
-        kCBMsgArgName: 'node-' + (new Date()).getTime(),
-        kCBMsgArgOptions: {
-            kCBInitOptionShowPowerAlert: 1
-        },
-        kCBMsgArgType: 1
-      });
-    }
   }.bind(this));
 };
 
-blenoBindings.on('kCBMsgId6', function(args) {
+blenoBindings.on('kCBMsgId4', function(args) {
   var state = ['unknown', 'resetting', 'unsupported', 'unauthorized', 'poweredOff', 'poweredOn'][args.kCBMsgArgState];
   debug('state change ' + state);
   this.emit('stateChange', state);
@@ -110,35 +103,27 @@ blenoBindings.startAdvertising = function(name, serviceUuids) {
     }
   }
 
-  this.sendCBMsg(8, advertisement);
+  this.sendCBMsg(16, advertisement);
 };
 
 blenoBindings.startAdvertisingIBeacon = function(data) {
   var args = {};
 
-  if (osRelease >= 14) {
-    args.kCBAdvDataAppleMfgData = Buffer.concat([
-      new Buffer([data.length + 5, 0xff, 0x4c, 0x00, 0x02, data.length]),
-      data
-    ]);
-  } else {
-    args.kCBAdvDataAppleBeaconKey = data;
-  }
+  args.kCBAdvDataAppleMfgData = Buffer.concat([
+    new Buffer([data.length + 5, 0xff, 0x4c, 0x00, 0x02, data.length]),
+    data
+  ]);
 
-  this.sendCBMsg(8, args);
+  this.sendCBMsg(16, args);
 };
 
 blenoBindings.startAdvertisingWithEIRData = function(advertisementData) {
-  if (osRelease < 14) {
-    throw new Error('startAdvertisingWithEIRData is only supported on OS X 10.10 and above!');
-  }
-
-  this.sendCBMsg(8, {
+  this.sendCBMsg(16, {
     kCBAdvDataAppleMfgData: advertisementData
   });
 };
 
-blenoBindings.on('kCBMsgId16', function(args) {
+blenoBindings.on('kCBMsgId27', function(args) {
   var result = args.kCBMsgArgResult;
   var error = null;
 
@@ -150,15 +135,15 @@ blenoBindings.on('kCBMsgId16', function(args) {
 });
 
 blenoBindings.stopAdvertising = function() {
-  this.sendCBMsg(9, null);
+  this.sendCBMsg(17, null);
 };
 
-blenoBindings.on('kCBMsgId17', function(args) {
+blenoBindings.on('kCBMsgId28', function(args) {
   this.emit('advertisingStop');
 });
 
 blenoBindings.setServices = function(services) {
-  this.sendCBMsg(12, null); // remove all services
+  this.sendCBMsg(19, null); // remove all services
 
   services = services || [];
   var attributeId = 1;
@@ -260,7 +245,7 @@ blenoBindings.setServices = function(services) {
         attributeId++;
       }
 
-      this.sendCBMsg(10, arg);
+      this.sendCBMsg(18, arg);
     }
   } else {
     this.emit('servicesSet');
@@ -271,13 +256,13 @@ blenoBindings.updateRssi = function() {
   if (this._deviceUUID === null) {
     this.emit('rssiUpdate', 127); // not supported
   } else {
-    this.sendCBMsg(44, {
+    this.sendCBMsg(61, {
       kCBMsgArgDeviceUUID: this._deviceUUID
     });
   }
 };
 
-blenoBindings.on('kCBMsgId18', function(args) {
+blenoBindings.on('kCBMsgId29', function(args) {
   var attributeId = args.kCBMsgArgAttributeID;
   var result = args.kCBMsgArgResult;
 
@@ -296,7 +281,7 @@ blenoBindings.on('kCBMsgId18', function(args) {
   }
 });
 
-blenoBindings.on('kCBMsgId53', function(args) {
+blenoBindings.on('kCBMsgId57', function(args) {
   var deviceUUID = args.kCBMsgArgDeviceUUID.toString('hex');
   var mtu = args.kCBMsgArgATTMTU;
 
@@ -309,14 +294,14 @@ blenoBindings.on('kCBMsgId53', function(args) {
   }.bind(this));
 });
 
-blenoBindings.on('kCBMsgId19', function(args) {
+blenoBindings.on('kCBMsgId30', function(args) {
   var attributeId = args.kCBMsgArgAttributeID;
   var offset = args.kCBMsgArgOffset || 0;
   var transactionId = args.kCBMsgArgTransactionID;
 
   var callback = (function(attributeId, transactionId) {
     return function(result, data) {
-      this.sendCBMsg(13, {
+      this.sendCBMsg(21, {
         kCBMsgArgAttributeID: attributeId,
         kCBMsgArgData: data,
         kCBMsgArgResult: result,
@@ -328,7 +313,7 @@ blenoBindings.on('kCBMsgId19', function(args) {
   this._attributes[attributeId].emit('readRequest', offset, callback);
 });
 
-blenoBindings.on('kCBMsgId20', function(args) {
+blenoBindings.on('kCBMsgId31', function(args) {
   var attWrites = args.kCBMsgArgATTWrites;
   var transactionId = args.kCBMsgArgTransactionID;
 
@@ -343,7 +328,7 @@ blenoBindings.on('kCBMsgId20', function(args) {
     var callback = (function(attributeId, transactionId, ignoreResponse) {
       return function(result) {
         if (!ignoreResponse) {
-          this.sendCBMsg(13, {
+          this.sendCBMsg(21, {
             kCBMsgArgAttributeID: attributeId,
             kCBMsgArgData: null,
             kCBMsgArgResult: result,
@@ -357,13 +342,13 @@ blenoBindings.on('kCBMsgId20', function(args) {
   }
 });
 
-blenoBindings.on('kCBMsgId21', function(args) {
+blenoBindings.on('kCBMsgId32', function(args) {
   var attributeId = args.kCBMsgArgAttributeID;
   var maxValueSize = 20;
 
   var callback = (function(attributeId) {
     return function(data) {
-      this.sendCBMsg(15, {
+      this.sendCBMsg(22, {
         kCBMsgArgAttributeID: attributeId,
         kCBMsgArgData: data,
         kCBMsgArgUUIDs: []
@@ -374,13 +359,13 @@ blenoBindings.on('kCBMsgId21', function(args) {
   this._attributes[attributeId].emit('subscribe', maxValueSize, callback);
 });
 
-blenoBindings.on('kCBMsgId22', function(args) {
+blenoBindings.on('kCBMsgId33', function(args) {
   var attributeId = args.kCBMsgArgAttributeID;
 
   this._attributes[attributeId].emit('unsubscribe');
 });
 
-blenoBindings.on('kCBMsgId23', function(args) {
+blenoBindings.on('kCBMsgId34', function(args) {
   var attributeId = args.kCBMsgArgAttributeID;
   var attribute = this._attributes[attributeId];
 
@@ -393,7 +378,7 @@ blenoBindings.on('kCBMsgId23', function(args) {
   }
 });
 
-blenoBindings.on('kCBMsgId55', function(args) {
+blenoBindings.on('kCBMsgId71', function(args) {
   var rssi = args.kCBMsgArgData;
 
   this.emit('rssiUpdate', rssi);