Automatic Deployment [skip ci]

This commit is contained in:
thegecko
2020-05-10 09:32:00 +00:00
parent b2859220bd
commit 3d537a2745
13 changed files with 715 additions and 9 deletions

2
dist/secure-dfu.js vendored Normal file

File diff suppressed because one or more lines are too long

1
dist/secure-dfu.js.map vendored Normal file

File diff suppressed because one or more lines are too long

64
lib/dispatcher.js Normal file
View File

@@ -0,0 +1,64 @@
"use strict";
/*
* Web Bluetooth DFU
* Copyright (c) 2018 Rob Moran
*
* The MIT License (MIT)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
var events_1 = require("events");
/**
* @hidden
*/
var EventDispatcher = /** @class */ (function (_super) {
__extends(EventDispatcher, _super);
function EventDispatcher() {
return _super !== null && _super.apply(this, arguments) || this;
}
// tslint:disable-next-line:array-type
EventDispatcher.prototype.addEventListener = function (event, listener) {
return _super.prototype.addListener.call(this, event, listener);
};
// tslint:disable-next-line:array-type
EventDispatcher.prototype.removeEventListener = function (event, listener) {
return _super.prototype.removeListener.call(this, event, listener);
};
EventDispatcher.prototype.dispatchEvent = function (eventType, event) {
return _super.prototype.emit.call(this, eventType, event);
};
return EventDispatcher;
}(events_1.EventEmitter));
exports.EventDispatcher = EventDispatcher;
//# sourceMappingURL=dispatcher.js.map

1
lib/dispatcher.js.map Normal file
View File

@@ -0,0 +1 @@
{"version":3,"sources":["dispatcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;;;;;;;;;;;;;;;AAEF,iCAAsC;AAEtC;;GAEG;AACH;IAAqC,mCAAY;IAAjD;;IAeA,CAAC;IAbG,sCAAsC;IAC/B,0CAAgB,GAAvB,UAAwB,KAAsB,EAAE,QAAkC;QAC9E,OAAO,iBAAM,WAAW,YAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,sCAAsC;IAC/B,6CAAmB,GAA1B,UAA2B,KAAsB,EAAE,QAAkC;QACjF,OAAO,iBAAM,cAAc,YAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAEM,uCAAa,GAApB,UAAqB,SAA0B,EAAE,KAAW;QACxD,OAAO,iBAAM,IAAI,YAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IACL,sBAAC;AAAD,CAfA,AAeC,CAfoC,qBAAY,GAehD;AAfY,0CAAe","file":"dispatcher.js","sourcesContent":["/*\n* Web Bluetooth DFU\n* Copyright (c) 2018 Rob Moran\n*\n* The MIT License (MIT)\n*\n* Permission is hereby granted, free of charge, to any person obtaining a copy\n* of this software and associated documentation files (the \"Software\"), to deal\n* in the Software without restriction, including without limitation the rights\n* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n* copies of the Software, and to permit persons to whom the Software is\n* furnished to do so, subject to the following conditions:\n*\n* The above copyright notice and this permission notice shall be included in all\n* copies or substantial portions of the Software.\n*\n* THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n* SOFTWARE.\n*/\n\nimport { EventEmitter } from \"events\";\n\n/**\n * @hidden\n */\nexport class EventDispatcher extends EventEmitter {\n\n // tslint:disable-next-line:array-type\n public addEventListener(event: string | symbol, listener: (...args: any[]) => void) {\n return super.addListener(event, listener);\n }\n\n // tslint:disable-next-line:array-type\n public removeEventListener(event: string | symbol, listener: (...args: any[]) => void) {\n return super.removeListener(event, listener);\n }\n\n public dispatchEvent(eventType: string | symbol, event?: any) {\n return super.emit(eventType, event);\n }\n}\n"],"sourceRoot":"../src"}

29
lib/index.js Normal file
View File

@@ -0,0 +1,29 @@
"use strict";
/*
* Web Bluetooth DFU
* Copyright (c) 2018 Rob Moran
*
* The MIT License (MIT)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
var secure_dfu_1 = require("./secure-dfu");
module.exports = secure_dfu_1.SecureDfu;
//# sourceMappingURL=index.js.map

1
lib/index.js.map Normal file
View File

@@ -0,0 +1 @@
{"version":3,"sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AAEF,2CAAyC;AACzC,iBAAS,sBAAS,CAAC","file":"index.js","sourcesContent":["/*\n* Web Bluetooth DFU\n* Copyright (c) 2018 Rob Moran\n*\n* The MIT License (MIT)\n*\n* Permission is hereby granted, free of charge, to any person obtaining a copy\n* of this software and associated documentation files (the \"Software\"), to deal\n* in the Software without restriction, including without limitation the rights\n* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n* copies of the Software, and to permit persons to whom the Software is\n* furnished to do so, subject to the following conditions:\n*\n* The above copyright notice and this permission notice shall be included in all\n* copies or substantial portions of the Software.\n*\n* THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n* SOFTWARE.\n*/\n\nimport { SecureDfu } from \"./secure-dfu\";\nexport = SecureDfu;\n"],"sourceRoot":"../src"}

