@cloudflare/realtimekit-react-native 0.1.4-staging.1 → 0.1.4-staging.10

package/lib/{src → typescript}/ReactHooks.d.ts

@@ -1,8 +1,8 @@
-import RealtimeKitClient from '@cloudflare/realtimekit';
+import RealtimeKitClient, { RealtimeKitClientOptions } from '@cloudflare/realtimekit';
 /**
  * Hook which manages a RealtimeKitClient instance
  */
-export declare const useRealtimeKitClient: () => [RealtimeKitClient | undefined, (options: any) => {}];
+export declare const useRealtimeKitClient: () => [RealtimeKitClient | undefined, (options: RealtimeKitClientOptions) => {}];
 type StateSelector<T extends object, U> = (state: T) => U;
 /**
  * @deprecated Use `useRealtimeKitSelector` instead.

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

@@ -0,0 +1 @@
+export const BASE_SDK_VERSION: "0.1.4";

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

@@ -0,0 +1 @@
+export declare const SDK_VERSION = "0.1.4-staging.10";

package/package.json

@@ -1,11 +1,12 @@
 {
     "name": "@cloudflare/realtimekit-react-native",
-    "version": "0.1.4-staging.1",
+    "version": "0.1.4-staging.10",
     "description": "Cloudflare RealtimeKit SDK for react native",
-    "main": "lib/index.js",
+    "main": "lib/commonjs/index",
     "author": "Cloudflare",
     "homepage": "https://realtime.cloudflare.com",
-    "types": "lib/index.d.ts",
+    "module": "lib/module/index",
+    "types": "lib/typescript/index.d.ts",
     "files": [
         "lib",
         "android",
@@ -25,7 +26,7 @@
     },
     "private": false,
     "dependencies": {
-        "@cloudflare/realtimekit": "1.1.7-staging.2",
+        "@cloudflare/realtimekit": "1.1.7",
         "events": "^3.3.0",
         "fast-base64-decode": "1.0.0",
         "node-libs-react-native": "^1.2.1",

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,60 @@ 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 withAndroidBlobProviderAuthority = (config) => {
+    return (0, config_plugins_1.withStringsXml)(config, async (_config) => {
+        // Avoid duplicates
+        const existing = _config.modResults.resources.string?.find((item) => item.$.name === 'blob_provider_authority');
+        if (!existing) {
+            _config.modResults.resources.string = [
+                ...(_config.modResults.resources.string || []),
+                {
+                    $: { name: 'blob_provider_authority' },
+                    _: 'com.cloudflare.realtimekit.expo.blobs',
+                },
+            ];
+        }
+        return _config;
+    });
+};
 const withVoice = (config, props = {}) => {
     const _props = props ? props : {};
     config = withIosPermissions(config, _props);
     if (_props.microphonePermission !== false) {
         config = withAndroidPermissions(config);
     }
+    config = withAndroidScreenshare(config);
+    config = withAndroidBlobProviderAuthority(config);
     return config;
 };
 exports.default = (0, config_plugins_1.createRunOncePlugin)(withVoice, '@cloudflare/realtimekit-react-native');

package/plugin/src/withRTK.ts

@@ -1,14 +1,15 @@
 import {
   AndroidConfig,
+  AndroidManifest,
   ConfigPlugin,
   createRunOncePlugin,
+  withAndroidManifest,
   withInfoPlist,
+  withStringsXml,
 } 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 +48,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 +65,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 +110,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 +117,63 @@ 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 withAndroidBlobProviderAuthority: ConfigPlugin = (config) => {
+  return withStringsXml(config, async (_config) => {
+    // Avoid duplicates
+    const existing = _config.modResults.resources.string?.find(
+      (item) => item.$.name === 'blob_provider_authority'
+    );
+    if (!existing) {
+      _config.modResults.resources.string = [
+        ...(_config.modResults.resources.string || []),
+        {
+          $: { name: 'blob_provider_authority' },
+          _: 'com.cloudflare.realtimekit.expo.blobs',
+        },
+      ];
+    }
+    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);
+  config = withAndroidBlobProviderAuthority(config);
   return config;
 };
 

package/android/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="blob_provider_authority">com.cloudflare.realtimekit.blobs</string>
-</resources>

package/lib/package.json

@@ -1,168 +0,0 @@
-{
-    "name": "@cloudflare/realtimekit-react-native",
-    "version": "1.1.4-staging.1",
-    "description": "Cloudflare RealtimeKit SDK for react native",
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
-    "source": "src/index",
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org/",
-        "access": "public",
-        "tag": "latest"
-    },
-    "files": [
-        "lib",
-        "android",
-        "ios",
-        "cpp",
-        "plugin",
-        "app.plugin.js",
-        "RealtimeKitCore.podspec",
-        "!android/build",
-        "!ios/build",
-        "!**/__tests__",
-        "!**/__fixtures__",
-        "!**/__mocks__"
-    ],
-    "scripts": {
-        "test": "jest",
-        "typescript": "tsc -p tsconfig.build.json",
-        "lint": "eslint \"**/*.{js,ts,tsx}\"",
-        "prepare": "npm run typescript && tsc --build plugin",
-        "release": "release-it",
-        "example": "yarn --cwd example",
-        "pods": "cd example && pod-install --quiet",
-        "bootstrap": "yarn example && yarn && yarn pods",
-        "prepublishOnly": "cp package.json package.json.bak && node prepublish.js",
-        "postpublish": "mv package.json.bak package.json"
-    },
-    "keywords": [
-        "react-native",
-        "ios",
-        "android"
-    ],
-    "repository": "https://github.com/cloudflare",
-    "author": "Cloudflare",
-    "license": "UNLICENSED",
-    "bugs": {
-        "url": "https://realtime.cloudflare.com/issues"
-    },
-    "homepage": "https://realtime.cloudflare.com",
-    "dependencies": {
-        "@cloudflare/realtimekit": "1.1.7-staging.2",
-        "events": "^3.3.0",
-        "fast-base64-decode": "1.0.0",
-        "node-libs-react-native": "^1.2.1",
-        "react-native-url-polyfill": "1.3.0",
-        "text-encoding-polyfill": "^0.6.7"
-    },
-    "devDependencies": {
-        "@commitlint/config-conventional": "^11.0.0",
-        "@cloudflare/react-native-webrtc": "^125.0.1",
-        "@react-native-community/eslint-config": "3.0.0",
-        "@release-it/conventional-changelog": "^2.0.0",
-        "@semantic-release/changelog": "^5.0.1",
-        "@semantic-release/commit-analyzer": "^8.0.1",
-        "@semantic-release/exec": "^5.0.0",
-        "@semantic-release/git": "^9.0.1",
-        "@semantic-release/npm": "^7.1.3",
-        "@semantic-release/release-notes-generator": "^9.0.3",
-        "@types/jest": "^26.0.0",
-        "@types/react": "18.0.25",
-        "@types/react-dom": "18.0.9",
-        "@types/react-native": "0.67.1",
-        "@typescript-eslint/eslint-plugin": "^6.21.0",
-        "@typescript-eslint/parser": "^6.21.0",
-        "babel-plugin-module-resolver": "^5.0.0",
-        "commitlint": "^11.0.0",
-        "eslint": "^7.2.0",
-        "eslint-config-prettier": "^7.0.0",
-        "eslint-plugin-prettier": "^3.1.3",
-        "eslint-plugin-react-native": "^4.1.0",
-        "expo-module-scripts": "^3.1.0",
-        "husky": "^6.0.0",
-        "i": "^0.3.7",
-        "jest": "^26.0.1",
-        "metro-react-native-babel-preset": "^0.77.0",
-        "npm": "^9.2.0",
-        "pod-install": "^0.1.0",
-        "prettier": "^2.0.5",
-        "react": "18.2.0",
-        "react-native": "0.73.2",
-        "react-native-builder-bob": "^0.18.0",
-        "typescript": "^5.3.3"
-    },
-    "peerDependencies": {
-        "@cloudflare/react-native-webrtc": "~125.0.1",
-        "@expo/config-plugins": "*",
-        "react": "*",
-        "react-native": "*"
-    },
-    "jest": {
-        "preset": "react-native",
-        "testEnvironment": "node",
-        "modulePathIgnorePatterns": [
-            "<rootDir>/example/node_modules",
-            "<rootDir>/lib/"
-        ]
-    },
-    "commitlint": {
-        "extends": [
-            "@commitlint/config-conventional"
-        ]
-    },
-    "eslintConfig": {
-        "root": true,
-        "parser": "@typescript-eslint/parser",
-        "plugins": [
-            "@typescript-eslint"
-        ],
-        "extends": [
-            "@react-native-community",
-            "prettier"
-        ],
-        "globals": {
-            "NodeJS": true,
-            "React": true,
-            "JSX": true
-        },
-        "rules": {
-            "prettier/prettier": [
-                "error",
-                {
-                    "quoteProps": "consistent",
-                    "singleQuote": true,
-                    "tabWidth": 2,
-                    "trailingComma": "es5",
-                    "useTabs": false
-                }
-            ]
-        }
-    },
-    "eslintIgnore": [
-        "node_modules/",
-        "lib/",
-        "plugin/build"
-    ],
-    "prettier": {
-        "quoteProps": "consistent",
-        "singleQuote": true,
-        "tabWidth": 2,
-        "trailingComma": "es5",
-        "useTabs": false
-    },
-    "react-native-builder-bob": {
-        "source": "src",
-        "output": "lib",
-        "targets": [
-            "commonjs",
-            "module",
-            [
-                "typescript",
-                {
-                    "project": "tsconfig.build.json"
-                }
-            ]
-        ]
-    }
-}

