remove unnecessary

commaai · Apr 21, 2024 · e04901f · e04901f
1 parent e87e329
commit e04901f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 282 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -14,7 +14,6 @@
   },
   "dependencies": {
     "autoprefixer": "10.4.14",
-    "comlink": "^4.4.1",
     "crc-32": "^1.2.2",
     "eslint": "8.40.0",
     "eslint-config-next": "13.4.1",

diff --git a/src/utils/flash.js b/src/utils/flash.js
@@ -3,12 +3,10 @@ import { useEffect, useRef, useState } from 'react'
 
 import { concatUint8Array } from '@/QDL/utils'
 import { qdlDevice } from '@/QDL/qdl'
-import * as Comlink from 'comlink'
 import { usePlausible } from 'next-plausible'
 
 import config from '@/config'
 import { download } from '@/utils/blob'
-import { useImageWorker } from '@/utils/image'
 import { createManifest } from '@/utils/manifest'
 import { withProgress } from '@/utils/progress'
 
@@ -76,7 +74,6 @@ export function useQdl() {
   const [onContinue, setOnContinue] = useState(null)
   const [onRetry, setOnRetry] = useState(null)
 
-  const imageWorker = useImageWorker()
   const qdl = useRef(new qdlDevice())
 
   /** @type {React.RefObject<Image[]>} */
@@ -101,10 +98,6 @@ export function useQdl() {
     setMessage()
 
     if (error) return
-    if (!imageWorker.current) {
-      console.debug('[QDL] Waiting for image worker')
-      return
-    }
 
     switch (step) {
       case Step.INITIALIZING: {
@@ -130,24 +123,17 @@ export function useQdl() {
         }
 
         // TODO: change manifest once alt image is in release
-        imageWorker.current?.init()
-          .then(() => download(config.manifests['master']))
-          .then(blob => blob.text())
-          .then(text => {
-            manifest.current = createManifest(text)
-
-            // sanity check
-            if (manifest.current.length === 0) {
-              throw 'Manifest is empty'
-            }
+        async function initialize() {
+          const blobText = await (await download(config.manifests['master'])).text()
+          manifest.current = createManifest(blobText)
+          if (manifest.current.length === 0) {
+            throw 'Manifest is empty'
+          }
+          console.debug('[QDL] Loaded manifest', manifest.current)
+          setStep(Step.READY)
+        }
 
-            console.debug('[QDL] Loaded manifest', manifest.current)
-            setStep(Step.READY)
-          })
-          .catch((err) => {
-            console.error('[QDL] Initialization error', err)
-            setError(Error.UNKNOWN)
-          })
+        initialize()
         break
       }
 
@@ -177,7 +163,7 @@ export function useQdl() {
                 setSerial(qdl.current.sahara.serial || 'unknown')
                 setConnected(true)
                 plausible('device-connected')
-                setStep(Step.DOWNLOADING)
+                setStep(Step.FLASHING)
               })
               .catch((err) => {
                 console.error('[QDL] Error getting device information', err)
@@ -197,54 +183,6 @@ export function useQdl() {
         break
       }
 
-      case Step.DOWNLOADING: {
-        setProgress(0)
-
-        async function downloadImages() {
-          for await (const [image, onProgress] of withProgress(manifest.current, setProgress)) {
-            setMessage(`Downloading ${image.name}`)
-            await imageWorker.current.downloadImage(image, Comlink.proxy(onProgress))
-          }
-        }
-
-        downloadImages()
-          .then(() => {
-            console.debug('[QDL] Downloaded all images')
-            setStep(Step.UNPACKING)
-          })
-          .catch((err) => {
-            console.error('[QDL] Download error', err)
-            setError(Error.DOWNLOAD_FAILED)
-          })
-        break
-      }
-
-      case Step.UNPACKING: {
-        setProgress(0)
-
-        async function unpackImages() {
-          for await (const [image, onProgress] of withProgress(manifest.current, setProgress)) {
-            setMessage(`Unpacking ${image.name}`)
-            await imageWorker.current.unpackImage(image, Comlink.proxy(onProgress))
-          }
-        }
-
-        unpackImages()
-          .then(() => {
-            console.debug('[QDL] Unpacked all images')
-            setStep(Step.FLASHING)
-          })
-          .catch((err) => {
-            console.error('[QDL] Unpack error', err)
-            if (err.startsWith('Checksum mismatch')) {
-              setError(Error.CHECKSUM_MISMATCH)
-            } else {
-              setError(Error.UNPACK_FAILED)
-            }
-          })
-        break
-      }
-
       case Step.FLASHING: {
         setProgress(0)
 
@@ -260,12 +198,9 @@ export function useQdl() {
           await qdl.current.erase("xbl"+`_${currentSlot}`)
 
           for await (const [image, onProgress] of withProgress(manifest.current, setProgress)) {
-            const fileHandle = await imageWorker.current.getImage(image)
-            const blob = await fileHandle.getFile()
-
             setMessage(`Flashing ${image.name}`)
             const partitionName = image.name + `_${otherSlot}`
-            await qdl.current.flashBlob(partitionName, blob, onProgress)
+            await qdl.current.flashBlob(partitionName, image, onProgress)
           }
           console.debug('[QDL] Flashed all partitions')
 
@@ -280,7 +215,13 @@ export function useQdl() {
           })
           .catch((err) => {
             console.error('[QDL] Flashing error', err)
-            setError(Error.FLASH_FAILED)
+            if (err.startsWith("Checksum mismatch")) {
+              setError(Error.CHECKSUM_MISMATCH)
+            } else if (error.startsWith("Error download archive")) {
+              setError(Error.DOWNLOAD_FAILED)
+            } else {
+              setError(Error.FLASH_FAILED)
+            }
           })
         break
       }
@@ -318,7 +259,7 @@ export function useQdl() {
         break
       }
     }
-  }, [imageWorker, step])
+  }, [step])
 
   useEffect(() => {
     if (error !== Error.NONE) {

diff --git a/src/utils/image.js b/src/utils/image.js
diff --git a/src/utils/manifest.js b/src/utils/manifest.js
@@ -51,15 +51,13 @@ export class Image {
       this.checksum = json.alt.hash
       this.fileName = `${this.name}-skip-chunks-${json.hash_raw}.img`
       this.archiveUrl = json.alt.url
-      this.size = json.alt.size
     } else {
       this.checksum = json.hash
       this.fileName = `${this.name}-${json.hash_raw}.img`
       this.archiveUrl = json.url
-      this.size = json.size
-    } 
+    }
 
-    this.archiveFileName = this.archiveUrl.split('/').pop()
+    this.size = json.size
   }
 }
 

diff --git a/src/workers/image.worker.js b/src/workers/image.worker.js