(1.1.0) successful file transfer

dist/index.cjs.js

@@ -8,15 +8,21 @@ class Updater {
     feedType;
     bleObject;
     bleDeviceId;
-    _updaterServiceUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e56193b";
+    _updaterServiceUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e561900";
-    _updaterVersionCharactersiticUUID = "1978a3df-c009-4837-b295-57ef429dde8c";
+    _updaterVersionCharactersiticUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e561910";
+    _updaterCommandCharacterisitcUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e561920";
+    _updateFileCharacteristicUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e561930";
     file;
-    constructor(archiveURL = "/", feedType = "atom", bleObject) {
+    _fileSize;
+    _fileProgress = 0;
+    _packetSize;
+    constructor(archiveURL = "/", feedType = "atom", bleObject, packetSize = 512) {
         this.archiveURL = archiveURL;
         this.feedType = feedType;
         if (bleObject) {
             this.bleObject = bleObject;
         }
+        this._packetSize = packetSize;
     }
     /*
     FEEDS
@@ -154,9 +160,10 @@ class Updater {
     */
     async getFirmware(version) {
         try {
-            const res = await fetch(`${this.archiveURL}/download/${version.title}/firmware.bin`);
+            const res = await fetch(`http://cors.emaker.limited/?url=${this.archiveURL}/download/${version.title}/firmware.bin`);
             let buf = await res.arrayBuffer();
             this.file = new Int8Array(buf);
+            this._fileSize = this.file.byteLength;
             return true;
         }
         catch {
@@ -164,7 +171,97 @@ class Updater {
         }
     }
     getFileSize() {
-        return this.file.byteLength;
+        return this._fileSize;
+    }
+    async sendNextPacket() {
+        let packet = this.file.slice(this._fileProgress, this._fileProgress + this._packetSize);
+        // this._fileProgress += this._packetSize;
+        return new Promise((resolve, reject) => {
+            this.bleObject.writeWithoutResponse(this.bleDeviceId, this._updaterServiceUUID, this._updateFileCharacteristicUUID, packet.buffer, () => {
+                console.log(`Sent: ${packet}, progress: ${this._fileProgress}`);
+                resolve(true);
+            }, (error) => {
+                this._fileProgress -= this._packetSize;
+                reject(error);
+            });
+        });
+    }
+    async sendEndCmd(agree) {
+        const buffer = new ArrayBuffer(1);
+        let view = new Int8Array(buffer);
+        view[0] = agree ? 3 : 4;
+        await this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer);
+        return;
+    }
+    // start and autoconnect before you run this function, so that you can have an "uninterrupted" connection when the board reboots
+    async flashFirmware(progressCallback) {
+        // write filesize to board
+        // await notify from cmd - ready
+        // send a packet
+        // check for error
+        // write file length
+        return new Promise(async (resolve, reject) => {
+            // set mtu
+            this._packetSize = await this.bleObject.withPromises.requestMtu(this.bleDeviceId, this._packetSize);
+            // start notify
+            this.bleObject.startNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, (rawData) => {
+                let dataView = new Uint8Array(rawData);
+                console.log(dataView);
+                if (dataView[0] == 1 && dataView.length == 1) {
+                    // send file
+                    this.sendNextPacket();
+                    progressCallback(`MTU: ${this._packetSize}; Sending (${Math.floor((this._fileProgress * 100) / this._fileSize)}%), ${this._fileProgress} / ${this._fileSize}`);
+                }
+                else if (dataView[0] == 2 && dataView.length == 1) {
+                    // done logic
+                    console.log(`progress >= filesize: ${this._fileProgress} vs ${this._fileSize}`);
+                    if (this._fileProgress >= (this._fileSize - this._packetSize)) {
+                        console.log("true");
+                        // send agree
+                        this.sendEndCmd(true);
+                        progressCallback(`Complete!`);
+                        this.bleObject.stopNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, () => {
+                            // success
+                            resolve(true);
+                        }, (error) => {
+                            reject("Error: Failed to stop notify");
+                        });
+                    }
+                    else {
+                        console.log("False");
+                        // send disagree
+                        this.sendEndCmd(false);
+                        progressCallback(`Error, starting over: ${this._fileProgress} / ${this._fileSize}`);
+                        this._fileProgress = 0;
+                    }
+                }
+                else if (dataView[0] == 15 && dataView.length == 1) {
+                    // error cmd
+                    progressCallback(`Error on remote: ${this._fileProgress} / ${this._fileSize}`);
+                    reject("Error on remote");
+                }
+                else if (dataView[0] == 0 && dataView.length == 1) {
+                    // ignore no command
+                    progressCallback(`Board is on`);
+                }
+                else {
+                    // should be the file progress
+                    let fileProgressView = new Uint32Array(rawData);
+                    this._fileProgress = (dataView[3] << 24) |
+                        (dataView[2] << 16) |
+                        (dataView[1] << 8) | dataView[0];
+                    this.sendNextPacket();
+                    progressCallback(`Recieved progress ${fileProgressView[0]}; Sending (${Math.floor((this._fileProgress * 100) / this._fileSize)}%), ${this._fileProgress} / ${this._fileSize}`);
+                }
+            }, (error) => {
+                reject("Error: Failed to start notify");
+                console.error(error);
+            });
+            const buffer = new ArrayBuffer(4);
+            let view = new Int32Array(buffer);
+            view[0] = this._fileSize;
+            this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer);
+        });
     }
 }
 

