diff --git a/dist/index.cjs.js b/dist/index.cjs.js index 04048df..96fbe76 100644 --- a/dist/index.cjs.js +++ b/dist/index.cjs.js @@ -177,7 +177,7 @@ class Updater { let packet = this.file.slice(this._fileProgress, this._fileProgress + this._packetSize); this._fileProgress += this._packetSize; return new Promise((resolve, reject) => { - this.bleObject.write(this.bleDeviceId, this._updaterServiceUUID, this._updateFileCharacteristicUUID, packet.buffer, () => { + this.bleObject.writeWithoutResponse(this.bleDeviceId, this._updaterServiceUUID, this._updateFileCharacteristicUUID, packet.buffer, () => { resolve(true); }, (error) => { this._fileProgress -= this._packetSize; @@ -199,14 +199,14 @@ class Updater { // send a packet // check for error // write file length - return new Promise(async (resolve, reject) => { + return new Promise((resolve, reject) => { // start notify - this.bleObject.startNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, async (rawData) => { + this.bleObject.startNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, (rawData) => { let dataView = new Uint8Array(rawData); console.log(dataView); if (dataView[0] == 1) { // send file - await this.sendNextPacket(); + this.sendNextPacket(); progressCallback(`Sending (${Math.floor((this._fileProgress * 100) / this._fileSize)}%), ${this._fileProgress} / ${this._fileSize}`); } else if (dataView[0] == 2) { @@ -215,7 +215,7 @@ class Updater { if (this._fileProgress >= this._fileSize) { console.log("true"); // send agree - await this.sendEndCmd(true); + this.sendEndCmd(true); progressCallback(`Complete!`); this.bleObject.stopNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, () => { // success @@ -227,7 +227,7 @@ class Updater { else { console.log("False"); // send disagree - await this.sendEndCmd(false); + this.sendEndCmd(false); progressCallback(`Error, starting over: ${this._fileProgress} / ${this._fileSize}`); this._fileProgress = 0; } @@ -253,7 +253,7 @@ class Updater { const buffer = new ArrayBuffer(4); let view = new Int32Array(buffer); view[0] = this._fileSize; - await this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer); + this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer); }); } } diff --git a/dist/index.es.js b/dist/index.es.js index be84531..e34171a 100644 --- a/dist/index.es.js +++ b/dist/index.es.js @@ -175,7 +175,7 @@ class Updater { let packet = this.file.slice(this._fileProgress, this._fileProgress + this._packetSize); this._fileProgress += this._packetSize; return new Promise((resolve, reject) => { - this.bleObject.write(this.bleDeviceId, this._updaterServiceUUID, this._updateFileCharacteristicUUID, packet.buffer, () => { + this.bleObject.writeWithoutResponse(this.bleDeviceId, this._updaterServiceUUID, this._updateFileCharacteristicUUID, packet.buffer, () => { resolve(true); }, (error) => { this._fileProgress -= this._packetSize; @@ -197,14 +197,14 @@ class Updater { // send a packet // check for error // write file length - return new Promise(async (resolve, reject) => { + return new Promise((resolve, reject) => { // start notify - this.bleObject.startNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, async (rawData) => { + this.bleObject.startNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, (rawData) => { let dataView = new Uint8Array(rawData); console.log(dataView); if (dataView[0] == 1) { // send file - await this.sendNextPacket(); + this.sendNextPacket(); progressCallback(`Sending (${Math.floor((this._fileProgress * 100) / this._fileSize)}%), ${this._fileProgress} / ${this._fileSize}`); } else if (dataView[0] == 2) { @@ -213,7 +213,7 @@ class Updater { if (this._fileProgress >= this._fileSize) { console.log("true"); // send agree - await this.sendEndCmd(true); + this.sendEndCmd(true); progressCallback(`Complete!`); this.bleObject.stopNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, () => { // success @@ -225,7 +225,7 @@ class Updater { else { console.log("False"); // send disagree - await this.sendEndCmd(false); + this.sendEndCmd(false); progressCallback(`Error, starting over: ${this._fileProgress} / ${this._fileSize}`); this._fileProgress = 0; } @@ -251,7 +251,7 @@ class Updater { const buffer = new ArrayBuffer(4); let view = new Int32Array(buffer); view[0] = this._fileSize; - await this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer); + this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer); }); } } diff --git a/package.json b/package.json index 1004479..6de1c5a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "updaterweblibrary", - "version": "1.0.20", + "version": "1.0.21", "description": "OTA Updater App frontend library", "repository": { "type": "git",