@aepyornis/fastboot.ts 0.0.9 → 0.0.11

package/package.json

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

package/src/client.ts

@@ -60,11 +60,14 @@ export class FastbootClient {
   async reboot() {
     this.logger.log("rebooting")
     await this.fd.exec("reboot")
+    await new Promise((resolve) => setTimeout(resolve, 5000))
+    await this.fd.waitForReconnect()
   }
 
   async rebootBootloader() {
     this.logger.log("rebooting into bootloader")
-    this.fd.exec("reboot-bootloader")
+    await this.fd.exec("reboot-bootloader")
+    await new Promise((resolve) => setTimeout(resolve, 5000))
     await this.fd.waitForReconnect()
   }
 
@@ -72,16 +75,12 @@ export class FastbootClient {
     const serialNumber = this.fd.serialNumber
     this.logger.log("rebooting into fastboot")
     await this.fd.exec("reboot-fastboot")
+    await new Promise((resolve) => setTimeout(resolve, 5000))
     // 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()
-      }
+      await FastbootClient.findOrRequestDevice(serialNumber)
     }, 30000)
-
     await this.fd.waitForReconnect()
   }
 
@@ -165,14 +164,8 @@ export class FastbootClient {
     }
     this.logger.log(`ACTION NEEDED: flashing ${command}`)
     await this.fd.exec(`flashing ${command}`)
-
-    // some devices might register before we have a chance to call
-    // waitForReconnect()
-    if (MotorolaProducts.includes(await this.getVarCache("product")) && (await navigator.usb.getDevices()).length > 0) {
-      await this.fd.reconnect()
-    } else {
-      await this.fd.waitForReconnect()
-    }
+    await new Promise((resolve) => setTimeout(resolve, 5000))
+    await this.fd.waitForReconnect()
   }
 
   // run text, typically the contents of fastboot-info.txt
@@ -369,9 +362,19 @@ export class FastbootClient {
     return new FastbootClient(await this.requestUsbDevice(), window.console)
   }
 
-  static requestUsbDevice(): Promise<USBDevice> {
+  static async requestUsbDevice(): Promise<USBDevice> {
     return window.navigator.usb.requestDevice({
       filters: [FastbootUSBDeviceFilter],
     })
   }
+
+  static async findOrRequestDevice(serialNumber: string): Promise<Void> {
+    for (const device of (await navigator.usb.getDevices())) {
+      if (device.serialNumber === serialNumber) {
+	return device
+      }
+    }
+    return await FastbootClient.requestUsbDevice()
+  }
+
 }

package/src/device.ts

@@ -34,11 +34,11 @@ export class FastbootDevice {
   serialNumber: string;
   in: USBEndpoint
   out: USBEndpoint
-  session: FastbootSession
+  session: FastbootSession | null
   sessions: FastbootSession[]
   logger: Logger
 
-  constructor(device, logger = window.console) {
+  constructor(device: USBDevice, logger: Logger = window.console) {
     this.device = device
     this.serialNumber = this.device.serialNumber
     this.session = null
@@ -97,24 +97,33 @@ export class FastbootDevice {
     throw new Error("Could not find device in navigator.usb.getDevices()")
   }
 
-  waitForReconnect(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      navigator.usb.addEventListener(
-        "connect",
-        async (event) => {
-          this.logger.log(
-            `waitForReconnect: device connected ${event.device.productName}`,
-          )
-          try {
-            await this.reconnect()
-            resolve(true)
-          } catch (e) {
-            reject(e)
-          }
-        },
-        { once: true },
-      )
-    })
+  async waitForReconnect(): Promise<boolean> {
+    const devices = await navigator.usb.getDevices()
+
+    if (devices.some(device => device.serialNumber === this.serialNumber)) {
+      this.logger.log(`waitForReconnect: Found device ${this.serialNumber}`)
+      await this.reconnect()
+      return Promise.resolve(true)
+    } else {
+      this.logger.log(`waitForReconnect: Adding navigator.usb event listener`)
+      return new Promise((resolve, reject) => {
+	navigator.usb.addEventListener(
+          "connect",
+          async (event) => {
+            this.logger.log(
+              `waitForReconnect: Device connected ${event.device.productName}`,
+            )
+            try {
+              await this.reconnect()
+              resolve(true)
+            } catch (e) {
+              reject(e)
+            }
+          },
+          { once: true },
+	)
+      })
+    }
   }
 
   async getPacket(): ResponsePacket {
@@ -193,12 +202,15 @@ export class FastbootDevice {
     return this.sendCommand(command)
   }
 
-  async getVar(variable: FastbootClientVariables): Promise<string> {
+  async getVar(variable: string): Promise<string> {
     await this.exec(`getvar:${variable}`)
     return this.lastPacket.message
   }
 
   get lastPacket() {
+    if (!this.session || this.session.packets.length === 0) {
+      return null
+    }
     return this.session.packets[this.session.packets.length - 1]
   }