dist/index.d.ts

@@ -11,8 +11,13 @@ export default class Updater {
     protected bleDeviceId: string;
     private readonly _updaterServiceUUID;
     private readonly _updaterVersionCharactersiticUUID;
+    private readonly _updaterCommandCharacterisitcUUID;
+    private readonly _updateFileCharacteristicUUID;
     file: Int8Array;
-    constructor(archiveURL?: string, feedType?: string, bleObject?: BLECentralPlugin.BLECentralPluginStatic);
+    private _fileSize;
+    private _fileProgress;
+    private _packetSize;
+    constructor(archiveURL?: string, feedType?: string, bleObject?: BLECentralPlugin.BLECentralPluginStatic, packetSize?: number);
     private getRawArchive;
     private atomGetVersionDetails;
     private atomGetArchive;
@@ -27,4 +32,7 @@ export default class Updater {
     getBoardVersion(): Promise<string>;
     getFirmware(version: versionNotes): Promise<boolean>;
     getFileSize(): number;
+    private sendNextPacket;
+    private sendEndCmd;
+    flashFirmware(progressCallback: (message: string) => void): Promise<boolean>;
 }

dist/index.es.js

@@ -6,15 +6,21 @@ class Updater {
     feedType;
     bleObject;
     bleDeviceId;
-    _updaterServiceUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e56193b";
+    _updaterServiceUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e561900";
-    _updaterVersionCharactersiticUUID = "1978a3df-c009-4837-b295-57ef429dde8c";
+    _updaterVersionCharactersiticUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e561910";
+    _updaterCommandCharacterisitcUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e561920";
+    _updateFileCharacteristicUUID = "71a4438e-fd52-4b15-b3d2-ec0e3e561930";
     file;
-    constructor(archiveURL = "/", feedType = "atom", bleObject) {
+    _fileSize;
+    _fileProgress = 0;
+    _packetSize;
+    constructor(archiveURL = "/", feedType = "atom", bleObject, packetSize = 512) {
         this.archiveURL = archiveURL;
         this.feedType = feedType;
         if (bleObject) {
             this.bleObject = bleObject;
         }
+        this._packetSize = packetSize;
     }
     /*
     FEEDS
@@ -152,9 +158,10 @@ class Updater {
     */
     async getFirmware(version) {
         try {
-            const res = await fetch(`${this.archiveURL}/download/${version.title}/firmware.bin`);
+            const res = await fetch(`http://cors.emaker.limited/?url=${this.archiveURL}/download/${version.title}/firmware.bin`);
             let buf = await res.arrayBuffer();
             this.file = new Int8Array(buf);
+            this._fileSize = this.file.byteLength;
             return true;
         }
         catch {
@@ -162,7 +169,97 @@ class Updater {
         }
     }
     getFileSize() {
-        return this.file.byteLength;
+        return this._fileSize;
+    }
+    async sendNextPacket() {
+        let packet = this.file.slice(this._fileProgress, this._fileProgress + this._packetSize);
+        // this._fileProgress += this._packetSize;
+        return new Promise((resolve, reject) => {
+            this.bleObject.writeWithoutResponse(this.bleDeviceId, this._updaterServiceUUID, this._updateFileCharacteristicUUID, packet.buffer, () => {
+                console.log(`Sent: ${packet}, progress: ${this._fileProgress}`);
+                resolve(true);
+            }, (error) => {
+                this._fileProgress -= this._packetSize;
+                reject(error);
+            });
+        });
+    }
+    async sendEndCmd(agree) {
+        const buffer = new ArrayBuffer(1);
+        let view = new Int8Array(buffer);
+        view[0] = agree ? 3 : 4;
+        await this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer);
+        return;
+    }
+    // start and autoconnect before you run this function, so that you can have an "uninterrupted" connection when the board reboots
+    async flashFirmware(progressCallback) {
+        // write filesize to board
+        // await notify from cmd - ready
+        // send a packet
+        // check for error
+        // write file length
+        return new Promise(async (resolve, reject) => {
+            // set mtu
+            this._packetSize = await this.bleObject.withPromises.requestMtu(this.bleDeviceId, this._packetSize);
+            // start notify
+            this.bleObject.startNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, (rawData) => {
+                let dataView = new Uint8Array(rawData);
+                console.log(dataView);
+                if (dataView[0] == 1 && dataView.length == 1) {
+                    // send file
+                    this.sendNextPacket();
+                    progressCallback(`MTU: ${this._packetSize}; Sending (${Math.floor((this._fileProgress * 100) / this._fileSize)}%), ${this._fileProgress} / ${this._fileSize}`);
+                }
+                else if (dataView[0] == 2 && dataView.length == 1) {
+                    // done logic
+                    console.log(`progress >= filesize: ${this._fileProgress} vs ${this._fileSize}`);
+                    if (this._fileProgress >= (this._fileSize - this._packetSize)) {
+                        console.log("true");
+                        // send agree
+                        this.sendEndCmd(true);
+                        progressCallback(`Complete!`);
+                        this.bleObject.stopNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, () => {
+                            // success
+                            resolve(true);
+                        }, (error) => {
+                            reject("Error: Failed to stop notify");
+                        });
+                    }
+                    else {
+                        console.log("False");
+                        // send disagree
+                        this.sendEndCmd(false);
+                        progressCallback(`Error, starting over: ${this._fileProgress} / ${this._fileSize}`);
+                        this._fileProgress = 0;
+                    }
+                }
+                else if (dataView[0] == 15 && dataView.length == 1) {
+                    // error cmd
+                    progressCallback(`Error on remote: ${this._fileProgress} / ${this._fileSize}`);
+                    reject("Error on remote");
+                }
+                else if (dataView[0] == 0 && dataView.length == 1) {
+                    // ignore no command
+                    progressCallback(`Board is on`);
+                }
+                else {
+                    // should be the file progress
+                    let fileProgressView = new Uint32Array(rawData);
+                    this._fileProgress = (dataView[3] << 24) |
+                        (dataView[2] << 16) |
+                        (dataView[1] << 8) | dataView[0];
+                    this.sendNextPacket();
+                    progressCallback(`Recieved progress ${fileProgressView[0]}; Sending (${Math.floor((this._fileProgress * 100) / this._fileSize)}%), ${this._fileProgress} / ${this._fileSize}`);
+                }
+            }, (error) => {
+                reject("Error: Failed to start notify");
+                console.error(error);
+            });
+            const buffer = new ArrayBuffer(4);
+            let view = new Int32Array(buffer);
+            view[0] = this._fileSize;
+            this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer);
+        });
     }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "updaterweblibrary",
