added 11.8.2

Author: sMaltsevAcuant

README.md

@@ -1,6 +1,6 @@
-# Acuant JavaScript Web SDK v11.8.1
+# Acuant JavaScript Web SDK v11.8.2
 
-**March 2023**
+**April 2023**
 
 See [https://github.com/Acuant/JavascriptWebSDKV11/releases](https://github.com/Acuant/JavascriptWebSDKV11/releases) for release notes.
 
@@ -728,6 +728,12 @@ Web Workers/WASM and CDNs can be used together with workarounds. The following c
 
 ----------
 
+## Using the SDK as part of an iOS or Android WebView
+
+See the [WebView ReadMe](docs/WebViewReadMe.md) for documentation on WebViews.
+
+----------
+
 ## Improved support for devices with extreme memory constraints.
 
 Although the Web Workers use only a minimal amount of memory, you can reduce the memory usage by running only one of the Web Workers at a time. This is recommended only if you have severe memory constraints that you can not address any other way. Normally when both **AcauntImageWorker** and **AcuantMetricsWorker** are running simultaneously, they seamlessly make calls between themselves until they are ready to return a finished image that has been cropped and has had all the metrics run on it. If only one is running at a time, the workflow has to look like this:
@@ -743,9 +749,9 @@ Starting and stopping Workers is a very slow operation, so you will see performa
 
 ## Known Issues/FAQ
 
-1. iPhone 13 Pro, 13 Pro Max, 14 Pro, and 14 Pro Max struggle to focus at close distances when running iOS 16.
+1. iPhone 13 Pro, 13 Pro Max, 14 Pro, and 14 Pro Max struggle to focus at close distances when running iOS 16.0 through 16.3.
 
-	11.7.1 adds a workaround for this issue by having those devices capture from further away. This is a workaround for an issue in iOS 16. There is a more detailed explanation of both the issue and the workaround in the 11.7.1 section of the [Migration Details](docs/MigrationDetails.md). We have been in contact with Apple and they tell us that they are now aware of the issue and are looking into it.
+    11.7.1 adds a workaround for this issue by having those devices capture from farther away. This is a workaround for an issue in iOS 16. There is a more detailed explanation of both the issue and the workaround in the 11.7.1 section of the [Migration Details](docs/MigrationDetails.md). We have been in contact with Apple and as of iOS 16.4 Apple has provided us with the tools to fix this issue properly. This fix was released as part of 11.8.2.
 
 1. iOS 15 has multiple issues that manifest themselves as GPU Highwater failures (ie system daemon used too much memory).
 

app/index.html

@@ -304,7 +304,7 @@ <h3 id="acuant-modal-text"></h3>
 
   function startCamera() {
     currentResult = {};
-    if (AcuantCamera.isCameraSupported && !AcuantCamera.isIOSWebview && !liveCaptureFailed) {
+    if (AcuantCamera.isCameraSupported && !liveCaptureFailed) {
       cameraBtn.style.display = "none";
       camera.style.display = "block";
 

docs/WebViewReadMe.md

@@ -0,0 +1,79 @@
+# Web View Implementation Information
+
+## Android
+
+1. The app that contains the WebView must first declare and obtain the following permissions:
+	
+    	<uses-permission android:name="android.permission.INTERNET"/>
+    	<uses-permission android:name="android.permission.CAMERA" />
+    
+1. Override the following methods within 'webChromeClient' property of your WebView, using either an inline object or a custom class.
+
+		
+	* This function is used to grant the relevant permissions to the webpage:
+	
+		
+			override fun onPermissionRequest(request: PermissionRequest) {
+				request.grant(request.resources)
+			}
+        
+	* The following function implements the file selection dialog for the manual capture fallback (if the user does not grant or unexpectedly revokes the camera permission):
+	
+			override fun onShowFileChooser(
+			    webView: WebView?,
+			    filePathCallback: ValueCallback<Array<Uri>>?,
+			    fileChooserParams: FileChooserParams?
+			): Boolean {
+				//save the callback to be accessible to the on activity result function.
+				this@MainActivity.filePathCallback = filePathCallback
+				    
+				//create the file selection dialog intent from the params set by the webpage.
+				val intent = fileChooserParams!!.createIntent()
+				try {
+					//launch activity for result.
+					resultLauncher.launch(intent)
+				} catch (e: ActivityNotFoundException) {
+					//this exception is highly unlikely, but should be handled nonetheless. Since the file selection dialog is already the fallback to the main capture experience, assume the user is unable to proceed via the app.
+					return false
+				}
+				return true
+			}
+			
+	* Then add the following at the activity level:
+
+			//the callback being saved to be accessible in the activity.
+			private var filePathCallback: ValueCallback<Array<Uri>>? = null
+			
+			//the modern format of start activity for result.
+			private val resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+				val data: Intent? = result.data
+				
+				//pass the data to the WebView.
+				filePathCallback?.onReceiveValue(
+					WebChromeClient.FileChooserParams.parseResult(result.resultCode, data)
+				)
+			}
+			
+1. For the WebView settings, set the following properties:
+
+		wvSettings.javaScriptEnabled = true
+		wvSettings.domStorageEnabled = true
+		wvSettings.allowFileAccess = true
+		wvSettings.allowContentAccess = true
+		wvSettings.javaScriptCanOpenWindowsAutomatically = true
+		wvSettings.mediaPlaybackRequiresUserGesture = false
+
+## iOS
+
+1. Declare a camera permission message by adding NSCameraUsageDescription to the info.plist.
+		
+1. iOS requires the following WebView definition:
+
+		//Create Web View
+		let webConfiguration = WKWebViewConfiguration()
+		webConfiguration.allowsInlineMediaPlayback = true
+		WKWebView(frame: CGRect(x: 0, y: 0, width: 200, height: 200), configuration: webConfiguration)
+		
+		//Load Web View
+		let request = URLRequest(url: "yourWebUrl")
+		webView.load(request)

webSdk/AcuantCamera.js

@@ -686,32 +686,35 @@ var AcuantCamera = (function () {
   //could be prone to error
   function getDevice() {
     return new Promise((resolve) => {
-      navigator.mediaDevices.enumerateDevices().then(function(devices) {
-        const minSuffixDevice = {
-          suffix: undefined,
-          device: undefined,
-        };
-        devices.filter((device) => {
-          return device.kind === 'videoinput';
-        })
-          .forEach(function(device) {
-            const activeCameraIsBackFacing = (device.getCapabilities && device.getCapabilities().facingMode.length && device.getCapabilities().facingMode[0] === 'environment') 
-                        || isBackCameraLabel(device.label);
-            if (activeCameraIsBackFacing) {
-              let split = device.label.split(',');
-              let cameraSuffixNumber = parseInt(split[0][split[0].length -1]);
-
-              if (cameraSuffixNumber || cameraSuffixNumber === 0) {
-                if (minSuffixDevice.suffix === undefined || minSuffixDevice.suffix > cameraSuffixNumber) {
-                  minSuffixDevice.suffix = cameraSuffixNumber;
-                  minSuffixDevice.device = device;
+      navigator.mediaDevices.enumerateDevices()
+        .then((devices) => {
+          const minSuffixDevice = {
+            suffix: undefined,
+            device: undefined,
+          };
+          const dualWideCamera = devices.find(d => d.label === 'Back Dual Wide Camera');
+          if (isiOS164Plus() && dualWideCamera) {
+            minSuffixDevice.device = dualWideCamera;
+          } else {
+            devices
+              .filter(device => device.kind === 'videoinput')
+              .forEach(device => {
+                if (isBackCameraLabel(device.label)) {
+                  let split = device.label.split(',');
+                  let cameraSuffixNumber = parseInt(split[0][split[0].length -1]);
+
+                  if (cameraSuffixNumber || cameraSuffixNumber === 0) {
+                    if (minSuffixDevice.suffix === undefined || minSuffixDevice.suffix > cameraSuffixNumber) {
+                      minSuffixDevice.suffix = cameraSuffixNumber;
+                      minSuffixDevice.device = device;
+                    }
+                  }
                 }
-              }
-            }
-          });
-        resolve(minSuffixDevice.device);
-      })
-        .catch(function() {
+              });
+          }
+          resolve(minSuffixDevice.device);
+        })
+        .catch(() => {
           resolve();
         });
     });        
@@ -720,23 +723,24 @@ var AcuantCamera = (function () {
   function startCamera(constraints, iteration = 0) {
     const MAX_ITERATIONS = 2;
 
-    const getDeviceWasAbleToReadLabels = Boolean(constraints.video.deviceId);
-    navigator.mediaDevices.getUserMedia(constraints).then((stream) => {
-      if (!getDeviceWasAbleToReadLabels && iteration < MAX_ITERATIONS) {
-        // Check if there is a better camera to use once we have permissions
-        getDevice().then(function(device) {
-          if (device && device.deviceId !== stream.getVideoTracks()[0].getSettings().deviceId) {
-            userConfig.primaryConstraints.video.deviceId = device.deviceId;
-            stopMediaTracks(stream);
-            startCamera(userConfig.primaryConstraints, iteration++);
-          } else {
-            enableCamera(stream);
-          }
-        });
-      } else {
-        enableCamera(stream);
-      }
-    })
+    const getDeviceWasAbleToReadLabels = Boolean(constraints);
+    navigator.mediaDevices.getUserMedia(constraints)
+      .then((stream) => {
+        if (!getDeviceWasAbleToReadLabels && iteration < MAX_ITERATIONS) {
+          // Check if there is a better camera to use once we have permissions
+          getDevice().then((device) => {
+            if (device && device.deviceId !== stream.getVideoTracks()[0].getSettings().deviceId) {
+              userConfig.primaryConstraints.video.deviceId = device.deviceId;
+              stopMediaTracks(stream);
+              startCamera(userConfig.primaryConstraints, iteration++);
+            } else {
+              enableCamera(stream);
+            }
+          });
+        } else {
+          enableCamera(stream);
+        }
+      })
       .catch((error) => {
         callCameraError(error, AcuantJavascriptWebSdk.START_FAIL_CODE);
       });
@@ -790,10 +794,7 @@ var AcuantCamera = (function () {
       }
 
       acuantCamera.dispatchEvent(new Event('acuantcameracreated'));
-      getDevice().then((device) => {
-        if (device) userConfig.primaryConstraints.video.deviceId = device.deviceId;
-        startCamera(userConfig.primaryConstraints);
-      });
+      startCamera(userConfig.primaryConstraints);
     }
   }
 
@@ -990,9 +991,14 @@ var AcuantCamera = (function () {
     return ver && ver != -1 && ver.length >= 1 && ver[0] == 15;
   }
 
-  function isiOS16() {
+  function isiOS163OrLess() {
+    let ver = iOSversion();
+    return ver && ver != -1 && ver.length >= 1 && ver[0] == 16 && ver [1] < 4;
+  }
+
+  function isiOS164Plus() {
     let ver = iOSversion();
-    return ver && ver != -1 && ver.length >= 1 && ver[0] == 16;
+    return ver && ver != -1 && ver.length >= 1 && ver[0] >= 16 && ver [1] >= 4;
   }
 
   function isDeviceAffectedByIOS16Issue() {
@@ -1003,7 +1009,7 @@ var AcuantCamera = (function () {
     if (decodedCookie.includes('AcuantForceDistantCapture=true')) {
       return true;
     }
-    if (isiOS16()) {
+    if (isiOS163OrLess()) {
       let dims = [screen.width, screen.height];
       let long = Math.max(...dims);
       let short = Math.min(...dims);