@aepyornis/fastboot.ts 0.0.4 → 0.0.6

package/README.md

@@ -1,5 +1,7 @@
 # fastboot.ts
 
+Android Fastboot implementation for WebUSB
+
 ```sh
 npm install
 npm run build
@@ -11,7 +13,11 @@ npm run build
     src/sparse.ts sparse image utilities Copyright (c) 2021 Danny Lin <danny@kdrag0n.dev>
 
 ```js
-import { FastbootClient, FashbootFlasher } from "@aepyornis/fastboot.ts"
+import {
+  FastbootDevice,
+  FastbootClient,
+  FastbootFlasher,
+} from "@aepyornis/fastboot.ts"
 
 const client = await FastbootClient.create()
 
@@ -21,31 +27,12 @@ await client.getVar("product")
 
 // flash CalyxOS
 import OpfsBlobStore from "@aepyornis/opfs_blob_store"
-const bs = await OpfsBlobStore.create()
-const hash = "a4434edb21e5e12a00ab9949f48f06c48169adcaeb4dce644857e1528b275274"
-const url = "https://release.calyxinstitute.org/lynx-factory-25605200.zip"
-await bs.fetch(hash, url)
-const file = await bs.get(hash)
-
-const instructions = `
-fastboot --set-active=other reboot-bootloader
-sleep 5
-fastboot flash --slot=other bootloader bootloader-lynx-lynx-15.2-12878710.img
-fastboot --set-active=other reboot-bootloader
-sleep 5
-fastboot flash --slot=other radio radio-lynx-g5300q-241205-250127-B-12973597.img
-fastboot --set-active=other reboot-bootloader
-sleep 5
-fastboot flash --slot=other radio radio-lynx-g5300q-241205-250127-B-12973597.img
-fastboot --set-active=other reboot-bootloader
-sleep 5
-fastboot erase avb_custom_key
-fastboot flash avb_custom_key avb_custom_key.img
-fastboot --skip-reboot -w update image-lynx-bp1a.250305.019.zip
-fastboot reboot-bootloader
-`
-
+const opfs = await OpfsBlobStore.create()
+const hash = "db9ab330a1b5d5ebf131f378dca8b5f6400337f438a97aef2a09a1ba88f3935c"
+const url = "https://release.calyxinstitute.org/bangkk-factory-25608210.zip"
+await opfs.fetch(hash, url)
+const file = await opfs.get(hash)
 const client = await FastbootClient.create()