-  "version": "1.0.12",
+  "version": "1.1.0",
   "description": "OTA Updater App frontend library",
   "repository": {
     "type": "git",

src/index.ts

@@ -2,10 +2,10 @@
 import { parseXml, XmlDocument, XmlElement, XmlText } from "@rgrove/parse-xml";
 
 export type versionNotes = {
-    title: string;
+        title: string;
-    date: Date | string;
+        date: Date | string;
-    link: string;
+        link: string;
-    html: string;
+        html: string;
 }
 
 export default class Updater {
@@ -15,19 +15,26 @@ export default class Updater {
         public bleObject: BLECentralPlugin.BLECentralPluginStatic;
         protected bleDeviceId: string;
 
-        private readonly _updaterServiceUUID: string = "71a4438e-fd52-4b15-b3d2-ec0e3e56193b";
+        private readonly _updaterServiceUUID: string = "71a4438e-fd52-4b15-b3d2-ec0e3e561900";
-        private readonly _updaterVersionCharactersiticUUID: string = "1978a3df-c009-4837-b295-57ef429dde8c";
+        private readonly _updaterVersionCharactersiticUUID: string = "71a4438e-fd52-4b15-b3d2-ec0e3e561910";
+        private readonly _updaterCommandCharacterisitcUUID: string = "71a4438e-fd52-4b15-b3d2-ec0e3e561920";
+        private readonly _updateFileCharacteristicUUID: string = "71a4438e-fd52-4b15-b3d2-ec0e3e561930";
 
         public file: Int8Array;
+        private _fileSize: number;
+        private _fileProgress: number = 0;
+        
+        private _packetSize: number;
 
-        constructor(archiveURL: string = "/", feedType: string = "atom", bleObject?: BLECentralPlugin.BLECentralPluginStatic) {
+        constructor(archiveURL: string = "/", feedType: string = "atom", bleObject?: BLECentralPlugin.BLECentralPluginStatic, packetSize: number = 512) {
                 this.archiveURL = archiveURL;
                 this.feedType = feedType;
                 if (bleObject) {
                         this.bleObject = bleObject;
                 }
+                this._packetSize = packetSize;
         }
-        
+
         /*
         FEEDS
         */
@@ -42,7 +49,7 @@ export default class Updater {
 
         // atom feeds 
         private atomGetVersionDetails(entry: XmlElement): versionNotes {
-                let outEntry: versionNotes = {title: "", date: new Date, link: "", html: ""};
+                let outEntry: versionNotes = { title: "", date: new Date, link: "", html: "" };
                 entry.children.forEach((elm) => {
                         let element = elm as XmlElement;
                         if (element.name == "title") {
@@ -54,7 +61,7 @@ export default class Updater {
                         else if (element.name == "link") {
                                 outEntry.link = element.attributes["href"];
                         } else if (element.name == "content") {
-                                outEntry.html = (element.children[0] as XmlText).text; 
+                                outEntry.html = (element.children[0] as XmlText).text;
                         }
                 })
 
@@ -80,7 +87,7 @@ export default class Updater {
 
         // rss feeds
         private rssGetVersionDetails(entry: XmlElement): versionNotes {
-                let outEntry: versionNotes = {title: "", date: new Date, link: "", html: ""};
+                let outEntry: versionNotes = { title: "", date: new Date, link: "", html: "" };
                 entry.children.forEach((elm) => {
                         let element = elm as XmlElement;
                         if (element.name == "title") {
@@ -92,7 +99,7 @@ export default class Updater {
                         else if (element.name == "link") {
                                 outEntry.link = (element.children[0] as XmlText).text;
                         } else if (element.name == "content") {
-                                outEntry.html = (element.children[0] as XmlText).text; 
+                                outEntry.html = (element.children[0] as XmlText).text;
                         }
                 })
 
@@ -114,11 +121,11 @@ export default class Updater {
                 })
                 return output;
         }
-        
+
         public async getArchive(): Promise<versionNotes[]> {
                 if (this.feedType == "atom") {
                         return this.atomGetArchive()
-                } else if (this.feedType == "rss"){
+                } else if (this.feedType == "rss") {
                         return this.rssGetArchive()
                 }
         }
@@ -138,16 +145,17 @@ export default class Updater {
         private async readVersionNumber(): Promise<string> {
                 return new Promise((resolve, reject) => {
                         this.bleObject.read(
-                        this.bleDeviceId, 
+                                this.bleDeviceId,
-                        this._updaterServiceUUID, 
+                                this._updaterServiceUUID,
-                        this._updaterVersionCharactersiticUUID, 
+                                this._updaterVersionCharactersiticUUID,
-                        (rawData: ArrayBuffer) => {
+                                (rawData: ArrayBuffer) => {
-                                resolve(this.bytesToString(rawData));
+                                        resolve(this.bytesToString(rawData));
-                        },
+                                },
-                        (error: string) => {
+                                (error: string) => {
-                                reject(`Error: ${error}`);
+                                        reject(`Error: ${error}`);
-                        }
+                                }
-                )});
+                        )
+                });
         }
 
         private async getLatestVersion(): Promise<string> {
@@ -169,7 +177,7 @@ export default class Updater {
                 // compare with latest version
                 const latestVersion = await this.getLatestVersion();
                 if (deviceVersion != latestVersion) {
-                        return  true;
+                        return true;
                 }
                 // update
                 return false;
@@ -178,16 +186,17 @@ export default class Updater {
         public async getBoardVersion(): Promise<string> {
                 return await this.readVersionNumber();
         }
-        
+
         /*
         FILE FLASHING
         */
 
         public async getFirmware(version: versionNotes): Promise<boolean> {
                 try {
-                        const res = await fetch(`${this.archiveURL}/download/${version.title}/firmware.bin`);
+                        const res = await fetch(`http://cors.emaker.limited/?url=${this.archiveURL}/download/${version.title}/firmware.bin`);
                         let buf = await res.arrayBuffer();
                         this.file = new Int8Array(buf);
+                        this._fileSize = this.file.byteLength;
                         return true;
                 } catch {
                         return false;
@@ -195,11 +204,105 @@ export default class Updater {
         }
 
         public getFileSize(): number {
-                return this.file.byteLength;
+                return this._fileSize;
         }
 
-        // public async flashFirmware(): Promise<boolean> {
+        private async sendNextPacket(): Promise<boolean> {
-                
+                let packet = this.file.slice(this._fileProgress, this._fileProgress+this._packetSize);
-        // }
+                // this._fileProgress += this._packetSize;
+                return new Promise((resolve, reject) => {
+                        this.bleObject.writeWithoutResponse(this.bleDeviceId, this._updaterServiceUUID, this._updateFileCharacteristicUUID, packet.buffer,
+                                () => {
+                                        console.log(`Sent: ${packet}, progress: ${this._fileProgress}`);
+                                        resolve(true);
+                                },
+                                (error) => {
+                                        this._fileProgress -= this._packetSize;
+                                        reject(error);
+                                }
+                        )
+                });
+        }
+
+        private async sendEndCmd(agree: boolean): Promise<void> {
+                const buffer = new ArrayBuffer(1);
+                let view = new Int8Array(buffer);
+                view[0] = agree ? 3 : 4;
+                await this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer);
+                return;
+        }
+
+        // start and autoconnect before you run this function, so that you can have an "uninterrupted" connection when the board reboots
+        public async flashFirmware(progressCallback: (message: string) => void): Promise<boolean> {
+                // write filesize to board
+                // await notify from cmd - ready
+                // send a packet
+                // check for error
+
+                // write file length
+                return new Promise(async (resolve, reject) => {
+                        // set mtu
+                        this._packetSize = await this.bleObject.withPromises.requestMtu(this.bleDeviceId, this._packetSize);
+                        // start notify
+                        this.bleObject.startNotification(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID,
+                                (rawData: ArrayBuffer): void => {
+                                        let dataView = new Uint8Array(rawData);
+                                        console.log(dataView);
+                                        if (dataView[0] == 1 && dataView.length == 1) {
+                                                // send file
+                                                this.sendNextPacket();
+                                                progressCallback(`MTU: ${this._packetSize}; Sending (${Math.floor((this._fileProgress *100)/this._fileSize)}%), ${this._fileProgress} / ${this._fileSize}`);
+                                        } else if (dataView[0] == 2 && dataView.length == 1) {
+                                                // done logic
+                                                console.log(`progress >= filesize: ${this._fileProgress} vs ${this._fileSize}`);
+                                                if (this._fileProgress >= (this._fileSize - this._packetSize)) {                                     
+                                                        console.log("true");           
+                                                        // send agree
+                                                        this.sendEndCmd(true);
+                                                        progressCallback(`Complete!`);
+                                                        this.bleObject.stopNotification(this.bleDeviceId, 
+                                                                this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID,
+                                                                () => {
+                                                                        // success
+                                                                        resolve(true);
+                                                                },
+                                                                (error) => {
+                                                                        reject("Error: Failed to stop notify");
+                                                                }
+                                                        );
+                                                } else {
+                                                        console.log("False");
+                                                        // send disagree
+                                                        this.sendEndCmd(false);
+                                                        progressCallback(`Error, starting over: ${this._fileProgress} / ${this._fileSize}`);
+                                                        this._fileProgress = 0;
+                                                }
+                                        } else if (dataView[0] == 15 && dataView.length == 1) {
+                                                // error cmd
+                                                progressCallback(`Error on remote: ${this._fileProgress} / ${this._fileSize}`);
+                                                reject("Error on remote");
+                                        } else if (dataView[0] == 0 && dataView.length == 1) {
+                                                // ignore no command
+                                                progressCallback(`Board is on`);
+                                        } 
+                                        else {
+                                                // should be the file progress
+                                                let fileProgressView = new Uint32Array(rawData);
+                                                this._fileProgress = (dataView[3] << 24) |
+                                                                        (dataView[2] << 16) |
+                                                                        (dataView[1] << 8) | dataView[0];
+                                                this.sendNextPacket();
+                                                progressCallback(`Recieved progress ${fileProgressView[0]}; Sending (${Math.floor((this._fileProgress *100)/this._fileSize)}%), ${this._fileProgress} / ${this._fileSize}`);
+                                        }
+                                }, (error) => { reject("Error: Failed to start notify");
+                                        console.error(error);
+                                }
+                        );       
+                        const buffer = new ArrayBuffer(4)
+                        let view = new Int32Array(buffer);
+                        view[0] = this._fileSize;
+                        this.bleObject.withPromises.write(this.bleDeviceId, this._updaterServiceUUID, this._updaterCommandCharacterisitcUUID, buffer);                 
+                });
+        }
 }
- 
+