@apirtc/expo-apirtc-options-plugin 0.0.9 → 0.0.11

package/build/withAndroidPlugin.js

@@ -52,15 +52,18 @@ const REQUIRED_PERMISSIONS = [
     "android.permission.FOREGROUND_SERVICE_CAMERA"
 ];
 const MLKIT_SEGMENTATION_DEP = 'implementation("com.google.mlkit:segmentation-selfie:16.0.0-beta6")';
-function getAndroidPackagePath(projectRoot) {
+function getAndroidPackagePath(projectRoot, packageNameHint) {
     var _a, _b;
-    const manifestPath = path.join(projectRoot, 'android/app/src/main/AndroidManifest.xml');
-    let packageName;
-    if (fs.existsSync(manifestPath)) {
-        const manifestContent = fs.readFileSync(manifestPath, 'utf8');
-        const match = manifestContent.match(/package="([\w.]+)"/);
-        if (match) {
-            packageName = match[1];
+    let packageName = packageNameHint;
+    // Fallback: read from AndroidManifest.xml
+    if (!packageName) {
+        const manifestPath = path.join(projectRoot, 'android/app/src/main/AndroidManifest.xml');
+        if (fs.existsSync(manifestPath)) {
+            const manifestContent = fs.readFileSync(manifestPath, 'utf8');
+            const match = manifestContent.match(/package="([\w.]+)"/);
+            if (match) {
+                packageName = match[1];
+            }
         }
     }
     // Fallback: read from app.config.ts or app.config.js
@@ -91,19 +94,19 @@ function getAndroidPackagePath(projectRoot) {
         }
     }
     if (!packageName) {
-        throw new Error('Package name not found in AndroidManifest.xml, app.config.ts, app.config.js or app.json');
+        throw new Error('Package name not found in config.android.package, AndroidManifest.xml, app.config.ts, app.config.js or app.json');
     }
     return path.join(projectRoot, 'android/app/src/main/java', ...packageName.split('.'));
 }
-function getPackageName(projectRoot) {
-    return getAndroidPackagePath(projectRoot)
+function getPackageName(projectRoot, packageNameHint) {
+    return getAndroidPackagePath(projectRoot, packageNameHint)
         .replace(path.join(projectRoot, 'android/app/src/main/java') + path.sep, '')
         .split(path.sep)
         .join('.');
 }
-function copyAndPatchJavaFiles(projectRoot) {
+function copyAndPatchJavaFiles(projectRoot, packageNameHint) {
     const srcDir = path.join(__dirname, 'static/java');
-    const destDir = getAndroidPackagePath(projectRoot);
+    const destDir = getAndroidPackagePath(projectRoot, packageNameHint);
     const packageName = destDir
         .replace(path.join(projectRoot, 'android/app/src/main/java') + path.sep, '')
         .split(path.sep)
@@ -122,9 +125,9 @@ function copyAndPatchJavaFiles(projectRoot) {
         }
     });
 }
-function copyAndPatchKotlinFiles(projectRoot) {
+function copyAndPatchKotlinFiles(projectRoot, packageNameHint) {
     const srcDir = path.join(__dirname, 'static/kotlin');
-    const destDir = getAndroidPackagePath(projectRoot);
+    const destDir = getAndroidPackagePath(projectRoot, packageNameHint);
     const packageName = destDir
         .replace(path.join(projectRoot, 'android/app/src/main/java') + path.sep, '')
         .split(path.sep)
@@ -184,12 +187,14 @@ const withMlKitGradleDep = (config) => {
 const withAndroidPlugin = (config, props) => {
     logger_1.logger.info('withAndroidPlugin called with props:', props);
     let updatedConfig = (0, config_plugins_1.withMainApplication)(config, (config) => {
+        var _a, _b, _c, _d;
         const mainApplication = config.modResults;
         const packageName = (() => {
+            var _a, _b;
             try {
-                return getPackageName(config.modRequest.projectRoot);
+                return getPackageName(config.modRequest.projectRoot, (_b = (_a = config.android) === null || _a === void 0 ? void 0 : _a.package) !== null && _b !== void 0 ? _b : undefined);
             }
-            catch (_a) {
+            catch (_c) {
                 return null;
             }
         })();
@@ -234,10 +239,10 @@ const withAndroidPlugin = (config, props) => {
                 mainApplication.contents = mainApplication.contents.replace(/(\/\/ add\(MyReactNativePackage\(\)\))/, match => `${match}\n          add(BackgroundBlurPackage())`);
             }
             // Copy Kotlin native files
-            copyAndPatchKotlinFiles(config.modRequest.projectRoot);
+            copyAndPatchKotlinFiles(config.modRequest.projectRoot, (_b = (_a = config.android) === null || _a === void 0 ? void 0 : _a.package) !== null && _b !== void 0 ? _b : undefined);
         }
         // Copy Java native files
-        copyAndPatchJavaFiles(config.modRequest.projectRoot);
+        copyAndPatchJavaFiles(config.modRequest.projectRoot, (_d = (_c = config.android) === null || _c === void 0 ? void 0 : _c.package) !== null && _d !== void 0 ? _d : undefined);
         return config;
     });
     // Add ML Kit Gradle dependency when video effects are enabled

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apirtc/expo-apirtc-options-plugin",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Expo Plugin to add apiRTC features in a React Native application",
   "main": "index.js",
   "keywords": [