@oiti/rn-liveness3d 3.4.0 → 5.0.0

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "@oiti/rn-liveness3d",
-  "version": "3.4.0",
+  "version": "5.0.0",
   "description": "test",
-  "main": "lib/commonjs/index",
-  "module": "lib/module/index",
-  "types": "lib/typescript/index.d.ts",
-  "react-native": "src/index",
-  "source": "src/index",
+  "main": "./lib/module/index.js",
+  "types": "./lib/typescript/src/index.d.ts",
+  "exports": {
+    ".": {
+      "source": "./src/index.tsx",
+      "types": "./lib/typescript/src/index.d.ts",
+      "default": "./lib/module/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
     "src",
     "lib",
@@ -14,7 +19,7 @@
     "ios",
     "cpp",
     "*.podspec",
-    "!lib/typescript/example",
+    "react-native.config.js",
     "!ios/build",
     "!android/build",
     "!android/gradle",
@@ -27,20 +32,23 @@
     "!**/.*"
   ],
   "scripts": {
+    "example": "yarn workspace testing-example",
     "test": "jest",
-    "typescript": "tsc --noEmit",
+    "typecheck": "tsc",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
+    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
     "prepare": "bob build",
-    "release": "release-it",
-    "example": "yarn --cwd example",
-    "bootstrap": "yarn example && yarn install && yarn example pods"
+    "release": "release-it --only-version"
   },
   "keywords": [
     "react-native",
     "ios",
     "android"
   ],
-  "repository": "https://github.com/oititec/rn-liveness3d",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/oititec/rn-liveness3d"
+  },
   "author": "catelli <eu@gabrielcatelli.com> (https://github.com/catelli)",
   "license": "MIT",
   "bugs": {
@@ -50,31 +58,42 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
+  "dependencies": {
+    "@react-navigation/native": "^6.1.6",
+    "@react-navigation/native-stack": "^6.9.12",
+    "react-native-safe-area-context": "^4.5.0",
+    "react-native-screens": "^3.20.0"
+  },
   "devDependencies": {
     "@arkweid/lefthook": "^0.7.7",
     "@commitlint/config-conventional": "^17.0.2",
+    "@eslint/compat": "^1.4.0",
     "@react-native-community/eslint-config": "^3.0.2",
     "@release-it/conventional-changelog": "^5.0.0",
     "@types/jest": "^28.1.2",
-    "@types/react": "17.0.21",
-    "@types/react-native": "0.70.0",
+    "@types/react": "^19.1.0",
+    "@types/react-native": "0.73.0",
     "commitlint": "^17.0.2",
-    "eslint": "^8.4.1",
+    "eslint": "^9.0.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^28.1.1",
     "pod-install": "^0.1.0",
     "prettier": "^2.0.5",
-    "react": "18.2.0",
-    "react-native": "0.70.0",
+    "react": "19.1.0",
+    "react-native": "0.81.4",
     "react-native-builder-bob": "^0.20.0",
     "release-it": "^15.0.0",
-    "typescript": "^4.5.2"
+    "typescript": "^5.0.4"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
   },
+  "workspaces": [
+    "example"
+  ],
+  "packageManager": "yarn@3.6.1",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [
@@ -100,33 +119,12 @@
     },
     "plugins": {
       "@release-it/conventional-changelog": {
-        "preset": "angular"
-      }
-    }
-  },
-  "eslintConfig": {
-    "root": true,
-    "extends": [
-      "@react-native-community",
-      "prettier"
-    ],
-    "rules": {
-      "prettier/prettier": [
-        "error",
-        {
-          "quoteProps": "consistent",
-          "singleQuote": true,
-          "tabWidth": 2,
-          "trailingComma": "es5",
-          "useTabs": false
+        "preset": {
+          "name": "angular"
         }
-      ]
+      }
     }
   },
