react-native-otp-auto-verify 0.2.0 → 0.2.1

package/package.json

@@ -1,175 +1,183 @@
-{
-  "name": "react-native-otp-auto-verify",
-  "version": "0.2.0",
-  "description": "react-native-otp-auto-verify is a React Native library for automatic OTP verification on Android and iOS. It uses the Google SMS Retriever API to detect OTP codes automatically without requiring the READ_SMS permission. The library is fully Play Store compliant, improves user login experience, supports TurboModule, and works with the React Native New Architecture",
-  "keywords": [
-    "react-native",
-    "react-native-library",
-    "react-native-otp",
-    "react-native-otp-auto-verify",
-    "react-native-sms",
-    "otp",
-    "otp-verification",
-    "otp-auto-verify",
-    "otp-auto-read",
-    "sms",
-    "sms-retriever",
-    "google-sms-retriever",
-    "android-otp",
-    "ios-otp",
-    "otp-without-permission",
-    "play-store-compliant",
-    "react-native-new-architecture",
-    "turbo-module"
-  ],
-  "homepage": "https://github.com/kailas-rathod/react-native-otp-auto-verify?tab=readme-ov-file",
-  "bugs": {
-    "url": "https://github.com/kailas-rathod/react-native-otp-auto-verify/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kailas-rathod/react-native-otp-auto-verify.git"
-  },
-  "license": "MIT",
-  "author": "Kailas Rathod (https://github.com/kailas-rathod)",
-  "type": "commonjs",
-  "main": "./lib/module/index.js",
-  "types": "./lib/typescript/src/index.d.ts",
-  "files": [
-    "src",
-    "lib",
-    "android",
-    "ios",
-    "*.podspec",
-    "react-native.config.js",
-    "!ios/build",
-    "!android/build",
-    "!android/gradle",
-    "!android/gradlew",
-    "!android/gradlew.bat",
-    "!android/local.properties",
-    "!**/__tests__",
-    "!**/__fixtures__",
-    "!**/__mocks__",
-    "!**/.*"
-  ],
-  "scripts": {
-    "prepare": "bob build",
-    "typecheck": "tsc",
-    "lint": "eslint \"**/*.{js,ts,tsx}\"",
-    "test": "jest",
-    "check": "yarn typecheck && yarn lint && yarn test",
-    "release": "release-it --only-version"
-  },
-  "devDependencies": {
-    "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/compat": "^1.3.2",
-    "@eslint/eslintrc": "^3.3.4",
-    "@eslint/js": "^9.35.0",
-    "@react-native/babel-preset": "0.83.0",
-    "@react-native-community/eslint-config": "^3.2.0",
-    "@release-it/conventional-changelog": "^10.0.1",
-    "@types/jest": "^29.5.14",
-    "@types/react": "^19.2.0",
-    "commitlint": "^19.8.1",
-    "eslint": "^10.0.2",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-react-native": "^5.0.0",
-    "jest": "^30.2.0",
-    "prettier": "^2.8.8",
-    "react": "19.2.4",
-    "react-native": "0.83.0",
-    "react-native-builder-bob": "0.39.1",
-    "release-it": "^19.0.4",
-    "typescript": "^5.9.3"
-  },
-  "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "eslintConfig": {
-    "root": true,
-    "extends": [
-      "@react-native-community",
-      "prettier"
-    ],
-    "rules": {
-      "prettier/prettier": [
-        "error",
-        {
-          "quoteProps": "consistent",
-          "singleQuote": true,
-          "tabWidth": 2,
-          "trailingComma": "es5",
-          "useTabs": false
-        }
-      ]
-    }
-  },
-  "eslintIgnore": [
-    "node_modules/",
-    "lib/"
-  ],
-  "packageManager": "yarn@4.11.0",
-  "react-native-builder-bob": {
-    "source": "src",
-    "output": "lib",
-    "targets": [
-      [
-        "module",
-        {
-          "esm": true
-        }
-      ],
-      [
-        "typescript",
-        {
-          "project": "tsconfig.build.json"
-        }
-      ]
-    ]
-  },
-  "codegenConfig": {
-    "name": "OtpAutoVerifySpec",
-    "type": "modules",
-    "jsSrcsDir": "src",
-    "android": {
-      "javaPackageName": "com.otpautoverify"
-    }
-  },
-  "prettier": {
-    "quoteProps": "consistent",
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "es5",
-    "useTabs": false
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "release-it": {
-    "git": {
-      "commitMessage": "chore: release ${version}",
-      "tagName": "v${version}"
-    },
-    "npm": {
-      "publish": true
-    },
-    "github": {
-      "release": true
-    },
-    "plugins": {
-      "@release-it/conventional-changelog": {
-        "preset": {
-          "name": "angular"
-        }
-      }
-    }
-  }
-}
+{
+  "name": "react-native-otp-auto-verify",
+  "version": "0.2.1",
+  "description": "react-native-otp-auto-verify is a React Native library for automatic OTP verification on Android and iOS. It uses the Google SMS Retriever API to detect OTP codes automatically without requiring the READ_SMS permission. The library is fully Play Store compliant, improves user login experience, supports TurboModule, and works with the React Native New Architecture",
+  "keywords": [
+    "react-native",
+    "react-native-library",
+    "react-native-otp",
+    "react-native-otp-auto-verify",
+    "react-native-sms",
+    "otp",
+    "otp-verification",
+    "otp-auto-verify",
+    "otp-auto-read",
+    "sms",
+    "sms-retriever",
+    "google-sms-retriever",
+    "android-otp",
+    "ios-otp",
+    "otp-without-permission",
+    "play-store-compliant",
+    "react-native-new-architecture",
+    "turbo-module"
+  ],
+  "homepage": "https://github.com/kailas-rathod/react-native-otp-auto-verify?tab=readme-ov-file",
+  "bugs": {
+    "url": "https://github.com/kailas-rathod/react-native-otp-auto-verify/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kailas-rathod/react-native-otp-auto-verify.git"
+  },
+  "license": "MIT",
+  "author": "Kailas Rathod (https://github.com/kailas-rathod)",
+  "type": "commonjs",
+  "main": "./lib/module/index.js",
+  "types": "./lib/typescript/src/index.d.ts",
+  "files": [
+    "src",
+    "lib",
+    "android",
+    "ios",
+    "*.podspec",
+    "react-native.config.js",
+    "!ios/build",
+    "!android/build",
+    "!android/gradle",
+    "!android/gradlew",
+    "!android/gradlew.bat",
+    "!android/local.properties",
+    "!**/__tests__",
+    "!**/__fixtures__",
+    "!**/__mocks__",
+    "!**/.*"
+  ],
+  "scripts": {
+    "prepare": "bob build",
+    "typecheck": "tsc",
+    "lint": "eslint \"**/*.{js,ts,tsx}\"",
+    "test": "jest",
+    "check": "yarn typecheck && yarn lint && yarn test",
+    "release": "release-it --only-version"
+  },
+  "devDependencies": {
+    "@babel/eslint-parser": "^7.28.0",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@eslint/eslintrc": "^3.3.4",
+    "@eslint/js": "9.35.0",
+    "@react-native-community/eslint-config": "^3.2.0",
+    "@react-native-community/eslint-plugin": "^1.1.0",
+    "@typescript-eslint/eslint-plugin": "^8.15.0",
+    "@typescript-eslint/parser": "^8.15.0",
+    "@react-native/babel-preset": "0.83.3",
+    "@release-it/conventional-changelog": "^10.0.6",
+    "@types/jest": "^29.5.14",
+    "@types/react": "^19.2.0",
+    "commitlint": "^19.8.1",
+    "eslint": "9.35.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-eslint-comments": "^3.2.0",
+    "eslint-plugin-ft-flow": "^2.0.1",
+    "eslint-plugin-jest": "^28.11.0",
+    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-react": "^7.37.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-native": "^5.0.0",
+    "jest": "^30.3.0",
+    "prettier": "^3.4.2",
+    "react": "19.2.5",
+    "react-native": "0.83.3",
+    "react-native-builder-bob": "0.39.1",
+    "release-it": "^19.0.4",
+    "typescript": "^5.9.3"
+  },
+  "peerDependencies": {
+    "react": "*",
+    "react-native": "*"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "eslintConfig": {
+    "root": true,
+    "extends": [
+      "@react-native-community",
+      "prettier"
+    ],
+    "rules": {
+      "prettier/prettier": [
+        "error",
+        {
+          "quoteProps": "consistent",
+          "singleQuote": true,
+          "tabWidth": 2,
+          "trailingComma": "es5",
+          "useTabs": false
+        }
+      ]
+    }
+  },
+  "eslintIgnore": [
+    "node_modules/",
+    "lib/"
+  ],
+  "packageManager": "yarn@4.11.0",
+  "react-native-builder-bob": {
+    "source": "src",
+    "output": "lib",
+    "targets": [
+      [
+        "module",
+        {
+          "esm": true
+        }
+      ],
+      [
+        "typescript",
+        {
+          "project": "tsconfig.build.json"
+        }
+      ]
+    ]
+  },
+  "codegenConfig": {
+    "name": "OtpAutoVerifySpec",
+    "type": "modules",
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "com.otpautoverify"
+    }
+  },
+  "prettier": {
+    "quoteProps": "consistent",
+    "singleQuote": true,
+    "tabWidth": 2,
+    "trailingComma": "es5",
+    "useTabs": false
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "release-it": {
+    "git": {
+      "commitMessage": "chore: release ${version}",
+      "tagName": "v${version}"
+    },
+    "npm": {
+      "publish": true
+    },
+    "github": {
+      "release": true
+    },
+    "plugins": {
+      "@release-it/conventional-changelog": {
+        "preset": {
+          "name": "angular"
+        }
+      }
+    }
+  }
+}

package/src/NativeOtpAutoVerify.ts

@@ -1,25 +1,37 @@
-import { NativeModules, TurboModuleRegistry, type TurboModule } from 'react-native';
-
-export interface OtpAutoVerifySpec extends TurboModule {
-  getConstants(): { OTP_RECEIVED_EVENT: string };
-  getHash(): Promise<ReadonlyArray<string>>;
-  startSmsRetriever(): Promise<boolean>;
-  addListener(eventName: string): void;
-  removeListeners(count: number): void;
-}
-
-function getNativeModule(): OtpAutoVerifySpec {
-  try {
-    return TurboModuleRegistry.getEnforcing<OtpAutoVerifySpec>('OtpAutoVerify');
-  } catch {
-    const legacy = NativeModules.OtpAutoVerify;
-    if (!legacy) {
-      throw new Error(
-        'OtpAutoVerify native module is not available. Ensure the library is properly linked.'
-      );
-    }
-    return legacy as OtpAutoVerifySpec;
-  }
-}
-
-export default getNativeModule();
+import {
+  NativeModules,
+  TurboModuleRegistry,
+  type TurboModule,
+} from 'react-native';
+
+export interface Spec extends TurboModule {
+  getConstants(): { OTP_RECEIVED_EVENT: string };
+  getHash(): Promise<ReadonlyArray<string>>;
+  startSmsRetriever(): Promise<boolean>;
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
+}
+
+function loadNativeModule(): Spec {
+  try {
+    return TurboModuleRegistry.getEnforcing<Spec>('OtpAutoVerify');
+  } catch {
+    const legacy = NativeModules.OtpAutoVerify;
+    if (!legacy) {
+      throw new Error(
+        'OtpAutoVerify native module is not available. Ensure the library is properly linked.'
+      );
+    }
+    return legacy as Spec;
+  }
+}
+
+let cachedModule: Spec | null = null;
+
+/** Resolves the native module on first use so importing this package does not throw before APIs run. */
+export function getOtpNativeModule(): Spec {
+  if (cachedModule === null) {
+    cachedModule = loadNativeModule();
+  }
+  return cachedModule;
+}

package/src/index.tsx

@@ -1,15 +1,9 @@
 import * as React from 'react';
 import { NativeEventEmitter, Platform } from 'react-native';
-import NativeOtpAutoVerify from './NativeOtpAutoVerify';
+import { getOtpNativeModule } from './NativeOtpAutoVerify';
 
-const eventEmitter =
-  Platform.OS === 'android' && NativeOtpAutoVerify
-    ? new NativeEventEmitter(NativeOtpAutoVerify)
-    : null;
-
-const OTP_RECEIVED_EVENT =
-  (NativeOtpAutoVerify.getConstants?.()?.OTP_RECEIVED_EVENT as string) ??
-  'otpReceived';
+/** Must match native `OTP_RECEIVED_EVENT` (Android/iOS). */
+export const OTP_RECEIVED_EVENT = 'otpReceived';
 
 export const TIMEOUT_MESSAGE = 'Timeout Error.';
 const DEFAULT_DIGITS = 6;
@@ -19,11 +13,29 @@ const MAX_OTP_DIGITS = 8;
 
 export type OtpDigits = 4 | 5 | 6 | 7 | 8;
 
-function getOtpRegex(digits: number): RegExp {
-  if (digits < MIN_OTP_DIGITS || digits > MAX_OTP_DIGITS) {
-    return new RegExp(`\\b(\\d{${DEFAULT_DIGITS}})\\b`);
+let androidEventEmitter: NativeEventEmitter | null | undefined;
+
+function getAndroidEventEmitter(): NativeEventEmitter | null {
+  if (Platform.OS !== 'android') return null;
+  if (androidEventEmitter !== undefined) {
+    return androidEventEmitter;
+  }
+  try {
+    androidEventEmitter = new NativeEventEmitter(getOtpNativeModule());
+    return androidEventEmitter;
+  } catch {
+    androidEventEmitter = null;
+    return null;
   }
-  return new RegExp(`\\b(\\d{${digits}})\\b`);
+}
+
+function getOtpRegex(digits: number): RegExp {
+  const d =
+    digits >= MIN_OTP_DIGITS && digits <= MAX_OTP_DIGITS
+      ? digits
+      : DEFAULT_DIGITS;
+  // Prefer non-`\b` boundaries so OTPs still match after ":" and similar (e.g. "OTP:123456").
+  return new RegExp(`(^|[^0-9])(\\d{${d}})(?!\\d)`);
 }
 
 export interface UseOtpVerificationOptions {
@@ -64,13 +76,13 @@ export function extractOtp(
   if (!trimmed) return null;
   const regex = getOtpRegex(numberOfDigits);
   const match = trimmed.match(regex);
-  return match ? match[1]! : null;
+  return match ? match[2]! : null;
 }
 
 /** Returns app hash strings for the current app. Android only; iOS returns []. */
 export async function getHash(): Promise<string[]> {
   if (Platform.OS !== 'android') return [];
-  const arr = await NativeOtpAutoVerify.getHash();
+  const arr = await getOtpNativeModule().getHash();
   return Array.from(arr);
 }
 
@@ -84,12 +96,17 @@ export async function activateOtpListener(
   handler: (sms: string, extractedOtp?: string | null) => void,
   options?: { numberOfDigits?: OtpDigits }
 ): Promise<OtpListenerSubscription> {
-  if (Platform.OS !== 'android' || !eventEmitter) {
+  if (Platform.OS !== 'android') {
+    return NOOP_SUBSCRIPTION;
+  }
+
+  const emitter = getAndroidEventEmitter();
+  if (!emitter) {
     return NOOP_SUBSCRIPTION;
   }
 
   const numberOfDigits = options?.numberOfDigits ?? DEFAULT_DIGITS;
-  const subscription = eventEmitter.addListener(
+  const subscription = emitter.addListener(
     OTP_RECEIVED_EVENT,
     (...args: unknown[]) => {
       const smsText = String(args[0] ?? '');
@@ -97,11 +114,21 @@ export async function activateOtpListener(
     }
   );
 
-  await NativeOtpAutoVerify.startSmsRetriever();
+  try {
+    await getOtpNativeModule().startSmsRetriever();
+  } catch (err) {
+    subscription.remove();
+    throw err;
+  }
+
   return {
     remove: () => {
       subscription.remove();
-      NativeOtpAutoVerify.removeListeners(0);
+      try {
+        getOtpNativeModule().removeListeners(0);
+      } catch {
+        // Native may be unavailable during teardown
+      }
     },
   };
 }
@@ -111,8 +138,11 @@ export async function activateOtpListener(
  * The native module ignores the count parameter and always unregisters the SMS receiver.
  */
 export function removeListener(): void {
-  if (Platform.OS === 'android') {
-    NativeOtpAutoVerify.removeListeners(0);
+  if (Platform.OS !== 'android') return;
+  try {
+    getOtpNativeModule().removeListeners(0);
+  } catch {
+    // Native not linked or already torn down
   }
 }
 
@@ -153,7 +183,9 @@ export function useOtpVerification(
         const hashes = await getHash();
         setHashCode(hashes[0] ?? '');
       } catch (err) {
-        setError(err instanceof Error ? err : new Error(String(err)));
+        const wrapped = err instanceof Error ? err : new Error(String(err));
+        setError(wrapped);
+        return;
       }
 
       const sub = await activateOtpListener(
@@ -193,5 +225,3 @@ export function useOtpVerification(
     [hashCode, otp, sms, timeoutError, error, startListening, stopListening]
   );
 }
-
-export { OTP_RECEIVED_EVENT };