expo-camera 13.5.1 → 13.7.0

package/CHANGELOG.md

@@ -10,6 +10,28 @@
 
 ### 💡 Others
 
+## 13.7.0 — 2023-09-15
+
+_This version does not introduce any user-facing changes._
+
+## 13.4.4 — 2023-09-11
+
+### 🐛 Bug fixes
+
+- Remove @koale/useworker. ([#23967](https://github.com/expo/expo/pull/23967) by [@marklawlor](https://github.com/marklawlor))
+
+## 13.6.0 — 2023-09-04
+
+### 🎉 New features
+
+- Added support for React Native 0.73. ([#24018](https://github.com/expo/expo/pull/24018) by [@kudo](https://github.com/kudo))
+
+### 🐛 Bug fixes
+
+- Fixed flash is not enabled during recordings. ([#23776](https://github.com/expo/expo/pull/23776) by [@tszheichoi](https://github.com/tszheichoi))
+- On iOS, fix dead frames when starting a video recording. ([#22037](https://github.com/expo/expo/pull/22037) by [@alanjhughes](https://github.com/alanjhughes))
+- Remove @koale/useworker. ([#23967](https://github.com/expo/expo/pull/23967) by [@marklawlor](https://github.com/marklawlor))
+
 ## 13.5.1 — 2023-08-02
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '13.5.1'
+version = '13.7.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -53,13 +53,16 @@ afterEvaluate {
 android {
   compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
-  }
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.majorVersion
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
 
   namespace "expo.modules.camera"
@@ -67,7 +70,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 32
-    versionName "13.5.1"
+    versionName "13.7.0"
   }
 
   lintOptions {

package/build/useWebQRScanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWebQRScanner.d.ts","sourceRoot":"","sources":["../src/useWebQRScanner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AA2CjG,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,gBAAgB,GAAG,IAAI,CAAC,EACtD,EACE,SAAS,EACT,cAAc,EACd,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE;IACD,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,IAAI,CAAC,oBAAoB,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC;IACtE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,CAAC,cAAc,EAAE;QAAE,WAAW,EAAE,qBAAqB,CAAA;KAAE,KAAK,IAAI,CAAC;IAC7E,OAAO,CAAC,EAAE,kBAAkB,CAAC;CAC9B,QA8DF"}
+{"version":3,"file":"useWebQRScanner.d.ts","sourceRoot":"","sources":["../src/useWebQRScanner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAwEjG,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,gBAAgB,GAAG,IAAI,CAAC,EACtD,EACE,SAAS,EACT,cAAc,EACd,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE;IACD,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,IAAI,CAAC,oBAAoB,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC;IACtE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,CAAC,cAAc,EAAE;QAAE,WAAW,EAAE,qBAAqB,CAAA;KAAE,KAAK,IAAI,CAAC;IAC7E,OAAO,CAAC,EAAE,kBAAkB,CAAC;CAC9B,QAyDF"}

package/build/useWebQRScanner.js

@@ -1,4 +1,3 @@
-import { useWorker } from '@koale/useworker';
 import * as React from 'react';
 import { captureImageData } from './WebCameraUtils';
 const qrWorkerMethod = ({ data, width, height }) => {
@@ -32,16 +31,35 @@ const qrWorkerMethod = ({ data, width, height }) => {
     }
     return parsed;
 };
-function useRemoteJsQR() {
-    return useWorker(qrWorkerMethod, {
-        remoteDependencies: ['https://cdn.jsdelivr.net/npm/jsqr@1.2.0/dist/jsQR.min.js'],
-        autoTerminate: false,
-    });
-}
+const createWorkerAsyncFunction = (fn, deps) => {
+    const stringifiedFn = [
+        `self.func = ${fn.toString()};`,
+        'self.onmessage = (e) => {',
+        '  const result = self.func(e.data);',
+        '  self.postMessage(result);',
+        '};',
+    ];
+    if (deps.length > 0) {
+        stringifiedFn.unshift(`importScripts(${deps.map((dep) => `'${dep}'`).join(', ')});`);
+    }
+    const blob = new Blob(stringifiedFn, { type: 'text/javascript' });
+    const worker = new Worker(URL.createObjectURL(blob));
+    // First-In First-Out queue of promises
+    const promises = [];
+    worker.onmessage = (e) => promises.shift()?.resolve(e.data);
+    return (data) => {
+        return new Promise((resolve, reject) => {
+            promises.push({ resolve, reject });
+            worker.postMessage(data);
+        });
+    };
+};
+const decode = createWorkerAsyncFunction(qrWorkerMethod, [
+    'https://cdn.jsdelivr.net/npm/jsqr@1.2.0/dist/jsQR.min.js',
+]);
 export function useWebQRScanner(video, { isEnabled, captureOptions, interval, onScanned, onError, }) {
     const isRunning = React.useRef(false);
     const timeout = React.useRef(undefined);
-    const [decode, clearWorker] = useRemoteJsQR();
     async function scanAsync() {
         // If interval is 0 then only scan once.
         if (!isRunning.current || !onScanned) {
@@ -86,15 +104,11 @@ export function useWebQRScanner(video, { isEnabled, captureOptions, interval, on
             isRunning.current = true;
             scanAsync();
         }
-        else {
-            stop();
-        }
-    }, [isEnabled]);
-    React.useEffect(() => {
         return () => {
-            stop();
-            clearWorker.kill();
+            if (isEnabled) {
+                stop();
+            }
         };
-    }, []);
+    }, [isEnabled]);
 }
 //# sourceMappingURL=useWebQRScanner.js.map

package/build/useWebQRScanner.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWebQRScanner.js","sourceRoot":"","sources":["../src/useWebQRScanner.ts"],"names":[],"mappings":"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","sourcesContent":["import { useWorker } from '@koale/useworker';\nimport * as React from 'react';\n\nimport { BarCodeScanningResult, CameraPictureOptions, MountErrorListener } from './Camera.types';\nimport { captureImageData } from './WebCameraUtils';\n\nconst qrWorkerMethod = ({ data, width, height }: ImageData): any => {\n  // eslint-disable-next-line no-undef\n  const decoded = (self as any).jsQR(data, width, height, {\n    inversionAttempts: 'attemptBoth',\n  });\n\n  let parsed;\n  try {\n    parsed = JSON.parse(decoded);\n  } catch {\n    parsed = decoded;\n  }\n\n  if (parsed?.data) {\n    const nativeEvent: BarCodeScanningResult = {\n      type: 'qr',\n      data: parsed.data,\n      cornerPoints: [],\n      bounds: { origin: { x: 0, y: 0 }, size: { width: 0, height: 0 } },\n    };\n    if (parsed.location) {\n      nativeEvent.cornerPoints = [\n        parsed.location.topLeftCorner,\n        parsed.location.bottomLeftCorner,\n        parsed.location.topRightCorner,\n        parsed.location.bottomRightCorner,\n      ];\n    }\n    return nativeEvent;\n  }\n  return parsed;\n};\n\nfunction useRemoteJsQR() {\n  return useWorker(qrWorkerMethod, {\n    remoteDependencies: ['https://cdn.jsdelivr.net/npm/jsqr@1.2.0/dist/jsQR.min.js'],\n    autoTerminate: false,\n  });\n}\n\nexport function useWebQRScanner(\n  video: React.MutableRefObject<HTMLVideoElement | null>,\n  {\n    isEnabled,\n    captureOptions,\n    interval,\n    onScanned,\n    onError,\n  }: {\n    isEnabled: boolean;\n    captureOptions: Pick<CameraPictureOptions, 'scale' | 'isImageMirror'>;\n    interval?: number;\n    onScanned?: (scanningResult: { nativeEvent: BarCodeScanningResult }) => void;\n    onError?: MountErrorListener;\n  }\n) {\n  const isRunning = React.useRef<boolean>(false);\n  const timeout = React.useRef<number | undefined>(undefined);\n\n  const [decode, clearWorker] = useRemoteJsQR();\n\n  async function scanAsync() {\n    // If interval is 0 then only scan once.\n    if (!isRunning.current || !onScanned) {\n      stop();\n      return;\n    }\n    try {\n      const data = captureImageData(video.current, captureOptions);\n\n      if (data) {\n        const nativeEvent: BarCodeScanningResult | any = await decode(data);\n        if (nativeEvent?.data) {\n          onScanned({\n            nativeEvent,\n          });\n        }\n      }\n    } catch (error) {\n      if (onError) {\n        onError({ nativeEvent: error });\n      }\n    } finally {\n      // If interval is 0 then only scan once.\n      if (interval === 0) {\n        stop();\n        return;\n      }\n      const intervalToUse = !interval || interval < 0 ? 16 : interval;\n      // @ts-ignore: Type 'Timeout' is not assignable to type 'number'\n      timeout.current = setTimeout(() => {\n        scanAsync();\n      }, intervalToUse);\n    }\n  }\n\n  function stop() {\n    isRunning.current = false;\n    clearTimeout(timeout.current);\n  }\n\n  React.useEffect(() => {\n    if (isEnabled) {\n      isRunning.current = true;\n      scanAsync();\n    } else {\n      stop();\n    }\n  }, [isEnabled]);\n\n  React.useEffect(() => {\n    return () => {\n      stop();\n      clearWorker.kill();\n    };\n  }, []);\n}\n"]}
+{"version":3,"file":"useWebQRScanner.js","sourceRoot":"","sources":["../src/useWebQRScanner.ts"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react';\n\nimport { BarCodeScanningResult, CameraPictureOptions, MountErrorListener } from './Camera.types';\nimport { captureImageData } from './WebCameraUtils';\n\nconst qrWorkerMethod = ({ data, width, height }: ImageData): any => {\n  // eslint-disable-next-line no-undef\n  const decoded = (self as any).jsQR(data, width, height, {\n    inversionAttempts: 'attemptBoth',\n  });\n\n  let parsed;\n  try {\n    parsed = JSON.parse(decoded);\n  } catch {\n    parsed = decoded;\n  }\n\n  if (parsed?.data) {\n    const nativeEvent: BarCodeScanningResult = {\n      type: 'qr',\n      data: parsed.data,\n      cornerPoints: [],\n      bounds: { origin: { x: 0, y: 0 }, size: { width: 0, height: 0 } },\n    };\n    if (parsed.location) {\n      nativeEvent.cornerPoints = [\n        parsed.location.topLeftCorner,\n        parsed.location.bottomLeftCorner,\n        parsed.location.topRightCorner,\n        parsed.location.bottomRightCorner,\n      ];\n    }\n    return nativeEvent;\n  }\n  return parsed;\n};\n\nconst createWorkerAsyncFunction = <T extends (data: any) => any>(fn: T, deps: string[]) => {\n  const stringifiedFn = [\n    `self.func = ${fn.toString()};`,\n    'self.onmessage = (e) => {',\n    '  const result = self.func(e.data);',\n    '  self.postMessage(result);',\n    '};',\n  ];\n\n  if (deps.length > 0) {\n    stringifiedFn.unshift(`importScripts(${deps.map((dep) => `'${dep}'`).join(', ')});`);\n  }\n\n  const blob = new Blob(stringifiedFn, { type: 'text/javascript' });\n  const worker = new Worker(URL.createObjectURL(blob));\n\n  // First-In First-Out queue of promises\n  const promises: {\n    resolve: (value: ReturnType<T>) => void;\n    reject: (reason?: any) => void;\n  }[] = [];\n\n  worker.onmessage = (e) => promises.shift()?.resolve(e.data);\n\n  return (data: Parameters<T>[0]) => {\n    return new Promise<ReturnType<T>>((resolve, reject) => {\n      promises.push({ resolve, reject });\n      worker.postMessage(data);\n    });\n  };\n};\n\nconst decode = createWorkerAsyncFunction(qrWorkerMethod, [\n  'https://cdn.jsdelivr.net/npm/jsqr@1.2.0/dist/jsQR.min.js',\n]);\n\nexport function useWebQRScanner(\n  video: React.MutableRefObject<HTMLVideoElement | null>,\n  {\n    isEnabled,\n    captureOptions,\n    interval,\n    onScanned,\n    onError,\n  }: {\n    isEnabled: boolean;\n    captureOptions: Pick<CameraPictureOptions, 'scale' | 'isImageMirror'>;\n    interval?: number;\n    onScanned?: (scanningResult: { nativeEvent: BarCodeScanningResult }) => void;\n    onError?: MountErrorListener;\n  }\n) {\n  const isRunning = React.useRef<boolean>(false);\n  const timeout = React.useRef<number | undefined>(undefined);\n\n  async function scanAsync() {\n    // If interval is 0 then only scan once.\n    if (!isRunning.current || !onScanned) {\n      stop();\n      return;\n    }\n    try {\n      const data = captureImageData(video.current, captureOptions);\n\n      if (data) {\n        const nativeEvent: BarCodeScanningResult | any = await decode(data);\n        if (nativeEvent?.data) {\n          onScanned({\n            nativeEvent,\n          });\n        }\n      }\n    } catch (error) {\n      if (onError) {\n        onError({ nativeEvent: error });\n      }\n    } finally {\n      // If interval is 0 then only scan once.\n      if (interval === 0) {\n        stop();\n        return;\n      }\n      const intervalToUse = !interval || interval < 0 ? 16 : interval;\n      // @ts-ignore: Type 'Timeout' is not assignable to type 'number'\n      timeout.current = setTimeout(() => {\n        scanAsync();\n      }, intervalToUse);\n    }\n  }\n\n  function stop() {\n    isRunning.current = false;\n    clearTimeout(timeout.current);\n  }\n\n  React.useEffect(() => {\n    if (isEnabled) {\n      isRunning.current = true;\n      scanAsync();\n    }\n\n    return () => {\n      if (isEnabled) {\n        stop();\n      }\n    };\n  }, [isEnabled]);\n}\n"]}

package/ios/EXCamera/EXCamera.m

@@ -62,13 +62,12 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
     _previewLayer = [AVCaptureVideoPreviewLayer layerWithSession:_session];
     _previewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
     _previewLayer.needsDisplayOnBoundsChange = YES;
+    _previewLayer.session = _session;
 #endif
     _paused = NO;
     _isValidVideoOptions = YES;
     _pictureSize = AVCaptureSessionPresetHigh;
     [self changePreviewOrientation:[UIApplication sharedApplication].statusBarOrientation];
-    [self initializeCaptureSessionInput];
-    [self startSession];
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(orientationChanged:)
                                                  name:UIDeviceOrientationDidChangeNotification
@@ -77,6 +76,8 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
     _motionManager = [[CMMotionManager alloc] init];
     _motionManager.accelerometerUpdateInterval = 0.2;
     _motionManager.gyroUpdateInterval = 0.2;
+    [self initializeCaptureSessionInput];
+    [self startSession];
   }
   return self;
 }
@@ -322,7 +323,11 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
 
 - (void)updatePictureSize
 {
-  [self updateSessionPreset:_pictureSize];
+  EX_WEAKIFY(self);
+  dispatch_async(self.sessionQueue, ^{
+    EX_STRONGIFY(self);
+    [self updateSessionPreset:_pictureSize];
+  });
 }
 
 - (void)updateResponsiveOrientationWhenOrientationLocked
@@ -561,30 +566,48 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 
 - (void)record:(NSDictionary *)options resolve:(EXPromiseResolveBlock)resolve reject:(EXPromiseRejectBlock)reject
 {
-  if (_movieFileOutput == nil) {
-    // At the time of writing AVCaptureMovieFileOutput and AVCaptureVideoDataOutput (> GMVDataOutput)
-    // cannot coexist on the same AVSession (see: https://stackoverflow.com/a/4986032/1123156).
-    // We stop face detection here and restart it in when AVCaptureMovieFileOutput finishes recording.
-    if (_faceDetectorManager) {
-      [_faceDetectorManager stopFaceDetection];
-    }
-    [self setupMovieFileCapture];
+  if (_faceDetectorManager) {
+    [_faceDetectorManager stopFaceDetection];
   }
+  
+  EX_WEAKIFY(self);
+  dispatch_async(self.sessionQueue, ^{
+    EX_STRONGIFY(self);
+    [self configureVideoSessionWith:options reject:reject];
 
-  if (_movieFileOutput != nil && !_movieFileOutput.isRecording && _videoRecordedResolve == nil && _videoRecordedReject == nil) {
-    bool shouldBeMuted = options[@"mute"] && [options[@"mute"] boolValue];
-    [self updateSessionAudioIsMuted:shouldBeMuted];
-
-    AVCaptureConnection *connection = [_movieFileOutput connectionWithMediaType:AVMediaTypeVideo];
-    // TODO: Add support for videoStabilizationMode (right now it is not only read, never written to)
-    if (connection.isVideoStabilizationSupported == NO) {
-      EXLogWarn(@"%s: Video Stabilization is not supported on this device.", __func__);
-    } else {
-      [connection setPreferredVideoStabilizationMode:self.videoStabilizationMode];
+    // it is possible that the session has been invalidated at this point
+    // for example, the video codec option is invalid and so this call has already rejected
+    if (!self.isValidVideoOptions) {
+      return;
     }
-    UIDeviceOrientation deviceOrientation = self.responsiveOrientationWhenOrientationLocked ? self.physicalOrientation : [[UIDevice currentDevice] orientation];
-    [connection setVideoOrientation:[EXCameraUtils videoOrientationForDeviceOrientation:deviceOrientation]];
     
+    if (!self) {
+      reject(@"E_IMAGE_SAVE_FAILED", @"Camera view has been unmounted.", nil);
+      return;
+    }
+    if (!self.fileSystem) {
+      reject(@"E_IMAGE_SAVE_FAILED", @"No file system module", nil);
+      return;
+    }
+    NSString *directory = [self.fileSystem.cachesDirectory stringByAppendingPathComponent:@"Camera"];
+    NSString *path = [self.fileSystem generatePathInDirectory:directory withExtension:@".mov"];
+    NSURL *outputURL = [[NSURL alloc] initFileURLWithPath:path];
+    self.videoRecordedResolve = resolve;
+    self.videoRecordedReject = reject;
+    [self.movieFileOutput startRecordingToOutputFileURL:outputURL recordingDelegate:self];
+  });
+}
+
+- (void)configureVideoSessionWith:(NSDictionary *)options reject:(EXPromiseRejectBlock)reject
+{
+  [self.session beginConfiguration];
+  bool shouldBeMuted = options[@"mute"] && [options[@"mute"] boolValue];
+  [self setupMovieFileCapture];
+  [self updateSessionAudioIsMuted:shouldBeMuted];
+  
+  AVCaptureConnection *connection = [_movieFileOutput connectionWithMediaType:AVMediaTypeVideo];
+  // TODO: Add support for videoStabilizationMode (right now it is not only read, never written to)
+  if (connection) {
     AVCaptureSessionPreset preset;
     if (options[@"quality"]) {
       EXCameraVideoResolution resolution = [options[@"quality"] integerValue];
@@ -592,11 +615,19 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
     } else if ([self.session.sessionPreset isEqual:AVCaptureSessionPresetPhoto]) {
       preset = AVCaptureSessionPresetHigh;
     }
-
+      
     if (preset != nil) {
       [self updateSessionPreset:preset];
     }
     
+    if (connection.isVideoStabilizationSupported == NO) {
+      EXLogWarn(@"%s: Video Stabilization is not supported on this device.", __func__);
+    } else {
+      [connection setPreferredVideoStabilizationMode:self.videoStabilizationMode];
+    }
+    UIDeviceOrientation deviceOrientation = self.responsiveOrientationWhenOrientationLocked ? self.physicalOrientation : [[UIDevice currentDevice] orientation];
+    [connection setVideoOrientation:[EXCameraUtils videoOrientationForDeviceOrientation:deviceOrientation]];
+    
     [self setVideoOptions:options forConnection:connection onReject:reject];
     
     bool canBeMirrored = connection.isVideoMirroringSupported;
@@ -604,74 +635,47 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
     if (canBeMirrored && shouldBeMirrored) {
       [connection setVideoMirrored:shouldBeMirrored];
     }
-
-    EX_WEAKIFY(self);
-    dispatch_async(self.sessionQueue, ^{
-      EX_STRONGIFY(self);
-      // it is possible that the session has been invalidated at this point
-      // for example, the video codec option is invalid and so this call has already rejected
-      if (!self.isValidVideoOptions) {
-        return;
-      }
-
-      if (!self) {
-        reject(@"E_IMAGE_SAVE_FAILED", @"Camera view has been unmounted.", nil);
-        return;
-      }
-      if (!self.fileSystem) {
-        reject(@"E_IMAGE_SAVE_FAILED", @"No file system module", nil);
-        return;
-      }
-      NSString *directory = [self.fileSystem.cachesDirectory stringByAppendingPathComponent:@"Camera"];
-      NSString *path = [self.fileSystem generatePathInDirectory:directory withExtension:@".mov"];
-      NSURL *outputURL = [[NSURL alloc] initFileURLWithPath:path];
-      [self.movieFileOutput startRecordingToOutputFileURL:outputURL recordingDelegate:self];
-      self.videoRecordedResolve = resolve;
-      self.videoRecordedReject = reject;
-    });
   }
+
+  [self updateFlashMode];
+  [self.session commitConfiguration];
 }
 
 // Video options are set in an async block to prevent the possible race condition outlined here:
 // https://github.com/react-native-camera/react-native-camera/pull/2694
 - (void)setVideoOptions:(NSDictionary *)options forConnection:(AVCaptureConnection *)connection onReject:(EXPromiseRejectBlock)reject
 {
-  EX_WEAKIFY(self);
-  dispatch_async(_sessionQueue, ^{
-    EX_STRONGIFY(self);
     // Reset validation flag
-    self.isValidVideoOptions = YES;
-
-    if (options[@"maxDuration"]) {
-      Float64 maxDuration = [options[@"maxDuration"] floatValue];
-      self.movieFileOutput.maxRecordedDuration = CMTimeMakeWithSeconds(maxDuration, 30);
-    }
-
-    if (options[@"maxFileSize"]) {
-      self.movieFileOutput.maxRecordedFileSize = [options[@"maxFileSize"] integerValue];
-    }
+  self.isValidVideoOptions = YES;
+  
+  if (options[@"maxDuration"]) {
+    Float64 maxDuration = [options[@"maxDuration"] floatValue];
+    self.movieFileOutput.maxRecordedDuration = CMTimeMakeWithSeconds(maxDuration, 30);
+  }
+  
+  if (options[@"maxFileSize"]) {
+    self.movieFileOutput.maxRecordedFileSize = [options[@"maxFileSize"] integerValue];
+  }
+  
+  if (options[@"codec"]) {
+    AVVideoCodecType videoCodecType = [EXCameraUtils videoCodecForType: [options[@"codec"] integerValue]];
     
-    if (options[@"codec"]) {
-      AVVideoCodecType videoCodecType = [EXCameraUtils videoCodecForType: [options[@"codec"] integerValue]];
-
-      if ([self.movieFileOutput.availableVideoCodecTypes containsObject:videoCodecType]) {
-        [self.movieFileOutput setOutputSettings: @{AVVideoCodecKey: videoCodecType} forConnection: connection];
-        self.videoCodecType = videoCodecType;
-      } else {
-        if ([videoCodecType isEqualToString: @"VIDEO_CODEC_UNKNOWN"]) {
-          videoCodecType = options[@"codec"];
-        }
-        NSString *videoCodecErrorMessage = [NSString stringWithFormat: @"Video Codec '%@' is not supported on this device", videoCodecType];
-        reject(@"E_RECORDING_FAILED", videoCodecErrorMessage, nil);
-        
-        [self cleanupMovieFileCapture];
-        self.videoRecordedResolve = nil;
-        self.videoRecordedReject = nil;
-        self.isValidVideoOptions = NO;
+    if ([self.movieFileOutput.availableVideoCodecTypes containsObject:videoCodecType]) {
+      [self.movieFileOutput setOutputSettings: @{AVVideoCodecKey: videoCodecType} forConnection: connection];
+      self.videoCodecType = videoCodecType;
+    } else {
+      if ([videoCodecType isEqualToString: @"VIDEO_CODEC_UNKNOWN"]) {
+        videoCodecType = options[@"codec"];
       }
+      NSString *videoCodecErrorMessage = [NSString stringWithFormat: @"Video Codec '%@' is not supported on this device", videoCodecType];
+      reject(@"E_RECORDING_FAILED", videoCodecErrorMessage, nil);
+      
+      [self cleanupMovieFileCapture];
+      self.videoRecordedResolve = nil;
+      self.videoRecordedReject = nil;
+      self.isValidVideoOptions = NO;
     }
-    
-  });
+  }
 }
 
 - (void)maybeStartFaceDetection:(BOOL)mirrored {
@@ -690,7 +694,11 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 
 - (void)stopRecording
 {
-  [_movieFileOutput stopRecording];
+  EX_WEAKIFY(self);
+  dispatch_async(self.sessionQueue, ^{
+    EX_STRONGIFY(self);
+    [self.movieFileOutput stopRecording];
+  });
 }
 
 - (void)resumePreview
@@ -715,12 +723,12 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
     return;
   }
   EX_WEAKIFY(self);
-  dispatch_async(_sessionQueue, ^{
-    EX_ENSURE_STRONGIFY(self);
-
+  dispatch_async(self.sessionQueue, ^{
+    EX_STRONGIFY(self);
     if (self.presetCamera == AVCaptureDevicePositionUnspecified) {
       return;
     }
+    [self.session beginConfiguration];
 
     AVCapturePhotoOutput *photoOutput = [AVCapturePhotoOutput new];
     photoOutput.highResolutionCaptureEnabled = YES;
@@ -729,12 +737,12 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
       [self.session addOutput:photoOutput];
       self.photoOutput = photoOutput;
     }
+    [self.session commitConfiguration];
 
     [self setRuntimeErrorHandlingObserver:
      [[NSNotificationCenter defaultCenter] addObserverForName:AVCaptureSessionRuntimeErrorNotification object:self.session queue:nil usingBlock:^(NSNotification *note) {
-      EX_ENSURE_STRONGIFY(self);
       dispatch_async(self.sessionQueue, ^{
-        EX_ENSURE_STRONGIFY(self)
+        EX_STRONGIFY(self);
         // Manually restarting the session since it must
         // have been stopped due to an error.
         [self.session startRunning];
@@ -746,7 +754,7 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
     // when BarCodeScanner is enabled since the beginning of camera component lifecycle,
     // some race condition occurs in reconfiguration and barcodes aren't scanned at all
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 50 * NSEC_PER_USEC), self.sessionQueue, ^{
-      EX_ENSURE_STRONGIFY(self);
+      EX_STRONGIFY(self);
       [self maybeStartFaceDetection:self.presetCamera!=1];
       if (self.barCodeScanner) {
         [self.barCodeScanner maybeStartBarCodeScanning];
@@ -757,6 +765,7 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
       [self onReady:nil];
     });
   });
+
 #pragma clang diagnostic pop
 }
 
@@ -766,9 +775,8 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   return;
 #endif
   EX_WEAKIFY(self);
-  dispatch_async(_sessionQueue, ^{
-    EX_ENSURE_STRONGIFY(self);
-
+  dispatch_async(self.sessionQueue, ^{
+    EX_STRONGIFY(self);
     if (self.faceDetectorManager) {
       [self.faceDetectorManager stopFaceDetection];
     }
@@ -777,8 +785,7 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
     }
     [self.motionManager stopAccelerometerUpdates];
     [self.previewLayer removeFromSuperlayer];
-    [self.session commitConfiguration];
-    [self.session stopRunning];
+    [self.session beginConfiguration];
     for (AVCaptureInput *input in self.session.inputs) {
       [self.session removeInput:input];
     }
@@ -786,6 +793,8 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
     for (AVCaptureOutput *output in self.session.outputs) {
       [self.session removeOutput:output];
     }
+    [self.session commitConfiguration];
+    [self.session stopRunning];
   });
 }
 
@@ -802,9 +811,8 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   AVCaptureVideoOrientation orientation = [EXCameraUtils videoOrientationForInterfaceOrientation:interfaceOrientation];
 
   EX_WEAKIFY(self);
-  dispatch_async(_sessionQueue, ^{
-    EX_ENSURE_STRONGIFY(self);
-
+  dispatch_async(self.sessionQueue, ^{
+    EX_STRONGIFY(self);
     [self.session beginConfiguration];
 
     NSError *error = nil;
@@ -843,8 +851,8 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 - (void)ensureSessionConfiguration
 {
   EX_WEAKIFY(self);
-  dispatch_async(_sessionQueue, ^{
-    EX_ENSURE_STRONGIFY(self);
+  dispatch_async(self.sessionQueue, ^{
+    EX_STRONGIFY(self);
     [self updateFlashMode];
   });
 }
@@ -855,54 +863,41 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 {
 #if !(TARGET_IPHONE_SIMULATOR)
   if (preset) {
-    EX_WEAKIFY(self);
-    dispatch_async(_sessionQueue, ^{
-      EX_ENSURE_STRONGIFY(self);
-      [self.session beginConfiguration];
-      if ([self.session canSetSessionPreset:preset]) {
-        self.session.sessionPreset = preset;
-      }
-      [self.session commitConfiguration];
-    });
+    [self.session beginConfiguration];
+    if ([self.session canSetSessionPreset:preset]) {
+      self.session.sessionPreset = preset;
+    }
+    [self.session commitConfiguration];
   }
 #endif
 }
 
 - (void)updateSessionAudioIsMuted:(BOOL)isMuted
 {
-  EX_WEAKIFY(self);
-  dispatch_async(_sessionQueue, ^{
-    EX_ENSURE_STRONGIFY(self);
-    [self.session beginConfiguration];
-
-    for (AVCaptureDeviceInput* input in [self.session inputs]) {
-      if ([input.device hasMediaType:AVMediaTypeAudio]) {
-        if (isMuted) {
-          [self.session removeInput:input];
-        }
-        [self.session commitConfiguration];
-        return;
+  for (AVCaptureDeviceInput* input in [self.session inputs]) {
+    if ([input.device hasMediaType:AVMediaTypeAudio]) {
+      if (isMuted) {
+        [self.session removeInput:input];
       }
+      return;
     }
-
-    if (!isMuted) {
-      NSError *error = nil;
-
-      AVCaptureDevice *audioCaptureDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio];
-      AVCaptureDeviceInput *audioDeviceInput = [AVCaptureDeviceInput deviceInputWithDevice:audioCaptureDevice error:&error];
-
-      if (error || audioDeviceInput == nil) {
-        EXLogInfo(@"%s: %@", __func__, error);
-        return;
-      }
-
-      if ([self.session canAddInput:audioDeviceInput]) {
-        [self.session addInput:audioDeviceInput];
-      }
+  }
+  
+  if (!isMuted) {
+    NSError *error = nil;
+    
+    AVCaptureDevice *audioCaptureDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio];
+    AVCaptureDeviceInput *audioDeviceInput = [AVCaptureDeviceInput deviceInputWithDevice:audioCaptureDevice error:&error];
+    
+    if (error || audioDeviceInput == nil) {
+      EXLogInfo(@"%s: %@", __func__, error);
+      return;
     }
-
-    [self.session commitConfiguration];
-  });
+    
+    if ([self.session canAddInput:audioDeviceInput]) {
+      [self.session addInput:audioDeviceInput];
+    }
+  }
 }
 
 - (void)onAppForegrounded
@@ -910,8 +905,8 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   if (![_session isRunning] && [self isSessionPaused]) {
     _paused = NO;
     EX_WEAKIFY(self);
-    dispatch_async(_sessionQueue, ^{
-      EX_ENSURE_STRONGIFY(self);
+    dispatch_async(self.sessionQueue, ^{
+      EX_STRONGIFY(self);
       [self.session startRunning];
       [self ensureSessionConfiguration];
     });
@@ -923,8 +918,8 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   if ([_session isRunning] && ![self isSessionPaused]) {
     _paused = YES;
     EX_WEAKIFY(self);
-    dispatch_async(_sessionQueue, ^{
-      EX_ENSURE_STRONGIFY(self);
+    dispatch_async(self.sessionQueue, ^{
+      EX_STRONGIFY(self);
       [self.session stopRunning];
     });
   }
@@ -953,7 +948,6 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 - (void)setupMovieFileCapture
 {
   AVCaptureMovieFileOutput *movieFileOutput = [[AVCaptureMovieFileOutput alloc] init];
-
   if ([_session canAddOutput:movieFileOutput]) {
     [_session addOutput:movieFileOutput];
     _movieFileOutput = movieFileOutput;
@@ -963,8 +957,10 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 - (void)cleanupMovieFileCapture
 {
   if ([_session.outputs containsObject:_movieFileOutput]) {
+    [_session beginConfiguration];
     [_session removeOutput:_movieFileOutput];
     _movieFileOutput = nil;
+    [_session commitConfiguration];
   }
 }
 
@@ -986,13 +982,17 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   _videoRecordedReject = nil;
   _videoCodecType = nil;
 
-  [self cleanupMovieFileCapture];
   // If face detection has been running prior to recording to file
   // we reenable it here (see comment in -record).
   [self maybeStartFaceDetection:false];
 
   if (_session.sessionPreset != _pictureSize) {
-    [self updateSessionPreset:_pictureSize];
+    EX_WEAKIFY(self);
+    dispatch_async(self.sessionQueue, ^{
+      EX_STRONGIFY(self);
+      [self updateSessionPreset:_pictureSize];
+      [self cleanupMovieFileCapture];
+    });
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-camera",
-  "version": "13.5.1",
+  "version": "13.7.0",
   "description": "A React component that renders a preview for the device's either front or back camera. Camera's parameters like zoom, auto focus, white balance and flash mode are adjustable. With expo-camera, one can also take photos and record videos that are saved to the app's cache. Morever, the component is also capable of detecting faces and bar codes appearing on the preview.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -34,7 +34,6 @@
     "preset": "expo-module-scripts"
   },
   "dependencies": {
-    "@koale/useworker": "^4.0.2",
     "invariant": "^2.2.4"
   },
   "devDependencies": {
@@ -43,5 +42,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "2240630a92eb79a4e4bf73e1439916c394876478"
+  "gitHead": "ee2c866ba3c7fbc35ff2a3e896041cf15d3bd7c5"
 }

package/src/useWebQRScanner.ts

@@ -1,4 +1,3 @@
-import { useWorker } from '@koale/useworker';
 import * as React from 'react';
 
 import { BarCodeScanningResult, CameraPictureOptions, MountErrorListener } from './Camera.types';
@@ -37,12 +36,41 @@ const qrWorkerMethod = ({ data, width, height }: ImageData): any => {
   return parsed;
 };
 
-function useRemoteJsQR() {
-  return useWorker(qrWorkerMethod, {
-    remoteDependencies: ['https://cdn.jsdelivr.net/npm/jsqr@1.2.0/dist/jsQR.min.js'],
-    autoTerminate: false,
-  });
-}
+const createWorkerAsyncFunction = <T extends (data: any) => any>(fn: T, deps: string[]) => {
+  const stringifiedFn = [
+    `self.func = ${fn.toString()};`,
+    'self.onmessage = (e) => {',
+    '  const result = self.func(e.data);',
+    '  self.postMessage(result);',
+    '};',
+  ];
+
+  if (deps.length > 0) {
+    stringifiedFn.unshift(`importScripts(${deps.map((dep) => `'${dep}'`).join(', ')});`);
+  }
+
+  const blob = new Blob(stringifiedFn, { type: 'text/javascript' });
+  const worker = new Worker(URL.createObjectURL(blob));
+
+  // First-In First-Out queue of promises
+  const promises: {
+    resolve: (value: ReturnType<T>) => void;
+    reject: (reason?: any) => void;
+  }[] = [];
+
+  worker.onmessage = (e) => promises.shift()?.resolve(e.data);
+
+  return (data: Parameters<T>[0]) => {
+    return new Promise<ReturnType<T>>((resolve, reject) => {
+      promises.push({ resolve, reject });
+      worker.postMessage(data);
+    });
+  };
+};
+
+const decode = createWorkerAsyncFunction(qrWorkerMethod, [
+  'https://cdn.jsdelivr.net/npm/jsqr@1.2.0/dist/jsQR.min.js',
+]);
 
 export function useWebQRScanner(
   video: React.MutableRefObject<HTMLVideoElement | null>,
@@ -63,8 +91,6 @@ export function useWebQRScanner(
   const isRunning = React.useRef<boolean>(false);
   const timeout = React.useRef<number | undefined>(undefined);
 
-  const [decode, clearWorker] = useRemoteJsQR();
-
   async function scanAsync() {
     // If interval is 0 then only scan once.
     if (!isRunning.current || !onScanned) {
@@ -109,15 +135,12 @@ export function useWebQRScanner(
     if (isEnabled) {
       isRunning.current = true;
       scanAsync();
-    } else {
-      stop();
     }
-  }, [isEnabled]);
 
-  React.useEffect(() => {
     return () => {
-      stop();
-      clearWorker.kill();
+      if (isEnabled) {
+        stop();
+      }
     };
-  }, []);
+  }, [isEnabled]);
 }