@cloudflare/realtimekit-react-native 0.1.4-staging.7 → 0.1.4-staging.8

package/lib/commonjs/utils/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SDK_VERSION = void 0;
-const SDK_VERSION = exports.SDK_VERSION = '0.1.4-staging.7';
+const SDK_VERSION = exports.SDK_VERSION = '0.1.4-staging.8';
 //# sourceMappingURL=version.js.map

package/lib/commonjs/utils/version.js.map

@@ -1 +1 @@
-{"version":3,"names":["SDK_VERSION","exports"],"sources":["version.ts"],"sourcesContent":["export const SDK_VERSION = '0.1.4-staging.7';\n"],"mappings":";;;;;;AAAO,MAAMA,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG,iBAAiB","ignoreList":[]}
+{"version":3,"names":["SDK_VERSION","exports"],"sources":["version.ts"],"sourcesContent":["export const SDK_VERSION = '0.1.4-staging.8';\n"],"mappings":";;;;;;AAAO,MAAMA,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG,iBAAiB","ignoreList":[]}

package/lib/module/utils/version.js

@@ -1,2 +1,2 @@
-export const SDK_VERSION = '0.1.4-staging.7';
+export const SDK_VERSION = '0.1.4-staging.8';
 //# sourceMappingURL=version.js.map

package/lib/module/utils/version.js.map

@@ -1 +1 @@
-{"version":3,"names":["SDK_VERSION"],"sources":["version.ts"],"sourcesContent":["export const SDK_VERSION = '0.1.4-staging.7';\n"],"mappings":"AAAA,OAAO,MAAMA,WAAW,GAAG,iBAAiB","ignoreList":[]}
+{"version":3,"names":["SDK_VERSION"],"sources":["version.ts"],"sourcesContent":["export const SDK_VERSION = '0.1.4-staging.8';\n"],"mappings":"AAAA,OAAO,MAAMA,WAAW,GAAG,iBAAiB","ignoreList":[]}

package/lib/typescript/utils/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "0.1.4-staging.7";
+export declare const SDK_VERSION = "0.1.4-staging.8";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudflare/realtimekit-react-native",
-    "version": "0.1.4-staging.7",
+    "version": "0.1.4-staging.8",
     "description": "Cloudflare RealtimeKit SDK for react native",
     "main": "lib/commonjs/index",
     "author": "Cloudflare",

package/plugin/build/withRTK.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
 const MICROPHONE = 'Allow $(PRODUCT_NAME) to access the microphone';
 const CAMERA = 'Allow $(PRODUCT_NAME) to access the camera';
-const BLUETOOTH = 'Allow $(PRODUCT_NAME) to access the bluetooth';
-const BLUETOOTH_ALWAYS = 'Allow $(PRODUCT_NAME) to access the bluetooth';
 const LIBRARY = 'Allow $(PRODUCT_NAME) to access the files';
 /**
  * Adds `NSMicrophoneUsageDescription` and `NSSpeechRecognitionUsageDescription` to the `Info.plist`.
@@ -13,7 +11,7 @@ const LIBRARY = 'Allow $(PRODUCT_NAME) to access the files';
  * @param props.microphonePermission microphone permission message
  * @returns
  */