504
lib/secure-dfu.js Normal file
View File

@@ -0,0 +1,504 @@
"use strict";
/*
* Web Bluetooth DFU
* Copyright (c) 2018 Rob Moran
*
* The MIT License (MIT)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
var __assign = (this && this.__assign) || function () {
__assign = Object.assign || function(t) {
for (var s, i = 1, n = arguments.length; i < n; i++) {
s = arguments[i];
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
t[p] = s[p];
}
return t;
};
return __assign.apply(this, arguments);
};
Object.defineProperty(exports, "__esModule", { value: true });
var dispatcher_1 = require("./dispatcher");
var CONTROL_UUID = "8ec90001-f315-4f60-9fb8-838830daea50";
var PACKET_UUID = "8ec90002-f315-4f60-9fb8-838830daea50";
var BUTTON_UUID = "8ec90003-f315-4f60-9fb8-838830daea50";
var LITTLE_ENDIAN = true;
var PACKET_SIZE = 20;
var OPERATIONS = {
BUTTON_COMMAND: [0x01],
CREATE_COMMAND: [0x01, 0x01],
CREATE_DATA: [0x01, 0x02],
RECEIPT_NOTIFICATIONS: [0x02],
CACULATE_CHECKSUM: [0x03],
EXECUTE: [0x04],
SELECT_COMMAND: [0x06, 0x01],
SELECT_DATA: [0x06, 0x02],
RESPONSE: [0x60, 0x20]
};
var RESPONSE = {
// Invalid code
0x00: "Invalid opcode",
// Success
0x01: "Operation successful",
// Opcode not supported
0x02: "Opcode not supported",
// Invalid parameter
0x03: "Missing or invalid parameter value",
// Insufficient resources
0x04: "Not enough memory for the data object",
// Invalid object
0x05: "Data object does not match the firmware and hardware requirements, the signature is wrong, or parsing the command failed",
// Unsupported type
0x07: "Not a valid object type for a Create request",
// Operation not permitted
0x08: "The state of the DFU process does not allow this operation",
// Operation failed
0x0A: "Operation failed",
// Extended error
0x0B: "Extended error"
};
var EXTENDED_ERROR = {
// No error
0x00: "No extended error code has been set. This error indicates an implementation problem",
// Invalid error code
0x01: "Invalid error code. This error code should never be used outside of development",
// Wrong command format
0x02: "The format of the command was incorrect",
// Unknown command
0x03: "The command was successfully parsed, but it is not supported or unknown",
// Init command invalid
0x04: "The init command is invalid. The init packet either has an invalid update type or it is missing required fields for the update type",
// Firmware version failure
0x05: "The firmware version is too low. For an application, the version must be greater than the current application. For a bootloader, it must be greater than or equal to the current version",
// Hardware version failure
0x06: "The hardware version of the device does not match the required hardware version for the update",
// Softdevice version failure
0x07: "The array of supported SoftDevices for the update does not contain the FWID of the current SoftDevice",
// Signature missing
0x08: "The init packet does not contain a signature",
// Wrong hash type
0x09: "The hash type that is specified by the init packet is not supported by the DFU bootloader",
// Hash failed
0x0A: "The hash of the firmware image cannot be calculated",
// Wrong signature type
0x0B: "The type of the signature is unknown or not supported by the DFU bootloader",
// Verification failed
0x0C: "The hash of the received firmware image does not match the hash in the init packet",
// Insufficient space
0x0D: "The available space on the device is insufficient to hold the firmware"
};
/**
* Secure Device Firmware Update class
*/
var SecureDfu = /** @class */ (function (_super) {
__extends(SecureDfu, _super);
/**
* Characteristic constructor
* @param bluetooth A bluetooth instance
* @param crc32 A CRC32 function
* @param delay Milliseconds of delay between packets
*/
function SecureDfu(crc32, bluetooth, delay) {
if (delay === void 0) { delay = 0; }
var _this = _super.call(this) || this;
_this.crc32 = crc32;
_this.bluetooth = bluetooth;
_this.delay = delay;
_this.DEFAULT_UUIDS = {
service: SecureDfu.SERVICE_UUID,
button: BUTTON_UUID,
control: CONTROL_UUID,
packet: PACKET_UUID
};
_this.notifyFns = {};
_this.controlChar = null;
_this.packetChar = null;
if (!_this.bluetooth && window && window.navigator && window.navigator.bluetooth) {
_this.bluetooth = navigator.bluetooth;
}
return _this;
}
SecureDfu.prototype.log = function (message) {
this.dispatchEvent(SecureDfu.EVENT_LOG, {
message: message
});
};
SecureDfu.prototype.progress = function (bytes) {
this.dispatchEvent(SecureDfu.EVENT_PROGRESS, {
object: "unknown",
totalBytes: 0,
currentBytes: bytes
});
};
SecureDfu.prototype.connect = function (device) {
var _this = this;
device.addEventListener("gattserverdisconnected", function () {
_this.notifyFns = {};
_this.controlChar = null;
_this.packetChar = null;
});
return this.gattConnect(device)
.then(function (characteristics) {
_this.log("found " + characteristics.length + " characteristic(s)");
_this.packetChar = characteristics.find(function (characteristic) {
return (characteristic.uuid === PACKET_UUID);
});
if (!_this.packetChar)
throw new Error("Unable to find packet characteristic");
_this.log("found packet characteristic");
_this.controlChar = characteristics.find(function (characteristic) {
return (characteristic.uuid === CONTROL_UUID);
});
if (!_this.controlChar)
throw new Error("Unable to find control characteristic");
_this.log("found control characteristic");
if (!_this.controlChar.properties.notify && !_this.controlChar.properties.indicate) {
throw new Error("Control characteristic does not allow notifications");
}
return _this.controlChar.startNotifications();
})
.then(function () {
_this.controlChar.addEventListener("characteristicvaluechanged", _this.handleNotification.bind(_this));
_this.log("enabled control notifications");
return device;
});
};
SecureDfu.prototype.gattConnect = function (device, serviceUUID) {
var _this = this;
if (serviceUUID === void 0) { serviceUUID = SecureDfu.SERVICE_UUID; }
return Promise.resolve()
.then(function () {
if (device.gatt.connected)
return device.gatt;
return device.gatt.connect();
})
.then(function (server) {
_this.log("connected to gatt server");
return server.getPrimaryService(serviceUUID)
.catch(function () {
throw new Error("Unable to find DFU service");
});
})
.then(function (service) {
_this.log("found DFU service");
return service.getCharacteristics();
});
};
SecureDfu.prototype.handleNotification = function (event) {
var view = event.target.value;
if (OPERATIONS.RESPONSE.indexOf(view.getUint8(0)) < 0) {
throw new Error("Unrecognised control characteristic response notification");
}
var operation = view.getUint8(1);
if (this.notifyFns[operation]) {
var result = view.getUint8(2);
var error = null;
if (result === 0x01) {
var data = new DataView(view.buffer, 3);
this.notifyFns[operation].resolve(data);
}
else if (result === 0x0B) {
var code = view.getUint8(3);
error = "Error: " + EXTENDED_ERROR[code];
}
else {
error = "Error: " + RESPONSE[result];
}
if (error) {
this.log("notify: " + error);
this.notifyFns[operation].reject(error);
}
delete this.notifyFns[operation];
}
};
SecureDfu.prototype.sendOperation = function (characteristic, operation, buffer) {
var _this = this;
return new Promise(function (resolve, reject) {
var size = operation.length;
if (buffer)
size += buffer.byteLength;
var value = new Uint8Array(size);
value.set(operation);
if (buffer) {
var data = new Uint8Array(buffer);
value.set(data, operation.length);
}
_this.notifyFns[operation[0]] = {
resolve: resolve,
reject: reject
};
characteristic.writeValue(value)
.catch(function (e) {
_this.log(e);
return Promise.resolve()
.then(function () { return _this.delayPromise(500); })
// Retry once
.then(function () { return characteristic.writeValue(value); });
});
});
};
SecureDfu.prototype.sendControl = function (operation, buffer) {
var _this = this;
return new Promise(function (resolve) {
_this.sendOperation(_this.controlChar, operation, buffer)
.then(function (resp) {
setTimeout(function () { return resolve(resp); }, _this.delay);
});
});
};
SecureDfu.prototype.transferInit = function (buffer) {
return this.transfer(buffer, "init", OPERATIONS.SELECT_COMMAND, OPERATIONS.CREATE_COMMAND);
};
SecureDfu.prototype.transferFirmware = function (buffer) {
return this.transfer(buffer, "firmware", OPERATIONS.SELECT_DATA, OPERATIONS.CREATE_DATA);
};
SecureDfu.prototype.transfer = function (buffer, type, selectType, createType) {
var _this = this;
return this.sendControl(selectType)
.then(function (response) {
var maxSize = response.getUint32(0, LITTLE_ENDIAN);
var offset = response.getUint32(4, LITTLE_ENDIAN);
var crc = response.getInt32(8, LITTLE_ENDIAN);
if (type === "init" && offset === buffer.byteLength && _this.checkCrc(buffer, crc)) {
_this.log("init packet already available, skipping transfer");
return;
}
_this.progress = function (bytes) {
_this.dispatchEvent(SecureDfu.EVENT_PROGRESS, {
object: type,
totalBytes: buffer.byteLength,
currentBytes: bytes
});
};
_this.progress(0);
return _this.transferObject(buffer, createType, maxSize, offset);
});
};
SecureDfu.prototype.transferObject = function (buffer, createType, maxSize, offset) {
var _this = this;
var start = offset - offset % maxSize;
var end = Math.min(start + maxSize, buffer.byteLength);
var view = new DataView(new ArrayBuffer(4));
view.setUint32(0, end - start, LITTLE_ENDIAN);
return this.sendControl(createType, view.buffer)
.then(function () {
var data = buffer.slice(start, end);
return _this.transferData(data, start);
})
.then(function () {
return _this.sendControl(OPERATIONS.CACULATE_CHECKSUM);
})
.then(function (response) {
var crc = response.getInt32(4, LITTLE_ENDIAN);
var transferred = response.getUint32(0, LITTLE_ENDIAN);
var data = buffer.slice(0, transferred);
if (_this.checkCrc(data, crc)) {
_this.log("written " + transferred + " bytes");
offset = transferred;
return _this.sendControl(OPERATIONS.EXECUTE);
}
else {
_this.log("object failed to validate");
}
})
.then(function () {
if (end < buffer.byteLength) {
return _this.transferObject(buffer, createType, maxSize, offset);
}
else {
_this.log("transfer complete");
}
});
};
SecureDfu.prototype.transferData = function (data, offset, start) {
var _this = this;
start = start || 0;
var end = Math.min(start + PACKET_SIZE, data.byteLength);
var packet = data.slice(start, end);
return this.packetChar.writeValue(packet)
.then(function () { return _this.delayPromise(_this.delay); })
.then(function () {
_this.progress(offset + end);
if (end < data.byteLength) {
return _this.transferData(data, offset, end);
}
});
};
SecureDfu.prototype.checkCrc = function (buffer, crc) {
if (!this.crc32) {
this.log("crc32 not found, skipping CRC check");
return true;
}
return crc === this.crc32(new Uint8Array(buffer));
};
SecureDfu.prototype.delayPromise = function (delay) {
return new Promise(function (resolve) {
setTimeout(resolve, delay);
});
};
/**
* Scans for a device to update
* @param buttonLess Scans for all devices and will automatically call `setDfuMode`
* @param filters Alternative filters to use when scanning
* @param uuids Optional alternative uuids for service, control, packet or button
* @returns Promise containing the device
*/
SecureDfu.prototype.requestDevice = function (buttonLess, filters, uuids) {
var _this = this;
if (uuids === void 0) { uuids = this.DEFAULT_UUIDS; }
uuids = __assign(__assign({}, this.DEFAULT_UUIDS), uuids);
if (!buttonLess && !filters) {
filters = [{ services: [uuids.service] }];
}
var options = {
optionalServices: [uuids.service]
};
if (filters)
options.filters = filters;
else
options.acceptAllDevices = true;
return this.bluetooth.requestDevice(options)
.then(function (device) {
if (buttonLess) {
return _this.setDfuMode(device, uuids);
}
return device;
});
};
/**
* Sets the DFU mode of a device, preparing it for update
* @param device The device to switch mode
* @param uuids Optional alternative uuids for control, packet or button
* @returns Promise containing the device if it is still on a valid state
*/
SecureDfu.prototype.setDfuMode = function (device, uuids) {
var _this = this;
if (uuids === void 0) { uuids = this.DEFAULT_UUIDS; }
uuids = __assign(__assign({}, this.DEFAULT_UUIDS), uuids);
return this.gattConnect(device, uuids.service)
.then(function (characteristics) {
_this.log("found " + characteristics.length + " characteristic(s)");
var controlChar = characteristics.find(function (characteristic) {
return (characteristic.uuid === uuids.control);
});
var packetChar = characteristics.find(function (characteristic) {
return (characteristic.uuid === uuids.packet);
});
if (controlChar && packetChar) {
return device;
}
var buttonChar = characteristics.find(function (characteristic) {
return (characteristic.uuid === uuids.button);
});
if (!buttonChar) {
throw new Error("Unsupported device");
}
// Support buttonless devices
_this.log("found buttonless characteristic");
if (!buttonChar.properties.notify && !buttonChar.properties.indicate) {
throw new Error("Buttonless characteristic does not allow notifications");
}
return new Promise(function (resolve, _reject) {
function complete() {
this.notifyFns = {};
// Resolve with null device as it needs reconnecting
resolve(null);
}
buttonChar.startNotifications()
.then(function () {
_this.log("enabled buttonless notifications");
device.addEventListener("gattserverdisconnected", complete.bind(_this));
buttonChar.addEventListener("characteristicvaluechanged", _this.handleNotification.bind(_this));
return _this.sendOperation(buttonChar, OPERATIONS.BUTTON_COMMAND);
})
.then(function () {
_this.log("sent DFU mode");
complete();
});
});
});
};
/**
* Updates a device
* @param device The device to switch mode
* @param init The initialisation packet to send
* @param firmware The firmware to update
* @returns Promise containing the device
*/
SecureDfu.prototype.update = function (device, init, firmware) {
var _this = this;
return new Promise(function (resolve, reject) {
if (!device)
return reject("Device not specified");
if (!init)
return reject("Init not specified");
if (!firmware)
return reject("Firmware not specified");
_this.connect(device)
.then(function () {
_this.log("transferring init");
return _this.transferInit(init);
})
.then(function () {
_this.log("transferring firmware");
return _this.transferFirmware(firmware);
})
.then(function () {
_this.log("complete, disconnecting...");
device.addEventListener("gattserverdisconnected", function () {
_this.log("disconnected");
resolve(device);
});
})
.catch(function (error) { return reject(error); });
});
};
/**
* DFU Service unique identifier
*/
SecureDfu.SERVICE_UUID = 0xFE59;
/**
* Log event
* @event
*/
SecureDfu.EVENT_LOG = "log";
/**
* Progress event
* @event
*/
SecureDfu.EVENT_PROGRESS = "progress";
return SecureDfu;
}(dispatcher_1.EventDispatcher));
exports.SecureDfu = SecureDfu;
//# sourceMappingURL=secure-dfu.js.map

