Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

more work for lazy bindings #309

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

more work for lazy bindings #309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 112 additions & 55 deletions lib/bleno.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if (platform === 'darwin') {
function Bleno() {
this.initialized = false;
this.platform = 'unknown';
this.state = 'unknown';
this._state = 'unknown';
this.address = 'unknown';
this.rssi = 0;
this.mtu = 20;
Expand All @@ -44,13 +44,26 @@ function Bleno() {

this._bindings.on('rssiUpdate', this.onRssiUpdate.bind(this));

//lazy init bindings on first new listener, should be on stateChange
this.on('newListener', function(event) {
if (event === 'stateChange' && !this.initialized) {
this._bindings.init();

this.initialized = true;
}
}.bind(this));

//or lazy init bindings if someone attempts to get state first
Object.defineProperties(this, {
state: {
get: function () {
if (!this.initialized) {
this._bindings.init();
this.initialized = true;
}
return this._state;
}
}
});
}

util.inherits(Bleno, events.EventEmitter);
Expand All @@ -68,7 +81,7 @@ Bleno.prototype.onPlatform = function(platform) {
Bleno.prototype.onStateChange = function(state) {
debug('stateChange ' + state);

this.state = state;
this._state = state;

this.emit('stateChange', state);
};
Expand Down Expand Up @@ -98,61 +111,85 @@ Bleno.prototype.onDisconnect = function(clientAddress) {
};

Bleno.prototype.startAdvertising = function(name, serviceUuids, callback) {
if (this.state !== 'poweredOn') {
var error = new Error('Could not start advertising, state is ' + this.state + ' (not poweredOn)');
var advertise = function(state) {

if (typeof callback === 'function') {
callback(error);
if (state !== 'poweredOn') {
var error = new Error('Could not start advertising, state is ' + state + ' (not poweredOn)');

if (typeof callback === 'function') {
callback(error);
} else {
throw error;
}
} else {
throw error;
}
} else {
if (callback) {
this.once('advertisingStart', callback);
}
if (callback) {
this.once('advertisingStart', callback);
}

var undashedServiceUuids = [];
var undashedServiceUuids = [];

if (serviceUuids && serviceUuids.length) {
for (var i = 0; i < serviceUuids.length; i++) {
undashedServiceUuids[i] = UuidUtil.removeDashes(serviceUuids[i]);
if (serviceUuids && serviceUuids.length) {
for (var i = 0; i < serviceUuids.length; i++) {
undashedServiceUuids[i] = UuidUtil.removeDashes(serviceUuids[i]);
}
}

this._bindings.startAdvertising(name, undashedServiceUuids);
}
}

this._bindings.startAdvertising(name, undashedServiceUuids);
//if bindings still not init, do it now
if (!this.initialized) {
this._bindings.init();
this.initialized = true;
this.once('stateChange', advertise.bind(this));
}else{
advertise.call(this, this._state);
}
};

Bleno.prototype.startAdvertisingIBeacon = function(uuid, major, minor, measuredPower, callback) {
if (this.state !== 'poweredOn') {
var error = new Error('Could not start advertising, state is ' + this.state + ' (not poweredOn)');
var advertise = function(state) {

if (state !== 'poweredOn') {
var error = new Error('Could not start advertising, state is ' + state + ' (not poweredOn)');

if (typeof callback === 'function') {
callback(error);
if (typeof callback === 'function') {
callback(error);
} else {
throw error;
}
} else {
throw error;
}
} else {
var undashedUuid = UuidUtil.removeDashes(uuid);
var uuidData = new Buffer(undashedUuid, 'hex');
var uuidDataLength = uuidData.length;
var iBeaconData = new Buffer(uuidData.length + 5);

for (var i = 0; i < uuidDataLength; i++) {
iBeaconData[i] = uuidData[i];
}
var undashedUuid = UuidUtil.removeDashes(uuid);
var uuidData = new Buffer(undashedUuid, 'hex');
var uuidDataLength = uuidData.length;
var iBeaconData = new Buffer(uuidData.length + 5);

for (var i = 0; i < uuidDataLength; i++) {
iBeaconData[i] = uuidData[i];
}

iBeaconData.writeUInt16BE(major, uuidDataLength);
iBeaconData.writeUInt16BE(minor, uuidDataLength + 2);
iBeaconData.writeInt8(measuredPower, uuidDataLength + 4);
iBeaconData.writeUInt16BE(major, uuidDataLength);
iBeaconData.writeUInt16BE(minor, uuidDataLength + 2);
iBeaconData.writeInt8(measuredPower, uuidDataLength + 4);

if (callback) {
this.once('advertisingStart', callback);
}
if (callback) {
this.once('advertisingStart', callback);
}

debug('iBeacon data = ' + iBeaconData.toString('hex'));

debug('iBeacon data = ' + iBeaconData.toString('hex'));
this._bindings.startAdvertisingIBeacon(iBeaconData);
}
}

this._bindings.startAdvertisingIBeacon(iBeaconData);
//if bindings still not init, do it now
if (!this.initialized) {
this._bindings.init();
this.initialized = true;
this.once('stateChange', advertise.bind(this));
}else{
advertise.call(this, this._state);
}
};

Expand All @@ -172,28 +209,42 @@ Bleno.prototype.startAdvertisingWithEIRData = function(advertisementData, scanDa
scanData = null;
}

if (this.state !== 'poweredOn') {
var error = new Error('Could not advertising scanning, state is ' + this.state + ' (not poweredOn)');
var advertise = function(state) {

if (typeof callback === 'function') {
callback(error);
if (state !== 'poweredOn') {
var error = new Error('Could not advertising scanning, state is ' + state + ' (not poweredOn)');

if (typeof callback === 'function') {
callback(error);
} else {
throw error;
}
} else {
throw error;
}
} else {
if (callback) {
this.once('advertisingStart', callback);
if (callback) {
this.once('advertisingStart', callback);
}

this._bindings.startAdvertisingWithEIRData(advertisementData, scanData);
}
}

this._bindings.startAdvertisingWithEIRData(advertisementData, scanData);
//if bindings still not init, do it now
if (!this.initialized) {
this._bindings.init();
this.initialized = true;
this.once('stateChange', advertise.bind(this));
}else{
advertise.call(this, this._state);
}
};

Bleno.prototype.stopAdvertising = function(callback) {
if (callback) {
this.once('advertisingStop', callback);
}
this._bindings.stopAdvertising();
if(this._bindings && this.initialized){
this._bindings.stopAdvertising();
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a few spots like this below, where an edge case exists. If the bindings are not initialized for whatever reason. The passed in callback would never be called.

Do we want to cover this case? I'm guessing something similar would happen before though ...

};

Bleno.prototype.onAdvertisingStop = function() {
Expand All @@ -205,7 +256,9 @@ Bleno.prototype.setServices = function(services, callback) {
if (callback) {
this.once('servicesSet', callback);
}
this._bindings.setServices(services);
if(this._bindings && this.initialized){
this._bindings.setServices(services);
}
};

Bleno.prototype.onServicesSet = function(error) {
Expand All @@ -220,7 +273,9 @@ Bleno.prototype.onServicesSet = function(error) {

Bleno.prototype.disconnect = function() {
debug('disconnect');
this._bindings.disconnect();
if(this._bindings && this.initialized){
this._bindings.disconnect();
}
};

Bleno.prototype.updateRssi = function(callback) {
Expand All @@ -230,7 +285,9 @@ Bleno.prototype.updateRssi = function(callback) {
});
}

this._bindings.updateRssi();
if(this._bindings && this.initialized){
this._bindings.updateRssi();
}
};

Bleno.prototype.onRssiUpdate = function(rssi) {
Expand Down