@fishjam-cloud/react-native-client 0.25.0-rc.1 → 0.25.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/react-native-client",
-  "version": "0.25.0-rc.1",
+  "version": "0.25.0-rc.3",
   "description": "React Native client library for Fishjam",
   "license": "Apache-2.0",
   "author": "Fishjam Team",
@@ -10,7 +10,8 @@
   "react-native": "src/index.ts",
   "files": [
     "dist/**",
-    "plugin/**",
+    "plugin/build/**",
+    "plugin/broadcastExtensionFiles/**",
     "app.plugin.js"
   ],
   "repository": {
@@ -44,16 +45,16 @@
     "react-native": "*"
   },
   "dependencies": {
-    "@fishjam-cloud/react-client": "0.25.0-rc.1",
+    "@fishjam-cloud/react-client": "0.25.0-rc.3",
     "@fishjam-cloud/react-native-webrtc": "git+https://github.com/fishjam-cloud/fishjam-react-native-webrtc.git#9753272f9e6c992d8a05263e668e2198ec858160",
+    "promise-fs": "^2.1.1",
     "react-native-get-random-values": "^1.11.0"
   },
   "devDependencies": {
     "@types/promise-fs": "^2.1.2",
     "eslint-config-expo": "~9.2.0",
     "eslint-plugin-prettier": "^5.5.1",
-    "expo-module-scripts": "^5.0.7",
-    "promise-fs": "^2.1.1"
+    "expo-module-scripts": "^5.0.7"
   },
   "packageManager": "yarn@4.12.0",
   "stableVersion": "0.23.0"

package/plugin/src/types.ts

@@ -1,19 +0,0 @@
-export type FishjamPluginOptions =
-  | {
-      android?: {
-        enableForegroundService?: boolean;
-        enableScreensharing?: boolean;
-        supportsPictureInPicture?: boolean;
-      };
-      ios?: {
-        enableScreensharing?: boolean;
-        supportsPictureInPicture?: boolean;
-        broadcastExtensionTargetName?: string;
-        broadcastExtensionDisplayName?: string;
-        appGroupContainerId?: string;
-        mainTargetName?: string;
-        iphoneDeploymentTarget?: string;
-        enableVoIPBackgroundMode?: boolean;
-      };
-    }
-  | undefined;

package/plugin/src/withFishjam.ts

@@ -1,42 +0,0 @@
-import type { ConfigPlugin } from '@expo/config-plugins';
-
-import type { FishjamPluginOptions } from './types';
-import { withFishjamAndroid } from './withFishjamAndroid';
-import { withFishjamIos } from './withFishjamIos';
-
-/**
- * Main Fishjam Expo config plugin.
- *
- * This plugin configures both iOS and Android platforms for Picture-in-Picture support.
- *
- * ## Usage
- *
- * ```json
- * {
- *   "plugins": [
- *     [
- *       "@fishjam-cloud/react-native-client",
- *       {
- *         "android": {
- *           "supportsPictureInPicture": true
- *         },
- *         "ios": {
- *           "supportsPictureInPicture": true
- *         }
- *       }
- *     ]
- *   ]
- * }
- * ```
- *
- * @param config - Expo config object
- * @param options - Plugin configuration options
- * @returns Modified config object
- */
-const withFishjam: ConfigPlugin<FishjamPluginOptions> = (config, options) => {
-  config = withFishjamAndroid(config, options);
-  config = withFishjamIos(config, options);
-  return config;
-};
-
-export default withFishjam;

package/plugin/src/withFishjamAndroid.ts

