@regulaforensics/idv 3.10.262-beta → 3.10.263-beta

package/examples/capacitor/package.json

@@ -6,7 +6,7 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/idv": "3.10.262-beta",
+    "@regulaforensics/idv": "3.10.263-beta",
     "@regulaforensics/idv-module-document-reader": "3.10.377-rc",
     "@regulaforensics/idv-module-face": "3.10.378-rc",
     "@regulaforensics/document-reader-core-fullauthrfid": "9.9.3305",

package/examples/ionic/package.json

@@ -7,7 +7,7 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@regulaforensics/idv": "3.10.262-beta",
+    "@regulaforensics/idv": "3.10.263-beta",
     "@regulaforensics/idv-module-document-reader": "3.10.377-rc",
     "@regulaforensics/idv-module-face": "3.10.378-rc",
     "@regulaforensics/document-reader-core-fullauthrfid": "9.9.3305",

package/examples/react_native/app.config.ts

@@ -36,17 +36,19 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   },
   plugins: [
     '@regulaforensics/idv',
+    './scripts/withoutMetroServer',
     ['expo-custom-assets', { assetsPaths: ['./assets'] }],
     ['expo-build-properties', {
+      ios: { networkInspector: false },
       android: {
+        networkInspector: false,
         extraMavenRepos: [
           { url: 'https://maven.regulaforensics.com/RegulaDocumentReader' },
           { url: 'https://maven.regulaforensics.com/RegulaDocumentReader/Beta' },
           { url: 'https://maven.regulaforensics.com/RegulaDocumentReader/Nightly' },
           { url: 'https://maven.regulaforensics.com/RegulaDocumentReader/Stage' }
         ]
-      },
-      ios: { networkInspector: false }
+      }
     }]
   ]
 })

package/examples/react_native/index.tsx

@@ -1,6 +1,8 @@
 import { registerRootComponent } from 'expo'
 import WebView from 'react-native-webview'
 import React from 'react'
+import * as RNFS from 'react-native-fs'
+import { Platform } from 'react-native'
 import { main } from './src/main'
 
 var webViewRef: any
@@ -47,17 +49,45 @@ const document = {
 }
 
 function parseValue(value: any) {
-  if (value !== true && value !== false) return `"${value}"`
-  return value
+  const json = JSON.stringify(value)
+  return typeof value === 'string' ? `(window.webImages[${json}] ?? ${json})` : json
+}
+
+async function loadWebUI() {
+  const webRoot = Platform.OS === 'ios' ? RNFS.MainBundlePath + '/web/' : 'web/'
+  const readWebFile = Platform.OS === 'ios' ? RNFS.readFile : RNFS.readFileAssets
+  const readWebDir = Platform.OS === 'ios' ? RNFS.readDir : RNFS.readDirAssets
+  const webImages: Record<string, string> = {}
+  const [styles, content] = await Promise.all(['src/main.css', 'src/main.html'].map(path => readWebFile(webRoot + path, 'utf8')))
+
+  for (const file of (await readWebDir(webRoot + 'images')).filter(file => file.isFile())) {
+    const extension = file.name.split('.').pop()!.toLowerCase()
+    const type = ({ jpg: 'jpeg', svg: 'svg+xml' } as Record<string, string>)[extension] ?? extension
+    webImages['images/' + file.name] = `data:image/${type};base64,${await readWebFile(file.path, 'base64')}`
+  }
+
+  const html = content.replace(/src="([^"]+)"/g, (match, path) => webImages[path] ? `src="${webImages[path]}"` : match)
+  return `<meta name="viewport" content="initial-scale=1, user-scalable=no, viewport-fit=cover">
+<style>${styles}</style>
+<div id="content" style="height: 100%">${html}</div>
+<script>
+  window.webImages = ${JSON.stringify(webImages)};
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    window.ReactNativeWebView.postMessage(JSON.stringify({ id: "ready" }))
+  }))
+</script>`
 }
 
 (globalThis as any).document = document;
-registerRootComponent(() =>
-  <WebView
+registerRootComponent(() => {
+  const [html, setHtml] = React.useState('')
+  React.useEffect(() => { loadWebUI().then(setHtml).catch(console.error) }, [])
+  return html ? <WebView
     ref={ref => { webViewRef = ref }}
     onMessage={onMessage}
-    source={require("./index.html")}
+    originWhitelist={['*']}
+    source={{ html }}
     scrollEnabled={false}
     overScrollMode={'content'}
-  />
-)
+  /> : null
+})

package/examples/react_native/metro.config.js

@@ -1,7 +1,5 @@
 const config = require('expo/metro-config').getDefaultConfig(__dirname)
 config.watchFolders = [
-    __dirname + '/node_modules'
 ]
