@appsonair.ir/react-native 1.0.11 → 1.0.12

package/lib/sync.js

@@ -812,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.11",
+  "version": "1.0.12",
   "description": "React Native client SDK for self-hosted OTA updates",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",