react-native-3rddigital-appupdate 1.0.3 → 1.0.5

package/lib/module/checkOTAUpdate.js

@@ -23,7 +23,11 @@ export const checkOTAUpdate = async ({
     const forceUpdate = data?.forceUpdate ?? false;
     const url = data?.url ?? '';
     const bundleId = data?.bundleId ?? '';
-    if (version <= currentVersion) return;
+    const currentAppVersion = DeviceInfo.getVersion();
+    const bundleAppVersion = data?.appVersion ?? currentAppVersion;
+    if (version <= currentVersion || currentAppVersion != bundleAppVersion) {
+      return;
+    }
     const downloadAndReport = () => {
       AppLoader.show(loaderOptions);
       hotUpdate.downloadBundleUri(ReactNativeBlobUtil, url, version, {

package/lib/module/checkOTAUpdate.js.map

@@ -1 +1 @@
-{"version":3,"names":["axios","Platform","ReactNativeBlobUtil","DeviceInfo","hotUpdate","AppAlertDialog","AppLoader","API_URL","checkOTAUpdate","key","iosPackage","androidPackage","loaderOptions","dialogOptions","response","get","currentVersion","getCurrentVersion","data","OS","android","ios","version","forceUpdate","url","bundleId","downloadAndReport","show","downloadBundleUri","updateSuccess","post","status","headers","finally","hide","updateFail","error","JSON","stringify","deviceInfo","model","getModel","brand","getBrand","systemName","getSystemName","systemVersion","getSystemVersion","restartAfterInstall","restartDelay","showMessage","title","message","confirmText","cancelText","onConfirm","onCancel","err","console","warn"],"sourceRoot":"../../src","sources":["checkOTAUpdate.ts"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,QAAQ,QAAQ,cAAc;AACvC,OAAOC,mBAAmB,MAAM,wBAAwB;AACxD,OAAOC,UAAU,MAAM,0BAA0B;AACjD,OAAOC,SAAS,MAAM,6BAA6B;AACnD,SAASC,cAAc,QAA4B,qBAAkB;AACrE,SAASC,SAAS,QAA4B,gBAAa;AAE3D,MAAMC,OAAO,GAAG,+CAA+C;AAU/D,OAAO,MAAMC,cAAc,GAAG,MAAAA,CAAO;EACnCC,GAAG;EACHC,UAAU;EACVC,cAAc;EACdC,aAAa;EACbC;AACc,CAAC,KAAK;EACpB,IAAI;IACF,MAAMC,QAAQ,GAAG,MAAMd,KAAK,CAACe,GAAG,CAC9B,GAAGR,OAAO,2BAA2BE,GAAG,eAAeC,UAAU,mBAAmBC,cAAc,EACpG,CAAC;IAED,MAAMK,cAAc,GAAG,MAAMZ,SAAS,CAACa,iBAAiB,CAAC,CAAC;IAC1D,MAAMC,IAAI,GACRjB,QAAQ,CAACkB,EAAE,KAAK,SAAS,GAAGL,QAAQ,EAAEI,IAAI,EAAEE,OAAO,GAAGN,QAAQ,EAAEI,IAAI,EAAEG,GAAG;IAC3E,MAAMC,OAAO,GAAGJ,IAAI,EAAEI,OAAO,IAAI,CAAC;IAClC,MAAMC,WAAW,GAAGL,IAAI,EAAEK,WAAW,IAAI,KAAK;IAC9C,MAAMC,GAAG,GAAGN,IAAI,EAAEM,GAAG,IAAI,EAAE;IAC3B,MAAMC,QAAQ,GAAGP,IAAI,EAAEO,QAAQ,IAAI,EAAE;IAErC,IAAIH,OAAO,IAAIN,cAAc,EAAE;IAE/B,MAAMU,iBAAiB,GAAGA,CAAA,KAAM;MAC9BpB,SAAS,CAACqB,IAAI,CAACf,aAAa,CAAC;MAC7BR,SAAS,CAACwB,iBAAiB,CAAC1B,mBAAmB,EAAEsB,GAAG,EAAEF,OAAO,EAAE;QAC7DO,aAAa,EAAEA,CAAA,KAAM;UACnB7B,KAAK,CACF8B,IAAI,CACH,GAAGvB,OAAO,WAAWkB,QAAQ,QAAQ,EACrC;YAAEM,MAAM,EAAE;UAAU,CAAC,EACrB;YAAEC,OAAO,EAAE;cAAE,cAAc,EAAE;YAAmB;UAAE,CACpD,CAAC,CACAC,OAAO,CAAC,MAAM3B,SAAS,CAAC4B,IAAI,CAAC,CAAC,CAAC;QACpC,CAAC;QACDC,UAAU,EAAGC,KAAK,IAAK;UACrBpC,KAAK,CACF8B,IAAI,CACH,GAAGvB,OAAO,WAAWkB,QAAQ,QAAQ,EACrC;YACEM,MAAM,EAAE,SAAS;YACjBK,KAAK,EAAEC,IAAI,CAACC,SAAS,CAACF,KAAK,CAAC;YAC5BG,UAAU,EAAE;cACVC,KAAK,EAAErC,UAAU,CAACsC,QAAQ,CAAC,CAAC;cAC5BC,KAAK,EAAEvC,UAAU,CAACwC,QAAQ,CAAC,CAAC;cAC5BC,UAAU,EAAEzC,UAAU,CAAC0C,aAAa,CAAC,CAAC;cACtCC,aAAa,EAAE3C,UAAU,CAAC4C,gBAAgB,CAAC;YAC7C;UACF,CAAC,EACD;YAAEf,OAAO,EAAE;cAAE,cAAc,EAAE;YAAmB;UAAE,CACpD,CAAC,CACAC,OAAO,CAAC,MAAM3B,SAAS,CAAC4B,IAAI,CAAC,CAAC,CAAC;QACpC,CAAC;QACDc,mBAAmB,EAAE,IAAI;QACzBC,YAAY,EAAE;MAChB,CAAC,CAAC;IACJ,CAAC;IAED,IAAI1B,WAAW,EAAE;MACfG,iBAAiB,CAAC,CAAC;IACrB,CAAC,MAAM;MACLrB,cAAc,CAAC6C,WAAW,CAAC;QACzBC,KAAK,EAAE,mBAAmB;QAC1BC,OAAO,EAAE,sCAAsC;QAC/CC,WAAW,EAAE,QAAQ;QACrBC,UAAU,EAAE,QAAQ;QACpBC,SAAS,EAAE7B,iBAAiB;QAC5B8B,QAAQ,EAAEA,CAAA,KAAM,CAAC,CAAC;QAClB,GAAG3C;MACL,CAAC,CAAC;IACJ;EACF,CAAC,CAAC,OAAO4C,GAAG,EAAE;IACZC,OAAO,CAACC,IAAI,CAAC,0BAA0B,EAAEF,GAAG,CAAC;EAC/C;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["axios","Platform","ReactNativeBlobUtil","DeviceInfo","hotUpdate","AppAlertDialog","AppLoader","API_URL","checkOTAUpdate","key","iosPackage","androidPackage","loaderOptions","dialogOptions","response","get","currentVersion","getCurrentVersion","data","OS","android","ios","version","forceUpdate","url","bundleId","currentAppVersion","getVersion","bundleAppVersion","appVersion","downloadAndReport","show","downloadBundleUri","updateSuccess","post","status","headers","finally","hide","updateFail","error","JSON","stringify","deviceInfo","model","getModel","brand","getBrand","systemName","getSystemName","systemVersion","getSystemVersion","restartAfterInstall","restartDelay","showMessage","title","message","confirmText","cancelText","onConfirm","onCancel","err","console","warn"],"sourceRoot":"../../src","sources":["checkOTAUpdate.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/checkOTAUpdate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkOTAUpdate.d.ts","sourceRoot":"","sources":["../../../src/checkOTAUpdate.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAa,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5D,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,UAAU,CAAC,CAAC;CAC/D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAU,oEAMlC,cAAc,kBAmEhB,CAAC"}
+{"version":3,"file":"checkOTAUpdate.d.ts","sourceRoot":"","sources":["../../../src/checkOTAUpdate.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAa,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5D,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,UAAU,CAAC,CAAC;CAC/D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAU,oEAMlC,cAAc,kBAuEhB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-3rddigital-appupdate",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "A React Native library for seamless over-the-air (OTA) updates with version checks, automatic bundle download, and customizable user prompts for iOS and Android.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/scripts/bundle.js

@@ -8,6 +8,9 @@ const { input, select, confirm } = require('@inquirer/prompts');
 
 const API_BASE_URL = 'https://dev.3rddigital.com/appupdate-api/api/';
 
+/**
+ * Run a shell command synchronously.
+ */
 function run(command) {
   try {
     console.log(`\n➡️ Running: ${command}\n`);
@@ -19,6 +22,9 @@ function run(command) {
   }
 }
 
+/**
+ * Upload bundle file to server.
+ */
 async function uploadBundle({ filePath, platform, config }) {
   console.log(`📤 Uploading ${platform} bundle to server...`);
 
@@ -59,6 +65,9 @@ async function uploadBundle({ filePath, platform, config }) {
   }
 }
 
+/**
+ * Build Android JS bundle and zip it.
+ */
 function buildAndroid() {
   console.log('📦 Building Android bundle...');
   const outputPath = path.join('android', 'index.android.bundle.zip');
@@ -74,6 +83,9 @@ function buildAndroid() {
   return outputPath;
 }
 
+/**
+ * Build iOS JS bundle and zip it.
+ */
 function buildIOS() {
   console.log('📦 Building iOS bundle...');
   const outputPath = path.join('ios', 'main.jsbundle.zip');
@@ -89,46 +101,114 @@ function buildIOS() {
   return outputPath;
 }
 
-async function getConfig(platform) {
-  console.log(`\n⚙️  Enter configuration for ${platform.toUpperCase()}\n`);
+/**
+ * Automatically detect app version from native files.
+ */
+function getAppVersion(platform) {
+  try {
+    if (platform === 'android') {
+      // Read Android versionName from build.gradle
+      const gradlePath = path.join(__dirname, 'android', 'app', 'build.gradle');
+      if (!fs.existsSync(gradlePath)) {
+        console.warn('⚠️ Android build.gradle not found.');
+        return null;
+      }
+      const gradleContent = fs.readFileSync(gradlePath, 'utf8');
+      const match = gradleContent.match(/versionName\s+"([\d.]+)"/);
+      if (match && match[1]) {
+        return match[1];
+      } else {
+        console.warn('⚠️ Could not find versionName in build.gradle.');
+      }
+    } else if (platform === 'ios') {
+      // Read MARKETING_VERSION directly from project.pbxproj
+      const iosDir = path.join(__dirname, 'ios');
+      const projectDir = fs
+        .readdirSync(iosDir)
+        .find((d) => d.endsWith('.xcodeproj'));
+
+      if (!projectDir) {
+        console.warn('⚠️ .xcodeproj not found inside ios directory.');
+        return null;
+      }
+
+      const pbxprojPath = path.join(iosDir, projectDir, 'project.pbxproj');
+      if (!fs.existsSync(pbxprojPath)) {
+        console.warn('⚠️ project.pbxproj not found.');
+        return null;
+      }
+
+      const pbxprojContent = fs.readFileSync(pbxprojPath, 'utf8');
+      const match = pbxprojContent.match(/MARKETING_VERSION\s*=\s*([\d.]+);/);
+
+      if (match && match[1]) {
+        return match[1];
+      } else {
+        console.warn('⚠️ Could not find MARKETING_VERSION in project.pbxproj.');
+      }
+    }
+  } catch (err) {
+    console.warn(`⚠️ Failed to read ${platform} version:`, err.message);
+  }
+
+  return null;
+}
+
+/**
+ * Get common configuration (API token, project ID, env).
+ */
+async function getCommonConfig() {
+  console.log(`\n⚙️  Enter common configuration (applies to both platforms)\n`);
 
   const API_TOKEN = await input({
-    message: `(${platform}) Enter API Token:`,
+    message: `Enter API Token:`,
     validate: (val) => (val.trim() ? true : 'API Token is required'),
   });
 
   const PROJECT_ID = await input({
-    message: `(${platform}) Enter Project ID:`,
+    message: `Enter Project ID:`,
     validate: (val) => (val.trim() ? true : 'Project ID is required'),
   });
 
   const ENVIRONMENT = await select({
-    message: `(${platform}) Select Environment:`,
+    message: `Select Environment:`,
     choices: [
       { name: 'development', value: 'development' },
       { name: 'production', value: 'production' },
     ],
   });
 
-  const VERSION = await input({
-    message: `(${platform}) Enter App Version (e.g. 1.0.0):`,
-    validate: (val) => (val.trim() ? true : 'Version is required'),
-  });
+  return { API_TOKEN, PROJECT_ID, ENVIRONMENT };
+}
+
+/**
+ * Get platform-specific configuration with version auto-detection.
+ */
+async function getPlatformSpecificConfig(platform) {
+  console.log(`\n🔧 Configuring ${platform.toUpperCase()}...\n`);
+
+  let detectedVersion = getAppVersion(platform);
+  if (detectedVersion) {
+    console.log(`📱 Detected ${platform} version: ${detectedVersion}`);
+  } else {
+    console.warn(`⚠️ Could not detect ${platform} version automatically.`);
+    detectedVersion = await input({
+      message: `(${platform}) Enter App Version (e.g. 1.0.0):`,
+      validate: (val) => (val.trim() ? true : 'Version is required'),
+    });
+  }
 
   const FORCE_UPDATE = await confirm({
     message: `(${platform}) Force Update?`,
     default: false,
   });
 
-  return {
-    API_TOKEN,
-    PROJECT_ID,
-    ENVIRONMENT,
-    VERSION,
-    FORCE_UPDATE,
-  };
+  return { VERSION: detectedVersion, FORCE_UPDATE };
 }
 
+/**
+ * Entry point
+ */
 (async () => {
   try {
     const platform = process.argv[2];
@@ -137,8 +217,11 @@ async function getConfig(platform) {
       process.exit(1);
     }
 
+    const commonConfig = await getCommonConfig();
+
     if (platform === 'android') {
-      const config = await getConfig('android');
+      const androidExtra = await getPlatformSpecificConfig('android');
+      const config = { ...commonConfig, ...androidExtra };
       const androidFile = buildAndroid();
       await uploadBundle({
         filePath: androidFile,
@@ -146,24 +229,25 @@ async function getConfig(platform) {
         config,
       });
     } else if (platform === 'ios') {
-      const config = await getConfig('ios');
+      const iosExtra = await getPlatformSpecificConfig('ios');
+      const config = { ...commonConfig, ...iosExtra };
       const iosFile = buildIOS();
       await uploadBundle({ filePath: iosFile, platform: 'ios', config });
     } else if (platform === 'all') {
-      const androidConfig = await getConfig('android');
+      const androidExtra = await getPlatformSpecificConfig('android');
       const androidFile = buildAndroid();
       await uploadBundle({
         filePath: androidFile,
         platform: 'android',
-        config: androidConfig,
+        config: { ...commonConfig, ...androidExtra },
       });
 
-      const iosConfig = await getConfig('ios');
+      const iosExtra = await getPlatformSpecificConfig('ios');
       const iosFile = buildIOS();
       await uploadBundle({
         filePath: iosFile,
         platform: 'ios',
-        config: iosConfig,
+        config: { ...commonConfig, ...iosExtra },
       });
     } else {
       console.log('❌ Invalid option. Use: android | ios | all');

package/src/checkOTAUpdate.ts

@@ -35,8 +35,12 @@ export const checkOTAUpdate = async ({
     const forceUpdate = data?.forceUpdate ?? false;
     const url = data?.url ?? '';
     const bundleId = data?.bundleId ?? '';
+    const currentAppVersion = DeviceInfo.getVersion();
+    const bundleAppVersion = data?.appVersion ?? currentAppVersion;
 
-    if (version <= currentVersion) return;
+    if (version <= currentVersion || currentAppVersion != bundleAppVersion) {
+      return;
+    }
 
     const downloadAndReport = () => {
       AppLoader.show(loaderOptions);