@aepyornis/fastboot.ts 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aepyornis/fastboot.ts",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Fastboot using WebUSB",
   "main": "src/index.ts",
   "scripts": {

package/src/client.ts

@@ -11,6 +11,8 @@ const FastbootUSBDeviceFilter = {
   protocolCode: 0x03,
 }
 
+const MotorolaProducts = ["bangkk", "fogos"]
+
 interface Logger {
   log(message: string): void
 }
@@ -67,8 +69,19 @@ export class FastbootClient {
   }
 
   async rebootFastboot() {
+    const serialNumber = this.fd.serialNumber
     this.logger.log("rebooting into fastboot")
-    this.fd.exec("reboot-fastboot")
+    await this.fd.exec("reboot-fastboot")
+    // Devices may not automatically reconnect after entering fastbootd, so
+    // after 30 seconds if the device has not been connected we prompt again.
+    setTimeout(async () => {
+      const devices = await navigator.usb.getDevices()
+      if (!devices.some(device => device.serialNumber === serialNumber)) {
+	this.logger.log("Device did not reconnect, requesting new device")
+	await this.requestUsbDevice()
+      }
+    }, 30000)
+
     await this.fd.waitForReconnect()
   }
 
@@ -135,7 +148,7 @@ export class FastbootClient {
     )
   }
 
-  // fb->ResizePartition ?
+  // fb->ResizePartition
   async resizePartition(name: string, totalBytes: number) {
     // As per AOSP fastboot, we reset the partition to 0 bytes first
     // to optimize extent allocation before setting the actual size.
@@ -155,7 +168,7 @@ export class FastbootClient {
 
     // some devices might register before we have a chance to call
     // waitForReconnect()
-    if (this.getVarCache("product") === "bangkk" && (await navigator.usb.getDevices()).length > 0) {
+    if (MotorolaProducts.includes(await this.getVarCache("product")) && (await navigator.usb.getDevices()).length > 0) {
       await this.fd.reconnect()
     } else {
       await this.fd.waitForReconnect()
@@ -290,8 +303,7 @@ export class FastbootClient {
   }
 
   async unlocked() {
-    const product = await this.getVarCache("product")
-    if (product === "bangkk") {
+    if (MotorolaProducts.includes(await this.getVarCache("product"))) {
       return (await this.getVar("securestate")) === "flashing_unlocked"
     } else {
       return (await this.getVar("unlocked")) === "yes"
@@ -299,8 +311,7 @@ export class FastbootClient {
   }
 
   async locked() {
-    const product = await this.getVarCache("product")
-    if (product === "bangkk") {
+    if (MotorolaProducts.includes(await this.getVarCache("product"))) {
       return (await this.getVar("securestate")) === "flashing_locked"
     } else {
       return (await this.getVar("unlocked")) === "no"

package/src/flasher.ts

@@ -111,6 +111,7 @@ export class FastbootFlasher {
       new TextWriter(),
     )
 
+    this.client.logger.log("flash-all.sh\n" + flashAllSh)
     const instructions = flashAllSh
       .split("\n")
       .map((x) => x.trim())
@@ -123,7 +124,6 @@ export class FastbootFlasher {
   async run(instructions: text) {
     const entries: Entry[] = await this.reader.getEntries() // io with factory.zip
     const commands: Instruction[] = parseInstructions(instructions)
-    console.log(commands)
 
     for (const command of commands) {
       this.client.logger.log(`‣ ${JSON.stringify(command)}`)
@@ -191,7 +191,7 @@ export class FastbootFlasher {
         await new Promise((resolve) => setTimeout(resolve, ms))
         // do_oem_command in cpp is raw command?
       } else if (command.command === "oem") {
-        // motorola setting that does nothing useful here?
+        // ignore motorola oem commands that do nothing useful?
         if (
           command.args[0] === "fb_mode_set" ||
           command.args[0] === "fb_mode_clear"