-config.resolver.nodeModulesPaths = config.watchFolders
-config.resolver.assetExts.push('css')
+config.resolver.nodeModulesPaths = [__dirname + '/node_modules']
 module.exports = config

package/examples/react_native/package.json

@@ -4,17 +4,15 @@
   "scripts": {
     "setup": "scripts/setup.sh",
     "ios": "scripts/ios.sh",
-    "android": "scripts/android.sh",
-    "start": "expo start --port \"$npm_package_config_metroPort\""
+    "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/idv": "3.10.262-beta",
+    "@regulaforensics/idv": "3.10.263-beta",
     "@regulaforensics/idv-module-document-reader": "3.10.377-rc",
     "@regulaforensics/idv-module-face": "3.10.378-rc",
     "@regulaforensics/document-reader-core-fullauthrfid": "9.9.3305",
     "@regulaforensics/face-core-basic": "8.4.884",
     "expo": "~58.0.10",
-    "expo-dev-client": "~58.0.13",
     "expo-build-properties": "~58.0.10",
     "expo-custom-assets": "^1.5.0",
     "react-native": "0.88.0",
@@ -22,14 +20,12 @@
     "@types/react": "19.3.0",
     "react-native-webview": "^14.0.1",
     "typescript": "^7.0.2",
-    "@expo/config-plugins": "~58.0.9"
+    "@expo/config-plugins": "~58.0.9",
+    "react-native-fs": "^2.20.0"
   },
   "overrides": {
     "xcode": {
       "uuid": "^11.1.1"
     }
-  },
-  "config": {
-    "metroPort": 8083
   }
 }

package/examples/react_native/scripts/android.sh

@@ -1,15 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
-adb reverse tcp:${npm_package_config_metroPort} tcp:${npm_package_config_metroPort} >/dev/null || :
 if [[ " $* " == *" --open "* ]] || [[ " $* " == *" -o "* ]]; then
     open -a 'Android Studio' android
-    # Check if Metro is running at app's port.
-    if [[ "$(curl --silent --max-time 2 http://localhost:${npm_package_config_metroPort}/status)" != "packager-status:running" ]]; then
-        npm start
-    else
-        echo "Metro is already running on port ${npm_package_config_metroPort}."
-    fi
 else
-    expo run:android --device --port ${npm_package_config_metroPort}
+    npx expo run:android --device --no-bundler "$@"
 fi

package/examples/react_native/scripts/ios.sh

@@ -3,12 +3,6 @@ set -e
 
 if [[ " $* " == *" --open "* ]] || [[ " $* " == *" -o "* ]]; then
     open ios/IDV.xcworkspace
-    # Check if Metro is running at app's port.
-    if [[ "$(curl --silent --max-time 2 http://localhost:${npm_package_config_metroPort}/status)" != "packager-status:running" ]]; then
-        npm start
-    else
-        echo "Metro is already running on port ${npm_package_config_metroPort}."
-    fi
 else
-    npx expo run:ios --device --port ${npm_package_config_metroPort}
+    npx expo run:ios --device --no-bundler "$@"
 fi

package/examples/react_native/scripts/setup.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-# Kill Metro instance at app's port.
-lsof -tiTCP:${npm_package_config_metroPort} -sTCP:LISTEN | xargs kill 2>/dev/null || true
-
 npm install
 npx expo prebuild --no-install
 (cd ios && (pod install || pod update))

package/examples/react_native/scripts/withoutMetroServer.js

