@appsonair.ir/react-native 1.0.7 → 1.0.10

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

@@ -21,6 +21,23 @@ object OTAApkInstallHelper {
       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})",
+      )
+    }
+
     if (needsInstallPermission(reactContext) &&
       !reactContext.packageManager.canRequestPackageInstalls()) {
       OTAUpdaterStorage.setPendingApkPath(reactContext, file.absolutePath)

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

@@ -1,9 +1,9 @@
 package com.otaupdater
 
+import java.io.BufferedInputStream
 import java.io.File
-import java.io.FileInputStream
 import java.io.FileOutputStream
-import java.util.zip.ZipInputStream
+import java.util.zip.ZipFile
 
 object OTAZipExtractHelper {
   fun extract(zipPath: String, destDirPath: String) {
@@ -19,28 +19,43 @@ object OTAZipExtractHelper {
     }
     destDir.mkdirs()
 
-    ZipInputStream(FileInputStream(zipFile)).use { zipInput ->
-      var entry = zipInput.nextEntry
-      while (entry != null) {
-        val outFile = safeOutputFile(destDir, entry.name)
+    // ZipFile handles Info-ZIP / macOS ditto archives more reliably than ZipInputStream.
+    ZipFile(zipFile).use { zip ->
+      val entries = zip.entries()
+      while (entries.hasMoreElements()) {
+        val entry = entries.nextElement()
+        val normalized = entry.name.replace('\\', '/').trimStart('/')
+        val baseName = normalized.substringAfterLast('/')
+        if (
+          normalized.split('/').contains("__MACOSX") ||
+          baseName.startsWith("._") ||
+          baseName == ".DS_Store"
+        ) {
+          continue
+        }
+
+        val outFile = safeOutputFile(destDir, normalized)
 
         if (entry.isDirectory) {
           outFile.mkdirs()
-        } else {
-          outFile.parentFile?.mkdirs()
-          FileOutputStream(outFile).use { output ->
-            zipInput.copyTo(output)
-          }
+          continue
         }
 
-        zipInput.closeEntry()
-        entry = zipInput.nextEntry
+        outFile.parentFile?.mkdirs()
+        zip.getInputStream(entry).use { input ->
+          BufferedInputStream(input).use { buffered ->
+            FileOutputStream(outFile).use { output ->
+              buffered.copyTo(output)
+            }
+          }
+        }
       }
     }
   }
 
   private fun safeOutputFile(destDir: File, entryName: String): File {
-    val outFile = File(destDir, entryName)
+    val normalized = entryName.replace('\\', '/').trimStart('/')
+    val outFile = File(destDir, normalized)
     val destPath = destDir.canonicalPath
     val outPath = outFile.canonicalPath
     if (outPath != destPath && !outPath.startsWith("$destPath${File.separator}")) {

package/lib/index.d.ts

@@ -18,6 +18,8 @@ export { setUserInfo, clearUserInfo, getUserInfo } from './userInfo';
 export type { OTAUserInfo } from './userInfo';
 export { OTAUpdateModal } from './ui/OTAUpdateModal';
 export { OTAUpdateProvider } from './ui/OTAUpdateProvider';
+export { formatBytes, getProgressState, subscribeProgress } from './progress';
+export type { OTAProgressState } from './sync';
 export declare const OTAUpdater: {
     configure: typeof configure;
     getConfig: typeof getConfig;

package/lib/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OTAUpdater = exports.OTAUpdateProvider = exports.OTAUpdateModal = exports.getUserInfo = exports.clearUserInfo = exports.setUserInfo = exports.logEvent = exports.stopTelemetry = exports.startTelemetry = exports.ping = exports.respondToUpdatePrompt = exports.isSyncInProgress = exports.notifyAppReady = exports.getInstalledBundlePath = exports.clearUpdate = exports.resumePendingApkInstall = exports.installApk = exports.restartApp = exports.sync = exports.resolveUpdaterConfig = exports.isOtaConfigured = exports.getDeploymentKey = exports.configureFromProject = exports.DEFAULT_SERVER_URL = exports.getServerUrl = exports.getConfig = exports.configure = void 0;
+exports.OTAUpdater = exports.subscribeProgress = exports.getProgressState = exports.formatBytes = exports.OTAUpdateProvider = exports.OTAUpdateModal = exports.getUserInfo = exports.clearUserInfo = exports.setUserInfo = exports.logEvent = exports.stopTelemetry = exports.startTelemetry = exports.ping = exports.respondToUpdatePrompt = exports.isSyncInProgress = exports.notifyAppReady = exports.getInstalledBundlePath = exports.clearUpdate = exports.resumePendingApkInstall = exports.installApk = exports.restartApp = exports.sync = exports.resolveUpdaterConfig = exports.isOtaConfigured = exports.getDeploymentKey = exports.configureFromProject = exports.DEFAULT_SERVER_URL = exports.getServerUrl = exports.getConfig = exports.configure = void 0;
 exports.getCurrentLabel = getCurrentLabel;
 exports.checkUpdate = checkUpdate;
 const react_native_device_info_1 = __importDefault(require("react-native-device-info"));
@@ -77,6 +77,10 @@ var OTAUpdateModal_1 = require("./ui/OTAUpdateModal");
 Object.defineProperty(exports, "OTAUpdateModal", { enumerable: true, get: function () { return OTAUpdateModal_1.OTAUpdateModal; } });
 var OTAUpdateProvider_1 = require("./ui/OTAUpdateProvider");
 Object.defineProperty(exports, "OTAUpdateProvider", { enumerable: true, get: function () { return OTAUpdateProvider_1.OTAUpdateProvider; } });
+var progress_1 = require("./progress");
+Object.defineProperty(exports, "formatBytes", { enumerable: true, get: function () { return progress_1.formatBytes; } });
+Object.defineProperty(exports, "getProgressState", { enumerable: true, get: function () { return progress_1.getProgressState; } });
+Object.defineProperty(exports, "subscribeProgress", { enumerable: true, get: function () { return progress_1.subscribeProgress; } });
 exports.OTAUpdater = {
     configure: config_1.configure,
     getConfig: config_1.getConfig,

package/lib/progress.d.ts

@@ -1,2 +1,2 @@
 export type { OTAProgressState } from './sync';
-export { defaultMessages, delay, getMessageForStatus, getModalTitle, getProgressState, hideProgress, subscribeProgress, } from './sync';
+export { defaultMessages, delay, formatBytes, getMessageForStatus, getModalTitle, getProgressState, hideProgress, subscribeProgress, } from './sync';

package/lib/progress.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.subscribeProgress = exports.hideProgress = exports.getProgressState = exports.getModalTitle = exports.getMessageForStatus = exports.delay = exports.defaultMessages = void 0;
+exports.subscribeProgress = exports.hideProgress = exports.getProgressState = exports.getModalTitle = exports.getMessageForStatus = exports.formatBytes = exports.delay = exports.defaultMessages = void 0;
 var sync_1 = require("./sync");
 Object.defineProperty(exports, "defaultMessages", { enumerable: true, get: function () { return sync_1.defaultMessages; } });
 Object.defineProperty(exports, "delay", { enumerable: true, get: function () { return sync_1.delay; } });
+Object.defineProperty(exports, "formatBytes", { enumerable: true, get: function () { return sync_1.formatBytes; } });
 Object.defineProperty(exports, "getMessageForStatus", { enumerable: true, get: function () { return sync_1.getMessageForStatus; } });
 Object.defineProperty(exports, "getModalTitle", { enumerable: true, get: function () { return sync_1.getModalTitle; } });
 Object.defineProperty(exports, "getProgressState", { enumerable: true, get: function () { return sync_1.getProgressState; } });

package/lib/sync.d.ts

@@ -13,6 +13,22 @@ export interface OTAProgressState {
     showActions?: boolean;
     canSkip?: boolean;
     error?: string;
+    /** Whether this update is a JS bundle or native APK */
+    updateType?: 'bundle' | 'apk';
+    /** Target release app version (from server) */
+    appVersion?: string;
+    /** Target APK versionCode (from server) */
+    buildNumber?: number;
+    /** Currently installed native app version */
+    currentAppVersion?: string;
+    /** Currently installed native build / versionCode */
+    currentBuildNumber?: string;
+    /** Currently installed JS bundle label, if any */
+    currentLabel?: string;
+    /** Total download size in bytes (0 if unknown) */
+    totalBytes?: number;
+    /** Bytes downloaded so far */
+    downloadedBytes?: number;
 }
 type ProgressListener = (state: OTAProgressState) => void;
 export declare function getProgressState(): OTAProgressState;
@@ -20,6 +36,8 @@ export declare function subscribeProgress(listener: ProgressListener): () => voi
 export declare function hideProgress(): void;
 export declare const defaultMessages: {
     title: string;
+    titleBundle: string;
+    titleApk: string;
     checking: string;
     downloading: string;
     installing: string;
@@ -28,15 +46,20 @@ export declare const defaultMessages: {
     downloadInterrupted: string;
     upToDate: string;
     updateAvailable: string;
+    updateAvailableBundle: string;
+    updateAvailableApk: string;
     changelogTitle: string;
     updateNow: string;
     skip: string;
     dismiss: string;
     appliedNextLaunch: string;
     mandatoryHint: string;
+    versionBundle: string;
+    versionApk: string;
 };
 export declare function getMessageForStatus(status: SyncStatus, messages?: Partial<typeof defaultMessages>): string;
-export declare function getModalTitle(messages?: Partial<typeof defaultMessages>): string;
+export declare function getModalTitle(messages?: Partial<typeof defaultMessages>, updateType?: 'bundle' | 'apk'): string;
+export declare function formatBytes(bytes: number | undefined): string;
 export declare function delay(ms: number): Promise<void>;
 type UpdatePromptAction = 'update' | 'skip' | 'dismiss';
 /** Resolve the Update / Skip / Dismiss prompt shown by OTAUpdateModal. */
@@ -54,7 +77,7 @@ export declare function checkForUpdate(serverUrl: string, deploymentKey: string,
 export declare function getBundleReleaseDir(label: string): string;
 export declare function getBundleFilePath(label: string): string;
 export declare function getApkFilePath(label: string): string;
-export declare function downloadBundle(downloadUrl: string, deploymentKey: string, label: string, expectedSize?: number, onProgress?: (progress: number) => void, extension?: 'bundle' | 'apk', deviceAbi?: string, packageFormat?: 'bundle' | 'zip', expectedHash?: string): Promise<string>;
+export declare function downloadBundle(downloadUrl: string, deploymentKey: string, label: string, expectedSize?: number, onProgress?: (progress: number, received?: number, total?: number) => void, extension?: 'bundle' | 'apk', deviceAbi?: string, packageFormat?: 'bundle' | 'zip', expectedHash?: string): Promise<string>;
 export declare function verifyBundleHash(filePath: string, expectedHash: string): Promise<boolean>;
 type ProgressCallback = (status: SyncStatus, progress?: number) => void;
 export declare function isSyncInProgress(): boolean;

package/lib/sync.js

@@ -42,6 +42,7 @@ exports.subscribeProgress = subscribeProgress;
 exports.hideProgress = hideProgress;
 exports.getMessageForStatus = getMessageForStatus;
 exports.getModalTitle = getModalTitle;
+exports.formatBytes = formatBytes;
 exports.delay = delay;
 exports.respondToUpdatePrompt = respondToUpdatePrompt;
 exports.getStoredBundleMeta = getStoredBundleMeta;
@@ -105,6 +106,8 @@ function shouldShowModalForStatus(status) {
 }
 exports.defaultMessages = {
     title: 'به\u200cروزرسانی برنامه',
+    titleBundle: 'به\u200cروزرسانی محتوا',
+    titleApk: 'به\u200cروزرسانی نسخه برنامه',
     checking: 'در حال بررسی به\u200cروزرسانی...',
     downloading: 'در حال دانلود به\u200cروزرسانی...',
     installing: 'در حال نصب به\u200cروزرسانی...',
@@ -113,12 +116,16 @@ exports.defaultMessages = {
     downloadInterrupted: 'دانلود قطع شد. لطفاً دوباره تلاش کنید',
     upToDate: 'برنامه به\u200cروز است',
     updateAvailable: 'نسخه جدیدی در دسترس است',
+    updateAvailableBundle: 'به\u200cروزرسانی محتوا آماده است',
+    updateAvailableApk: 'نسخه جدید برنامه آماده نصب است',
     changelogTitle: 'تغییرات این نسخه',
     updateNow: 'به\u200cروزرسانی',
     skip: 'فعلاً نه',
     dismiss: 'باشه',
     appliedNextLaunch: 'به\u200cروزرسانی نصب شد و در اجرای بعدی برنامه اعمال می\u200cشود',
     mandatoryHint: 'این به\u200cروزرسانی الزامی است',
+    versionBundle: 'باندل',
+    versionApk: 'نسخه برنامه',
 };
 function getMessageForStatus(status, messages = {}) {
     const m = { ...exports.defaultMessages, ...messages };
@@ -141,10 +148,28 @@ function getMessageForStatus(status, messages = {}) {
             return m.upToDate;
     }
 }
-function getModalTitle(messages = {}) {
+function getModalTitle(messages = {}, updateType) {
     const m = { ...exports.defaultMessages, ...messages };
+    if (updateType === 'apk') {
+        return m.titleApk ?? m.title;
+    }
+    if (updateType === 'bundle') {
+        return m.titleBundle ?? m.title;
+    }
     return m.title;
 }
+function formatBytes(bytes) {
+    if (bytes == null || !Number.isFinite(bytes) || bytes <= 0) {
+        return '—';
+    }
+    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 delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -401,6 +426,14 @@ async function isZipArchive(filePath) {
         return false;
     }
 }
+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');
+}
 async function shouldExtractZipPackage(downloadedPath, packageFormat) {
     if (packageFormat === 'zip') {
         return true;
@@ -539,14 +572,33 @@ async function pickExtractedApk(dir, deviceAbi) {
 async function extractApkUpdate(label, zipPath, deviceAbi) {
     const ReactNativeBlobUtil = require('react-native-blob-util').default;
     const extractDir = getApkExtractDir(label);
+    const finalApkPath = getApkFilePath(label);
     await removePathRecursive(extractDir);
     await ReactNativeBlobUtil.fs.mkdir(extractDir);
     await (0, zipExtract_1.extractZipToDirectory)(zipPath, extractDir);
+    const extractedApk = await pickExtractedApk(extractDir, deviceAbi);
+    if (!extractedApk.toLowerCase().endsWith('.apk')) {
+        throw new Error('Zip did not contain a valid APK');
+    }
+    // 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);
+    }
     const zipExists = await ReactNativeBlobUtil.fs.exists(zipPath);
     if (zipExists) {
         await ReactNativeBlobUtil.fs.unlink(zipPath);
     }
-    return pickExtractedApk(extractDir, deviceAbi);
+    // Drop extract clutter; keep only the installable APK.
+    await removePathRecursive(extractDir);
+    const apkExists = await ReactNativeBlobUtil.fs.exists(finalApkPath);
+    if (!apkExists) {
+        throw new Error('Failed to prepare APK for install');
+    }
+    return finalApkPath;
 }
 function getBundleDirectory() {
     const ReactNativeBlobUtil = require('react-native-blob-util').default;
@@ -689,7 +741,7 @@ async function tryRecoverCompletedDownload(destPath, extension, totalBytes, expe
         else if (!sizeLooksComplete) {
             return null;
         }
-        if (extension === 'apk' && (packageFormat === 'zip' || (await isZipArchive(destPath)))) {
+        if (extension === 'apk' && (await shouldExtractApkZip(destPath, packageFormat))) {
             return extractApkUpdate(label, destPath, deviceAbi);
         }
         if (extension === 'bundle' && (await shouldExtractZipPackage(destPath, packageFormat))) {
@@ -736,9 +788,11 @@ async function downloadBundle(downloadUrl, deploymentKey, label, expectedSize, o
             if (!onProgress)
                 return;
             const resolvedTotal = total > 0 ? total : totalBytes;
-            if (resolvedTotal <= 0)
+            if (resolvedTotal <= 0) {
+                onProgress(0, Math.max(received, 0), 0);
                 return;
-            onProgress(Math.min(Math.max(received / resolvedTotal, 0), 0.99));
+            }
+            onProgress(Math.min(Math.max(received / resolvedTotal, 0), 0.99), Math.max(received, 0), resolvedTotal);
         };
         let pollTimer = null;
         if (onProgress && totalBytes > 0) {
@@ -762,9 +816,6 @@ async function downloadBundle(downloadUrl, deploymentKey, label, expectedSize, o
         }
         try {
             const response = await task;
-            if (onProgress) {
-                onProgress(1);
-            }
             const downloadedPath = String(response.path()).replace(/^file:\/\//, '');
             if (downloadedPath !== destPath) {
                 await ReactNativeBlobUtil.fs.cp(downloadedPath, destPath);
@@ -774,13 +825,16 @@ async function downloadBundle(downloadUrl, deploymentKey, label, expectedSize, o
             if (!stat || stat.size < minSize) {
                 throw new Error(`Downloaded file is too small (${stat?.size ?? 0} bytes)`);
             }
+            if (onProgress) {
+                onProgress(1, stat.size, totalBytes > 0 ? totalBytes : stat.size);
+            }
             if (expectedHash) {
                 const valid = await verifyBundleHash(destPath, expectedHash);
                 if (!valid) {
-                    throw new Error('Package hash verification failed');
+                    throw new Error('Wrong package: hash verification failed');
                 }
             }
-            if (extension === 'apk' && (isApkZip || (await isZipArchive(destPath)))) {
+            if (extension === 'apk' && (await shouldExtractApkZip(destPath, packageFormat))) {
                 return extractApkUpdate(label, destPath, deviceAbi);
             }
             if (extension === 'bundle' && (await shouldExtractZipPackage(destPath, packageFormat))) {
@@ -839,8 +893,17 @@ function reportProgress(showUI, messages, onProgress, status, progress = 0, extr
         status === types_1.SyncStatus.APK_INSTALL_PENDING) {
         return;
     }
+    const updateType = extra?.updateType;
+    let statusMessage = extra?.message ?? getMessageForStatus(status, messages);
+    if (!extra?.message && status === types_1.SyncStatus.UPDATE_AVAILABLE && updateType) {
+        const m = { ...exports.defaultMessages, ...messages };
+        statusMessage =
+            updateType === 'apk'
+                ? (m.updateAvailableApk ?? m.updateAvailable)
+                : (m.updateAvailableBundle ?? m.updateAvailable);
+    }
     if (status === types_1.SyncStatus.ERROR) {
-        showProgress(status, progress, extra?.error ?? getMessageForStatus(status, messages), {
+        showProgress(status, progress, extra?.error ?? statusMessage, {
             error: extra?.error,
             showActions: true,
             canSkip: false,
@@ -849,24 +912,36 @@ function reportProgress(showUI, messages, onProgress, status, progress = 0, extr
         return;
     }
     if (shouldShowModalForStatus(status)) {
-        showProgress(status, progress, extra?.message ?? getMessageForStatus(status, messages), {
+        showProgress(status, progress, statusMessage, {
             showActions: false,
             canSkip: false,
             ...extra,
         });
     }
 }
-async function promptForUpdate(showUI, messages, onProgress, update, installMode) {
-    const changelog = getUpdateChangelog(update);
+function buildUpdateProgressExtra(update, installMode, currentLabel) {
+    return {
+        label: update.label,
+        description: getUpdateChangelog(update),
+        isMandatory: update.isMandatory,
+        installMode,
+        updateType: update.updateType ?? 'bundle',
+        appVersion: update.appVersion,
+        buildNumber: update.buildNumber,
+        currentAppVersion: react_native_device_info_1.default.getVersion(),
+        currentBuildNumber: react_native_1.Platform.OS === 'android' ? react_native_device_info_1.default.getBuildNumber() : undefined,
+        currentLabel: currentLabel ?? undefined,
+        totalBytes: update.size && update.size > 0 ? update.size : undefined,
+        downloadedBytes: 0,
+    };
+}
+async function promptForUpdate(showUI, messages, onProgress, update, installMode, currentLabel) {
     const isMandatory = update.isMandatory === true;
     if (!showUI) {
         return 'update';
     }
     reportProgress(showUI, messages, onProgress, types_1.SyncStatus.UPDATE_AVAILABLE, 0, {
-        label: update.label,
-        description: changelog,
-        isMandatory,
-        installMode,
+        ...buildUpdateProgressExtra(update, installMode, currentLabel),
         showActions: true,
         canSkip: !isMandatory,
     });
@@ -963,7 +1038,7 @@ async function performSync(options = {}, onProgress, messages) {
         else {
             await clearSkippedUpdate();
         }
-        const decision = await promptForUpdate(showUI, messages, onProgress, update, installMode);
+        const decision = await promptForUpdate(showUI, messages, onProgress, update, installMode, meta?.label);
         if (decision === 'skip') {
             await markUpdateSkipped(update.label);
             if (showUI)
@@ -977,19 +1052,14 @@ async function performSync(options = {}, onProgress, messages) {
         }
         await clearSkippedUpdate();
         if (update.updateType === 'apk') {
-            return performApkSync(update, showUI, messages, onProgress, changelog);
+            return performApkSync(update, showUI, messages, onProgress, changelog, meta?.label);
         }
-        reportProgress(showUI, messages, onProgress, types_1.SyncStatus.DOWNLOADING, 0, {
-            label: update.label,
-            description: changelog,
-            isMandatory: update.isMandatory,
-            installMode,
-        });
-        const bundlePath = await downloadBundle(update.downloadUrl, config.deploymentKey, update.label, update.size, (p) => reportProgress(showUI, messages, onProgress, types_1.SyncStatus.DOWNLOADING, p, {
-            label: update.label,
-            description: changelog,
-            isMandatory: update.isMandatory,
-            installMode,
+        const progressExtra = buildUpdateProgressExtra(update, installMode, meta?.label);
+        reportProgress(showUI, messages, onProgress, types_1.SyncStatus.DOWNLOADING, 0, progressExtra);
+        const bundlePath = await downloadBundle(update.downloadUrl, config.deploymentKey, update.label, update.size, (p, received, total) => reportProgress(showUI, messages, onProgress, types_1.SyncStatus.DOWNLOADING, p, {
+            ...progressExtra,
+            downloadedBytes: received,
+            totalBytes: total && total > 0 ? total : progressExtra.totalBytes,
         }), 'bundle', undefined, update.packageFormat ?? 'bundle', update.packageHash);
         onProgress?.(types_1.SyncStatus.INSTALLING, 1);
         const ReactNativeBlobUtil = require('react-native-blob-util').default;
@@ -1011,10 +1081,8 @@ async function performSync(options = {}, onProgress, messages) {
         const shouldRestartNow = installMode === 'immediate' || update.isMandatory === true;
         if (shouldRestartNow) {
             reportProgress(showUI, messages, onProgress, types_1.SyncStatus.RESTARTING, 1, {
-                label: update.label,
-                description: changelog,
-                isMandatory: update.isMandatory,
-                installMode,
+                ...progressExtra,
+                downloadedBytes: progressExtra.totalBytes,
             });
             await markRestartPending();
             await delay(300);
@@ -1027,10 +1095,8 @@ async function performSync(options = {}, onProgress, messages) {
         }
         if (showUI) {
             reportProgress(showUI, messages, onProgress, types_1.SyncStatus.UPDATE_INSTALLED, 1, {
-                label: update.label,
-                description: changelog,
-                isMandatory: update.isMandatory,
-                installMode,
+                ...progressExtra,
+                downloadedBytes: progressExtra.totalBytes,
                 showActions: true,
                 canSkip: false,
                 message: getMessageForStatus(types_1.SyncStatus.UPDATE_INSTALLED, messages),
@@ -1061,22 +1127,23 @@ async function performSync(options = {}, onProgress, messages) {
         };
     }
 }
-async function performApkSync(update, showUI, messages, onProgress, changelog) {
+async function performApkSync(update, showUI, messages, onProgress, changelog, currentLabel) {
     if (!update.downloadUrl || !update.label || !update.packageHash) {
         return { status: types_1.SyncStatus.UP_TO_DATE };
     }
     const notes = changelog ?? getUpdateChangelog(update);
+    const progressExtra = buildUpdateProgressExtra(update, undefined, currentLabel);
+    const packageFormat = update.packageFormat ?? 'zip';
     try {
-        reportProgress(showUI, messages, onProgress, types_1.SyncStatus.DOWNLOADING, 0, {
-            label: update.label,
-            description: notes,
-            isMandatory: update.isMandatory,
-        });
-        const apkPath = await downloadBundle(update.downloadUrl, (0, config_1.getConfig)().deploymentKey, update.label, update.size, (p) => reportProgress(showUI, messages, onProgress, types_1.SyncStatus.DOWNLOADING, p, {
-            label: update.label,
-            description: notes,
-            isMandatory: update.isMandatory,
-        }), 'apk', update.deviceAbi, update.packageFormat ?? 'bundle', update.packageHash);
+        reportProgress(showUI, messages, onProgress, types_1.SyncStatus.DOWNLOADING, 0, progressExtra);
+        const apkPath = await downloadBundle(update.downloadUrl, (0, config_1.getConfig)().deploymentKey, update.label, update.size, (p, received, total) => reportProgress(showUI, messages, onProgress, types_1.SyncStatus.DOWNLOADING, p, {
+            ...progressExtra,
+            downloadedBytes: received,
+            totalBytes: total && total > 0 ? total : progressExtra.totalBytes,
+        }), 'apk', update.deviceAbi, packageFormat, update.packageHash);
+        if (!apkPath.toLowerCase().endsWith('.apk')) {
+            throw new Error('Wrong package: expected an APK after zip extract');
+        }
         onProgress?.(types_1.SyncStatus.INSTALLING, 1);
         // Drop the OTA JS path before opening the installer so the new APK does not
         // keep loading the previous bundle on first launch after install.
@@ -1084,9 +1151,8 @@ async function performApkSync(update, showUI, messages, onProgress, changelog) {
         const installResult = await installApk(apkPath);
         if (installResult === 'permission_required') {
             reportProgress(showUI, messages, onProgress, types_1.SyncStatus.INSTALLING, 1, {
-                label: update.label,
-                description: notes,
-                isMandatory: update.isMandatory,
+                ...progressExtra,
+                downloadedBytes: progressExtra.totalBytes,
             });
             return {
                 status: types_1.SyncStatus.APK_INSTALL_PENDING,
@@ -1106,6 +1172,7 @@ async function performApkSync(update, showUI, messages, onProgress, changelog) {
     catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));
         reportProgress(showUI, messages, onProgress, types_1.SyncStatus.ERROR, 0, {
+            ...progressExtra,
             error: err.message,
             showActions: true,
             canSkip: false,
@@ -1143,6 +1210,9 @@ async function clearUpdate() {
         await removePathRecursive(getBundleReleaseDir(meta.label));
         await cleanupPartialDownload(getBundleZipPath(meta.label));
         await cleanupPartialDownload(getLegacyBundleFilePath(meta.label));
+        await cleanupPartialDownload(getApkFilePath(meta.label));
+        await cleanupPartialDownload(getApkZipPath(meta.label));
+        await removePathRecursive(getApkExtractDir(meta.label));
     }
 }
 async function notifyAppReady() {

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import type { ReactNode } from 'react';
+import type { ComponentType, ReactNode } from 'react';
 /** When to apply a downloaded JS bundle update. */
 export type InstallMode = 'immediate' | 'next-launch'
 /** @deprecated use `next-launch` */
@@ -35,6 +35,8 @@ export interface OTAUpdaterConfig {
 }
 export interface OTAProgressMessages {
     title?: string;
+    titleBundle?: string;
+    titleApk?: string;
     checking?: string;
     downloading?: string;
     installing?: string;
@@ -43,12 +45,43 @@ export interface OTAProgressMessages {
     upToDate?: string;
     /** Prompt when an update is available */
     updateAvailable?: string;
+    updateAvailableBundle?: string;
+    updateAvailableApk?: string;
     changelogTitle?: string;
     updateNow?: string;
     skip?: string;
     dismiss?: string;
     appliedNextLaunch?: string;
     mandatoryHint?: string;
+    versionBundle?: string;
+    versionApk?: string;
+}
+export interface OTAUpdateUIProps {
+    visible: boolean;
+    status: SyncStatus;
+    progress: number;
+    message: string;
+    label?: string;
+    description?: string;
+    isMandatory?: boolean;
+    installMode?: InstallMode;
+    showActions?: boolean;
+    canSkip?: boolean;
+    error?: string;
+    updateType?: 'bundle' | 'apk';
+    appVersion?: string;
+    buildNumber?: number;
+    currentAppVersion?: string;
+    currentBuildNumber?: string;
+    currentLabel?: string;
+    totalBytes?: number;
+    downloadedBytes?: number;
+    title?: string;
+    fontFamily?: string;
+    messages?: OTAProgressMessages;
+    onUpdate?: () => void;
+    onSkip?: () => void;
+    onDismiss?: () => void;
 }
 export interface OTAUpdateProviderProps {
     children: ReactNode;
@@ -64,6 +97,13 @@ export interface OTAUpdateProviderProps {
     fontFamily?: string;
     /** Passed to sync() */
     syncOptions?: SyncOptions;
+    /**
+     * Replace the built-in update modal.
+     * Receive progress props + action handlers; return null to hide.
+     */
+    renderUpdateUI?: (props: OTAUpdateUIProps) => ReactNode;
+    /** Component alternative to renderUpdateUI */
+    UpdateComponent?: ComponentType<OTAUpdateUIProps>;
 }
 export interface UpdateCheckResult {
     updateAvailable: boolean;

package/lib/ui/OTAUpdateModal.d.ts

@@ -1,9 +1,4 @@
 import React from 'react';
-import { defaultMessages, OTAProgressState } from '../sync';
-interface OTAUpdateModalProps extends OTAProgressState {
-    title?: string;
-    fontFamily?: string;
-    messages?: Partial<typeof defaultMessages>;
-}
-export declare function OTAUpdateModal({ visible, status, progress, message, description, isMandatory, error, showActions, canSkip, title, fontFamily, messages, }: OTAUpdateModalProps): React.JSX.Element;
-export {};
+import { OTAUpdateUIProps } from '../types';
+export type OTAUpdateModalProps = OTAUpdateUIProps;
+export declare 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, }: OTAUpdateModalProps): React.JSX.Element;

package/lib/ui/OTAUpdateModal.js

@@ -38,8 +38,17 @@ const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const sync_1 = require("../sync");
 const types_1 = require("../types");
-function OTAUpdateModal({ visible, status, progress, message, description, isMandatory, error, showActions, canSkip, title = sync_1.defaultMessages.title, fontFamily, messages, }) {
+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)(() => {
+        if (title)
+            return title;
+        if (updateType === 'apk')
+            return copy.titleApk ?? copy.title;
+        if (updateType === 'bundle')
+            return copy.titleBundle ?? copy.title;
+        return copy.title;
+    }, [title, updateType, copy]);
     const customFontStyle = (0, react_1.useMemo)(() => fontFamily
         ? {
             fontFamily,
@@ -60,19 +69,58 @@ function OTAUpdateModal({ visible, status, progress, message, description, isMan
     const showSpinner = status === types_1.SyncStatus.RESTARTING ||
         status === types_1.SyncStatus.INSTALLING ||
         (!showProgressBar && !isPrompt && !isDeferredDone && !isError);
+    const typeLabel = updateType === 'apk'
+        ? copy.versionApk
+        : updateType === 'bundle'
+            ? copy.versionBundle
+            : null;
+    const currentVersionText = updateType === 'apk'
+        ? [currentAppVersion, currentBuildNumber ? `(${currentBuildNumber})` : null]
+            .filter(Boolean)
+            .join(' ')
+        : currentLabel || currentAppVersion || null;
+    const nextVersionText = updateType === 'apk'
+        ? [appVersion, buildNumber != null ? `(${buildNumber})` : null]
+            .filter(Boolean)
+            .join(' ')
+        : label || appVersion || 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);
     return (<react_native_1.Modal visible transparent animationType="fade" statusBarTranslucent onRequestClose={() => {
             if (canSkip)
-                (0, sync_1.respondToUpdatePrompt)('skip');
+                handleSkip();
             else if (showActions && (isDeferredDone || isError)) {
-                (0, sync_1.respondToUpdatePrompt)('dismiss');
+                handleDismiss();
             }
         }}>
       <react_native_1.View style={styles.overlay}>
         <react_native_1.View style={styles.card}>
           <react_native_1.Text style={[styles.title, !fontFamily && styles.titleBold, textStyle]}>
-            {title}
+            {resolvedTitle}
           </react_native_1.Text>
 
+          {typeLabel ? (<react_native_1.View style={styles.badge}>
+              <react_native_1.Text style={[styles.badgeText, textStyle]}>{typeLabel}</react_native_1.Text>
+            </react_native_1.View>) : null}
+
+          {(currentVersionText || nextVersionText) && !error ? (<react_native_1.View style={styles.versionBox}>
+              {currentVersionText ? (<react_native_1.Text style={[styles.versionLine, textStyle]}>
+                  فعلی: {currentVersionText}
+                </react_native_1.Text>) : null}
+              {nextVersionText ? (<react_native_1.Text style={[
+                    styles.versionLine,
+                    styles.versionNext,
+                    !fontFamily && styles.titleBold,
+                    textStyle,
+                ]}>
+                  جدید: {nextVersionText}
+                </react_native_1.Text>) : null}
+            </react_native_1.View>) : null}
+
           <react_native_1.Text style={[styles.message, textStyle]}>{error ?? message}</react_native_1.Text>
 
           {isMandatory && isPrompt ? (<react_native_1.Text style={[styles.mandatory, textStyle]}>{copy.mandatoryHint}</react_native_1.Text>) : null}
@@ -93,13 +141,20 @@ function OTAUpdateModal({ visible, status, progress, message, description, isMan
               <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}
 
+          {!showProgressBar && total > 0 && (isPrompt || isError) ? (<react_native_1.Text style={[styles.sizeText, textStyle]}>
+              حجم دانلود: {(0, sync_1.formatBytes)(total)}
+            </react_native_1.Text>) : null}
+
           {showSpinner ? (<react_native_1.ActivityIndicator size="large" color="#2563eb" style={styles.spinner}/>) : null}
 
           {showActions ? (<react_native_1.View style={styles.actions}>
               {isPrompt ? (<>
-                  <react_native_1.Pressable style={[styles.button, styles.buttonPrimary]} onPress={() => (0, sync_1.respondToUpdatePrompt)('update')}>
+                  <react_native_1.Pressable style={[styles.button, styles.buttonPrimary]} onPress={handleUpdate}>
                     <react_native_1.Text style={[
                     styles.buttonPrimaryText,
                     !fontFamily && styles.titleBold,
@@ -108,10 +163,10 @@ function OTAUpdateModal({ visible, status, progress, message, description, isMan
                       {copy.updateNow}
                     </react_native_1.Text>
                   </react_native_1.Pressable>
-                  {canSkip ? (<react_native_1.Pressable style={[styles.button, styles.buttonGhost]} onPress={() => (0, sync_1.respondToUpdatePrompt)('skip')}>
+                  {canSkip ? (<react_native_1.Pressable style={[styles.button, styles.buttonGhost]} onPress={handleSkip}>
                       <react_native_1.Text style={[styles.buttonGhostText, textStyle]}>{copy.skip}</react_native_1.Text>
                     </react_native_1.Pressable>) : null}
-                </>) : (<react_native_1.Pressable style={[styles.button, styles.buttonPrimary]} onPress={() => (0, sync_1.respondToUpdatePrompt)('dismiss')}>
+                </>) : (<react_native_1.Pressable style={[styles.button, styles.buttonPrimary]} onPress={handleDismiss}>
                   <react_native_1.Text style={[
                     styles.buttonPrimaryText,
                     !fontFamily && styles.titleBold,
@@ -150,6 +205,35 @@ const styles = react_native_1.StyleSheet.create({
     titleBold: {
         fontWeight: '700',
     },
+    badge: {
+        alignSelf: 'center',
+        backgroundColor: '#eff6ff',
+        borderRadius: 999,
+        paddingHorizontal: 10,
+        paddingVertical: 4,
+        marginBottom: 8,
+    },
+    badgeText: {
+        fontSize: 12,
+        color: '#1d4ed8',
+        textAlign: 'center',
+    },
+    versionBox: {
+        backgroundColor: '#f9fafb',
+        borderRadius: 10,
+        paddingVertical: 8,
+        paddingHorizontal: 12,
+        marginBottom: 8,
+        gap: 4,
+    },
+    versionLine: {
+        fontSize: 13,
+        color: '#6b7280',
+        textAlign: 'center',
+    },
+    versionNext: {
+        color: '#111827',
+    },
     message: {
         fontSize: 15,
         color: '#374151',
@@ -211,6 +295,12 @@ const styles = react_native_1.StyleSheet.create({
     percentBold: {
         fontWeight: '600',
     },
+    sizeText: {
+        marginTop: 4,
+        fontSize: 12,
+        color: '#9ca3af',
+        textAlign: 'center',
+    },
     spinner: {
         marginTop: 12,
         alignSelf: 'center',

package/lib/ui/OTAUpdateProvider.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { OTAUpdateProviderProps } from '../types';
-export declare function OTAUpdateProvider({ children, projectConfig, autoSync, skipInDev, messages, fontFamily, syncOptions, }: OTAUpdateProviderProps): React.JSX.Element;
+export declare function OTAUpdateProvider({ children, projectConfig, autoSync, skipInDev, messages, fontFamily, syncOptions, renderUpdateUI, UpdateComponent, }: OTAUpdateProviderProps): React.JSX.Element;

package/lib/ui/OTAUpdateProvider.js

@@ -43,12 +43,12 @@ const telemetry_1 = require("../telemetry");
 const OTAUpdateModal_1 = require("./OTAUpdateModal");
 const SYNC_DELAY_MS = 2500;
 const FOREGROUND_SYNC_DEBOUNCE_MS = 30000;
-function OTAUpdateProvider({ children, projectConfig, autoSync = true, skipInDev = true, messages, fontFamily, syncOptions, }) {
+function OTAUpdateProvider({ children, projectConfig, autoSync = true, skipInDev = true, messages, fontFamily, syncOptions, renderUpdateUI, UpdateComponent, }) {
     const [progress, setProgress] = (0, react_1.useState)((0, progress_1.getProgressState)());
     const lastSyncAtRef = (0, react_1.useRef)(0);
     const foregroundTimerRef = (0, react_1.useRef)(null);
     const hasMountedSyncRef = (0, react_1.useRef)(false);
-    const modalTitle = (0, progress_1.getModalTitle)(messages);
+    const modalTitle = (0, progress_1.getModalTitle)(messages, progress.updateType);
     (0, react_1.useEffect)(() => {
         if (projectConfig) {
             (0, projectConfig_1.configureFromProject)(projectConfig);
@@ -101,8 +101,27 @@ function OTAUpdateProvider({ children, projectConfig, autoSync = true, skipInDev
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
+    const uiProps = (0, react_1.useMemo)(() => ({
+        ...progress,
+        title: modalTitle,
+        fontFamily,
+        messages,
+        onUpdate: () => (0, sync_1.respondToUpdatePrompt)('update'),
+        onSkip: () => (0, sync_1.respondToUpdatePrompt)('skip'),
+        onDismiss: () => (0, sync_1.respondToUpdatePrompt)('dismiss'),
+    }), [progress, modalTitle, fontFamily, messages]);
+    let updateUI = null;
+    if (renderUpdateUI) {
+        updateUI = renderUpdateUI(uiProps);
+    }
+    else if (UpdateComponent) {
+        updateUI = <UpdateComponent {...uiProps}/>;
+    }
+    else {
+        updateUI = <OTAUpdateModal_1.OTAUpdateModal {...uiProps}/>;
+    }
     return (<>
       {children}
-      <OTAUpdateModal_1.OTAUpdateModal {...progress} title={modalTitle} fontFamily={fontFamily} messages={messages}/>
+      {updateUI}
     </>);
 }

package/lib/zipExtract.js

@@ -88,6 +88,12 @@ async function extractZipToDirectoryJs(zipPath, destDir) {
             await mkdirRecursive(`${destDir}/${normalized.slice(0, -1)}`);
             continue;
         }
+        const base = normalized.split('/').pop() ?? normalized;
+        if (normalized.split('/').includes('__MACOSX') ||
+            base.startsWith('._') ||
+            base === '.DS_Store') {
+            continue;
+        }
         const content = rawContent instanceof Uint8Array
             ? rawContent
             : new Uint8Array(rawContent);

package/package.json

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