package/lib/src/AudioSampleHandler.js

@@ -1,57 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { NativeEventEmitter, NativeModules, Platform, } from 'react-native';
-import { EventEmitter } from 'events';
-const { WebRTCModule } = NativeModules;
-export default class AudioSampleHandler extends EventEmitter {
-    constructor() {
-        super();
-        this._isListening = false;
-        this.webRTCModuleEmitter = new NativeEventEmitter(WebRTCModule);
-        this._audioSampleHandler = this._audioSampleHandler.bind(this);
-        this._currentSamples = new Float32Array(1024);
-        this.initialiseSampler();
-    }
-    static init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new AudioSampleHandler();
-        });
-    }
-    _audioSampleHandler(audioData) {
-        this._currentSamples.fill(0);
-        if (Platform.OS === 'android') {
-            this._currentSamples.set(audioData);
-        }
-        else {
-            this._currentSamples.set(audioData.samples);
-        }
-    }
-    initialiseSampler() {
-        this._audioSamplesListener = this.webRTCModuleEmitter.addListener('audioSamples', this._audioSampleHandler);
-        this._isListening = true;
-    }
-    getFloatTimeDomainData(samples) {
-        if (!this._isListening) {
-            this.initialiseSampler();
-        }
-        samples.set(this._currentSamples);
-    }
-    stopListening() {
-        if (this._audioSamplesListener) {
-            this._audioSamplesListener.remove();
-            this._audioSamplesListener = undefined;
-            this._isListening = false;
-            this._currentSamples.fill(0);
-        }
-    }
-    destructor() {
-        this.stopListening();
-    }
-}