@@ -1,112 +0,0 @@
-import type { ConfigPlugin } from '@expo/config-plugins';
-import { AndroidConfig, withAndroidManifest } from '@expo/config-plugins';
-import { getMainApplicationOrThrow } from '@expo/config-plugins/build/android/Manifest';
-
-import type { FishjamPluginOptions } from './types';
-
-const withFishjamPictureInPicture: ConfigPlugin<FishjamPluginOptions> = (config, props) =>
-  withAndroidManifest(config, (configuration) => {
-    const activity = AndroidConfig.Manifest.getMainActivityOrThrow(configuration.modResults);
-
-    if (props?.android?.supportsPictureInPicture) {
-      activity.$['android:supportsPictureInPicture'] = 'true';
-    } else {
-      delete activity.$['android:supportsPictureInPicture'];
-    }
-    return configuration;
-  });
-
-const withFishjamForegroundService: ConfigPlugin<FishjamPluginOptions> = (config, props) =>
-  withAndroidManifest(config, async (configuration) => {
-    if (!props?.android?.enableForegroundService) {
-      return configuration;
-    }
-
-    const mainApplication = getMainApplicationOrThrow(configuration.modResults);
-    mainApplication.service = mainApplication.service || [];
-
-    const webRTCForegroundService = {
-      $: {
-        'android:name': 'com.oney.WebRTCModule.foregroundService.WebRTCForegroundService',
-        'android:foregroundServiceType': 'camera|microphone',
-        'android:stopWithTask': 'true',
-      },
-    };
-
-    const existingWebRTCForegroundServiceIndex = mainApplication.service.findIndex(
-      (service) => service.$['android:name'] === webRTCForegroundService.$['android:name'],
-    );
-
-    if (existingWebRTCForegroundServiceIndex !== -1) {
-      mainApplication.service[existingWebRTCForegroundServiceIndex] = webRTCForegroundService;
-    } else {
-      mainApplication.service.push(webRTCForegroundService);
-    }
-
-    if (props?.android?.enableScreensharing) {
-      const mediaProjectionService = {
-        $: {
-          'android:name': 'com.oney.WebRTCModule.MediaProjectionService',
-          'android:foregroundServiceType': 'mediaProjection',
-          'android:stopWithTask': 'true',
-        },
-      };
-
-      const existingMediaProjectionServiceIndex = mainApplication.service.findIndex(
-        (service) => service.$['android:name'] === mediaProjectionService.$['android:name'],
-      );
-
-      if (existingMediaProjectionServiceIndex !== -1) {
-        mainApplication.service[existingMediaProjectionServiceIndex] = mediaProjectionService;
-      } else {
-        mainApplication.service.push(mediaProjectionService);
-      }
-    }
-    return configuration;
-  });
-
-const withFishjamForegroundServicePermission: ConfigPlugin<FishjamPluginOptions> = (config, props) =>
-  withAndroidManifest(config, (configuration) => {
-    if (!props?.android?.enableForegroundService) {
-      return configuration;
-    }
-
-    const mainApplication = configuration.modResults;
-    if (!mainApplication.manifest) {
-      return configuration;
-    }
-
-    if (!mainApplication.manifest['uses-permission']) {
-      mainApplication.manifest['uses-permission'] = [];
-    }
-
-    const permissions = mainApplication.manifest['uses-permission'];
-
-    const foregroundServicePermissions = [
-      'android.permission.FOREGROUND_SERVICE',
-      'android.permission.FOREGROUND_SERVICE_CAMERA',
-      'android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION',
-      'android.permission.FOREGROUND_SERVICE_MICROPHONE',
-    ];
-
-    foregroundServicePermissions.forEach((permissionName) => {
-      const hasPermission = permissions.some((perm) => perm.$?.['android:name'] === permissionName);
-
-      if (!hasPermission) {
-        permissions.push({
-          $: {
-            'android:name': permissionName,
-          },
-        });
-      }
-    });
-
-    return configuration;
-  });
-
-export const withFishjamAndroid: ConfigPlugin<FishjamPluginOptions> = (config, props) => {
-  config = withFishjamForegroundServicePermission(config, props);
-  config = withFishjamForegroundService(config, props);
-  config = withFishjamPictureInPicture(config, props);
-  return config;
-};

package/plugin/src/withFishjamIos.ts

