From c559069f36ac031597edbff0e0cb21b51edb5290 Mon Sep 17 00:00:00 2001 From: Monobikash Das Date: Fri, 3 Mar 2023 15:56:09 +0530 Subject: [PATCH 1/3] #524 : model download issue fixed --- machines/auth.ts | 16 +++------------- package-lock.json | 14 +++++++------- package.json | 2 +- shared/commonprops/commonProps.ts | 25 +++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/machines/auth.ts b/machines/auth.ts index 98447c06b..9fd492256 100644 --- a/machines/auth.ts +++ b/machines/auth.ts @@ -1,7 +1,7 @@ import { init } from 'mosip-inji-face-sdk'; import { ContextFrom, EventFrom, send, StateFrom } from 'xstate'; import { createModel } from 'xstate/lib/model'; -import getAllConfigurations from '../shared/commonprops/commonProps'; +import { downloadModel } from '../shared/commonprops/commonProps'; import { AppServices } from '../shared/GlobalContext'; import { StoreEvents, StoreResponseEvent } from './store'; @@ -130,18 +130,8 @@ export const authMachine = model.createMachine( }, services: { - downloadFaceSdkModel: () => async () => { - var injiProp = null; - try { - var injiProp = await getAllConfigurations(); - const resp: string = - injiProp != null ? injiProp.faceSdkModelUrl : null; - if (resp != null) { - init(resp, false); - } - } catch (error) { - console.log(error); - } + downloadFaceSdkModel: () => () => { + downloadModel(); }, }, diff --git a/package-lock.json b/package-lock.json index 9d5f1b590..6b3827283 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "expo-status-bar": "~1.2.0", "expo-updates": "~0.11.6", "i18next": "^21.6.16", - "mosip-inji-face-sdk": "^0.1.7", + "mosip-inji-face-sdk": "^0.1.10", "node-forge": "^1.3.1", "react": "17.0.1", "react-i18next": "^11.16.6", @@ -17731,9 +17731,9 @@ } }, "node_modules/mosip-inji-face-sdk": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/mosip-inji-face-sdk/-/mosip-inji-face-sdk-0.1.7.tgz", - "integrity": "sha512-aVfYUs63M805xsk2+82nT4VHn5Ql7lb6j9qgTP/GKw/+qzd56Svu9U9GzNXbBz1wtaU5RGlV9gu0I0YpO2tXQQ==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/mosip-inji-face-sdk/-/mosip-inji-face-sdk-0.1.10.tgz", + "integrity": "sha512-vDte8Ufwt3AJbHOp1Ks1TqeS0UvoLHGKLmAYXx2IxWysEaIosLzBvH89lSSA3NLTWrF9c6rUKzbxIoJpXm1a7g==", "peerDependencies": { "react": "*", "react-native": "*", @@ -41360,9 +41360,9 @@ "dev": true }, "mosip-inji-face-sdk": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/mosip-inji-face-sdk/-/mosip-inji-face-sdk-0.1.7.tgz", - "integrity": "sha512-aVfYUs63M805xsk2+82nT4VHn5Ql7lb6j9qgTP/GKw/+qzd56Svu9U9GzNXbBz1wtaU5RGlV9gu0I0YpO2tXQQ==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/mosip-inji-face-sdk/-/mosip-inji-face-sdk-0.1.10.tgz", + "integrity": "sha512-vDte8Ufwt3AJbHOp1Ks1TqeS0UvoLHGKLmAYXx2IxWysEaIosLzBvH89lSSA3NLTWrF9c6rUKzbxIoJpXm1a7g==", "requires": {} }, "move-concurrently": { diff --git a/package.json b/package.json index de1d6149c..396995af4 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "expo-status-bar": "~1.2.0", "expo-updates": "~0.11.6", "i18next": "^21.6.16", - "mosip-inji-face-sdk": "^0.1.7", + "mosip-inji-face-sdk": "^0.1.10", "node-forge": "^1.3.1", "react": "17.0.1", "react-i18next": "^11.16.6", diff --git a/shared/commonprops/commonProps.ts b/shared/commonprops/commonProps.ts index 6d2e3b6e4..e792bfcfe 100644 --- a/shared/commonprops/commonProps.ts +++ b/shared/commonprops/commonProps.ts @@ -1,5 +1,6 @@ import { request } from '../request'; import AsyncStorage from '@react-native-async-storage/async-storage'; +import { init } from 'mosip-inji-face-sdk'; const COMMON_PROPS_KEY: string = 'CommonPropsKey-' + '6964d04a-9268-11ed-a1eb-0242ac120002'; @@ -22,6 +23,30 @@ export default async function getAllConfigurations() { } } +export async function downloadModel() { + try { + var injiProp = await getAllConfigurations(); + const maxRetryStr = injiProp.modelDownloadMaxRetry; + const maxRetry = parseInt(maxRetryStr); + const resp: string = injiProp != null ? injiProp.faceSdkModelUrl : null; + if (resp != null) { + var result = await init(resp, false); + console.log('model download result is = ' + result); + if (!result) { + for (let counter = 0; counter < maxRetry; counter++) { + result = await init(resp, false); + console.log('model redownload result is = ' + result); + if (result) { + break; + } + } + } + } + } catch (error) { + console.log(error); + } +} + export interface DownloadProps { maxDownloadLimit: number; downloadInterval: number; From 5208ab5007e9a7e53c7bd5a5f41643b52e8adfc0 Mon Sep 17 00:00:00 2001 From: Monobikash Das Date: Mon, 6 Mar 2023 12:32:19 +0530 Subject: [PATCH 2/3] Fixed review comments --- shared/commonprops/commonProps.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/shared/commonprops/commonProps.ts b/shared/commonprops/commonProps.ts index e792bfcfe..9224f8541 100644 --- a/shared/commonprops/commonProps.ts +++ b/shared/commonprops/commonProps.ts @@ -30,15 +30,11 @@ export async function downloadModel() { const maxRetry = parseInt(maxRetryStr); const resp: string = injiProp != null ? injiProp.faceSdkModelUrl : null; if (resp != null) { - var result = await init(resp, false); - console.log('model download result is = ' + result); - if (!result) { - for (let counter = 0; counter < maxRetry; counter++) { - result = await init(resp, false); - console.log('model redownload result is = ' + result); - if (result) { - break; - } + for (let counter = 0; counter < maxRetry; counter++) { + var result = await init(resp, false); + console.log('model download result is = ' + result); + if (result) { + break; } } } From 72835b5944c81514d9884fc2161f4d7b883baf68 Mon Sep 17 00:00:00 2001 From: Monobikash Das Date: Tue, 7 Mar 2023 15:35:12 +0530 Subject: [PATCH 3/3] Pointing to sdk 0.1.11 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b3827283..deebebf60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "expo-status-bar": "~1.2.0", "expo-updates": "~0.11.6", "i18next": "^21.6.16", - "mosip-inji-face-sdk": "^0.1.10", + "mosip-inji-face-sdk": "^0.1.11", "node-forge": "^1.3.1", "react": "17.0.1", "react-i18next": "^11.16.6", @@ -17731,9 +17731,9 @@ } }, "node_modules/mosip-inji-face-sdk": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/mosip-inji-face-sdk/-/mosip-inji-face-sdk-0.1.10.tgz", - "integrity": "sha512-vDte8Ufwt3AJbHOp1Ks1TqeS0UvoLHGKLmAYXx2IxWysEaIosLzBvH89lSSA3NLTWrF9c6rUKzbxIoJpXm1a7g==", + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/mosip-inji-face-sdk/-/mosip-inji-face-sdk-0.1.11.tgz", + "integrity": "sha512-M0U59+fHWFmG206t7RcBRKtMhDUNYQIS+3Bc6CQNDqAipYe95maKBtjPfTCm204NQDMnkJ4iVYPxKSrNEpKxJQ==", "peerDependencies": { "react": "*", "react-native": "*", @@ -41360,9 +41360,9 @@ "dev": true }, "mosip-inji-face-sdk": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/mosip-inji-face-sdk/-/mosip-inji-face-sdk-0.1.10.tgz", - "integrity": "sha512-vDte8Ufwt3AJbHOp1Ks1TqeS0UvoLHGKLmAYXx2IxWysEaIosLzBvH89lSSA3NLTWrF9c6rUKzbxIoJpXm1a7g==", + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/mosip-inji-face-sdk/-/mosip-inji-face-sdk-0.1.11.tgz", + "integrity": "sha512-M0U59+fHWFmG206t7RcBRKtMhDUNYQIS+3Bc6CQNDqAipYe95maKBtjPfTCm204NQDMnkJ4iVYPxKSrNEpKxJQ==", "requires": {} }, "move-concurrently": { diff --git a/package.json b/package.json index 396995af4..a84dda715 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "expo-status-bar": "~1.2.0", "expo-updates": "~0.11.6", "i18next": "^21.6.16", - "mosip-inji-face-sdk": "^0.1.10", + "mosip-inji-face-sdk": "^0.1.11", "node-forge": "^1.3.1", "react": "17.0.1", "react-i18next": "^11.16.6",