@appsonair.ir/react-native 1.0.6 → 1.0.7

package/lib/sync.js

@@ -456,6 +456,98 @@ function getApkFilePath(label) {
     const dirs = ReactNativeBlobUtil.fs.dirs;
     return `${dirs.DocumentDir}/ota-updates/${label}.apk`;
 }
+function getApkZipPath(label) {
+    const ReactNativeBlobUtil = require('react-native-blob-util').default;
+    const dirs = ReactNativeBlobUtil.fs.dirs;
+    return `${dirs.DocumentDir}/ota-updates/${label}-apk.zip`;
+}
+function getApkExtractDir(label) {
+    const ReactNativeBlobUtil = require('react-native-blob-util').default;
+    const dirs = ReactNativeBlobUtil.fs.dirs;
+    return `${dirs.DocumentDir}/ota-updates/${label}-apk`;
+}
+function apkAbiFromName(fileName) {
+    const lower = fileName.replace(/^.*[/\\]/, '').toLowerCase();
+    if (lower.includes('arm64-v8a') || lower.includes('arm64') || lower.includes('-v8a')) {
+        return 'arm64-v8a';
+    }
+    if (lower.includes('armeabi-v7a') ||
+        lower.includes('armeabi') ||
+        lower.includes('-v7a')) {
+        return 'armeabi-v7a';
+    }
+    if (lower.includes('x86_64')) {
+        return 'x86_64';
+    }
+    if (lower.includes('universal')) {
+        return 'universal';
+    }
+    return null;
+}
+async function listFilesRecursive(dir) {
+    const ReactNativeBlobUtil = require('react-native-blob-util').default;
+    const entries = await ReactNativeBlobUtil.fs.ls(dir);
+    const out = [];
+    for (const entry of entries) {
+        const path = `${dir}/${entry}`;
+        try {
+            const entryStat = await ReactNativeBlobUtil.fs.stat(path);
+            if (entryStat.type === 'directory') {
+                out.push(...(await listFilesRecursive(path)));
+            }
+            else {
+                out.push(path);
+            }
+        }
+        catch {
+            out.push(path);
+        }
+    }
+    return out;
+}
+async function pickExtractedApk(dir, deviceAbi) {
+    const files = await listFilesRecursive(dir);
+    const apks = files.filter((path) => path.toLowerCase().endsWith('.apk'));
+    if (apks.length === 0) {
+        throw new Error(`No APK found after unzipping ${dir}`);
+    }
+    if (apks.length === 1) {
+        return apks[0];
+    }
+    const wanted = (deviceAbi ?? (await getDeviceAbi()) ?? '').toLowerCase();
+    const scored = apks.map((path) => {
+        const abi = apkAbiFromName(path);
+        let score = 0;
+        if (abi && wanted && abi === wanted) {
+            score = 3;
+        }
+        else if (wanted.includes('arm64') && abi === 'arm64-v8a') {
+            score = 3;
+        }
+        else if ((wanted.includes('v7') || wanted.includes('armeabi')) &&
+            abi === 'armeabi-v7a') {
+            score = 2;
+        }
+        else if (abi === 'universal') {
+            score = 1;
+        }
+        return { path, score };
+    });
+    scored.sort((a, b) => b.score - a.score);
+    return scored[0].path;
+}
+async function extractApkUpdate(label, zipPath, deviceAbi) {
+    const ReactNativeBlobUtil = require('react-native-blob-util').default;
+    const extractDir = getApkExtractDir(label);
+    await removePathRecursive(extractDir);
+    await ReactNativeBlobUtil.fs.mkdir(extractDir);
+    await (0, zipExtract_1.extractZipToDirectory)(zipPath, extractDir);
+    const zipExists = await ReactNativeBlobUtil.fs.exists(zipPath);
+    if (zipExists) {
+        await ReactNativeBlobUtil.fs.unlink(zipPath);
+    }
+    return pickExtractedApk(extractDir, deviceAbi);
+}
 function getBundleDirectory() {
     const ReactNativeBlobUtil = require('react-native-blob-util').default;
     return `${ReactNativeBlobUtil.fs.dirs.DocumentDir}/ota-updates`;
@@ -480,10 +572,13 @@ async function cleanupOldUpdates(keepLabel) {
             keepLabel,
             `${keepLabel}.zip`,
             `${keepLabel}.bundle`,
+            `${keepLabel}.apk`,
+            `${keepLabel}-apk`,
+            `${keepLabel}-apk.zip`,
         ]);
         const entries = await ReactNativeBlobUtil.fs.ls(dir);
         await Promise.all(entries.map(async (entry) => {
-            if (keep.has(entry) || entry.endsWith('.apk')) {
+            if (keep.has(entry)) {
                 return;
             }
             await removePathRecursive(`${dir}/${entry}`);
@@ -575,7 +670,7 @@ async function cleanupPartialDownload(path) {
  * 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) {
+async function tryRecoverCompletedDownload(destPath, extension, totalBytes, expectedHash, packageFormat, label, deviceAbi) {
     try {
         const ReactNativeBlobUtil = require('react-native-blob-util').default;
         const exists = await ReactNativeBlobUtil.fs.exists(destPath);
@@ -594,6 +689,9 @@ async function tryRecoverCompletedDownload(destPath, extension, totalBytes, expe
         else if (!sizeLooksComplete) {
             return null;
         }
+        if (extension === 'apk' && (packageFormat === 'zip' || (await isZipArchive(destPath)))) {
+            return extractApkUpdate(label, destPath, deviceAbi);
+        }
         if (extension === 'bundle' && (await shouldExtractZipPackage(destPath, packageFormat))) {
             return extractBundleUpdate(label, destPath);
         }
@@ -606,16 +704,22 @@ async function tryRecoverCompletedDownload(destPath, extension, totalBytes, expe
 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';
+    const isApkZip = extension === 'apk' && packageFormat === 'zip';
     const destPath = isZipBundle
         ? getBundleZipPath(label)
-        : extension === 'apk'
-            ? getApkFilePath(label)
-            : getLegacyBundleFilePath(label);
+        : isApkZip
+            ? getApkZipPath(label)
+            : extension === 'apk'
+                ? getApkFilePath(label)
+                : getLegacyBundleFilePath(label);
     const totalBytes = await resolveDownloadSize(downloadUrl, deploymentKey, expectedSize, deviceAbi);
     await ensureBundleDirectory();
     if (isZipBundle) {
         await removePathRecursive(getBundleReleaseDir(label));
     }
+    if (isApkZip) {
+        await removePathRecursive(getApkExtractDir(label));
+    }
     let lastError;
     for (let attempt = 1; attempt <= DOWNLOAD_MAX_ATTEMPTS; attempt++) {
         await cleanupPartialDownload(destPath);
@@ -676,6 +780,9 @@ async function downloadBundle(downloadUrl, deploymentKey, label, expectedSize, o
                     throw new Error('Package hash verification failed');
                 }
             }
+            if (extension === 'apk' && (isApkZip || (await isZipArchive(destPath)))) {
+                return extractApkUpdate(label, destPath, deviceAbi);
+            }
             if (extension === 'bundle' && (await shouldExtractZipPackage(destPath, packageFormat))) {
                 return extractBundleUpdate(label, destPath);
             }
@@ -684,7 +791,7 @@ async function downloadBundle(downloadUrl, deploymentKey, label, expectedSize, o
         catch (error) {
             lastError = error;
             if (isRetryableDownloadError(error)) {
-                const recovered = await tryRecoverCompletedDownload(destPath, extension, totalBytes, expectedHash, packageFormat, label);
+                const recovered = await tryRecoverCompletedDownload(destPath, extension, totalBytes, expectedHash, packageFormat, label, deviceAbi);
                 if (recovered) {
                     if (onProgress)
                         onProgress(1);
@@ -969,7 +1076,7 @@ async function performApkSync(update, showUI, messages, onProgress, changelog) {
             label: update.label,
             description: notes,
             isMandatory: update.isMandatory,
-        }), 'apk', update.deviceAbi, 'bundle', update.packageHash);
+        }), 'apk', update.deviceAbi, update.packageFormat ?? 'bundle', update.packageHash);
         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.

package/package.json

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