-const deviceFlasher = new FastbootFlasher()
-await deviceFlasher.run(instructions)
+const deviceFlasher = new FastbootFlasher(client, file)
+await deviceFlasher.runFlashAll()
 ```

package/package.json

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

package/src/client.ts

@@ -1,7 +1,7 @@
 import { BlobWriter, Entry } from "@zip.js/zip.js"
 import { IMAGES } from "./images"
 import { parseBlobHeader, splitBlob, fromRaw } from "./sparse"
-import { FastbootDevice } from "./device"
+import { FastbootDevice, FastbootDeviceError } from "./device"
 
 export class FastbootError extends Error {}
 
@@ -20,16 +20,27 @@ interface Logger {
 export class FastbootClient {
   fd: FastbootDevice
   logger: Logger
+  var_cache: Object
 
   constructor(usb_device: USBDevice, logger: Logger = window.console) {
     this.fd = new FastbootDevice(usb_device, logger)
     this.logger = logger
+    this.var_cache = {}
   }
 
   async getVar(variable: string) {
     return this.fd.getVar(variable)
   }
 
+  async getVarCache(variable: string) {
+    if (this.var_cache[variable]) {
+      return this.var_cache[variable]
+    } else {
+      this.var_cache[variable] = await this.getVar(variable)
+      return this.var_cache[variable]
+    }
+  }
+
   async lock() {
     await this.flashing("lock")
     if (await this.unlocked()) {
@@ -139,10 +150,16 @@ export class FastbootClient {
     ) {
       return true
     }
-
     this.logger.log(`ACTION NEEDED: flashing ${command}`)
     await this.fd.exec(`flashing ${command}`)
-    await this.fd.waitForReconnect()
+
+    // some devices register before we have a chance to call
+    // waitForReconnect()
+    if ((await navigator.usb.getDevices()).length > 0) {
+      await this.fd.reconnect()
+    } else {
+      await this.fd.waitForReconnect()
+    }
   }
 
   // run text, typically the contents of fastboot-info.txt
@@ -273,11 +290,21 @@ export class FastbootClient {
   }
 
   async unlocked() {
-    return (await this.getVar("unlocked")) === "yes"
+    const product = await this.getVarCache("product")
+    if (product === "bangkk") {
+      return (await this.getVar("securestate")) === "flashing_unlocked"
+    } else {
+      return (await this.getVar("unlocked")) === "yes"
+    }
   }
 
   async locked() {
-    return (await this.getVar("unlocked")) === "no"
+    const product = await this.getVarCache("product")
+    if (product === "bangkk") {
+      return (await this.getVar("securestate")) === "flashing_locked"
+    } else {
+      return (await this.getVar("unlocked")) === "no"
+    }
   }
 
   async currentSlot() {
@@ -301,6 +328,32 @@ export class FastbootClient {
     return (await this.getVar("is-userspace")) === "yes"
   }
 
+  // tested on bangkk only
+  async getUnlockData() {
+    await client.fd.exec(`oem get_unlock_data`)
+
+    let data = ""
+
+    for (let packet of client.fd.session.packets) {
+      if (packet.command) {
+        continue
+      } else if (packet.status === "INFO") {
+        let message = packet.message.replace("(bootloader)", "").trim()
+        if (message === "Unlock data:") {
+          continue
+        } else {
+          data += message
+        }
+      } else if (packet.status === "OKAY") {
+        break
+      } else {
+        throw new Error(`packet status == ${packet.status}`)
+      }
+    }
+
+    return data
+  }
+
   static async create() {
     return new FastbootClient(await this.requestUsbDevice(), window.console)
   }

package/src/flasher.ts

@@ -57,6 +57,8 @@ function parseInstruction(text: string): Instruction {
         options.wipe = true
       } else if (word === "--set-active=other") {
         options.setActive = "other"
+      } else if (word === "--set-active=a" || word === "--set-active=b") {
+	options.setActive = word.slice(-1)
       } else if (word === "--slot-other") {
         options.slot = "other"
       } else if (word.slice(0, 6) === "--slot") {
@@ -105,12 +107,14 @@ export class FastbootFlasher {
   // except fastboot or sleep
   async runFlashAll() {
     const entries: Entry[] = await this.reader.getEntries()
-    const flashAllSh = await getEntry(entries, "flash-all.sh").getData(new TextWriter())
+    const flashAllSh = await getEntry(entries, "flash-all.sh").getData(
+      new TextWriter(),
+    )
 
     const instructions = flashAllSh
       .split("\n")
       .map((x) => x.trim())
-      .filter(x => (x.slice(0,9) === "fastboot " || x.slice(0,5) === "sleep"))
+      .filter((x) => x.slice(0, 9) === "fastboot " || x.slice(0, 5) === "sleep")
       .join("\n")
 
     return this.run(instructions)
@@ -141,6 +145,10 @@ export class FastbootFlasher {
       } else if (command.command === "reboot-bootloader") {
         if (command.options.setActive === "other") {
           await this.client.setActiveOtherSlot()
+        } else if (command.options.setActive === "a") {
+          await this.client.fd.exec("set_active:a")
+        } else if (command.options.setActive === "b") {
+          await this.client.fd.exec("set_active:b")
         }
         await this.client.rebootBootloader()
       } else if (command.command === "update") {
@@ -181,6 +189,19 @@ export class FastbootFlasher {
       } else if (command.command === "sleep") {
         const ms = command.args[0] ? parseInt(command.args[0]) * 1000 : 5000
         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?
+        if (
+          command.args[0] === "fb_mode_set" ||
+          command.args[0] === "fb_mode_clear"
+        ) {
+          await new Promise((resolve) => setTimeout(resolve, 10))
+        } else {
+          throw new Error(
+            `Fastboot oem command ${command.args[0]} not implemented`,
+          )
+        }
       } else {
         throw new Error(`Fastboot command ${command.command} not implemented`)
       }