@appsonair.ir/react-native 1.0.2 → 1.0.3

package/lib/sync.d.ts

@@ -25,6 +25,7 @@ export declare const defaultMessages: {
     installing: string;
     restarting: string;
     error: string;
+    downloadInterrupted: string;
     upToDate: string;
     updateAvailable: string;
     changelogTitle: string;

package/lib/sync.js

@@ -75,6 +75,7 @@ exports.defaultMessages = {
     installing: 'در حال نصب به\u200cروزرسانی...',
     restarting: 'در حال راه\u200cاندازی مجدد...',
     error: 'خطا در به\u200cروزرسانی',
+    downloadInterrupted: 'دانلود قطع شد. لطفاً دوباره تلاش کنید',
     upToDate: 'برنامه به\u200cروز است',
     updateAvailable: 'نسخه جدیدی در دسترس است',
     changelogTitle: 'تغییرات این نسخه',
@@ -413,6 +414,31 @@ async function ensureBundleDirectory() {
         await ReactNativeBlobUtil.fs.mkdir(dir);
     }
 }
+/** Keep only the active OTA package so leftover extracts don't fill disk / slow IO. */
+async function cleanupOldUpdates(keepLabel) {
+    try {
+        const ReactNativeBlobUtil = require('react-native-blob-util').default;
+        const dir = getBundleDirectory();
+        const exists = await ReactNativeBlobUtil.fs.exists(dir);
+        if (!exists)
+            return;
+        const keep = new Set([
+            keepLabel,
+            `${keepLabel}.zip`,
+            `${keepLabel}.bundle`,
+        ]);
+        const entries = await ReactNativeBlobUtil.fs.ls(dir);
+        await Promise.all(entries.map(async (entry) => {
+            if (keep.has(entry) || entry.endsWith('.apk')) {
+                return;
+            }
+            await removePathRecursive(`${dir}/${entry}`);
+        }));
+    }
+    catch {
+        // Best-effort cleanup; a leftover folder must not fail install.
+    }
+}
 async function resolveDownloadSize(downloadUrl, deploymentKey, expectedSize, deviceAbi) {
     if (expectedSize && expectedSize > 0) {
         return expectedSize;
@@ -449,6 +475,80 @@ async function resolveDownloadSize(downloadUrl, deploymentKey, expectedSize, dev
     }
     return expectedSize ?? 0;
 }
+const DOWNLOAD_MAX_ATTEMPTS = 3;
+function getErrorMessage(error) {
+    if (error instanceof Error)
+        return error.message;
+    if (typeof error === 'string')
+        return error;
+    if (error && typeof error === 'object' && 'message' in error) {
+        return String(error.message);
+    }
+    return String(error);
+}
+function isRetryableDownloadError(error) {
+    const message = getErrorMessage(error).toLowerCase();
+    return (message.includes('download interrupted') ||
+        message.includes('network') ||
+        message.includes('timeout') ||
+        message.includes('timed out') ||
+        message.includes('connection') ||
+        message.includes('socket') ||
+        message.includes('econnreset') ||
+        message.includes('failed to connect') ||
+        message.includes('software caused connection abort'));
+}
+function toUserFacingDownloadError(error) {
+    if (isRetryableDownloadError(error)) {
+        return new Error(exports.defaultMessages.downloadInterrupted);
+    }
+    return error instanceof Error ? error : new Error(getErrorMessage(error));
+}
+async function cleanupPartialDownload(path) {
+    try {
+        const ReactNativeBlobUtil = require('react-native-blob-util').default;
+        const exists = await ReactNativeBlobUtil.fs.exists(path);
+        if (exists) {
+            await ReactNativeBlobUtil.fs.unlink(path);
+        }
+    }
+    catch {
+        // Ignore cleanup errors.
+    }
+}
+/**
+ * react-native-blob-util rejects with "Download interrupted." whenever
+ * bytesWritten !== Content-Length — including when Content-Length is wrong
+ * but the full file actually landed. Recover those cases via size/hash checks.
+ */
+async function tryRecoverCompletedDownload(destPath, extension, totalBytes, expectedHash, packageFormat, label) {
+    try {
+        const ReactNativeBlobUtil = require('react-native-blob-util').default;
+        const exists = await ReactNativeBlobUtil.fs.exists(destPath);
+        if (!exists)
+            return null;
+        const stat = await ReactNativeBlobUtil.fs.stat(destPath);
+        const minSize = extension === 'apk' ? 1024 * 100 : 1024;
+        if (!stat || stat.size < minSize)
+            return null;
+        const sizeLooksComplete = totalBytes <= 0 || Math.abs(stat.size - totalBytes) <= 1;
+        if (expectedHash) {
+            const valid = await verifyBundleHash(destPath, expectedHash);
+            if (!valid)
+                return null;
+        }
+        else if (!sizeLooksComplete) {
+            return null;
+        }
+        if (extension === 'bundle' && (await shouldExtractZipPackage(destPath, packageFormat))) {
+            return extractBundleUpdate(label, destPath);
+        }
+        return destPath;
+    }
+    catch {
+        return null;
+    }
+}
 async function downloadBundle(downloadUrl, deploymentKey, label, expectedSize, onProgress, extension = 'bundle', deviceAbi, packageFormat = 'bundle', expectedHash) {
     const ReactNativeBlobUtil = require('react-native-blob-util').default;
     const isZipBundle = extension === 'bundle' && packageFormat === 'zip';
@@ -462,76 +562,95 @@ async function downloadBundle(downloadUrl, deploymentKey, label, expectedSize, o
     if (isZipBundle) {
         await removePathRecursive(getBundleReleaseDir(label));
     }
-    const destExists = await ReactNativeBlobUtil.fs.exists(destPath);
-    if (destExists) {
-        await ReactNativeBlobUtil.fs.unlink(destPath);
-    }
-    const task = ReactNativeBlobUtil.config({
-        path: destPath,
-        fileCache: false,
-        overwrite: true,
-    }).fetch('GET', downloadUrl, {
-        'X-Deployment-Key': deploymentKey,
-        ...(deviceAbi ? { 'X-Device-Abi': deviceAbi } : {}),
-    });
-    const reportDownloadProgress = (received, total) => {
-        if (!onProgress)
-            return;
-        const resolvedTotal = total > 0 ? total : totalBytes;
-        if (resolvedTotal <= 0)
-            return;
-        onProgress(Math.min(Math.max(received / resolvedTotal, 0), 0.99));
-    };
-    let pollTimer = null;
-    if (onProgress && totalBytes > 0) {
-        pollTimer = setInterval(async () => {
-            try {
-                const exists = await ReactNativeBlobUtil.fs.exists(destPath);
-                if (!exists)
-                    return;
-                const stat = await ReactNativeBlobUtil.fs.stat(destPath);
-                reportDownloadProgress(stat.size, totalBytes);
-            }
-            catch {
-                // Ignore polling errors while the file is being written.
-            }
-        }, 150);
-    }
-    if (onProgress) {
-        task.progress({ interval: 100, count: 10 }, (received, total) => {
-            reportDownloadProgress(received, total);
+    let lastError;
+    for (let attempt = 1; attempt <= DOWNLOAD_MAX_ATTEMPTS; attempt++) {
+        await cleanupPartialDownload(destPath);
+        const task = ReactNativeBlobUtil.config({
+            path: destPath,
+            fileCache: false,
+            overwrite: true,
+            timeout: 10 * 60 * 1000,
+        }).fetch('GET', downloadUrl, {
+            'X-Deployment-Key': deploymentKey,
+            ...(deviceAbi ? { 'X-Device-Abi': deviceAbi } : {}),
         });
-    }
-    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);
+        const reportDownloadProgress = (received, total) => {
+            if (!onProgress)
+                return;
+            const resolvedTotal = total > 0 ? total : totalBytes;
+            if (resolvedTotal <= 0)
+                return;
+            onProgress(Math.min(Math.max(received / resolvedTotal, 0), 0.99));
+        };
+        let pollTimer = null;
+        if (onProgress && totalBytes > 0) {
+            pollTimer = setInterval(async () => {
+                try {
+                    const exists = await ReactNativeBlobUtil.fs.exists(destPath);
+                    if (!exists)
+                        return;
+                    const stat = await ReactNativeBlobUtil.fs.stat(destPath);
+                    reportDownloadProgress(stat.size, totalBytes);
+                }
+                catch {
+                    // Ignore polling errors while the file is being written.
+                }
+            }, 150);
         }
-        const stat = await ReactNativeBlobUtil.fs.stat(destPath);
-        const minSize = extension === 'apk' ? 1024 * 100 : 1024;
-        if (!stat || stat.size < minSize) {
-            throw new Error(`Downloaded file is too small (${stat?.size ?? 0} bytes)`);
+        if (onProgress) {
+            task.progress({ interval: 100, count: 10 }, (received, total) => {
+                reportDownloadProgress(received, total);
+            });
         }
-        if (expectedHash) {
-            const valid = await verifyBundleHash(destPath, expectedHash);
-            if (!valid) {
-                throw new Error('Package hash verification failed');
+        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);
+            }
+            const stat = await ReactNativeBlobUtil.fs.stat(destPath);
+            const minSize = extension === 'apk' ? 1024 * 100 : 1024;
+            if (!stat || stat.size < minSize) {
+                throw new Error(`Downloaded file is too small (${stat?.size ?? 0} bytes)`);
+            }
+            if (expectedHash) {
+                const valid = await verifyBundleHash(destPath, expectedHash);
+                if (!valid) {
+                    throw new Error('Package hash verification failed');
+                }
+            }
+            if (extension === 'bundle' && (await shouldExtractZipPackage(destPath, packageFormat))) {
+                return extractBundleUpdate(label, destPath);
+            }
+            return destPath;
         }
-        if (extension === 'bundle' && (await shouldExtractZipPackage(destPath, packageFormat))) {
-            return extractBundleUpdate(label, destPath);
+        catch (error) {
+            lastError = error;
+            if (isRetryableDownloadError(error)) {
+                const recovered = await tryRecoverCompletedDownload(destPath, extension, totalBytes, expectedHash, packageFormat, label);
+                if (recovered) {
+                    if (onProgress)
+                        onProgress(1);
+                    return recovered;
+                }
+            }
+            await cleanupPartialDownload(destPath);
+            if (attempt < DOWNLOAD_MAX_ATTEMPTS && isRetryableDownloadError(error)) {
+                await delay(attempt * 750);
+                continue;
+            }
+            throw toUserFacingDownloadError(error);
         }
-        return destPath;
-    }
-    finally {
-        if (pollTimer) {
-            clearInterval(pollTimer);
+        finally {
+            if (pollTimer) {
+                clearInterval(pollTimer);
+            }
         }
     }
+    throw toUserFacingDownloadError(lastError);
 }
 async function verifyBundleHash(filePath, expectedHash) {
     const ReactNativeBlobUtil = require('react-native-blob-util').default;
@@ -725,6 +844,7 @@ async function performSync(options = {}, onProgress, messages) {
             packageHash: update.packageHash,
             installedAt: new Date().toISOString(),
         });
+        await cleanupOldUpdates(update.label);
         const shouldRestartNow = installMode === 'immediate' || update.isMandatory === true;
         if (shouldRestartNow) {
             reportProgress(showUI, messages, onProgress, types_1.SyncStatus.RESTARTING, 1, {
@@ -793,12 +913,8 @@ async function performApkSync(update, showUI, messages, onProgress, changelog) {
             label: update.label,
             description: notes,
             isMandatory: update.isMandatory,
-        }), 'apk', update.deviceAbi);
+        }), 'apk', update.deviceAbi, 'bundle', update.packageHash);
         onProgress?.(types_1.SyncStatus.INSTALLING, 1);
-        const valid = await verifyBundleHash(apkPath, update.packageHash);
-        if (!valid) {
-            throw new Error('APK hash verification failed');
-        }
         // 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.
         await clearUpdate();
@@ -855,10 +971,16 @@ async function getInstalledBundlePath() {
     return null;
 }
 async function clearUpdate() {
+    const meta = await getStoredBundleMeta();
     await clearStoredBundleMeta();
     if (OTAUpdaterNative?.clearBundlePath) {
         await OTAUpdaterNative.clearBundlePath();
     }
+    if (meta?.label) {
+        await removePathRecursive(getBundleReleaseDir(meta.label));
+        await cleanupPartialDownload(getBundleZipPath(meta.label));
+        await cleanupPartialDownload(getLegacyBundleFilePath(meta.label));
+    }
 }
 async function notifyAppReady() {
     const meta = await getStoredBundleMeta();

package/package.json

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