1
lib/secure-dfu.js.map Normal file

File diff suppressed because one or more lines are too long

12
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "web-bluetooth-dfu",
"version": "1.2.0",
"version": "1.2.1-next.b285922.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -1191,8 +1191,7 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true,
"optional": true
"dev": true
},
"constants-browserify": {
"version": "1.0.0",
@@ -3365,7 +3364,6 @@
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
"integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -3610,8 +3608,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
"dev": true,
"optional": true
"dev": true
},
"npm-packlist": {
"version": "1.4.8",
@@ -5571,8 +5568,7 @@
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
"dev": true,
"optional": true
"dev": true
},
"yargs": {
"version": "7.1.0",

View File

@@ -1,6 +1,6 @@
{
"name": "web-bluetooth-dfu",
"version": "1.2.0",
"version": "1.2.1-next.b285922.0",
"description": "Device firmware update with Web Bluetooth",
"homepage": "https://thegecko.github.io/web-bluetooth-dfu/",
"author": "Rob Moran <github@thegecko.org>",

10
types/dispatcher.d.ts vendored Normal file
View File

@@ -0,0 +1,10 @@
/// <reference types="node" />
import { EventEmitter } from "events";
/**
* @hidden
*/
export declare class EventDispatcher extends EventEmitter {
addEventListener(event: string | symbol, listener: (...args: any[]) => void): this;
removeEventListener(event: string | symbol, listener: (...args: any[]) => void): this;
dispatchEvent(eventType: string | symbol, event?: any): boolean;
}

2
types/index.d.ts vendored Normal file
View File

@@ -0,0 +1,2 @@
import { SecureDfu } from "./secure-dfu";
export = SecureDfu;

95
types/secure-dfu.d.ts vendored Normal file
View File

@@ -0,0 +1,95 @@
/// <reference types="web-bluetooth" />
import { EventDispatcher } from "./dispatcher";
/**
* BluetoothLE Scan Filter Init interface
*/
export interface BluetoothLEScanFilterInit {
/**
* An array of service UUIDs to filter on
*/
services?: Array<string | number>;
/**
* The device name to filter on
*/
name?: string;
/**
* The device name prefix to filter on
*/
namePrefix?: string;
}
export interface UuidOptions {
service?: number | string;
button?: number | string;
control?: number | string;
packet?: number | string;
}
/**
* Secure Device Firmware Update class
*/
export declare class SecureDfu extends EventDispatcher {
private crc32;
private bluetooth?;
private delay;
/**
* DFU Service unique identifier
*/
static SERVICE_UUID: number;
/**
* Log event
* @event
*/
static EVENT_LOG: string;
/**
* Progress event
* @event
*/
static EVENT_PROGRESS: string;
private DEFAULT_UUIDS;
private notifyFns;
private controlChar;
private packetChar;
/**
* Characteristic constructor
* @param bluetooth A bluetooth instance
* @param crc32 A CRC32 function
* @param delay Milliseconds of delay between packets
*/
constructor(crc32: (data: Array<number> | Uint8Array, seed?: number) => number, bluetooth?: Bluetooth, delay?: number);
private log;
private progress;
private connect;
private gattConnect;
private handleNotification;
private sendOperation;
private sendControl;
private transferInit;
private transferFirmware;
private transfer;
private transferObject;
private transferData;
private checkCrc;
private delayPromise;
/**
* Scans for a device to update
* @param buttonLess Scans for all devices and will automatically call `setDfuMode`
* @param filters Alternative filters to use when scanning
* @param uuids Optional alternative uuids for service, control, packet or button
* @returns Promise containing the device
*/
requestDevice(buttonLess: boolean, filters: Array<BluetoothLEScanFilterInit>, uuids?: UuidOptions): Promise<BluetoothDevice>;
/**
* Sets the DFU mode of a device, preparing it for update
* @param device The device to switch mode
* @param uuids Optional alternative uuids for control, packet or button
* @returns Promise containing the device if it is still on a valid state
*/
setDfuMode(device: BluetoothDevice, uuids?: UuidOptions): Promise<BluetoothDevice>;
/**
* Updates a device
* @param device The device to switch mode
* @param init The initialisation packet to send
* @param firmware The firmware to update
* @returns Promise containing the device
*/
update(device: BluetoothDevice, init: ArrayBuffer, firmware: ArrayBuffer): Promise<BluetoothDevice>;
}