-  "eslintIgnore": [
-    "node_modules/",
-    "lib/"
-  ],
   "prettier": {
     "quoteProps": "consistent",
     "singleQuote": true,
@@ -138,8 +136,12 @@
     "source": "src",
     "output": "lib",
     "targets": [
-      "commonjs",
-      "module",
+      [
+        "module",
+        {
+          "esm": true
+        }
+      ],
       [
         "typescript",
         {
@@ -148,10 +150,17 @@
       ]
     ]
   },
-  "dependencies": {
-    "@react-navigation/native": "^6.1.6",
-    "@react-navigation/native-stack": "^6.9.12",
-    "react-native-safe-area-context": "^4.5.0",
-    "react-native-screens": "^3.20.0"
+  "codegenConfig": {
+    "name": "RnLiveness3dSpec",
+    "type": "modules",
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "br.com.oiti.rnliveness3d"
+    }
+  },
+  "create-react-native-library": {
+    "languages": "kotlin-objc",
+    "type": "turbo-module",
+    "version": "0.54.6"
   }
 }

package/src/@types/ArgsType.ts

@@ -1,10 +1,9 @@
-import { FontsType } from './FontsType';
-import { TextsType } from './TextsType';
-import { ThemeType } from './ThemeType';
+import type { FontsType } from './FontsType';
+import type { TextsType } from './TextsType';
+import type { ThemeType } from './ThemeType';
 
 export type ArgsType = {
   appkey: string;
-  ticket?: string | null;
   environment: 'HML' | 'PRD';
   liveness3Dtext?: TextsType;
   theme?: ThemeType;

package/src/@types/ResultTypes.ts

@@ -1,6 +1,8 @@
-import { onErrorType, onSuccessType } from './ResultType';
+import type { ReactNode } from 'react';
+import type { onErrorType, onSuccessType } from './ResultType';
 
 export type ResultType = {
   onSuccess: (result: onSuccessType) => void;
   onError: (error: onErrorType) => void;
+  children?: ReactNode;
 };

package/src/NativeRnLiveness3d.ts

@@ -0,0 +1,9 @@
+import { TurboModuleRegistry, type TurboModule } from 'react-native';
+
+export interface Spec extends TurboModule {
+  checkCameraPermissionGranted(): boolean;
+  requestCameraPermission(resolve: (result: boolean) => void): void;
+  startLiveness3d(args: Object): Promise<any>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('RnLiveness3d');

package/src/actions/BackButton.tsx

@@ -1,7 +1,7 @@
 import React, { useRef } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { useLiveness3DContext } from '../context/Liveness3DContext';
-import { OitiBackButtonInterface } from '../interfaces/OitiBackButtonInterface';
+import type { OitiBackButtonInterface } from '../interfaces/OitiBackButtonInterface';
 
 export const BackButton: React.FC<OitiBackButtonInterface> = ({
   children,

package/src/actions/ContinueButton.tsx

@@ -2,7 +2,7 @@ import React, { useRef } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { useLiveness3DContext } from '../context/Liveness3DContext';
 import { continueButton } from '../utils/continueButton';
-import { OitiContinueButtonInterface } from '../interfaces/OitiContinueButton';
+import type { OitiContinueButtonInterface } from '../interfaces/OitiContinueButton';
 
 export const ContinueButton: React.FC<OitiContinueButtonInterface> = ({
   children,
@@ -12,10 +12,11 @@ export const ContinueButton: React.FC<OitiContinueButtonInterface> = ({
   const { setScreen, startLiveness } = useLiveness3DContext();
 
   function onContinue() {
-    continueButton().then((result) => {
-      result === true && startLiveness();
-      result === false && setScreen(2);
-    });
+    if (continueButton() === true) {
+      startLiveness();
+    } else {
+      setScreen(2);
+    }
   }
 
   const handlePress = () => {

package/src/actions/PermissionButton.tsx

@@ -1,17 +1,17 @@
 import React, { useRef } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { useLiveness3DContext } from '../context/Liveness3DContext';
-import { OitiPermissionButtonInterface } from '../interfaces/OitiPermissionButtonInterface';
+import type { OitiPermissionButtonInterface } from '../interfaces/OitiPermissionButtonInterface';
 
 export const PermissionButton: React.FC<OitiPermissionButtonInterface> = ({
   children,
   ...props
 }) => {
   const touchableOpacityRef = useRef(null);
-  const { onAskPermission } = useLiveness3DContext();
+  const { onRequestCameraPermission } = useLiveness3DContext();
 
   const handlePress = () => {
-    onAskPermission();
+    onRequestCameraPermission();
   };
 
   return (

package/src/context/Liveness3DContext.tsx

@@ -1,10 +1,9 @@
 import { startLiveness3d } from '../index';
-import React, { createContext, FC, useContext, useState } from 'react';
-import { ArgsType } from '../@types/ArgsType';
-import { onErrorType, onSuccessType } from '../@types/ResultType';
-import { ResultType } from '../@types/ResultTypes';
-import { askPermission } from '../utils/permissions';
-import { Platform } from 'react-native';
+import React, { createContext, type FC, useContext, useState } from 'react';
+import type { ArgsType } from '../@types/ArgsType';
+import type { onErrorType, onSuccessType } from '../@types/ResultType';
+import type { ResultType } from '../@types/ResultTypes';
+import { requestCameraPermission } from '../utils/permissions';
 
 export const SCREEN = Object.freeze({
   INSTRUCTION_VIEW: 1,
@@ -21,7 +20,7 @@ interface Liveness3DContextType {
   onLiveness3DError: (error: onErrorType) => void;
   onLiveness3DSuccess: (result: onSuccessType) => void;
   onBack: () => any;
-  onAskPermission: () => any;
+  onRequestCameraPermission: () => any;
   startLiveness: () => any;
   callbackView: string;
   setCallbackView: React.Dispatch<React.SetStateAction<string>>;
@@ -62,24 +61,12 @@ export const Liveness3DProvider: FC<ResultType> = ({
 
   function startLiveness() {
     if (options) {
-      startLiveness3d(options)
-        .then((result) => {
-          {
-            if (Platform.OS == 'android') {
-              //@ts-ignore
-              onSuccess(JSON.parse(result) as onSuccessType);
-            } else {
-              onSuccess(result as onSuccessType);
-            }
-          }
-        })
-        .catch((error) => {
-          onError(error as onErrorType);
-        });
+      startLiveness3d(options, onSuccess, onError);
     }
   }
-  function onAskPermission() {
-    askPermission().then((result) => {
+
+  function onRequestCameraPermission() {
+    requestCameraPermission().then((result) => {
       result === true && startLiveness();
       result === false && setScreen(1);
     });
@@ -96,7 +83,7 @@ export const Liveness3DProvider: FC<ResultType> = ({
     options,
     setOptions,
     startLiveness,
-    onAskPermission,
+    onRequestCameraPermission,
     callbackView,
     setCallbackView,
   };

package/src/helpers/Liveness3DHelper.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, type FC } from 'react';
+import { useEffect, type FC } from 'react';
 import { useLiveness3DContext } from '../context/Liveness3DContext';
 import type { Liveness3DHelperInterface } from '../interfaces/Liveness3DHelper';
 

package/src/index.tsx

@@ -1,5 +1,5 @@
-import React, { FC } from 'react';
-import { NativeModules, Platform } from 'react-native';
+import type { FC } from 'react';
+import { Platform } from 'react-native';
 import type { ArgsType, LoadingType } from './@types/ArgsType';
 import InstructionsView from './screens/Liveness3D/InstructionsView';
 import PermissionView from './screens/PermissionView';
@@ -10,31 +10,20 @@ import {
   useLiveness3DContext,
 } from './context/Liveness3DContext';
 import { Liveness3DHelper } from './helpers/Liveness3DHelper';
-
-const LINKING_ERROR =
-  `The package '@oiti/rn-liveness3d' doesn't seem to be linked. Make sure: \n\n` +
-  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
-  '- You rebuilt the app after installing the package\n' +
-  '- You are not using Expo Go\n';
-
-export const RnLiveness3d = NativeModules.RnLiveness3d
-  ? NativeModules.RnLiveness3d
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error(LINKING_ERROR);
-        },
-      }
-    );
+import {
+  checkCameraPermissionGranted,
+  requestCameraPermission,
+} from './utils/permissions';
+import RnLiveness3d from './NativeRnLiveness3d';
 
 export function startLiveness3d(
   options: ArgsType,
+  onSuccess: (result: onSuccessType) => void,
+  onError: (error: onErrorType) => void,
   loading?: LoadingType
-): Promise<onErrorType | onSuccessType> {
+) {
   let args: ArgsType = {
     appkey: options?.appkey === undefined ? '' : options?.appkey,
-    ticket: options?.ticket,
     environment:
       options?.environment === undefined ? 'HML' : options?.environment,
     liveness3Dtext: options?.liveness3Dtext || {},
@@ -43,103 +32,15 @@ export function startLiveness3d(
     loading: loading,
   };
 
-  if (Platform.OS === 'android') {
-    return RnLiveness3d.startliveness3d(
-      args.appkey,
-      args.ticket,
-      loading?.type ? loading?.type : 'default',
-      loading?.size ? loading?.size * 200 : 1 * 200,
-      loading?.backgroundColor ? loading?.backgroundColor : '#333333',
-      loading?.loadingColor ? loading?.loadingColor : '#05D758',
-      args?.theme,
-      args?.fonts,
-      args?.liveness3Dtext,
-      args?.environment
-    );
-  }
-  return RnLiveness3d.startliveness3d(args);
-}
-
-export function checkIosPermission(): Promise<any> {
-  return RnLiveness3d.checkiospermission({ p: 'granted' });
-}
-export function checkIosPermissionGranted(): Promise<any> {
-  return RnLiveness3d.checkpermissiongranted({ p: 'granted' });
-}
-
-export function checkcamerapermissionAndroid(): Promise<any> {
-  return RnLiveness3d.checkcamerapermission();
-}
-export function askcamerapermissionAndroid(): Promise<any> {
-  return RnLiveness3d.askcamerapermission();
-}
-
-export const requestCameraPermission = async (
-  options: ArgsType,
-  onSuccess: (result: onSuccessType) => void,
-  onError: (error: onErrorType) => void,
-  loading?: LoadingType
-) => {
-  if (Platform.OS === 'ios') {
-    checkIosPermission().then(async (result) => {
-      if (result === true) {
-        await startLiveness3d(options, loading)
-          .then((result) => {
-            if (Platform.OS == 'android') {
-              //@ts-ignore
-              onSuccess(JSON.parse(result) as onSuccessType);
-            } else {
-              onSuccess(result as onSuccessType);
-            }
-          })
-          .catch((error) => onError(error as onErrorType));
-      }
-      if (result === false) {
-        return;
+  RnLiveness3d.startLiveness3d(args)
+    .then((result) => {
+      if (Platform.OS === 'android') {
+        onSuccess(JSON.parse(result) as onSuccessType);
+      } else {
+        onSuccess(result as onSuccessType);
       }
-    });
-  }
-
-  if (Platform.OS === 'android') {
-    try {
-      await askcamerapermissionAndroid().then(async (res) => {
-        if (res === true) {
-          await startLiveness3d(options, loading)
-            .then((result) => {
-              if (Platform.OS == 'android') {
-                //@ts-ignore
-                onSuccess(JSON.parse(result) as onSuccessType);
-              } else {
-                onSuccess(result as onSuccessType);
-              }
-            })
-            .catch((error) => onError(error as onErrorType));
-        } else {
-          console.log('Camera permission denied');
-        }
-      });
-    } catch (err) {
-      console.warn(err);
-    }
-  }
-};
-
-async function checkPermission(): Promise<boolean> {
-  if (Platform.OS === 'ios') {
-    const grantediso = await checkIosPermissionGranted();
-    if (grantediso === true) {
-      return true;
-    }
-    if (grantediso === false) {
-      return false;
-    }
-  }
-  const granted = await checkcamerapermissionAndroid();
-  if (granted) {
-    return true;
-  } else {
-    return false;
-  }
+    })
+    .catch((error) => onError(error as onErrorType));
 }
 
 export function Liveness3dView({
@@ -208,23 +109,14 @@ export function GetIntructionView({
   }
   async function verifyPermission() {
     if (screen === 1) {
-      if ((await checkPermission()) === true) {
-        startLiveness3d(options, loading)
-          .then((result) => {
-            if (Platform.OS == 'android') {
-              //@ts-ignore
-              onSuccess(JSON.parse(result) as onSuccessType);
-            } else {
-              onSuccess(result as onSuccessType);
-            }
-          })
-          .catch((error) => onError(error as onErrorType));
+      if (checkCameraPermissionGranted() === true) {
+        startLiveness3d(options, onSuccess, onError, loading);
       } else {
         setScreen(2);
       }
     }
     if (screen === 2) {
-      await requestCameraPermission(options, onSuccess, onError);
+      await requestCameraPermission();
       setScreen(1);
     }
   }
@@ -235,14 +127,14 @@ export function GetIntructionView({
         (!CustomInstructionView ? (
           <InstructionsView onVerify={verifyPermission} onBack={onBackScreen} />
         ) : (
-          CustomInstructionView
+          <CustomInstructionView />
         ))}
 
       {screen === 2 &&
         (!CustomPermissionView ? (
           <PermissionView onVerify={verifyPermission} onBack={onBackScreen} />
         ) : (
-          CustomPermissionView
+          <CustomPermissionView />
         ))}
     </>
   );
@@ -251,3 +143,7 @@ export function GetIntructionView({
 export { ContinueButton } from './actions/ContinueButton';
 export { PermissionButton } from './actions/PermissionButton';
 export { BackButton } from './actions/BackButton';
+export type { onErrorType, onSuccessType } from './@types/ResultType';
+export type { ArgsType, LoadingType } from './@types/ArgsType';
+export type { FontsType } from './@types/FontsType';
+export type { ThemeType } from './@types/ThemeType';

package/src/interfaces/Liveness3DHelper.tsx

@@ -1,7 +1,9 @@
-import { onErrorType } from '../@types/ResultType';
-import { ArgsType } from '../@types/ArgsType';
+import type { ReactNode } from 'react';
+import type { onErrorType } from '../@types/ResultType';
+import type { ArgsType } from '../@types/ArgsType';
 
 export interface Liveness3DHelperInterface {
   options: ArgsType;
   onError: (error: onErrorType) => void;
+  children?: ReactNode;
 }

package/src/screens/Liveness3D/InstructionsView.tsx

@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import {
   StyleSheet,
   View,

package/src/screens/PermissionView.tsx

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Dimensions } from 'react-native';
 
 import { StyleSheet, View, Text, Image, TouchableOpacity } from 'react-native';

package/src/utils/continueButton.tsx

@@ -1,12 +1,5 @@
-import { verifyPermission } from './permissions';
+import { checkCameraPermissionGranted } from './permissions';
 
-export const continueButton = async (): Promise<boolean> => {
-  return verifyPermission()
-    .then((result) => {
-      return result;
-    })
-    .catch((error) => {
-      console.error(error);
-      return false;
-    });
+export const continueButton = (): boolean => {
+  return checkCameraPermissionGranted();
 };

package/src/utils/permissions.tsx

@@ -1,30 +1,13 @@
-import { NativeModules, Platform } from 'react-native';
+import RnLiveness3d from '../NativeRnLiveness3d';
 
-export const RnLiveness3d = NativeModules.RnLiveness3d
-  ? NativeModules.RnLiveness3d
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error(LINKING_ERROR);
-        },
-      }
-    );
-
-const LINKING_ERROR =
-  `The package '@oiti/rn-liveness3d' doesn't seem to be linked. Make sure: \n\n` +
-  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
-  '- You rebuilt the app after installing the package\n' +
-  '- You are not using Expo Go\n';
-
-export function verifyPermission(): Promise<boolean> {
-  return Platform.OS === 'android'
-    ? RnLiveness3d.checkcamerapermission()
-    : RnLiveness3d.checkiospermission({ p: 'granted' });
+export function checkCameraPermissionGranted(): boolean {
+  return RnLiveness3d.checkCameraPermissionGranted();
 }
 
-export function askPermission(): Promise<boolean> {
-  return Platform.OS === 'android'
-    ? RnLiveness3d.askcamerapermission()
-    : RnLiveness3d.checkpermissiongranted({ p: 'granted' });
+export function requestCameraPermission(): Promise<boolean> {
+  return new Promise((resolve, _reject) => {
+    RnLiveness3d.requestCameraPermission((result) => {
+      resolve(result);
+    });
+  });
 }

package/android/settings.gradle

@@ -1,6 +0,0 @@
-dependencyResolutionManagement {
-    //repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-      maven { url "https://raw.githubusercontent.com/oititec/android-oiti-versions/master" }
-    }
-}

package/ios/Podfile

@@ -1,13 +0,0 @@
-platform :ios, '12.4' 
-
-source 'https://github.com/oititec/ios-artifactory-beta.git'
-source 'https://github.com/CocoaPods/Specs.git'
- 
-
-target 'RnLiveness3d' do
-    # Comment the next line if you don't want to use dynamic frameworks
-    use_frameworks!
-    
-    pod 'OILiveness3D', '3.4.0'
-  
-  end