-const withIosPermissions = (c, { microphonePermission, cameraPermission, libraryPermission, bluetoothPermission, bluetoothAlwaysPermission, } = {}) => {
+const withIosPermissions = (c, { microphonePermission, cameraPermission, libraryPermission } = {}) => {
     return (0, config_plugins_1.withInfoPlist)(c, (config) => {
         if (microphonePermission !== false) {
             config.modResults.NSMicrophoneUsageDescription =
@@ -27,18 +25,6 @@ const withIosPermissions = (c, { microphonePermission, cameraPermission, library
                     config.modResults.NSCameraUsageDescription ||
                     CAMERA;
         }
-        if (bluetoothPermission !== false) {
-            config.modResults.NSBluetoothPeripheralUsageDescription =
-                bluetoothPermission ||
-                    config.modResults.NSBluetoothPeripheralUsageDescription ||
-                    BLUETOOTH;
-        }
-        if (bluetoothAlwaysPermission !== false) {
-            config.modResults.NSBluetoothAlwaysUsageDescription =
-                bluetoothAlwaysPermission ||
-                    config.modResults.NSBluetoothAlwaysUsageDescription ||
-                    BLUETOOTH_ALWAYS;
-        }
         if (libraryPermission !== false) {
             config.modResults.NSPhotoLibraryUsageDescription =
                 libraryPermission ||
@@ -81,20 +67,43 @@ const withAndroidPermissions = (config) => {
         'android.permission.SYSTEM_ALERT_WINDOW',
         'android.permission.WAKE_LOCK',
         'android.permission.FOREGROUND_SERVICE',
-        'android.permission.FOREGROUND_SERVICE_CAMERA',
-        'android.permission.FOREGROUND_SERVICE_MICROPHONE',
         'android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION',
         'android.permission.WRITE_EXTERNAL_STORAGE',
         'android.permission.READ_EXTERNAL_STORAGE',
         'android.permission.MICROPHONE',
     ]);
 };
+const withAndroidScreenshare = (config) => {
+    return (0, config_plugins_1.withAndroidManifest)(config, (_config) => {
+        const manifest = _config.modResults;
+        const app = manifest.manifest.application?.[0];
+        if (app) {
+            // Avoid duplicate entries
+            const exists = (app.service || []).some((service) => service.$['android:name'] ===
+                'com.cloudflare.realtimekit.ForegroundService');
+            if (!exists) {
+                app.service = [
+                    ...(app.service || []),
+                    {
+                        $: {
+                            'android:enabled': 'true',
+                            'android:foregroundServiceType': 'mediaProjection',
+                            'android:name': 'com.cloudflare.realtimekit.ForegroundService',
+                        },
+                    },
+                ];
+            }
+        }
+        return _config;
+    });
+};
 const withVoice = (config, props = {}) => {
     const _props = props ? props : {};
     config = withIosPermissions(config, _props);
     if (_props.microphonePermission !== false) {
         config = withAndroidPermissions(config);
     }
+    config = withAndroidScreenshare(config);
     return config;
 };
 exports.default = (0, config_plugins_1.createRunOncePlugin)(withVoice, '@cloudflare/realtimekit-react-native');

package/plugin/src/withRTK.ts

@@ -1,14 +1,14 @@
 import {
   AndroidConfig,
+  AndroidManifest,
   ConfigPlugin,
   createRunOncePlugin,
+  withAndroidManifest,
   withInfoPlist,
 } from '@expo/config-plugins';
 
 const MICROPHONE = 'Allow $(PRODUCT_NAME) to access the microphone';
 const CAMERA = 'Allow $(PRODUCT_NAME) to access the camera';
-const BLUETOOTH = 'Allow $(PRODUCT_NAME) to access the bluetooth';
-const BLUETOOTH_ALWAYS = 'Allow $(PRODUCT_NAME) to access the bluetooth';
 const LIBRARY = 'Allow $(PRODUCT_NAME) to access the files';
 
 export type Props = {
@@ -47,13 +47,7 @@ export type Props = {
  */
 const withIosPermissions: ConfigPlugin<Props> = (
   c,
-  {
-    microphonePermission,
-    cameraPermission,
-    libraryPermission,
-    bluetoothPermission,
-    bluetoothAlwaysPermission,
-  } = {}
+  { microphonePermission, cameraPermission, libraryPermission } = {}
 ) => {
   return withInfoPlist(c, (config) => {
     if (microphonePermission !== false) {
@@ -70,20 +64,6 @@ const withIosPermissions: ConfigPlugin<Props> = (
         CAMERA;
     }
 
-    if (bluetoothPermission !== false) {
-      config.modResults.NSBluetoothPeripheralUsageDescription =
-        bluetoothPermission ||
-        config.modResults.NSBluetoothPeripheralUsageDescription ||
-        BLUETOOTH;
-    }
-
-    if (bluetoothAlwaysPermission !== false) {
-      config.modResults.NSBluetoothAlwaysUsageDescription =
-        bluetoothAlwaysPermission ||
-        config.modResults.NSBluetoothAlwaysUsageDescription ||
-        BLUETOOTH_ALWAYS;
-    }
-
     if (libraryPermission !== false) {
       config.modResults.NSPhotoLibraryUsageDescription =
         libraryPermission ||
@@ -129,8 +109,6 @@ const withAndroidPermissions: ConfigPlugin = (config) => {
     'android.permission.SYSTEM_ALERT_WINDOW',
     'android.permission.WAKE_LOCK',
     'android.permission.FOREGROUND_SERVICE',
-    'android.permission.FOREGROUND_SERVICE_CAMERA',
-    'android.permission.FOREGROUND_SERVICE_MICROPHONE',
     'android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION',
     'android.permission.WRITE_EXTERNAL_STORAGE',
     'android.permission.READ_EXTERNAL_STORAGE',
@@ -138,12 +116,43 @@ const withAndroidPermissions: ConfigPlugin = (config) => {
   ]);
 };
 
+const withAndroidScreenshare: ConfigPlugin = (config) => {
+  return withAndroidManifest(config, (_config) => {
+    const manifest = _config.modResults as AndroidManifest;
+    const app = manifest.manifest.application?.[0];
+
+    if (app) {
+      // Avoid duplicate entries
+      const exists = (app.service || []).some(
+        (service) =>
+          service.$['android:name'] ===
+          'com.cloudflare.realtimekit.ForegroundService'
+      );
+      if (!exists) {
+        app.service = [
+          ...(app.service || []),
+          {
+            $: {
+              'android:enabled': 'true',
+              'android:foregroundServiceType': 'mediaProjection',
+              'android:name': 'com.cloudflare.realtimekit.ForegroundService',
+            },
+          },
+        ];
+      }
+    }
+
+    return _config;
+  });
+};
+
 const withVoice: ConfigPlugin<Props | void> = (config, props = {}) => {
   const _props = props ? props : {};
   config = withIosPermissions(config, _props);
   if (_props.microphonePermission !== false) {
     config = withAndroidPermissions(config);
   }
+  config = withAndroidScreenshare(config);
   return config;
 };