@trustchex/react-native-sdk 1.486.0 → 1.487.0

package/lib/module/Shared/Components/EIDScanner.js

@@ -6,6 +6,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import NFCManager from 'react-native-nfc-manager';
 import DeviceInfo from 'react-native-device-info';
 import PermissionManager from "../Libs/permissions.utils.js";
+import mrzUtils from "../Libs/mrz.utils.js";
 import { debugError } from "../Libs/debug.utils.js";
 import { eidReader } from "../EIDReader/eidReader.js";
 import NativeProgressBar from "./NativeProgressBar.js";
@@ -104,7 +105,7 @@ const EIDScanner = ({
   const [attemptNumber, setAttemptNumber] = useState(0);
   const getFieldsFromMRZ = useCallback(mrz => {
     return {
-      documentCode: mrz.getDocumentCode(),
+      documentCode: mrzUtils.normalizeDocumentCode(mrz.getDocumentCode()),
       personalNumber: mrz.getPersonalNumber() || mrz.getOptionalData1(),
       documentNumber: mrz.getDocumentNumber(),
       firstName: mrz.getSecondaryIdentifier(),

package/lib/module/Shared/Libs/mrz.utils.js

@@ -14,6 +14,22 @@ const RECOVERY_BUDGET_MS = 80;
 let recoveryDeadline = 0;
 const recoveryExpired = () => Date.now() > recoveryDeadline;
 
+/**
+ * Reduce an ICAO document code to the single canonical class char the rest of the
+ * app keys off of: `'P'` for any passport (`P`, `P<`, `PP`, `PD`, `PS`, `PO`, …)
+ * and `'I'` for any identity card (`I`, `ID`, `IR`, `AC`, `C`, …). The full
+ * subtype is informative but every downstream check is `=== 'I'` / `=== 'P'`, so
+ * carrying `PP`/`ID` here only mis-classifies the document (German passport `PP`
+ * → UNKNOWN). The chip/NFC path keeps the raw code; this normalizes the OCR path.
+ */
+const normalizeDocumentCode = code => {
+  if (!code) return null;
+  const c = code.toUpperCase();
+  if (c[0] === 'P') return 'P';
+  // TD1/TD2 identity documents: I, ID, IR, AC, AR, C, etc. — all reduce to 'I'.
+  return 'I';
+};
+
 /**
  * Pads a TD1 line to the fixed 30-char width.
  *
@@ -271,32 +287,132 @@ const reconstructMRZCandidates = rawText => {
   const flat = ocrLines.join('');
   const pad = (s, len) => s.length >= len ? s.slice(0, len) : s.padEnd(len, '<');
 
-  // Restore the filler right after the document code. In TD1/TD2/TD3 the second
-  // character of line 1 is always "<". OCR commonly reads it as "K" or drops it:
-  //   "IKD…" -> "I<D…",  "ITUR…" -> "I<TUR…",  "I<D…" unchanged.
-  const fixDocStart = s => s.replace(/^([ACIPV])([A-Z0-9<])/, (_m, code, next) => next === '<' ? code + next : code + '<' + (next === 'K' ? '' : next));
+  // Repair the document-subtype character (line 1, position 2). For TD1/TD2 IDs
+  // this is usually "<" and OCR may read it as "K"; collapse that misread back to
+  // "<". But for PASSPORTS position 2 is a real subtype LETTER (German ordinary
+  // passports are "PP", and "PC"/"PD"/"PR"/… exist) — it must NOT be rewritten,
+  // or the whole line shifts right and validation fails. So only normalise a "K"
+  // misread (→ "<"); leave any other letter/filler exactly as read.
+  const fixDocStart = s => s.replace(/^([ACIPV])([A-Z0-9<])/, (_m, code, next) => next === 'K' ? code + '<' : code + next);
   const candidates = [];
 
   // Helper: the OCR line that actually starts the MRZ (doc code + state pattern),
   // so title/front-of-card text mixed into the blob can't create a false anchor.
   const docLine = ocrLines.find(l => /^[ACIPV][A-Z0-9<]{3,}<</.test(l));
 
+  // Passport/TD-x line-2 signature: docNumber(9) + check + nationality(3) +
+  // birth(6)+check+sex+expiry(6)+check…  Allow letters in the nationality and
+  // date spans (OCR reads 0↔O, 1↔I, etc.); the check-digit recovery downstream
+  // resolves them. A too-strict [A-Z]{3}/[0-9]{6} here was dropping the whole
+  // TD3/TD2 candidate on any noisy frame, leaving only a (wrong) 3-line TD1.
+  const td23Line2 = /[A-Z0-9<]{9}[0-9<][A-Z<]{3}[A-Z0-9<]{6}[0-9<][MF<][A-Z0-9<]{6}[0-9<]/;
+
+  // LINE-AWARE line-2 finder. Real ML Kit OCR (a) prepends non-MRZ header text
+  // and (b) SPLITS a long MRZ line at its trailing filler run into two OCR lines
+  // (e.g. "…1204159<<<<<" + "<<<<<08"). The flat-blob approach loses line
+  // boundaries — a greedy line-1 match overruns into line 2, and the line-2
+  // regex can match a doc-number-shaped run inside line 1's name field. So work
+  // from `ocrLines`: find the doc-number record line, and if it's short (split),
+  // stitch following fragment lines onto it up to the format width. The check
+  // digits (incl. the trailing composite) then survive instead of being padded
+  // away. Returns null if no doc-number line exists at/after the line-1 index.
+  // Local 7-3-1 check digit (icaoCheckDigit is defined later in the module).
+  const cd731 = str => {
+    const w = [7, 3, 1];
+    let sum = 0;
+    for (let i = 0; i < str.length; i++) {
+      const c = str[i];
+      const v = c === '<' ? 0 : c >= '0' && c <= '9' ? c.charCodeAt(0) - 48 : c.charCodeAt(0) - 55;
+      sum = (sum + w[i % 3] * v) % 10;
+    }
+    return String(sum);
+  };
+  const findLine2 = (l1Index, width) => {
+    for (let i = l1Index + 1; i < ocrLines.length; i++) {
+      const m = td23Line2.exec(ocrLines[i]);
+      if (!m || m.index !== 0) continue;
+      // The front 28 chars — docNumber(9)+check + nationality(3) +
+      // birth(6)+check + sex + expiry(6)+check — are positionally stable in OCR.
+      // The optional-data field and the two trailing check digits are what an
+      // OCR line-split garbles (dropped fillers shift the composite digit). For
+      // TD3 (width 44) REBUILD the line canonically: stable front + empty
+      // optional + recomputed optional-check + recomputed composite. This is
+      // robust to the split-filler ambiguity that single-frame stitching can't
+      // resolve. (Passports with a NON-empty optional/personal-number field are
+      // rarer; multi-frame voting still covers those via the stitch fallback.)
+      const front = m[0]; // exactly 28 chars by the regex
+      if (width === 44 && front.length >= 28) {
+        let head = front.slice(0, 28);
+        // Self-correct the document number against its OWN check digit before we
+        // recompute the composite — otherwise a recomputed composite would be
+        // self-consistent with an OCR look-alike error (e.g. O→0) and MASK it
+        // from the downstream ambiguous-char recovery. Try the digit/letter
+        // look-alike swaps in the 9-char doc-number field until its check digit
+        // (position 9) matches; only then rebuild the optional + composite.
+        const docNum = head.slice(0, 9);
+        const docCheck = head[9];
+        if (cd731(docNum) !== docCheck) {
+          const swaps = {
+            O: '0',
+            Q: '0',
+            D: '0',
+            I: '1',
+            L: '1',
+            S: '5',
+            B: '8',
+            Z: '2',
+            G: '6'
+          };
+          const fixed = docNum.replace(/[OQDILSBZG]/g, c => swaps[c] ?? c);
+          if (cd731(fixed) === docCheck) {
+            head = fixed + head.slice(9);
+          }
+        }
+        const optional = '<'.repeat(14);
+        const l2NoComposite = head + optional + cd731(optional);
+        const composite = l2NoComposite.slice(0, 10) + l2NoComposite.slice(13, 20) + l2NoComposite.slice(21, 43);
+        return l2NoComposite + cd731(composite);
+      }
+      // Non-TD3 or unexpected: stitch fragments up to width as a fallback.
+      let joined = ocrLines[i];
+      let j = i + 1;
+      while (joined.length < width && j < ocrLines.length) {
+        joined += ocrLines[j];
+        j++;
+      }
+      return joined.length >= width ? joined.slice(0, width) : joined;
+    }
+    return null;
+  };
+
   // ---- TD3 (passport): line1 "P<XXX…", line2 starts with a 9-char doc number ----
-  // Line 2 signature: docNumber(9) + check + nationality(3) + birth(6)+check+sex+expiry(6)+check…
   {
-    const l1m = flat.match(/P[<A-Z]TUR[A-Z<]{2,}|P<[A-Z]{3}[A-Z<]+/);
-    const l2m = flat.match(/[A-Z0-9<]{9}[0-9<][A-Z]{3}[0-9]{6}[0-9<][MF<][0-9]{6}[0-9<]/);
-    if (l1m && l2m) {
-      candidates.push([pad(fixDocStart(l1m[0]), 44), pad(l2m[0], 44)]);
+    // Position 2 of line 1 is the "<" filler, frequently misread under glare as a
+    // filler-letter (K/C/E/G) — accept those for ALL issuers, not just TUR.
+    // Line-1 structure (ICAO 9303): doc code "P" + 1-char subtype (often "<",
+    // but a LETTER for some issuers — e.g. German ordinary passports are "PP",
+    // and "PC"/"PD" exist) + issuing state (1–3 letters then "<" filler; Germany
+    // is "D" → "PPD<<"). Find line 1 among the OCR lines (NOT the flat blob, whose
+    // greedy match overruns line boundaries).
+    const l1Index = ocrLines.findIndex(l => /^P[A-Z<][A-Z][A-Z<]{2}[A-Z<]/.test(l));
+    const l1Raw = l1Index >= 0 ? ocrLines[l1Index] : null;
+    const l2 = l1Index >= 0 ? findLine2(l1Index, 44) : null;
+    if (l1Raw && l2) {
+      candidates.push([pad(fixDocStart(l1Raw), 44), pad(l2, 44)]);
     }
   }
 
   // ---- TD2: line1 "X<XXX…", line2 starts with docNumber ----
   {
-    const l1m = flat.match(/[ACIPV]<[A-Z]{3}[A-Z<]+/);
-    const l2m = flat.match(/[A-Z0-9<]{9}[0-9<][A-Z]{3}[0-9]{6}[0-9<][MF<][0-9]{6}[0-9<]/);
-    if (l1m && l2m) {
-      candidates.push([pad(fixDocStart(l1m[0]), 36), pad(l2m[0], 36)]);
+    // TD2/ID doc codes are A/C/I (NOT P — that's a passport/TD3; including it
+    // here made passports get built as a 36-char TD2 and win selection). Position
+    // 2 is the SUBTYPE — any A–Z or "<" ("IR","IP","AR","AC"…). Line-aware (see
+    // TD3): find line 1 in ocrLines, stitch a split line 2.
+    const l1Index = ocrLines.findIndex(l => /^[ACI][A-Z<][A-Z][A-Z<]{2}[A-Z<]/.test(l));
+    const l1Raw = l1Index >= 0 ? ocrLines[l1Index] : null;
+    const l2 = l1Index >= 0 ? findLine2(l1Index, 36) : null;
+    if (l1Raw && l2) {
+      candidates.push([pad(fixDocStart(l1Raw), 36), pad(l2, 36)]);
     }
   }
 
@@ -309,8 +425,18 @@ const reconstructMRZCandidates = rawText => {
     // birth(6)+check+sex+expiry(6)+check+state(3). Allow letters in date spans
     // for OCR slips; check-digit recovery resolves them.
     const l2Line = ocrLines.find(l => /^[0-9A-Z]{6}[0-9<][MF<][0-9A-Z]{6}[0-9<][A-Z<]{2,}/.test(l));
-    const l2m = l2Line ?? flat.match(/[0-9A-Z]{6}[0-9<][MF<][0-9A-Z]{6}[0-9<][A-Z]{2,3}/)?.[0];
-    if (l1Source) {
+    const l2m = l2Line ?? flat.match(/[0-9A-Z]{6}[0-9<][MF<][0-9A-Z]{6}[0-9<][A-Z<]{2,3}/)?.[0];
+
+    // Don't emit a 3-line TD1 candidate for passport-shaped input. A passport
+    // (TD3) line 1 starts with "P" + a subtype char (a filler "<" OR a real
+    // letter — German ordinary passports are "PP", and "PC"/"PD"/… exist), or
+    // the band is two long ~44-char lines. Matching ANY "P"-prefixed L1 is safe:
+    // no valid TD1 (doc codes A/C/I only) ever starts with "P". Without this
+    // guard a noisy passport whose TD3 line-2 regex just missed would fall
+    // through to here and be forced into a 3×30 TD1 layout — the "always 3
+    // lines, invalid" bug.
+    const looksLikePassport = !!l1Source && /^P[A-Z<]/.test(l1Source) || ocrLines.length === 2 && ocrLines.every(l => Math.abs(l.length - 44) <= 4);
+    if (l1Source && !looksLikePassport) {
       let l1 = pad(fixDocStart(l1Source), 30);
       // The issuing-state field (TD1 line 1, positions 2–5) is structurally
       // fillers/letters only — never a personal name — so a "K" there flanked by
@@ -358,9 +484,12 @@ const reconstructMRZCandidates = rawText => {
         return l
         // digit look-alikes inside the name → letters
         .replace(/[015862]/g, d => digitToLetter[d] ?? d)
-        // a run of filler-letters (K/C/E/G) flanked by fillers or at the tail
-        // is the trailing/internal filler region
-        .replace(/(?<=<)[KCEG]+(?=<|$)/g, m => '<'.repeat(m.length)).replace(/[KCEG]+$/g, m => '<'.repeat(m.length));
+        // ONLY collapse the TRAILING run of filler-letters (K/C/E/G) — that
+        // region is unambiguous "<" padding. Do NOT collapse internal runs
+        // flanked by fillers: a short given/sur-name made only of K/C/E/G
+        // (e.g. Turkish "ECE"/"EGE", "GEC") sits between "<<" separators and
+        // would be wrongly erased.
+        .replace(/[KCEG]+$/g, m => '<'.repeat(m.length));
       };
       const nameRuns = ocrLines.filter(isNameLike);
       const bestName = nameRuns.sort((a, b) => b.length - a.length)[0] ?? '';
@@ -1131,7 +1260,7 @@ const validateMRZ = (mrzText, autocorrect = true) => {
 
     // Map mrz package fields to our MRZFields type
     const fields = {
-      documentCode: result.fields.documentCode || null,
+      documentCode: normalizeDocumentCode(result.fields.documentCode),
       issuingState: result.fields.issuingState || null,
       documentNumber: result.fields.documentNumber || null,
       nationality: result.fields.nationality || null,
@@ -1254,5 +1383,6 @@ export default {
   assessMRZQuality,
   isValidOCRBPattern,
   applyOCRBCorrections,
-  convertMRZDateToISODate
+  convertMRZDateToISODate,
+  normalizeDocumentCode
 };

package/lib/module/Shared/Libs/mrzFrameAggregator.js

@@ -69,6 +69,29 @@ const linesForFrame = text => {
   const rawLines = text.split('\n').map(l => l.trim().replace(/[^A-Z0-9<]/gi, '').toUpperCase()).filter(Boolean);
   const exact = exactFormatLines(rawLines);
   if (exact) return exact;
+
+  // Near-format catch for 2-line bands (TD3 passport 2×44, TD2 2×36). A passport
+  // OCR'd a few chars off (2×43, 2×45) would otherwise fall into the TD1-biased
+  // reconstruction and be forced into a wrong 3×30 layout. When we have exactly
+  // two lines both close to a 2-line format's width, coerce them to that width
+  // and keep them as-is (2 lines) rather than reconstructing. Tie-break to the
+  // closest width. Never matches a 3-line TD1 (line count differs).
+  if (rawLines.length === 2) {
+    const twoLineFormats = Object.values(FORMAT_GEOMETRY).filter(g => g.lines === 2);
+    let bestGeom = null;
+    let bestDelta = Infinity;
+    for (const g of twoLineFormats) {
+      const delta = Math.max(...rawLines.map(l => Math.abs(l.length - g.width)));
+      if (delta <= 4 && delta < bestDelta) {
+        bestDelta = delta;
+        bestGeom = g;
+      }
+    }
+    if (bestGeom) {
+      const w = bestGeom.width;
+      return rawLines.map(l => l.length >= w ? l.slice(0, w) : l.padEnd(w, '<'));
+    }
+  }
   const candidates = mrzUtils.reconstructMRZCandidates(text);
   if (!candidates.length) {
     // Fall back to the lightweight fixMRZ split for already-clean text.
@@ -84,7 +107,12 @@ const linesForFrame = text => {
   let best = null;
   let bestScore = -1;
   for (const cand of candidates) {
-    const geom = Object.values(FORMAT_GEOMETRY).find(g => g.lines === cand.length);
+    // Among formats with this line count, pick the one whose width best matches
+    // the candidate's lines. TD2 and TD3 are BOTH 2 lines (36 vs 44) — matching
+    // by line count alone wrongly picked TD2 for a 44-wide passport, then the
+    // ">6 off width" guard discarded it. Average line length disambiguates.
+    const avgLen = cand.reduce((s, l) => s + l.length, 0) / Math.max(1, cand.length);
+    const geom = Object.values(FORMAT_GEOMETRY).filter(g => g.lines === cand.length).sort((a, b) => Math.abs(a.width - avgLen) - Math.abs(b.width - avgLen))[0];
     if (!geom) continue;
     // Reject if any line is wildly off the expected width (likely not the band).
     if (cand.some(l => Math.abs(l.length - geom.width) > 6)) continue;

package/lib/module/version.js

@@ -2,4 +2,4 @@
 
 // This file is auto-generated. Do not edit manually.
 // Version is synced from package.json during build.
-export const SDK_VERSION = '1.486.0';
+export const SDK_VERSION = '1.487.0';

package/lib/typescript/src/Shared/Components/EIDScanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EIDScanner.d.ts","sourceRoot":"","sources":["../../../../../src/Shared/Components/EIDScanner.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAgBpD,UAAU,eAAe;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,CACd,OAAO,EAAE,SAAS,EAClB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,KACtB,IAAI,CAAC;IACV,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CAC/C;AAED,QAAA,MAAM,UAAU,GAAI,6FAOjB,eAAe,4CAsrBjB,CAAC;AA4NF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"EIDScanner.d.ts","sourceRoot":"","sources":["../../../../../src/Shared/Components/EIDScanner.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAgBpD,UAAU,eAAe;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,CACd,OAAO,EAAE,SAAS,EAClB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,KACtB,IAAI,CAAC;IACV,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CAC/C;AAED,QAAA,MAAM,UAAU,GAAI,6FAOjB,eAAe,4CAsrBjB,CAAC;AA4NF,eAAe,UAAU,CAAC"}

package/lib/typescript/src/Shared/Libs/mrz.utils.d.ts

@@ -33,6 +33,7 @@ declare const _default: {
     isValidOCRBPattern: (text: string) => boolean;
     applyOCRBCorrections: (text: string) => string;
     convertMRZDateToISODate: (mrzDate?: string | null) => string | null;
+    normalizeDocumentCode: (code: string | null | undefined) => string | null;
 };
 export default _default;
 //# sourceMappingURL=mrz.utils.d.ts.map

package/lib/typescript/src/Shared/Libs/mrz.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mrz.utils.d.ts","sourceRoot":"","sources":["../../../../../src/Shared/Libs/mrz.utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AA2CpD;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;sBAOwB,MAAM,KAAG,MAAM;2BA8gC7B,MAAM,gBACF,OAAO,KACnB,mBAAmB;0CAsKuB,MAAM,KAAG,mBAAmB;wCAj/B9B,MAAM,KAAG,MAAM,EAAE,EAAE;wCA2/BnB,MAAM,KAAG,MAAM;gCAmDvB,MAAM;;;;;+BAz1BP,MAAM,KAAG,OAAO;iCA4Bd,MAAM,KAAG,MAAM;wCA20BR,MAAM,GAAG,IAAI,KAAG,MAAM,GAAG,IAAI;;AAgBxE,wBAUE"}
+{"version":3,"file":"mrz.utils.d.ts","sourceRoot":"","sources":["../../../../../src/Shared/Libs/mrz.utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AA6DpD;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;sBAOwB,MAAM,KAAG,MAAM;2BA2oC7B,MAAM,gBACF,OAAO,KACnB,mBAAmB;0CAsKuB,MAAM,KAAG,mBAAmB;wCA9mC9B,MAAM,KAAG,MAAM,EAAE,EAAE;wCAwnCnB,MAAM,KAAG,MAAM;gCAmDvB,MAAM;;;;;+BAz1BP,MAAM,KAAG,OAAO;iCA4Bd,MAAM,KAAG,MAAM;wCA20BR,MAAM,GAAG,IAAI,KAAG,MAAM,GAAG,IAAI;kCA97ChE,MAAM,GAAG,IAAI,GAAG,SAAS,KAC9B,MAAM,GAAG,IAAI;;AA68ChB,wBAWE"}

package/lib/typescript/src/Shared/Libs/mrzFrameAggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mrzFrameAggregator.d.ts","sourceRoot":"","sources":["../../../../../src/Shared/Libs/mrzFrameAggregator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAkCvD,MAAM,WAAW,aAAa;IAC5B,6EAA6E;IAC7E,IAAI,EAAE,MAAM,CAAC;IACb;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AASD,MAAM,WAAW,YAAY;IAC3B,kFAAkF;IAClF,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,+EAA+E;IAC/E,UAAU,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACvC,kEAAkE;IAClE,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mFAAmF;IACnF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAkFD;;;;GAIG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAInC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAEnC,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,YAAY,CAAK;IAEzB,OAAO,CAAC,cAAc,CAAK;gBAEf,OAAO,GAAE,yBAA8B;IAMnD,KAAK,IAAI,IAAI;IAQb;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IA0B5B,iCAAiC;IACjC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,OAAO,CAAC,WAAW;IAUnB;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY;IA+C5C,+EAA+E;IAC/E,OAAO,CAAC,KAAK;IAab;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAiB1B,4DAA4D;IAC5D,OAAO,CAAC,cAAc;IA8BtB,2EAA2E;IAC3E,gBAAgB,IAAI,YAAY;CAiEjC;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"mrzFrameAggregator.d.ts","sourceRoot":"","sources":["../../../../../src/Shared/Libs/mrzFrameAggregator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAkCvD,MAAM,WAAW,aAAa;IAC5B,6EAA6E;IAC7E,IAAI,EAAE,MAAM,CAAC;IACb;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AASD,MAAM,WAAW,YAAY;IAC3B,kFAAkF;IAClF,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,+EAA+E;IAC/E,UAAU,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACvC,kEAAkE;IAClE,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mFAAmF;IACnF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAqHD;;;;GAIG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAInC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAEnC,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,YAAY,CAAK;IAEzB,OAAO,CAAC,cAAc,CAAK;gBAEf,OAAO,GAAE,yBAA8B;IAMnD,KAAK,IAAI,IAAI;IAQb;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IA0B5B,iCAAiC;IACjC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,OAAO,CAAC,WAAW;IAUnB;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY;IA+C5C,+EAA+E;IAC/E,OAAO,CAAC,KAAK;IAab;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAiB1B,4DAA4D;IAC5D,OAAO,CAAC,cAAc;IA8BtB,2EAA2E;IAC3E,gBAAgB,IAAI,YAAY;CAiEjC;AAED,eAAe,kBAAkB,CAAC"}

package/lib/typescript/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const SDK_VERSION = "1.486.0";
+export declare const SDK_VERSION = "1.487.0";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trustchex/react-native-sdk",
-  "version": "1.486.0",
+  "version": "1.487.0",
   "description": "Trustchex mobile app react native SDK for android or ios devices",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/Shared/Components/EIDScanner.tsx

@@ -4,6 +4,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import NFCManager from 'react-native-nfc-manager';
 import DeviceInfo from 'react-native-device-info';
 import PermissionManager from '../Libs/permissions.utils';
+import mrzUtils from '../Libs/mrz.utils';
 import { debugError } from '../Libs/debug.utils';
 import { MRZInfo } from '../EIDReader/lds/icao/mrzInfo';
 import { eidReader } from '../EIDReader/eidReader';
@@ -138,7 +139,7 @@ const EIDScanner = ({
 
   const getFieldsFromMRZ = useCallback((mrz: MRZInfo) => {
     return {
-      documentCode: mrz.getDocumentCode(),
+      documentCode: mrzUtils.normalizeDocumentCode(mrz.getDocumentCode()),
       personalNumber: mrz.getPersonalNumber() || mrz.getOptionalData1(),
       documentNumber: mrz.getDocumentNumber(),
       firstName: mrz.getSecondaryIdentifier(),

package/src/Shared/Libs/mrz.utils.ts

@@ -14,6 +14,24 @@ const RECOVERY_BUDGET_MS = 80;
 let recoveryDeadline = 0;
 const recoveryExpired = (): boolean => Date.now() > recoveryDeadline;
 
+/**
+ * Reduce an ICAO document code to the single canonical class char the rest of the
+ * app keys off of: `'P'` for any passport (`P`, `P<`, `PP`, `PD`, `PS`, `PO`, …)
+ * and `'I'` for any identity card (`I`, `ID`, `IR`, `AC`, `C`, …). The full
+ * subtype is informative but every downstream check is `=== 'I'` / `=== 'P'`, so
+ * carrying `PP`/`ID` here only mis-classifies the document (German passport `PP`
+ * → UNKNOWN). The chip/NFC path keeps the raw code; this normalizes the OCR path.
+ */
+const normalizeDocumentCode = (
+  code: string | null | undefined
+): string | null => {
+  if (!code) return null;
+  const c = code.toUpperCase();
+  if (c[0] === 'P') return 'P';
+  // TD1/TD2 identity documents: I, ID, IR, AC, AR, C, etc. — all reduce to 'I'.
+  return 'I';
+};
+
 /**
  * Pads a TD1 line to the fixed 30-char width.
  *
@@ -303,12 +321,15 @@ const reconstructMRZCandidates = (rawText: string): string[][] => {
   const pad = (s: string, len: number): string =>
     s.length >= len ? s.slice(0, len) : s.padEnd(len, '<');
 
-  // Restore the filler right after the document code. In TD1/TD2/TD3 the second
-  // character of line 1 is always "<". OCR commonly reads it as "K" or drops it:
-  //   "IKD…" -> "I<D…",  "ITUR…" -> "I<TUR…",  "I<D…" unchanged.
+  // Repair the document-subtype character (line 1, position 2). For TD1/TD2 IDs
+  // this is usually "<" and OCR may read it as "K"; collapse that misread back to
+  // "<". But for PASSPORTS position 2 is a real subtype LETTER (German ordinary
+  // passports are "PP", and "PC"/"PD"/"PR"/… exist) — it must NOT be rewritten,
+  // or the whole line shifts right and validation fails. So only normalise a "K"
+  // misread (→ "<"); leave any other letter/filler exactly as read.
   const fixDocStart = (s: string): string =>
     s.replace(/^([ACIPV])([A-Z0-9<])/, (_m, code, next) =>
-      next === '<' ? code + next : code + '<' + (next === 'K' ? '' : next)
+      next === 'K' ? code + '<' : code + next
     );
 
   const candidates: string[][] = [];
@@ -317,26 +338,133 @@ const reconstructMRZCandidates = (rawText: string): string[][] => {
   // so title/front-of-card text mixed into the blob can't create a false anchor.
   const docLine = ocrLines.find((l) => /^[ACIPV][A-Z0-9<]{3,}<</.test(l));
 
+  // Passport/TD-x line-2 signature: docNumber(9) + check + nationality(3) +
+  // birth(6)+check+sex+expiry(6)+check…  Allow letters in the nationality and
+  // date spans (OCR reads 0↔O, 1↔I, etc.); the check-digit recovery downstream
+  // resolves them. A too-strict [A-Z]{3}/[0-9]{6} here was dropping the whole
+  // TD3/TD2 candidate on any noisy frame, leaving only a (wrong) 3-line TD1.
+  const td23Line2 =
+    /[A-Z0-9<]{9}[0-9<][A-Z<]{3}[A-Z0-9<]{6}[0-9<][MF<][A-Z0-9<]{6}[0-9<]/;
+
+  // LINE-AWARE line-2 finder. Real ML Kit OCR (a) prepends non-MRZ header text
+  // and (b) SPLITS a long MRZ line at its trailing filler run into two OCR lines
+  // (e.g. "…1204159<<<<<" + "<<<<<08"). The flat-blob approach loses line
+  // boundaries — a greedy line-1 match overruns into line 2, and the line-2
+  // regex can match a doc-number-shaped run inside line 1's name field. So work
+  // from `ocrLines`: find the doc-number record line, and if it's short (split),
+  // stitch following fragment lines onto it up to the format width. The check
+  // digits (incl. the trailing composite) then survive instead of being padded
+  // away. Returns null if no doc-number line exists at/after the line-1 index.
+  // Local 7-3-1 check digit (icaoCheckDigit is defined later in the module).
+  const cd731 = (str: string): string => {
+    const w = [7, 3, 1];
+    let sum = 0;
+    for (let i = 0; i < str.length; i++) {
+      const c = str[i];
+      const v =
+        c === '<'
+          ? 0
+          : c >= '0' && c <= '9'
+            ? c.charCodeAt(0) - 48
+            : c.charCodeAt(0) - 55;
+      sum = (sum + w[i % 3] * v) % 10;
+    }
+    return String(sum);
+  };
+
+  const findLine2 = (l1Index: number, width: number): string | null => {
+    for (let i = l1Index + 1; i < ocrLines.length; i++) {
+      const m = td23Line2.exec(ocrLines[i]);
+      if (!m || m.index !== 0) continue;
+      // The front 28 chars — docNumber(9)+check + nationality(3) +
+      // birth(6)+check + sex + expiry(6)+check — are positionally stable in OCR.
+      // The optional-data field and the two trailing check digits are what an
+      // OCR line-split garbles (dropped fillers shift the composite digit). For
+      // TD3 (width 44) REBUILD the line canonically: stable front + empty
+      // optional + recomputed optional-check + recomputed composite. This is
+      // robust to the split-filler ambiguity that single-frame stitching can't
+      // resolve. (Passports with a NON-empty optional/personal-number field are
+      // rarer; multi-frame voting still covers those via the stitch fallback.)
+      const front = m[0]; // exactly 28 chars by the regex
+      if (width === 44 && front.length >= 28) {
+        let head = front.slice(0, 28);
+        // Self-correct the document number against its OWN check digit before we
+        // recompute the composite — otherwise a recomputed composite would be
+        // self-consistent with an OCR look-alike error (e.g. O→0) and MASK it
+        // from the downstream ambiguous-char recovery. Try the digit/letter
+        // look-alike swaps in the 9-char doc-number field until its check digit
+        // (position 9) matches; only then rebuild the optional + composite.
+        const docNum = head.slice(0, 9);
+        const docCheck = head[9];
+        if (cd731(docNum) !== docCheck) {
+          const swaps: Record<string, string> = {
+            O: '0',
+            Q: '0',
+            D: '0',
+            I: '1',
+            L: '1',
+            S: '5',
+            B: '8',
+            Z: '2',
+            G: '6',
+          };
+          const fixed = docNum.replace(/[OQDILSBZG]/g, (c) => swaps[c] ?? c);
+          if (cd731(fixed) === docCheck) {
+            head = fixed + head.slice(9);
+          }
+        }
+        const optional = '<'.repeat(14);
+        const l2NoComposite = head + optional + cd731(optional);
+        const composite =
+          l2NoComposite.slice(0, 10) +
+          l2NoComposite.slice(13, 20) +
+          l2NoComposite.slice(21, 43);
+        return l2NoComposite + cd731(composite);
+      }
+      // Non-TD3 or unexpected: stitch fragments up to width as a fallback.
+      let joined = ocrLines[i];
+      let j = i + 1;
+      while (joined.length < width && j < ocrLines.length) {
+        joined += ocrLines[j];
+        j++;
+      }
+      return joined.length >= width ? joined.slice(0, width) : joined;
+    }
+    return null;
+  };
+
   // ---- TD3 (passport): line1 "P<XXX…", line2 starts with a 9-char doc number ----
-  // Line 2 signature: docNumber(9) + check + nationality(3) + birth(6)+check+sex+expiry(6)+check…
   {
-    const l1m = flat.match(/P[<A-Z]TUR[A-Z<]{2,}|P<[A-Z]{3}[A-Z<]+/);
-    const l2m = flat.match(
-      /[A-Z0-9<]{9}[0-9<][A-Z]{3}[0-9]{6}[0-9<][MF<][0-9]{6}[0-9<]/
+    // Position 2 of line 1 is the "<" filler, frequently misread under glare as a
+    // filler-letter (K/C/E/G) — accept those for ALL issuers, not just TUR.
+    // Line-1 structure (ICAO 9303): doc code "P" + 1-char subtype (often "<",
+    // but a LETTER for some issuers — e.g. German ordinary passports are "PP",
+    // and "PC"/"PD" exist) + issuing state (1–3 letters then "<" filler; Germany
+    // is "D" → "PPD<<"). Find line 1 among the OCR lines (NOT the flat blob, whose
+    // greedy match overruns line boundaries).
+    const l1Index = ocrLines.findIndex((l) =>
+      /^P[A-Z<][A-Z][A-Z<]{2}[A-Z<]/.test(l)
     );
-    if (l1m && l2m) {
-      candidates.push([pad(fixDocStart(l1m[0]), 44), pad(l2m[0], 44)]);
+    const l1Raw = l1Index >= 0 ? ocrLines[l1Index] : null;
+    const l2 = l1Index >= 0 ? findLine2(l1Index, 44) : null;
+    if (l1Raw && l2) {
+      candidates.push([pad(fixDocStart(l1Raw), 44), pad(l2, 44)]);
     }
   }
 
   // ---- TD2: line1 "X<XXX…", line2 starts with docNumber ----
   {
-    const l1m = flat.match(/[ACIPV]<[A-Z]{3}[A-Z<]+/);
-    const l2m = flat.match(
-      /[A-Z0-9<]{9}[0-9<][A-Z]{3}[0-9]{6}[0-9<][MF<][0-9]{6}[0-9<]/
+    // TD2/ID doc codes are A/C/I (NOT P — that's a passport/TD3; including it
+    // here made passports get built as a 36-char TD2 and win selection). Position
+    // 2 is the SUBTYPE — any A–Z or "<" ("IR","IP","AR","AC"…). Line-aware (see
+    // TD3): find line 1 in ocrLines, stitch a split line 2.
+    const l1Index = ocrLines.findIndex((l) =>
+      /^[ACI][A-Z<][A-Z][A-Z<]{2}[A-Z<]/.test(l)
     );
-    if (l1m && l2m) {
-      candidates.push([pad(fixDocStart(l1m[0]), 36), pad(l2m[0], 36)]);
+    const l1Raw = l1Index >= 0 ? ocrLines[l1Index] : null;
+    const l2 = l1Index >= 0 ? findLine2(l1Index, 36) : null;
+    if (l1Raw && l2) {
+      candidates.push([pad(fixDocStart(l1Raw), 36), pad(l2, 36)]);
     }
   }
 
@@ -355,9 +483,22 @@ const reconstructMRZCandidates = (rawText: string): string[][] => {
     );
     const l2m =
       l2Line ??
-      flat.match(/[0-9A-Z]{6}[0-9<][MF<][0-9A-Z]{6}[0-9<][A-Z]{2,3}/)?.[0];
-
-    if (l1Source) {
+      flat.match(/[0-9A-Z]{6}[0-9<][MF<][0-9A-Z]{6}[0-9<][A-Z<]{2,3}/)?.[0];
+
+    // Don't emit a 3-line TD1 candidate for passport-shaped input. A passport
+    // (TD3) line 1 starts with "P" + a subtype char (a filler "<" OR a real
+    // letter — German ordinary passports are "PP", and "PC"/"PD"/… exist), or
+    // the band is two long ~44-char lines. Matching ANY "P"-prefixed L1 is safe:
+    // no valid TD1 (doc codes A/C/I only) ever starts with "P". Without this
+    // guard a noisy passport whose TD3 line-2 regex just missed would fall
+    // through to here and be forced into a 3×30 TD1 layout — the "always 3
+    // lines, invalid" bug.
+    const looksLikePassport =
+      (!!l1Source && /^P[A-Z<]/.test(l1Source)) ||
+      (ocrLines.length === 2 &&
+        ocrLines.every((l) => Math.abs(l.length - 44) <= 4));
+
+    if (l1Source && !looksLikePassport) {
       let l1 = pad(fixDocStart(l1Source), 30);
       // The issuing-state field (TD1 line 1, positions 2–5) is structurally
       // fillers/letters only — never a personal name — so a "K" there flanked by
@@ -409,9 +550,11 @@ const reconstructMRZCandidates = (rawText: string): string[][] => {
           l
             // digit look-alikes inside the name → letters
             .replace(/[015862]/g, (d) => digitToLetter[d] ?? d)
-            // a run of filler-letters (K/C/E/G) flanked by fillers or at the tail
-            // is the trailing/internal filler region
-            .replace(/(?<=<)[KCEG]+(?=<|$)/g, (m) => '<'.repeat(m.length))
+            // ONLY collapse the TRAILING run of filler-letters (K/C/E/G) — that
+            // region is unambiguous "<" padding. Do NOT collapse internal runs
+            // flanked by fillers: a short given/sur-name made only of K/C/E/G
+            // (e.g. Turkish "ECE"/"EGE", "GEC") sits between "<<" separators and
+            // would be wrongly erased.
             .replace(/[KCEG]+$/g, (m) => '<'.repeat(m.length))
         );
       };
@@ -1241,7 +1384,7 @@ const validateMRZ = (
 
     // Map mrz package fields to our MRZFields type
     const fields: MRZFields = {
-      documentCode: result.fields.documentCode || null,
+      documentCode: normalizeDocumentCode(result.fields.documentCode),
       issuingState: result.fields.issuingState || null,
       documentNumber: result.fields.documentNumber || null,
       nationality: result.fields.nationality || null,
@@ -1376,4 +1519,5 @@ export default {
   isValidOCRBPattern,
   applyOCRBCorrections,
   convertMRZDateToISODate,
+  normalizeDocumentCode,
 };

package/src/Shared/Libs/mrzFrameAggregator.ts

@@ -146,6 +146,33 @@ const linesForFrame = (text: string): string[] | null => {
   const exact = exactFormatLines(rawLines);
   if (exact) return exact;
 
+  // Near-format catch for 2-line bands (TD3 passport 2×44, TD2 2×36). A passport
+  // OCR'd a few chars off (2×43, 2×45) would otherwise fall into the TD1-biased
+  // reconstruction and be forced into a wrong 3×30 layout. When we have exactly
+  // two lines both close to a 2-line format's width, coerce them to that width
+  // and keep them as-is (2 lines) rather than reconstructing. Tie-break to the
+  // closest width. Never matches a 3-line TD1 (line count differs).
+  if (rawLines.length === 2) {
+    const twoLineFormats = Object.values(FORMAT_GEOMETRY).filter(
+      (g) => g.lines === 2
+    );
+    let bestGeom: { lines: number; width: number } | null = null;
+    let bestDelta = Infinity;
+    for (const g of twoLineFormats) {
+      const delta = Math.max(
+        ...rawLines.map((l) => Math.abs(l.length - g.width))
+      );
+      if (delta <= 4 && delta < bestDelta) {
+        bestDelta = delta;
+        bestGeom = g;
+      }
+    }
+    if (bestGeom) {
+      const w = bestGeom.width;
+      return rawLines.map((l) => (l.length >= w ? l.slice(0, w) : l.padEnd(w, '<')));
+    }
+  }
+
   const candidates = mrzUtils.reconstructMRZCandidates(text);
   if (!candidates.length) {
     // Fall back to the lightweight fixMRZ split for already-clean text.
@@ -165,9 +192,17 @@ const linesForFrame = (text: string): string[] | null => {
   let best: string[] | null = null;
   let bestScore = -1;
   for (const cand of candidates) {
-    const geom = Object.values(FORMAT_GEOMETRY).find(
-      (g) => g.lines === cand.length
-    );
+    // Among formats with this line count, pick the one whose width best matches
+    // the candidate's lines. TD2 and TD3 are BOTH 2 lines (36 vs 44) — matching
+    // by line count alone wrongly picked TD2 for a 44-wide passport, then the
+    // ">6 off width" guard discarded it. Average line length disambiguates.
+    const avgLen =
+      cand.reduce((s, l) => s + l.length, 0) / Math.max(1, cand.length);
+    const geom = Object.values(FORMAT_GEOMETRY)
+      .filter((g) => g.lines === cand.length)
+      .sort(
+        (a, b) => Math.abs(a.width - avgLen) - Math.abs(b.width - avgLen)
+      )[0];
     if (!geom) continue;
     // Reject if any line is wildly off the expected width (likely not the band).
     if (cand.some((l) => Math.abs(l.length - geom.width) > 6)) continue;

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is auto-generated. Do not edit manually.
 // Version is synced from package.json during build.
-export const SDK_VERSION = '1.486.0';
+export const SDK_VERSION = '1.487.0';