chore: camera error typings

Adamant-im · Jul 19, 2024 · ac715e4 · ac715e4
1 parent 54c09b8
commit ac715e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/components/QrcodeScannerDialog.vue b/src/components/QrcodeScannerDialog.vue
@@ -153,7 +153,7 @@ export default defineComponent({
         cameras.value = await scanner.value.getCameras()
       } catch (error) {
         cameraStatus.value = 'nocamera'
-        onError(error as string)
+        onError(error as Error)
       }
     }
 
@@ -168,7 +168,7 @@ export default defineComponent({
       show.value = false
     }
 
-    const onError = (error: string) => {
+    const onError = (error: Error) => {
       store.dispatch('snackbar/show', {
         message: t('scan.something_wrong')
       })
@@ -198,7 +198,7 @@ export default defineComponent({
             cameraStatus.value = 'noaccess'
           } else {
             cameraStatus.value = 'nostream'
-            noStreamDetails.value = error
+            noStreamDetails.value = `${error.name} ${error.message}`
           }
 
           onError(error)

diff --git a/src/lib/zxing/index.ts b/src/lib/zxing/index.ts
@@ -7,7 +7,7 @@ type DecodeContinuouslyCallback = (
   controls?: IScannerControls
 ) => void
 
-type ModalErrorCallback = (error: any) => void
+type ModalErrorCallback = (error: Error) => void
 
 export class Scanner {
   cameraStream!: MediaStream
@@ -26,7 +26,7 @@ export class Scanner {
   async start(
     currentCamera: number | null,
     decodeCallback: DecodeContinuouslyCallback,
-    modalCallback: ModalErrorCallback,
+    modalCallback: ModalErrorCallback
   ) {
     // Stop all tracks from media stream before camera changing
     if (this.cameraStream) this.stopVideoTracks()
@@ -42,8 +42,8 @@ export class Scanner {
 
       this.codeReader.decodeFromVideoElement(this.videoElement, decodeCallback)
     } catch (error) {
-      // If something went wrong, show the reason in modal window
-      modalCallback(error)
+      // If something went wrong, show the reason in the modal window
+      modalCallback(error as Error)
     }
   }