@@ -0,0 +1,86 @@
+const { withAppDelegate, withAppBuildGradle, withMainApplication, withXcodeProject } = require('expo/config-plugins')
+
+function replaceRequired(contents, pattern, replacement, description) {
+    if (!pattern.test(contents)) throw new Error(`Standalone build: cannot find ${description}`)
+    return contents.replace(pattern, replacement)
+}
+
+module.exports = config => {
+    config = withAppDelegate(config, config => {
+        let contents = config.modResults.contents
+        if (!contents.includes('// Standalone demo: no development menu.')) {
+            contents = replaceRequired(contents, /let factory = ExpoReactNativeFactory\(delegate: delegate\)/,
+                `let factory = ExpoReactNativeFactory(delegate: delegate)
+    // Standalone demo: no development menu.
+#if DEBUG
+    factory.devMenuConfiguration = RCTDevMenuConfiguration(
+      devMenuEnabled: false, shakeGestureEnabled: false, keyboardShortcutsEnabled: false)
+#endif`, 'React Native factory')
+        }
+        contents = replaceRequired(contents,
+            /override func bundleURL\(\) -> URL\? \{[\s\S]*?\n  \}/,
+            `override func bundleURL() -> URL? {
+    return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+  }`, 'bundleURL method')
+        config.modResults.contents = contents
+        return config
+    })
+
+    config = withXcodeProject(config, config => {
+        const phases = Object.values(config.modResults.hash.project.objects.PBXShellScriptBuildPhase || {})
+        const phase = phases.find(phase => phase.name === '"Bundle React Native code and images"')
+        if (!phase) throw new Error('Standalone build: cannot find iOS bundle build phase')
+        // Bundle plain JS in Debug as well. Hermes loads it directly, without an
+        // additional optimizing bytecode compiler pass or a Metro server.
+        phase.shellScript = JSON.stringify(`set -e
+if [[ -f "$SRCROOT/.xcode.env" ]]; then source "$SRCROOT/.xcode.env"; fi
+if [[ -f "$SRCROOT/.xcode.env.local" ]]; then source "$SRCROOT/.xcode.env.local"; fi
+export PROJECT_ROOT="$PROJECT_DIR/.."
+cd "$PROJECT_ROOT"
+export NODE_ENV=production
+export RCT_NO_LAUNCH_PACKAGER=1
+ENTRY_FILE=$("$NODE_BINARY" -e "require('expo/scripts/resolveAppEntry')" "$PROJECT_ROOT" ios absolute | tail -n 1)
+CLI_PATH=$("$NODE_BINARY" --print "require.resolve('@expo/cli', { paths: [require.resolve('expo/package.json')] })")
+DEST="$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH"
+mkdir -p "$DEST"
+rm -rf "$DEST/web"
+mkdir -p "$DEST/web/src"
+cp src/*.html src/*.css "$DEST/web/src/"
+cp -R images "$DEST/web/"
+"$NODE_BINARY" "$CLI_PATH" export:embed --entry-file "$ENTRY_FILE" --platform ios --dev false --minify false --bundle-output "$DEST/main.jsbundle" --assets-dest "$DEST"
+`)
+        phase.alwaysOutOfDate = 1
+        return config
+    })
+
+    config = withMainApplication(config, config => {
+        if (!config.modResults.contents.includes('useDevSupport = false')) {
+            config.modResults.contents = replaceRequired(config.modResults.contents,
+                /context = applicationContext,/, 'context = applicationContext,\n      useDevSupport = false,', 'Android ReactHost context')
+        }
+        return config
+    })
+
+    config = withAppBuildGradle(config, config => {
+        if (!config.modResults.contents.includes('// Standalone demo: embed JS in Debug.')) {
+            config.modResults.contents = replaceRequired(config.modResults.contents, /react \{/,
+                `react {
+    // Standalone demo: embed JS in Debug.
+    debuggableVariants = []
+    extraPackagerArgs = ["--minify", "false"]
+    hermesFlags = ["-O0"]`, 'Android react block')
+        }
+        if (!config.modResults.contents.includes('tasks.register("copyWebAssets", Sync)')) {
+            config.modResults.contents += `
+android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir("generated/webAssets").get().asFile)
+tasks.register("copyWebAssets", Sync) {
+    from(projectRoot) { include "src/*.html", "src/*.css", "images/**" }
+    into(layout.buildDirectory.dir("generated/webAssets/web"))
+}
+tasks.named("preBuild").configure { dependsOn("copyWebAssets") }
+`
+        }
+        return config
+    })
+    return config
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/idv",
-  "version": "3.10.262-beta",
+  "version": "3.10.263-beta",
   "description": "This is an npm module for Regula IDV, which unifies access to all Regula products. This plugin makes possible to use it with react-native, cordova and capacitor applications. Supports Android and iOS.",
   "main": "www/react-native/index.js",
   "module": "www/capacitor/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/idv" version="3.10.262-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/idv" version="3.10.263-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>IDV</name>
   <description>Cordova plugin for Regula IDV</description>
   <license>commercial</license>

package/react-native-idv.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'react-native-idv'
-  s.version      = '3.10.262-beta'
+  s.version      = '3.10.263-beta'
   s.summary      = 'Regula React Native plugin.'
   s.license      = 'commercial'
   s.authors      = { 'RegulaForensics' => 'support@regulaforensics.com' }

package/test/package-lock.json

@@ -13,7 +13,7 @@
     },
     "..": {
       "name": "@regulaforensics/idv",
-      "version": "3.10.262-beta",
+      "version": "3.10.263-beta",
       "dev": true,
       "license": "commercial",
       "dependencies": {

package/examples/react_native/index.html

@@ -1,12 +0,0 @@
-<meta name="viewport" content="initial-scale=1, user-scalable=no, viewport-fit=cover">
-<link rel="stylesheet" href="src/main.css">
-
-<div id="content" style="height: 100%"></div>
-
-<script>
-    (async () => {
-        document.getElementById("content").innerHTML = await fetch("src/main.html").then(r => r.text())
-        await new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)))
-        window.ReactNativeWebView.postMessage(JSON.stringify({ id: "ready" }))
-    })()
-</script>