@appsonair.ir/react-native 1.0.10 → 1.0.12

package/android/src/main/java/com/otaupdater/OTAApkInstallHelper.kt

@@ -5,47 +5,35 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.provider.Settings
+import android.util.Log
 import androidx.core.content.FileProvider
 import com.facebook.react.bridge.ReactApplicationContext
+import java.io.BufferedInputStream
 import java.io.File
+import java.io.FileOutputStream
+import java.util.zip.ZipFile
 
 object OTAApkInstallHelper {
+  private const val TAG = "OTAApkInstall"
   private const val MIN_APK_BYTES = 1024L * 100
 
   /**
    * @return "started" when the system install screen opens, "permission_required" when settings were opened
    */
   fun install(reactContext: ReactApplicationContext, path: String): String {
-    val file = File(normalizePath(path))
-    if (!file.exists() || file.length() < MIN_APK_BYTES) {
-      throw IllegalArgumentException("APK file is missing or invalid: ${file.absolutePath}")
-    }
-
-    if (file.name.endsWith(".zip", ignoreCase = true)) {
-      throw IllegalArgumentException(
-        "Downloaded zip was not extracted to an APK before install: ${file.name}",
-      )
-    }
-
-    val archiveInfo =
-      reactContext.packageManager.getPackageArchiveInfo(
-        file.absolutePath,
-        0,
-      )
-    if (archiveInfo == null) {
-      throw IllegalArgumentException(
-        "Wrong package: file is not a valid Android APK (${file.name})",
-      )
-    }
+    val prepared = prepareInstallableApk(File(normalizePath(path)))
+    return installPrepared(reactContext, prepared)
+  }
 
+  fun installPrepared(reactContext: ReactApplicationContext, prepared: File): String {
     if (needsInstallPermission(reactContext) &&
       !reactContext.packageManager.canRequestPackageInstalls()) {
-      OTAUpdaterStorage.setPendingApkPath(reactContext, file.absolutePath)
+      OTAUpdaterStorage.setPendingApkPath(reactContext, prepared.absolutePath)
       openUnknownSourcesSettings(reactContext)
       return "permission_required"
     }
 
-    launchInstallIntent(reactContext, file)
+    launchInstallIntent(reactContext, prepared)
     OTAUpdaterStorage.clearPendingApkPath(reactContext)
     return "started"
   }
@@ -59,14 +47,129 @@ object OTAApkInstallHelper {
       return
     }
 
-    val file = File(path)
-    if (!file.exists() || file.length() < MIN_APK_BYTES) {
+    try {
+      val prepared = prepareInstallableApk(File(path))
+      launchInstallIntent(reactContext, prepared)
+      OTAUpdaterStorage.clearPendingApkPath(reactContext)
+    } catch (e: Exception) {
+      Log.e(TAG, "Failed to resume APK install", e)
       OTAUpdaterStorage.clearPendingApkPath(reactContext)
-      return
     }
+  }
 
-    launchInstallIntent(reactContext, file)
-    OTAUpdaterStorage.clearPendingApkPath(reactContext)
+  /**
+   * Ensures [file] is a real APK (has AndroidManifest.xml).
+   * If it is an outer zip that contains an .apk entry, extracts that APK first.
+   */
+  fun prepareInstallableApk(file: File): File {
+    if (!file.exists() || file.length() < MIN_APK_BYTES) {
+      throw IllegalArgumentException("APK file is missing or invalid: ${file.absolutePath}")
+    }
+
+    if (isAndroidApk(file)) {
+      return file
+    }
+
+    val unwrapped = unwrapApkFromZip(file)
+    if (unwrapped != null && isAndroidApk(unwrapped)) {
+      Log.i(TAG, "Unwrapped nested APK from zip: ${unwrapped.absolutePath}")
+      return unwrapped
+    }
+
+    throw IllegalArgumentException(
+      "Wrong package: file is not a valid Android APK (${file.name}). " +
+        "Expected an APK or a zip that contains one.",
+    )
+  }
+
+  fun isAndroidApk(file: File): Boolean = hasAndroidManifest(file)
+
+  private fun hasAndroidManifest(file: File): Boolean {
+    return try {
+      ZipFile(file).use { zip ->
+        val entries = zip.entries()
+        while (entries.hasMoreElements()) {
+          val name = entries.nextElement().name.replace('\\', '/').lowercase()
+          if (name == "androidmanifest.xml" || name.endsWith("/androidmanifest.xml")) {
+            return true
+          }
+        }
+        false
+      }
+    } catch (e: Exception) {
+      Log.w(TAG, "Not a readable zip/apk: ${file.absolutePath}", e)
+      false
+    }
+  }
+
+  private fun unwrapApkFromZip(zipFile: File): File? {
+    return try {
+      ZipFile(zipFile).use { zip ->
+        val apkEntries = mutableListOf<java.util.zip.ZipEntry>()
+        val entries = zip.entries()
+        while (entries.hasMoreElements()) {
+          val entry = entries.nextElement()
+          if (entry.isDirectory) continue
+          val name = entry.name.replace('\\', '/')
+          val base = name.substringAfterLast('/')
+          if (
+            name.split('/').contains("__MACOSX") ||
+            base.startsWith("._") ||
+            base == ".DS_Store"
+          ) {
+            continue
+          }
+          if (base.endsWith(".apk", ignoreCase = true)) {
+            apkEntries.add(entry)
+          }
+        }
+
+        if (apkEntries.isEmpty()) {
+          return null
+        }
+
+        val entry =
+          apkEntries.maxByOrNull { scoreApkEntry(it.name) }
+            ?: return null
+
+        val out =
+          File(
+            zipFile.parentFile,
+            "${zipFile.nameWithoutExtension}-unwrapped.apk",
+          )
+        if (out.exists()) {
+          out.delete()
+        }
+
+        zip.getInputStream(entry).use { input ->
+          BufferedInputStream(input).use { buffered ->
+            FileOutputStream(out).use { output ->
+              buffered.copyTo(output)
+            }
+          }
+        }
+
+        if (out.length() < MIN_APK_BYTES) {
+          out.delete()
+          return null
+        }
+
+        out
+      }
+    } catch (e: Exception) {
+      Log.e(TAG, "Failed to unwrap APK from ${zipFile.absolutePath}", e)
+      null
+    }
+  }
+
+  private fun scoreApkEntry(name: String): Int {
+    val lower = name.lowercase()
+    return when {
+      lower.contains("arm64-v8a") || lower.contains("arm64") || lower.contains("-v8a") -> 3
+      lower.contains("armeabi-v7a") || lower.contains("armeabi") || lower.contains("-v7a") -> 2
+      lower.contains("universal") -> 1
+      else -> 0
+    }
   }
 
   private fun needsInstallPermission(context: Context): Boolean =

package/android/src/main/java/com/otaupdater/OTAUpdaterModule.kt

@@ -108,14 +108,33 @@ class OTAUpdaterModule(private val reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun installApk(path: String, promise: Promise) {
-    UiThreadUtil.runOnUiThread {
+    Thread {
       try {
-        val result = OTAApkInstallHelper.install(reactContext, path)
-        promise.resolve(result)
+        val prepared = OTAApkInstallHelper.prepareInstallableApk(File(path.removePrefix("file://")))
+        UiThreadUtil.runOnUiThread {
+          try {
+            val result = OTAApkInstallHelper.installPrepared(reactContext, prepared)
+            promise.resolve(result)
+          } catch (e: Exception) {
+            promise.reject("EINSTALL", e.message, e)
+          }
+        }
       } catch (e: Exception) {
         promise.reject("EINSTALL", e.message, e)
       }
-    }
+    }.start()
+  }
+
+  @ReactMethod
+  fun isAndroidApkPackage(path: String, promise: Promise) {
+    Thread {
+      try {
+        val file = File(path.removePrefix("file://"))
+        promise.resolve(OTAApkInstallHelper.isAndroidApk(file))
+      } catch (e: Exception) {
+        promise.reject("EAPK", e.message, e)
+      }
+    }.start()
   }
 
   @ReactMethod

package/lib/sync.js

@@ -427,12 +427,27 @@ async function isZipArchive(filePath) {
     }
 }
 async function shouldExtractApkZip(downloadedPath, packageFormat) {
-    // APK files are themselves zip archives (PK magic). Only unzip when the
-    // server said this package is a zip *of* an APK, or the download is named .zip.
     if (packageFormat === 'zip') {
         return true;
     }
-    return downloadedPath.toLowerCase().endsWith('.zip');
+    if (downloadedPath.toLowerCase().endsWith('.zip')) {
+        return true;
+    }
+    // Format mismatch: zip-of-apk was saved as `.apk`. Real APKs are also zip
+    // containers, so only extract when AndroidManifest.xml is missing.
+    if (!(await isZipArchive(downloadedPath))) {
+        return false;
+    }
+    if (OTAUpdaterNative?.isAndroidApkPackage) {
+        try {
+            const isApk = await OTAUpdaterNative.isAndroidApkPackage(downloadedPath);
+            return !isApk;
+        }
+        catch {
+            return false;
+        }
+    }
+    return false;
 }
 async function shouldExtractZipPackage(downloadedPath, packageFormat) {
     if (packageFormat === 'zip') {
@@ -580,16 +595,25 @@ async function extractApkUpdate(label, zipPath, deviceAbi) {
     if (!extractedApk.toLowerCase().endsWith('.apk')) {
         throw new Error('Zip did not contain a valid APK');
     }
+    const extractedStat = await ReactNativeBlobUtil.fs.stat(extractedApk);
+    if (!extractedStat || extractedStat.size < 1024 * 100) {
+        throw new Error(`Extracted APK is too small (${extractedStat?.size ?? 0} bytes)`);
+    }
     // Never hand the zip (or a nested extract path) to the installer.
     if (extractedApk !== finalApkPath) {
         const finalExists = await ReactNativeBlobUtil.fs.exists(finalApkPath);
         if (finalExists) {
             await ReactNativeBlobUtil.fs.unlink(finalApkPath);
         }
-        await ReactNativeBlobUtil.fs.cp(extractedApk, finalApkPath);
+        try {
+            await ReactNativeBlobUtil.fs.mv(extractedApk, finalApkPath);
+        }
+        catch {
+            await ReactNativeBlobUtil.fs.cp(extractedApk, finalApkPath);
+        }
     }
     const zipExists = await ReactNativeBlobUtil.fs.exists(zipPath);
-    if (zipExists) {
+    if (zipExists && zipPath !== finalApkPath) {
         await ReactNativeBlobUtil.fs.unlink(zipPath);
     }
     // Drop extract clutter; keep only the installable APK.
@@ -598,6 +622,10 @@ async function extractApkUpdate(label, zipPath, deviceAbi) {
     if (!apkExists) {
         throw new Error('Failed to prepare APK for install');
     }
+    const finalStat = await ReactNativeBlobUtil.fs.stat(finalApkPath);
+    if (!finalStat || finalStat.size < 1024 * 100) {
+        throw new Error(`Prepared APK is too small (${finalStat?.size ?? 0} bytes)`);
+    }
     return finalApkPath;
 }
 function getBundleDirectory() {
@@ -784,15 +812,29 @@ async function downloadBundle(downloadUrl, deploymentKey, label, expectedSize, o
             'X-Deployment-Key': deploymentKey,
             ...(deviceAbi ? { 'X-Device-Abi': deviceAbi } : {}),
         });
+        let lastReportedProgress = 0;
+        let lastReportedReceived = 0;
+        let lastReportedTotal = totalBytes > 0 ? totalBytes : 0;
         const reportDownloadProgress = (received, total) => {
             if (!onProgress)
                 return;
-            const resolvedTotal = total > 0 ? total : totalBytes;
-            if (resolvedTotal <= 0) {
-                onProgress(0, Math.max(received, 0), 0);
+            const safeReceived = Math.max(Number(received) || 0, lastReportedReceived);
+            let resolvedTotal = total > 0 ? total : totalBytes;
+            if (!(resolvedTotal > 0)) {
+                resolvedTotal = lastReportedTotal;
+            }
+            if (resolvedTotal > lastReportedTotal) {
+                lastReportedTotal = resolvedTotal;
+            }
+            // Keep bytes monotonic even when total is still unknown.
+            lastReportedReceived = safeReceived;
+            if (!(resolvedTotal > 0)) {
+                onProgress(lastReportedProgress, safeReceived, 0);
                 return;
             }
-            onProgress(Math.min(Math.max(received / resolvedTotal, 0), 0.99), Math.max(received, 0), resolvedTotal);
+            const nextProgress = Math.min(Math.max(safeReceived / resolvedTotal, lastReportedProgress), 0.99);
+            lastReportedProgress = nextProgress;
+            onProgress(nextProgress, safeReceived, resolvedTotal);
         };
         let pollTimer = null;
         if (onProgress && totalBytes > 0) {

package/lib/ui/OTAUpdateModal.js

@@ -38,6 +38,25 @@ const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const sync_1 = require("../sync");
 const types_1 = require("../types");
+/** Never returns "—" so download size labels don't flicker between ticks. */
+function stableFormatBytes(bytes) {
+    if (bytes == null || !Number.isFinite(bytes) || bytes < 0) {
+        return null;
+    }
+    if (bytes < 1024) {
+        return `${Math.round(bytes)} B`;
+    }
+    if (bytes < 1024 * 1024) {
+        return `${(bytes / 1024).toFixed(1)} KB`;
+    }
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
+function joinVersionParts(parts) {
+    const filtered = parts
+        .map((part) => (part == null ? '' : String(part).trim()))
+        .filter(Boolean);
+    return filtered.length > 0 ? filtered.join(' ') : null;
+}
 function OTAUpdateModal({ visible, status, progress, message, description, isMandatory, error, showActions, canSkip, updateType, appVersion, buildNumber, currentAppVersion, currentBuildNumber, currentLabel, label, totalBytes, downloadedBytes, title, fontFamily, messages, onUpdate, onSkip, onDismiss, }) {
     const copy = (0, react_1.useMemo)(() => ({ ...sync_1.defaultMessages, ...messages }), [messages]);
     const resolvedTitle = (0, react_1.useMemo)(() => {
@@ -59,13 +78,52 @@ function OTAUpdateModal({ visible, status, progress, message, description, isMan
         ...(customFontStyle ?? null),
         writingDirection: 'rtl',
     }), [customFontStyle]);
+    const isDownloading = status === types_1.SyncStatus.DOWNLOADING;
+    const stableProgressRef = (0, react_1.useRef)({ progress: 0, downloaded: 0, total: 0 });
+    (0, react_1.useEffect)(() => {
+        if (!isDownloading) {
+            stableProgressRef.current = { progress: 0, downloaded: 0, total: 0 };
+            return;
+        }
+        const nextProgress = Math.min(Math.max(Number(progress) || 0, 0), 1);
+        const nextDownloaded = Number(downloadedBytes);
+        const nextTotal = Number(totalBytes);
+        if (nextProgress >= stableProgressRef.current.progress) {
+            stableProgressRef.current.progress = nextProgress;
+        }
+        if (Number.isFinite(nextTotal) && nextTotal > stableProgressRef.current.total) {
+            stableProgressRef.current.total = nextTotal;
+        }
+        if (Number.isFinite(nextDownloaded) &&
+            nextDownloaded >= stableProgressRef.current.downloaded) {
+            stableProgressRef.current.downloaded = nextDownloaded;
+        }
+    }, [isDownloading, progress, downloadedBytes, totalBytes]);
     if (!visible)
         return null;
-    const progressPercent = Math.round(Math.min(Math.max(progress, 0), 1) * 100);
+    if (isDownloading) {
+        const nextProgress = Math.min(Math.max(Number(progress) || 0, 0), 1);
+        const nextDownloaded = Number(downloadedBytes);
+        const nextTotal = Number(totalBytes);
+        if (nextProgress >= stableProgressRef.current.progress) {
+            stableProgressRef.current.progress = nextProgress;
+        }
+        if (Number.isFinite(nextTotal) && nextTotal > stableProgressRef.current.total) {
+            stableProgressRef.current.total = nextTotal;
+        }
+        if (Number.isFinite(nextDownloaded) &&
+            nextDownloaded >= stableProgressRef.current.downloaded) {
+            stableProgressRef.current.downloaded = nextDownloaded;
+        }
+    }
+    const stableProgress = isDownloading
+        ? stableProgressRef.current.progress
+        : Math.min(Math.max(Number(progress) || 0, 0), 1);
+    const progressPercent = Math.round(stableProgress * 100);
     const isPrompt = status === types_1.SyncStatus.UPDATE_AVAILABLE;
     const isDeferredDone = status === types_1.SyncStatus.UPDATE_INSTALLED;
     const isError = status === types_1.SyncStatus.ERROR;
-    const showProgressBar = status === types_1.SyncStatus.DOWNLOADING;
+    const showProgressBar = isDownloading;
     const showSpinner = status === types_1.SyncStatus.RESTARTING ||
         status === types_1.SyncStatus.INSTALLING ||
         (!showProgressBar && !isPrompt && !isDeferredDone && !isError);
@@ -74,22 +132,42 @@ function OTAUpdateModal({ visible, status, progress, message, description, isMan
         : updateType === 'bundle'
             ? copy.versionBundle
             : null;
+    // Show both version number and release label/name when available.
     const currentVersionText = updateType === 'apk'
-        ? [currentAppVersion, currentBuildNumber ? `(${currentBuildNumber})` : null]
-            .filter(Boolean)
-            .join(' ')
-        : currentLabel || currentAppVersion || null;
+        ? joinVersionParts([
+            currentAppVersion,
+            currentBuildNumber ? `(${currentBuildNumber})` : null,
+        ])
+        : joinVersionParts([
+            currentAppVersion,
+            currentLabel && currentLabel !== currentAppVersion ? currentLabel : null,
+        ]);
     const nextVersionText = updateType === 'apk'
-        ? [appVersion, buildNumber != null ? `(${buildNumber})` : null]
-            .filter(Boolean)
-            .join(' ')
-        : label || appVersion || null;
+        ? joinVersionParts([
+            appVersion,
+            buildNumber != null ? `(${buildNumber})` : null,
+            label && label !== appVersion ? label : null,
+        ])
+        : joinVersionParts([
+            appVersion,
+            label && label !== appVersion ? label : null,
+        ]);
     const handleUpdate = () => (onUpdate ? onUpdate() : (0, sync_1.respondToUpdatePrompt)('update'));
     const handleSkip = () => (onSkip ? onSkip() : (0, sync_1.respondToUpdatePrompt)('skip'));
     const handleDismiss = () => onDismiss ? onDismiss() : (0, sync_1.respondToUpdatePrompt)('dismiss');
-    const downloaded = downloadedBytes ?? 0;
-    const total = totalBytes ?? 0;
-    const showSizes = showProgressBar && (total > 0 || downloaded > 0);
+    const stableDownloaded = showProgressBar
+        ? stableProgressRef.current.downloaded
+        : downloadedBytes ?? 0;
+    const stableTotal = showProgressBar
+        ? stableProgressRef.current.total
+        : totalBytes ?? 0;
+    const downloadedLabel = stableFormatBytes(stableDownloaded) || '0.0 MB';
+    const totalLabel = stableFormatBytes(stableTotal);
+    const sizeLabel = totalLabel
+        ? `${downloadedLabel} / ${totalLabel}`
+        : downloadedLabel;
+    const showSizes = showProgressBar;
+    const showPromptSize = !showProgressBar && stableTotal > 0 && (isPrompt || isError);
     return (<react_native_1.Modal visible transparent animationType="fade" statusBarTranslucent onRequestClose={() => {
             if (canSkip)
                 handleSkip();
@@ -134,20 +212,25 @@ function OTAUpdateModal({ visible, status, progress, message, description, isMan
               </react_native_1.ScrollView>
             </react_native_1.View>) : null}
 
-          {showProgressBar ? (<>
+          {showProgressBar ? (<react_native_1.View style={styles.progressBlock}>
               <react_native_1.View style={styles.progressTrack}>
-                <react_native_1.View style={[styles.progressFill, { width: `${progressPercent}%` }]}/>
+                <react_native_1.View style={[
+                styles.progressFill,
+                { width: `${Math.max(progressPercent, 2)}%` },
+            ]}/>
               </react_native_1.View>
-              <react_native_1.Text style={[styles.percent, !fontFamily && styles.percentBold, textStyle]}>
-                {progressPercent}٪
-              </react_native_1.Text>
-              {showSizes ? (<react_native_1.Text style={[styles.sizeText, textStyle]}>
-                  {(0, sync_1.formatBytes)(downloaded)} / {(0, sync_1.formatBytes)(total > 0 ? total : undefined)}
-                </react_native_1.Text>) : null}
-            </>) : null}
+              <react_native_1.View style={styles.progressMetaRow}>
+                <react_native_1.Text style={[styles.percent, !fontFamily && styles.percentBold]}>
+                  {progressPercent}٪
+                </react_native_1.Text>
+                {showSizes ? (<react_native_1.Text style={styles.sizeText} numberOfLines={1}>
+                    {sizeLabel}
+                  </react_native_1.Text>) : null}
+              </react_native_1.View>
+            </react_native_1.View>) : null}
 
-          {!showProgressBar && total > 0 && (isPrompt || isError) ? (<react_native_1.Text style={[styles.sizeText, textStyle]}>
-              حجم دانلود: {(0, sync_1.formatBytes)(total)}
+          {showPromptSize ? (<react_native_1.Text style={[styles.sizeTextCentered, textStyle]}>
+              حجم دانلود: {stableFormatBytes(stableTotal)}
             </react_native_1.Text>) : null}
 
           {showSpinner ? (<react_native_1.ActivityIndicator size="large" color="#2563eb" style={styles.spinner}/>) : null}
@@ -273,29 +356,48 @@ const styles = react_native_1.StyleSheet.create({
         textAlign: 'center',
         lineHeight: 20,
     },
+    progressBlock: {
+        width: '100%',
+        marginTop: 8,
+    },
     progressTrack: {
         width: '100%',
         height: 8,
         backgroundColor: '#e5e7eb',
         borderRadius: 999,
         overflow: 'hidden',
-        marginTop: 8,
     },
     progressFill: {
         height: '100%',
         backgroundColor: '#2563eb',
         borderRadius: 999,
     },
-    percent: {
+    progressMetaRow: {
         marginTop: 8,
+        width: '100%',
+        flexDirection: 'row',
+        alignItems: 'center',
+        justifyContent: 'space-between',
+        direction: 'ltr',
+    },
+    percent: {
         fontSize: 13,
         color: '#6b7280',
-        textAlign: 'center',
+        textAlign: 'left',
+        writingDirection: 'ltr',
     },
     percentBold: {
         fontWeight: '600',
     },
     sizeText: {
+        fontSize: 12,
+        color: '#9ca3af',
+        textAlign: 'right',
+        writingDirection: 'ltr',
+        flexShrink: 1,
+        marginLeft: 8,
+    },
+    sizeTextCentered: {
         marginTop: 4,
         fontSize: 12,
         color: '#9ca3af',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsonair.ir/react-native",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "React Native client SDK for self-hosted OTA updates",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",