@appsonair.ir/react-native 1.0.5 → 1.0.7

package/android/build.gradle

@@ -66,5 +66,8 @@ dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib"
   implementation "androidx.core:core:1.13.1"
-  implementation "com.google.firebase:firebase-messaging:24.1.1"
+  // Use BOM so transitive artifacts (installations, play-services-*) resolve
+  // correctly and stay aligned with @react-native-firebase when present.
+  implementation platform("com.google.firebase:firebase-bom:33.9.0")
+  implementation "com.google.firebase:firebase-messaging"
 }

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

@@ -56,7 +56,10 @@ internal object OTAFcmHelper {
     ensureNotificationChannel(context.applicationContext)
 
     try {
-      FirebaseMessaging.getInstance(app).token.addOnCompleteListener { task ->
+      // getInstance(FirebaseApp) is package-private in newer Firebase Messaging SDKs;
+      // FirebaseApp.get(Class) is the supported public API for named apps.
+      val messaging = app.get(FirebaseMessaging::class.java)
+      messaging.token.addOnCompleteListener { task ->
         val token =
           if (task.isSuccessful) {
             task.result?.takeIf { it.isNotBlank() }

package/lib/index.d.ts

@@ -3,6 +3,7 @@ import { configureFromProject, getDeploymentKey, isOtaConfigured, resolveUpdater
 import { sync, restartApp, installApk, resumePendingApkInstall, clearUpdate, getInstalledBundlePath, notifyAppReady } from './sync';
 import { logEvent } from './events';
 import { ping, startTelemetry, stopTelemetry } from './telemetry';
+import { clearUserInfo, getUserInfo, setUserInfo } from './userInfo';
 import { UpdateCheckResult } from './types';
 export { configure, getConfig, getServerUrl } from './config';
 export { DEFAULT_SERVER_URL } from './constants';
@@ -13,6 +14,8 @@ export declare function checkUpdate(): Promise<UpdateCheckResult>;
 export { sync, restartApp, installApk, resumePendingApkInstall, clearUpdate, getInstalledBundlePath, notifyAppReady, isSyncInProgress, respondToUpdatePrompt, } from './sync';
 export { ping, startTelemetry, stopTelemetry } from './telemetry';
 export { logEvent } from './events';
+export { setUserInfo, clearUserInfo, getUserInfo } from './userInfo';
+export type { OTAUserInfo } from './userInfo';
 export { OTAUpdateModal } from './ui/OTAUpdateModal';
 export { OTAUpdateProvider } from './ui/OTAUpdateProvider';
 export declare const OTAUpdater: {
@@ -31,5 +34,8 @@ export declare const OTAUpdater: {
     startTelemetry: typeof startTelemetry;
     stopTelemetry: typeof stopTelemetry;
     logEvent: typeof logEvent;
+    setUserInfo: typeof setUserInfo;
+    clearUserInfo: typeof clearUserInfo;
+    getUserInfo: typeof getUserInfo;
 };
 export * from './types';

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.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.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"));
@@ -31,6 +31,7 @@ Object.defineProperty(exports, "resolveUpdaterConfig", { enumerable: true, get:
 const sync_1 = require("./sync");
 const events_1 = require("./events");
 const telemetry_1 = require("./telemetry");
+const userInfo_1 = require("./userInfo");
 var config_2 = require("./config");
 Object.defineProperty(exports, "configure", { enumerable: true, get: function () { return config_2.configure; } });
 Object.defineProperty(exports, "getConfig", { enumerable: true, get: function () { return config_2.getConfig; } });
@@ -68,6 +69,10 @@ Object.defineProperty(exports, "startTelemetry", { enumerable: true, get: functi
 Object.defineProperty(exports, "stopTelemetry", { enumerable: true, get: function () { return telemetry_2.stopTelemetry; } });
 var events_2 = require("./events");
 Object.defineProperty(exports, "logEvent", { enumerable: true, get: function () { return events_2.logEvent; } });
+var userInfo_2 = require("./userInfo");
+Object.defineProperty(exports, "setUserInfo", { enumerable: true, get: function () { return userInfo_2.setUserInfo; } });
+Object.defineProperty(exports, "clearUserInfo", { enumerable: true, get: function () { return userInfo_2.clearUserInfo; } });
+Object.defineProperty(exports, "getUserInfo", { enumerable: true, get: function () { return userInfo_2.getUserInfo; } });
 var OTAUpdateModal_1 = require("./ui/OTAUpdateModal");
 Object.defineProperty(exports, "OTAUpdateModal", { enumerable: true, get: function () { return OTAUpdateModal_1.OTAUpdateModal; } });
 var OTAUpdateProvider_1 = require("./ui/OTAUpdateProvider");
@@ -88,5 +93,8 @@ exports.OTAUpdater = {
     startTelemetry: telemetry_1.startTelemetry,
     stopTelemetry: telemetry_1.stopTelemetry,
     logEvent: events_1.logEvent,
+    setUserInfo: userInfo_1.setUserInfo,
+    clearUserInfo: userInfo_1.clearUserInfo,
+    getUserInfo: userInfo_1.getUserInfo,
 };
 __exportStar(require("./types"), exports);

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/lib/telemetry.js

@@ -11,6 +11,7 @@ const react_native_device_info_1 = __importDefault(require("react-native-device-
 const config_1 = require("./config");
 const deviceProfile_1 = require("./deviceProfile");
 const sync_1 = require("./sync");
+const userInfo_1 = require("./userInfo");
 const PING_INTERVAL_MS = 60000;
 let started = false;
 let pingTimer = null;
@@ -27,6 +28,7 @@ async function buildPingBody(sessionStart) {
         (0, deviceProfile_1.getDeviceProfile)(),
         (0, sync_1.getFcmToken)(),
     ]);
+    const userInfo = (0, userInfo_1.getUserInfo)();
     return {
         clientUniqueId,
         appVersion: react_native_device_info_1.default.getVersion(),
@@ -36,6 +38,7 @@ async function buildPingBody(sessionStart) {
         packageHash: meta?.packageHash,
         fcmToken,
         sessionStart,
+        ...(userInfo ?? {}),
     };
 }
 async function ping(options = {}) {

package/lib/userInfo.d.ts

@@ -0,0 +1,18 @@
+export interface OTAUserInfo {
+    /** Host-app user id (string or number coerced to string). */
+    userId?: string | number | null;
+    userName?: string | null;
+    userEmail?: string | null;
+    userPhone?: string | null;
+}
+export type SanitizedOTAUserInfo = {
+    userId?: string;
+    userName?: string;
+    userEmail?: string;
+    userPhone?: string;
+};
+export declare function sanitizeUserInfo(info: OTAUserInfo | null | undefined): SanitizedOTAUserInfo | null;
+/** Attach logged-in host-app user to subsequent device pings. Pass null to clear. */
+export declare function setUserInfo(info: OTAUserInfo | null): void;
+export declare function clearUserInfo(): void;
+export declare function getUserInfo(): SanitizedOTAUserInfo | null;

package/lib/userInfo.js

@@ -0,0 +1,84 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sanitizeUserInfo = sanitizeUserInfo;
+exports.setUserInfo = setUserInfo;
+exports.clearUserInfo = clearUserInfo;
+exports.getUserInfo = getUserInfo;
+let currentUserInfo = null;
+function sanitizeField(value, maxLen) {
+    if (value == null) {
+        return undefined;
+    }
+    const text = String(value).trim();
+    if (!text) {
+        return undefined;
+    }
+    return text.slice(0, maxLen);
+}
+function sanitizeUserInfo(info) {
+    if (!info || typeof info !== 'object') {
+        return null;
+    }
+    const sanitized = {};
+    const userId = sanitizeField(info.userId, 128);
+    const userName = sanitizeField(info.userName, 128);
+    const userEmail = sanitizeField(info.userEmail, 256);
+    const userPhone = sanitizeField(info.userPhone, 64);
+    if (userId)
+        sanitized.userId = userId;
+    if (userName)
+        sanitized.userName = userName;
+    if (userEmail)
+        sanitized.userEmail = userEmail;
+    if (userPhone)
+        sanitized.userPhone = userPhone;
+    return Object.keys(sanitized).length > 0 ? sanitized : null;
+}
+/** Attach logged-in host-app user to subsequent device pings. Pass null to clear. */
+function setUserInfo(info) {
+    currentUserInfo = sanitizeUserInfo(info);
+    // Best-effort immediate sync so dashboards update without waiting for the interval.
+    void Promise.resolve().then(() => __importStar(require('./telemetry'))).then((mod) => mod.ping())
+        .catch(() => undefined);
+}
+function clearUserInfo() {
+    currentUserInfo = null;
+    void Promise.resolve().then(() => __importStar(require('./telemetry'))).then((mod) => mod.ping())
+        .catch(() => undefined);
+}
+function getUserInfo() {
+    return currentUserInfo;
+}

package/package.json

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