package/lib/src/BackgroundHandler.js

@@ -1,100 +0,0 @@
-import { DeviceEventEmitter, NativeAppEventEmitter, NativeEventEmitter, NativeModules, Platform, } from 'react-native';
-const { RTKRNBackgroundTimer } = NativeModules;
-const Emitter = new NativeEventEmitter(RTKRNBackgroundTimer);
-class BackgroundTimer {
-    constructor() {
-        this.uniqueId = 0;
-        this.callbacks = {};
-        Emitter.addListener('backgroundTimer.timeout', (id) => {
-            if (this.callbacks[id]) {
-                const callbackById = this.callbacks[id];
-                const { callback } = callbackById;
-                if (!this.callbacks[id].interval) {
-                    delete this.callbacks[id];
-                }
-                else {
-                    Platform.OS === 'android'
-                        ? RTKRNBackgroundTimer.backgroundTimerSetTimeout(id, this.callbacks[id].timeout)
-                        : RTKRNBackgroundTimer.setTimeout(id, this.callbacks[id].timeout);
-                }
-                callback();
-            }
-        });
-    }
-    init() {
-        return new BackgroundTimer();
-    }
-    // Original API
-    start(delay = 0) {
-        return Platform.OS === 'android'
-            ? RTKRNBackgroundTimer.backgroundTimerStart(delay)
-            : RTKRNBackgroundTimer.start(delay);
-    }
-    stop() {
-        Emitter.removeAllListeners('backgroundTimer.timeout');
-        return Platform.OS === 'android'
-            ? RTKRNBackgroundTimer.backgroundTimerStop()
-            : RTKRNBackgroundTimer.stop();
-    }
-    runBackgroundTimer(callback, delay) {
-        const EventEmitter = Platform.select({
-            ios: () => NativeAppEventEmitter,
-            android: () => DeviceEventEmitter,
-        })();
-        this.start(0);
-        this.backgroundListener = EventEmitter.addListener('backgroundTimer', () => {
-            this.backgroundListener.remove();
-            this.backgroundClockMethod(callback, delay);
-        });
-    }
-    backgroundClockMethod(callback, delay) {
-        this.backgroundTimer = this.setTimeout(() => {
-            callback();
-            this.backgroundClockMethod(callback, delay);
-        }, delay);
-    }
-    stopBackgroundTimer() {
-        this.stop();
-        this.clearTimeout(this.backgroundTimer);
-    }
-    // New API, allowing for multiple timers
-    setTimeout(callback, timeout) {
-        this.uniqueId += 1;
-        const timeoutId = this.uniqueId;
-        this.callbacks[timeoutId] = {
-            callback,
-            interval: false,
-            timeout,
-        };
-        Platform.OS === 'android'
-            ? RTKRNBackgroundTimer.backgroundTimerSetTimeout(timeoutId, timeout)
-            : RTKRNBackgroundTimer.setTimeout(timeoutId, timeout);
-        return timeoutId;
-    }
-    clearTimeout(timeoutId) {
-        if (this.callbacks[timeoutId]) {
-            delete this.callbacks[timeoutId];
-            // RTKRNBackgroundTimer.clearTimeout(timeoutId);
-        }
-    }
-    setInterval(callback, timeout) {
-        this.uniqueId += 1;
-        const intervalId = this.uniqueId;
-        this.callbacks[intervalId] = {
-            callback,
-            interval: true,
-            timeout,
-        };
-        Platform.OS === 'android'
-            ? RTKRNBackgroundTimer.backgroundTimerSetTimeout(intervalId, timeout)
-            : RTKRNBackgroundTimer.setTimeout(intervalId, timeout);
-        return intervalId;
-    }
-    clearInterval(intervalId) {
-        if (this.callbacks[intervalId]) {
-            delete this.callbacks[intervalId];
-            // RTKRNBackgroundTimer.clearTimeout(intervalId);
-        }
-    }
-}
-export default new BackgroundTimer();

package/lib/src/DeviceInfo.js

@@ -1,27 +0,0 @@
-import { Platform } from 'react-native';
-import sdk_package from '../package.json';
-class DeviceInfo {
-    constructor() {
-        this.deviceInfo = {
-            isMobile: true,
-            isReactNative: true,
-            osName: Platform.OS,
-            osVersion: Platform.Version,
-            reactNativeVersion: this.getReactNativeVersion(),
-            sdkType: 'realtimekit-react-native',
-            reactNativeSdkVersion: this.getSdkVersion(),
-        };
-    }
-    getSdkVersion() {
-        const version = sdk_package.version;
-        return '0.1.4' + version.slice(5);
-    }
-    getReactNativeVersion() {
-        const version = Platform.constants.reactNativeVersion;
-        return version.major + '.' + version.minor + '.' + version.patch;
-    }
-    getDeviceInfo() {
-        return this.deviceInfo;
-    }
-}
-export default new DeviceInfo();

package/lib/src/LocalMediaError.js

@@ -1,6 +0,0 @@
-export default class LocalMediaError extends Error {
-    constructor(message, code) {
-        super(message);
-        this.code = code;
-    }
-}