Working initial flash progress

It needs to become richer to deal with the multi-stage process and
indeterminate parts but we'll revisit that later.

NPM script for hot reload

Author: microbit-matt-hillsdon

package.json

@@ -10,6 +10,7 @@
     "ci": "npm run test && npm run lint && npm run build && npx prettier --check src",
     "deploy": "website-deploy-aws",
     "dev": "cross-env VITE_VERSION=$npm_package_version vite",
+    "dev:apps": "cross-env VITE_BUILD_MODE=apps VITE_VERSION=$npm_package_version vite --host",
     "invalidate": "invalidate-cloudfront-distribution",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "postinstall": "npm run theme",

src/connect-actions.ts

@@ -128,13 +128,16 @@ export class ConnectActions {
       : createUniversalHexFlashDataSource(hex);
 
     try {
-      await connection.flash(data, {
+      const options = {
+        // TODO: not supported by BLE (it's always partial first)
         partial: true,
         // If we could improve the re-rendering due to progress further we can remove this and accept the
         // default which updates 4x as often.
+        // TODO: Needed for BLE?
         minimumProgressIncrement: 0.01,
         progress: (v: number | undefined) => progress(v ?? 1),
-      });
+      };
+      await connection.flash(data, options);
       return ConnectResult.Success;
     } catch (e) {
       this.logging.error(`USB flashing failed: ${JSON.stringify(e)}`);

src/device/capacitor-ble/index.ts

@@ -24,7 +24,7 @@ import { DeviceInformationService } from "./device-information-service";
 import MemoryMap from "nrf-intel-hex";
 import partialFlash, { PartialFlashResult } from "./flashing-partial";
 import { fullFlash } from "./flashing-full";
-import { FlashResult } from "./model";
+import { FlashProgressStage, FlashResult, Progress } from "./model";
 import { AccelerometerService } from "./acceleromoeter-service";
 
 export class MicrobitCapacitorBluetoothConnection
@@ -190,13 +190,25 @@ export class MicrobitCapacitorBluetoothConnection
    * @param dataSource The data to use.
    * @param options Flash options and progress callback.
    */
-  async flash(dataSource: FlashDataSource): Promise<void> {
-    // We'll disconnect/reconnect multiple times but reporting this is unhelpful.
+  async flash(
+    dataSource: FlashDataSource,
+    options: { progress?: (v: number | undefined) => void }
+  ): Promise<void> {
+    // TODO: deal with the need for richer progress for BLE
+    const externalProgress = options.progress ?? (() => {});
+    const progress: Progress = (stage, v) => {
+      if (
+        (stage === FlashProgressStage.Partial ||
+          stage === FlashProgressStage.Full) &&
+        v !== undefined
+      ) {
+        externalProgress(v);
+      }
+    };
+
+    // We'll disconnect/reconnect multiple times due to device resets, but reporting this is unhelpful.
     this.deferStatusUpdates = true;
     try {
-      const progress = () => {
-        // TODO!
-      };
       if (this.status !== ConnectionStatus.CONNECTED) {
         const status = await this.connect();
         if (status !== ConnectionStatus.CONNECTED) {

src/device/capacitor-ble/nordic-dfu.ts

@@ -91,6 +91,7 @@ export async function flashDfu(
         ({ state, data }) => {
           switch (state) {
             case DfuState.DFU_COMPLETED: {
+              progress(FlashProgressStage.Full, 1);
               resolve(FlashResult.Success);
               break;
             }
@@ -99,7 +100,9 @@ export async function flashDfu(
               break;
             }
             case DfuState.DFU_PROGRESS: {
-              progress(FlashProgressStage.Full, data.percent);
+              if (typeof data.percent === "number") {
+                progress(FlashProgressStage.Full, data.percent / 100);
+              }
               break;
             }
             case DfuState.DFU_FAILED: {

src/hooks/download-hooks.tsx

@@ -27,6 +27,7 @@ import { Settings } from "../settings";
 import { useSettings, useStore } from "../store";
 import { downloadHex } from "../utils/fs-util";
 
+// TODO: extract this for consistency with connection actions
 export class DownloadProjectActions {
   private flashingProgressCallback: (value: number) => void;
   constructor(
@@ -58,7 +59,7 @@ export class DownloadProjectActions {
       (this.state.connection.status === DeviceConnectionStatus.CONNECTED ||
         isNativeBluetoothConnection(this.state.connection))
     ) {
-      // Reuse connection from last time.
+      // Reuse connection from last time if still connected or native Bluetooth.
       const newState: DownloadState = {
         ...this.state,
         step: DownloadStep.FlashingInProgress,