@@ -1,336 +0,0 @@
-import type { ConfigPlugin } from '@expo/config-plugins';
-import { withEntitlementsPlist, withInfoPlist, withPodfileProperties, withXcodeProject } from '@expo/config-plugins';
-import * as path from 'path';
-import * as fs from 'promise-fs';
-
-import type { FishjamPluginOptions } from './types';
-
-function getSbeTargetName(props: FishjamPluginOptions) {
-  return props?.ios?.broadcastExtensionTargetName || 'ScreenBroadcastExtension';
-}
-
-function getSbeDisplayName(props: FishjamPluginOptions) {
-  return props?.ios?.broadcastExtensionDisplayName || 'ScreenBroadcast';
-}
-
-const TARGETED_DEVICE_FAMILY = `"1,2"`;
-const IPHONEOS_DEPLOYMENT_TARGET = '15.1';
-const GROUP_IDENTIFIER_TEMPLATE_REGEX = /{{GROUP_IDENTIFIER}}/gm;
-const BUNDLE_IDENTIFIER_TEMPLATE_REGEX = /{{BUNDLE_IDENTIFIER}}/gm;
-const DISPLAY_NAME_TEMPLATE_REGEX = /{{DISPLAY_NAME}}/gm;
-
-/**
- * A helper function for updating a value in a file for given regex
- */
-async function updateFileWithRegex(
-  iosPath: string,
-  fileName: string,
-  regex: RegExp,
-  value: string,
-  props: FishjamPluginOptions,
-) {
-  const targetName = getSbeTargetName(props);
-  const filePath = `${iosPath}/${targetName}/${fileName}`;
-  let file = await fs.readFile(filePath, { encoding: 'utf-8' });
-  file = file.replace(regex, value);
-  await fs.writeFile(filePath, file);
-}
-
-/**
- * Adds "App Group" permission
- * App Group allows your app and the ScreenBroadcastExtension to communicate with each other.
- */
-const withAppGroupPermissions: ConfigPlugin<FishjamPluginOptions> = (config, props) => {
-  const APP_GROUP_KEY = 'com.apple.security.application-groups';
-  const bundleIdentifier = config.ios?.bundleIdentifier || '';
-  const groupIdentifier = props?.ios?.appGroupContainerId || `group.${bundleIdentifier}`;
-  const mainTarget = props?.ios?.mainTargetName || '';
-
-  config.ios ??= {};
-  config.ios.entitlements ??= {};
-  config.ios.entitlements[APP_GROUP_KEY] ??= [];
-
-  const entitlementsArray = config.ios.entitlements[APP_GROUP_KEY] as string[];
-  if (!entitlementsArray.includes(groupIdentifier)) {
-    entitlementsArray.push(groupIdentifier);
-  }
-
-  config = withEntitlementsPlist(config, (newConfig) => {
-    const modResultsArray = (newConfig.modResults[APP_GROUP_KEY] as string[]) || [];
-    if (!modResultsArray.includes(groupIdentifier)) {
-      modResultsArray.push(groupIdentifier);
-    }
-    newConfig.modResults[APP_GROUP_KEY] = modResultsArray;
-    return newConfig;
-  });
-
-  // eslint-disable-next-line no-shadow
-  config = withXcodeProject(config, (props) => {
-    const xcodeProject = props.modResults;
-    const targets = xcodeProject.getFirstTarget();
-    const project = xcodeProject.getFirstProject();
-
-    if (!targets || !project) {
-      return props;
-    }
-
-    const targetUuid = targets.uuid;
-    const projectUuid = project.uuid;
-
-    const projectObj = xcodeProject.hash.project.objects.PBXProject[projectUuid];
-    projectObj.attributes ??= {};
-    projectObj.attributes.TargetAttributes ??= {};
-    projectObj.attributes.TargetAttributes[targetUuid] ??= {};
-    projectObj.attributes.TargetAttributes[targetUuid].SystemCapabilities ??= {};
-
-    projectObj.attributes.TargetAttributes[targetUuid].SystemCapabilities['com.apple.ApplicationGroups.iOS'] = {
-      enabled: 1,
-    };
-
-    const mainTargetName = mainTarget || props.modRequest.projectName;
-    const entitlementsFilePath = `${mainTargetName}/${mainTargetName}.entitlements`;
-    const configurations = xcodeProject.pbxXCBuildConfigurationSection();
-
-    Object.keys(configurations).forEach((key) => {
-      // eslint-disable-next-line no-shadow
-      const config = configurations[key];
-      if (config.buildSettings?.PRODUCT_NAME?.includes(mainTargetName)) {
-        if (!config.buildSettings.CODE_SIGN_ENTITLEMENTS) {
-          config.buildSettings.CODE_SIGN_ENTITLEMENTS = entitlementsFilePath;
-        }
-      }
-    });
-
-    return props;
-  });
-
-  return config;
-};
-
-/**
- * Adds constants to Info.plist
- * In order to dynamically retrieve extension's bundleId and group name we need to store it in Info.plist.
- */
-const withInfoPlistConstants: ConfigPlugin<FishjamPluginOptions> = (config, props) =>
-  withInfoPlist(config, (configuration) => {
-    const bundleIdentifier = configuration.ios?.bundleIdentifier || '';
-    const groupIdentifier = props?.ios?.appGroupContainerId || `group.${bundleIdentifier}`;
-    configuration.modResults['RTCScreenSharingExtension'] = `${bundleIdentifier}.${getSbeTargetName(props)}`;
-    configuration.modResults['RTCAppGroupIdentifier'] = groupIdentifier;
-    return configuration;
-  });
-
-/**
- * Updates and copies required extension files.
- * Our extension needs to be properly setup inside the Xcode project. In order to do that we need to copy the files and update the pbxproj.
- */
-const withFishjamSBE: ConfigPlugin<FishjamPluginOptions> = (config, options) =>
-  withXcodeProject(config, async (props) => {
-    const appName = props.modRequest.projectName || '';
-    const iosPath = props.modRequest.platformProjectRoot;
-    const bundleIdentifier = props.ios?.bundleIdentifier;
-    const groupIdentifier = options?.ios?.appGroupContainerId || `group.${bundleIdentifier}`;
-    const xcodeProject = props.modResults;
-    const targetName = getSbeTargetName(options);
-
-    const pluginDir = require.resolve('@fishjam-cloud/react-native-client/package.json');
-    const extensionSourceDir = path.join(pluginDir, '../plugin/broadcastExtensionFiles/');
-
-    const projPath = `${iosPath}/${appName}.xcodeproj/project.pbxproj`;
-    const templateTargetName = 'ScreenBroadcastExtension';
-
-    const extFiles = [
-      'SampleHandler.swift',
-      'SampleUploader.swift',
-      `${templateTargetName}.entitlements`,
-      `Info.plist`,
-      'SocketConnection.swift',
-      'DarwinNotificationCenter.swift',
-      'Atomic.swift',
-    ];
-
-    const destFiles = [
-      'SampleHandler.swift',
-      'SampleUploader.swift',
-      `${targetName}.entitlements`,
-      `Info.plist`,
-      'SocketConnection.swift',
-      'DarwinNotificationCenter.swift',
-      'Atomic.swift',
-    ];
-
-    await xcodeProject.parse(async function (err: Error) {
-      if (err) {
-        console.error(`Error parsing iOS project: ${JSON.stringify(err)}`);
-        return;
-      }
-      if (xcodeProject.pbxTargetByName(targetName)) {
-        // eslint-disable-next-line no-console
-        console.log(`${targetName} already exists in project. Skipping...`);
-        return;
-      }
-      try {
-        await fs.mkdir(`${iosPath}/${targetName}`, { recursive: true });
-        for (let i = 0; i < extFiles.length; i++) {
-          const srcFile = `${extensionSourceDir}${extFiles[i]}`;
-          const destFile = `${iosPath}/${targetName}/${destFiles[i]}`;
-          await fs.copyFile(srcFile, destFile);
-        }
-      } catch (e) {
-        console.error('Error copying extension files: ', e);
-        throw e;
-      }
-
-      try {
-        await updateFileWithRegex(
-          iosPath,
-          `${targetName}.entitlements`,
-          GROUP_IDENTIFIER_TEMPLATE_REGEX,
-          groupIdentifier,
-          options,
-        );
-        await updateFileWithRegex(
-          iosPath,
-          'SampleHandler.swift',
-          GROUP_IDENTIFIER_TEMPLATE_REGEX,
-          groupIdentifier,
-          options,
-        );
-        await updateFileWithRegex(
-          iosPath,
-          'SampleUploader.swift',
-          BUNDLE_IDENTIFIER_TEMPLATE_REGEX,
-          bundleIdentifier || '',
-          options,
-        );
-        await updateFileWithRegex(
-          iosPath,
-          'Info.plist',
-          DISPLAY_NAME_TEMPLATE_REGEX,
-          getSbeDisplayName(options),
-          options,
-        );
-      } catch (e) {
-        console.error('Error updating extension files: ', e);
-      }
-
-      // Create new PBXGroup for the extension
-      const extGroup = xcodeProject.addPbxGroup(extFiles, targetName, targetName);
-
-      // Add the new PBXGroup to the top level group. This makes the
-      // files / folder appear in the file explorer in Xcode.
-      const groups = xcodeProject.hash.project.objects['PBXGroup'];
-      Object.keys(groups).forEach(function (key) {
-        if (groups[key].name === undefined) {
-          xcodeProject.addToPbxGroup(extGroup.uuid, key);
-        }
-      });
-
-      // WORK AROUND for codeProject.addTarget BUG
-      // Xcode projects don't contain these if there is only one target
-      // An upstream fix should be made to the code referenced in this link:
-      //   - https://github.com/apache/cordova-node-xcode/blob/8b98cabc5978359db88dc9ff2d4c015cba40f150/lib/pbxProject.js#L860
-      const projObjects = xcodeProject.hash.project.objects;
-      projObjects['PBXTargetDependency'] = projObjects['PBXTargetDependency'] || {};
-      projObjects['PBXContainerItemProxy'] = projObjects['PBXContainerItemProxy'] || {};
-
-      // Add the SBE target
-      // This adds PBXTargetDependency and PBXContainerItemProxy for you
-      const sbeTarget = xcodeProject.addTarget(
-        targetName,
-        'app_extension',
-        targetName,
-        `${bundleIdentifier}.${targetName}`,
-      );
-
-      // Add build phases to the new target
-      xcodeProject.addBuildPhase(
-        [
-          'SampleHandler.swift',
-          'SampleUploader.swift',
-          'SocketConnection.swift',
-          'DarwinNotificationCenter.swift',
-          'Atomic.swift',
-        ],
-        'PBXSourcesBuildPhase',
-        'Sources',
-        sbeTarget.uuid,
-      );
-      xcodeProject.addBuildPhase([], 'PBXResourcesBuildPhase', 'Resources', sbeTarget.uuid);
-
-      xcodeProject.addBuildPhase([], 'PBXFrameworksBuildPhase', 'Frameworks', sbeTarget.uuid);
-
-      xcodeProject.addFramework('ReplayKit.framework', {
-        target: sbeTarget.uuid,
-      });
-
-      // Edit the Deployment info of the new Target, only IphoneOS and Targeted Device Family
-      // However, can be more
-      const configurations = xcodeProject.pbxXCBuildConfigurationSection();
-      for (const key in configurations) {
-        if (
-          typeof configurations[key].buildSettings !== 'undefined' &&
-          configurations[key].buildSettings.PRODUCT_NAME === `"${targetName}"`
-        ) {
-          const buildSettingsObj = configurations[key].buildSettings;
-          buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET =
-            options?.ios?.iphoneDeploymentTarget ?? IPHONEOS_DEPLOYMENT_TARGET;
-          buildSettingsObj.TARGETED_DEVICE_FAMILY = TARGETED_DEVICE_FAMILY;
-          buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${targetName}/${targetName}.entitlements`;
-          buildSettingsObj.CODE_SIGN_STYLE = 'Automatic';
-          buildSettingsObj.INFOPLIST_FILE = `${targetName}/Info.plist`;
-          buildSettingsObj.SWIFT_VERSION = '5.0';
-          buildSettingsObj.MARKETING_VERSION = '1.0.0';
-          buildSettingsObj.CURRENT_PROJECT_VERSION = '1';
-          buildSettingsObj.ENABLE_BITCODE = 'NO';
-        }
-      }
-
-      await fs.writeFile(projPath, xcodeProject.writeSync());
-    });
-
-    return props;
-  });
-
-/**
- * Adds iOS VoIP background mode to keep the app running during calls
- */
-const withFishjamVoIPBackgroundMode: ConfigPlugin<FishjamPluginOptions> = (config, props) =>
-  withInfoPlist(config, (configuration) => {
-    if (props?.ios?.enableVoIPBackgroundMode) {
-      const backgroundModes = new Set(configuration.modResults.UIBackgroundModes ?? []);
-      backgroundModes.add('voip');
-
-      configuration.modResults.UIBackgroundModes = Array.from(backgroundModes);
-    }
-
-    return configuration;
-  });
-
-const withFishjamPictureInPicture: ConfigPlugin<FishjamPluginOptions> = (config, props) =>
-  withInfoPlist(config, (configuration) => {
-    if (props?.ios?.supportsPictureInPicture) {
-      const backgroundModes = new Set(configuration.modResults.UIBackgroundModes ?? []);
-      backgroundModes.add('audio');
-      configuration.modResults.UIBackgroundModes = Array.from(backgroundModes);
-    }
-
-    return configuration;
-  });
-
-const withFishjamIos: ConfigPlugin<FishjamPluginOptions> = (config, props) => {
-  if (props?.ios?.enableScreensharing) {
-    config = withAppGroupPermissions(config, props);
-    config = withInfoPlistConstants(config, props);
-    config = withFishjamSBE(config, props);
-  }
-  config = withPodfileProperties(config, (configuration) => {
-    configuration.modResults['ios.deploymentTarget'] = props?.ios?.iphoneDeploymentTarget ?? IPHONEOS_DEPLOYMENT_TARGET;
-    return configuration;
-  });
-  config = withFishjamPictureInPicture(config, props);
-  config = withFishjamVoIPBackgroundMode(config, props);
-  return config;
-};
-
-export { withFishjamIos };

package/plugin/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "expo-module-scripts/tsconfig.plugin",
-  "compilerOptions": {
-    "outDir": "build",
-    "rootDir": "src"
-  },
-  "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
-}

package/plugin/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["./src/types.ts","./src/withFishjam.ts","./src/withFishjamAndroid.ts","./src/withFishjamIos.ts"],"version":"5.8.3"}