@stream-io/video-react-native-sdk 1.40.1 → 1.41.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +40 -2
- package/android/src/main/java/com/streamvideo/reactnative/audio/AudioDeviceManager.kt +45 -16
- package/android/src/main/java/com/streamvideo/reactnative/callmanager/StreamInCallManagerModule.kt +12 -0
- package/dist/commonjs/components/Call/CallLayout/CallParticipantsSpotlight.js +2 -0
- package/dist/commonjs/components/Call/CallLayout/CallParticipantsSpotlight.js.map +1 -1
- package/dist/commonjs/components/Call/CallParticipantsList/CallParticipantsList.js +22 -31
- package/dist/commonjs/components/Call/CallParticipantsList/CallParticipantsList.js.map +1 -1
- package/dist/commonjs/components/Call/RingingCallContent/IncomingCall.js +8 -5
- package/dist/commonjs/components/Call/RingingCallContent/IncomingCall.js.map +1 -1
- package/dist/commonjs/components/Participant/ParticipantView/VideoRenderer/TrackSubscriber.js +1 -1
- package/dist/commonjs/components/Participant/ParticipantView/VideoRenderer/TrackSubscriber.js.map +1 -1
- package/dist/commonjs/components/Participant/ParticipantView/VideoRenderer/index.js +2 -1
- package/dist/commonjs/components/Participant/ParticipantView/VideoRenderer/index.js.map +1 -1
- package/dist/commonjs/hooks/useAndroidKeepCallAliveEffect.js +36 -4
- package/dist/commonjs/hooks/useAndroidKeepCallAliveEffect.js.map +1 -1
- package/dist/commonjs/modules/call-manager/CallManager.js +133 -1
- package/dist/commonjs/modules/call-manager/CallManager.js.map +1 -1
- package/dist/commonjs/utils/internal/callingx/callingx.js +37 -0
- package/dist/commonjs/utils/internal/callingx/callingx.js.map +1 -1
- package/dist/commonjs/utils/internal/registerSDKGlobals.js +34 -0
- package/dist/commonjs/utils/internal/registerSDKGlobals.js.map +1 -1
- package/dist/commonjs/utils/push/android.js +101 -103
- package/dist/commonjs/utils/push/android.js.map +1 -1
- package/dist/commonjs/utils/push/libs/callingx.js +3 -0
- package/dist/commonjs/utils/push/libs/callingx.js.map +1 -1
- package/dist/commonjs/utils/push/setupCallingExpEvents.js +31 -0
- package/dist/commonjs/utils/push/setupCallingExpEvents.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/module/components/Call/CallLayout/CallParticipantsSpotlight.js +3 -1
- package/dist/module/components/Call/CallLayout/CallParticipantsSpotlight.js.map +1 -1
- package/dist/module/components/Call/CallParticipantsList/CallParticipantsList.js +23 -32
- package/dist/module/components/Call/CallParticipantsList/CallParticipantsList.js.map +1 -1
- package/dist/module/components/Call/RingingCallContent/IncomingCall.js +9 -6
- package/dist/module/components/Call/RingingCallContent/IncomingCall.js.map +1 -1
- package/dist/module/components/Participant/ParticipantView/VideoRenderer/TrackSubscriber.js +2 -2
- package/dist/module/components/Participant/ParticipantView/VideoRenderer/TrackSubscriber.js.map +1 -1
- package/dist/module/components/Participant/ParticipantView/VideoRenderer/index.js +2 -1
- package/dist/module/components/Participant/ParticipantView/VideoRenderer/index.js.map +1 -1
- package/dist/module/hooks/useAndroidKeepCallAliveEffect.js +36 -4
- package/dist/module/hooks/useAndroidKeepCallAliveEffect.js.map +1 -1
- package/dist/module/modules/call-manager/CallManager.js +133 -1
- package/dist/module/modules/call-manager/CallManager.js.map +1 -1
- package/dist/module/utils/internal/callingx/callingx.js +38 -1
- package/dist/module/utils/internal/callingx/callingx.js.map +1 -1
- package/dist/module/utils/internal/registerSDKGlobals.js +34 -0
- package/dist/module/utils/internal/registerSDKGlobals.js.map +1 -1
- package/dist/module/utils/push/android.js +101 -103
- package/dist/module/utils/push/android.js.map +1 -1
- package/dist/module/utils/push/libs/callingx.js +3 -0
- package/dist/module/utils/push/libs/callingx.js.map +1 -1
- package/dist/module/utils/push/setupCallingExpEvents.js +32 -1
- package/dist/module/utils/push/setupCallingExpEvents.js.map +1 -1
- package/dist/module/version.js +1 -1
- package/dist/typescript/components/Call/CallLayout/CallParticipantsSpotlight.d.ts.map +1 -1
- package/dist/typescript/components/Call/CallParticipantsList/CallParticipantsList.d.ts.map +1 -1
- package/dist/typescript/components/Call/RingingCallContent/IncomingCall.d.ts.map +1 -1
- package/dist/typescript/components/Participant/ParticipantView/VideoRenderer/TrackSubscriber.d.ts.map +1 -1
- package/dist/typescript/components/Participant/ParticipantView/VideoRenderer/index.d.ts.map +1 -1
- package/dist/typescript/hooks/useAndroidKeepCallAliveEffect.d.ts.map +1 -1
- package/dist/typescript/modules/call-manager/CallManager.d.ts.map +1 -1
- package/dist/typescript/utils/StreamVideoRN/types.d.ts +5 -0
- package/dist/typescript/utils/StreamVideoRN/types.d.ts.map +1 -1
- package/dist/typescript/utils/internal/callingx/callingx.d.ts.map +1 -1
- package/dist/typescript/utils/internal/registerSDKGlobals.d.ts.map +1 -1
- package/dist/typescript/utils/push/android.d.ts.map +1 -1
- package/dist/typescript/utils/push/libs/callingx.d.ts.map +1 -1
- package/dist/typescript/utils/push/setupCallingExpEvents.d.ts.map +1 -1
- package/dist/typescript/version.d.ts +1 -1
- package/expo-config-plugin/dist/index.js +0 -2
- package/package.json +7 -11
- package/src/components/Call/CallLayout/CallParticipantsSpotlight.tsx +6 -1
- package/src/components/Call/CallParticipantsList/CallParticipantsList.tsx +63 -62
- package/src/components/Call/RingingCallContent/IncomingCall.tsx +10 -12
- package/src/components/Participant/ParticipantView/VideoRenderer/TrackSubscriber.tsx +3 -2
- package/src/components/Participant/ParticipantView/VideoRenderer/index.tsx +4 -1
- package/src/hooks/useAndroidKeepCallAliveEffect.ts +54 -10
- package/src/modules/call-manager/CallManager.ts +162 -1
- package/src/modules/call-manager/native-module.d.ts +8 -0
- package/src/utils/StreamVideoRN/types.ts +5 -0
- package/src/utils/internal/callingx/callingx.ts +44 -1
- package/src/utils/internal/registerSDKGlobals.ts +38 -0
- package/src/utils/push/android.ts +141 -140
- package/src/utils/push/libs/callingx.ts +4 -0
- package/src/utils/push/setupCallingExpEvents.ts +41 -1
- package/src/version.ts +1 -1
- package/expo-config-plugin/dist/withBuildProperties.js +0 -13
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import React from 'react';
|
|
4
|
-
import {
|
|
4
|
+
import { Image, StyleSheet, Text, View } from 'react-native';
|
|
5
5
|
import { useCallStateHooks, useConnectedUser, useI18n } from '@stream-io/video-react-bindings';
|
|
6
6
|
import { UserInfo } from './UserInfo';
|
|
7
7
|
import { IncomingCallControls as DefaultIncomingCallControls } from '../CallControls';
|
|
@@ -87,14 +87,17 @@ const Background = ({
|
|
|
87
87
|
user
|
|
88
88
|
}) => user.image).filter(image => !!image);
|
|
89
89
|
if (avatarsToShow.length) {
|
|
90
|
-
return /*#__PURE__*/
|
|
91
|
-
source: {
|
|
92
|
-
uri: avatarsToShow[0]
|
|
93
|
-
},
|
|
90
|
+
return /*#__PURE__*/_jsxs(View, {
|
|
94
91
|
style: [styles.background, {
|
|
95
92
|
backgroundColor: colors.sheetTertiary
|
|
96
93
|
}, incomingCall.background],
|
|
97
|
-
children:
|
|
94
|
+
children: [/*#__PURE__*/_jsx(Image, {
|
|
95
|
+
source: {
|
|
96
|
+
uri: avatarsToShow[0]
|
|
97
|
+
},
|
|
98
|
+
resizeMode: "cover",
|
|
99
|
+
style: StyleSheet.absoluteFill
|
|
100
|
+
}), children]
|
|
98
101
|
});
|
|
99
102
|
}
|
|
100
103
|
return /*#__PURE__*/_jsx(View, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","
|
|
1
|
+
{"version":3,"names":["React","Image","StyleSheet","Text","View","useCallStateHooks","useConnectedUser","useI18n","UserInfo","IncomingCallControls","DefaultIncomingCallControls","useTheme","jsx","_jsx","jsxs","_jsxs","IncomingCall","onAcceptCallHandler","onRejectCallHandler","landscape","t","theme","colors","incomingCall","typefaces","variants","landscapeContentStyles","flexDirection","insetStyles","paddingTop","insets","top","paddingBottom","bottom","paddingLeft","left","paddingRight","right","Background","children","style","styles","content","topContainer","incomingCallText","color","textPrimary","heading6","bottomContainer","incomingCallControls","connectedUser","useCallMembers","members","avatarsToShow","filter","user","id","map","image","length","background","backgroundColor","sheetTertiary","source","uri","resizeMode","absoluteFill","create","flex","justifyContent","marginTop","textAlign"],"sourceRoot":"../../../../../src","sources":["components/Call/RingingCallContent/IncomingCall.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { forwardRef, useImperativeHandle, useEffect, useMemo } from 'react';
|
|
4
4
|
import { CallingState, DebounceType, hasScreenShare, hasVideo } from '@stream-io/video-client';
|
|
5
|
-
import { BehaviorSubject, combineLatest, distinctUntilChanged, distinctUntilKeyChanged,
|
|
5
|
+
import { BehaviorSubject, combineLatest, distinctUntilChanged, distinctUntilKeyChanged, filter, map } from 'rxjs';
|
|
6
6
|
/**
|
|
7
7
|
* This component is used to subscribe to the video + audio track of the participant in the following cases:
|
|
8
8
|
* 1. When the participant starts publishing the video track
|
|
@@ -40,7 +40,7 @@ const TrackSubscriber = /*#__PURE__*/forwardRef((props, ref) => {
|
|
|
40
40
|
});
|
|
41
41
|
call.trackSubscriptionManager.apply(debounceType);
|
|
42
42
|
};
|
|
43
|
-
const isPublishingTrack$ = call.state.participants$.pipe(map(ps => ps.find(p => p.sessionId === participantSessionId)),
|
|
43
|
+
const isPublishingTrack$ = call.state.participants$.pipe(map(ps => ps.find(p => p.sessionId === participantSessionId)), filter(p => !!p), distinctUntilKeyChanged('publishedTracks'), map(p => trackType === 'videoTrack' ? hasVideo(p) : hasScreenShare(p)), distinctUntilChanged());
|
|
44
44
|
const isJoinedState$ = call.state.callingState$.pipe(map(callingState => callingState === CallingState.JOINED));
|
|
45
45
|
const subscription = combineLatest([dimensions$, isPublishingTrack$, isJoinedState$]).subscribe(([dimension, isPublishing, isJoined]) => {
|
|
46
46
|
if (isJoined) {
|
package/dist/module/components/Participant/ParticipantView/VideoRenderer/TrackSubscriber.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["forwardRef","useImperativeHandle","useEffect","useMemo","CallingState","DebounceType","hasScreenShare","hasVideo","BehaviorSubject","combineLatest","distinctUntilChanged","distinctUntilKeyChanged","
|
|
1
|
+
{"version":3,"names":["forwardRef","useImperativeHandle","useEffect","useMemo","CallingState","DebounceType","hasScreenShare","hasVideo","BehaviorSubject","combineLatest","distinctUntilChanged","distinctUntilKeyChanged","filter","map","TrackSubscriber","props","ref","call","participantSessionId","trackType","isVisible","dimensions$","undefined","requestTrackWithDimensions","debounceType","dimension","width","height","state","updateParticipantTracks","trackSubscriptionManager","apply","isPublishingTrack$","participants$","pipe","ps","find","p","sessionId","isJoinedState$","callingState$","callingState","JOINED","subscription","subscribe","isPublishing","isJoined","MEDIUM","IMMEDIATE","unsubscribe","onLayoutUpdate","event","Math","trunc","nativeEvent","layout","next","displayName"],"sourceRoot":"../../../../../../src","sources":["components/Participant/ParticipantView/VideoRenderer/TrackSubscriber.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -68,7 +68,8 @@ export const VideoRenderer = /*#__PURE__*/React.memo(({
|
|
|
68
68
|
const isScreenSharing = trackType === 'screenShareTrack';
|
|
69
69
|
const isPublishingVideoTrack = isScreenSharing ? hasScreenShare(participant) : hasVideo(participant);
|
|
70
70
|
const videoStreamToRender = isScreenSharing ? screenShareStream : videoStream;
|
|
71
|
-
const
|
|
71
|
+
const hasVideoTrackInStream = !!videoStreamToRender && videoStreamToRender.getVideoTracks().length > 0;
|
|
72
|
+
const canShowVideo = hasVideoTrackInStream && isVisible && isPublishingVideoTrack && !hasPausedTrack(participant, trackType) && isParticipantVideoEnabled(participant.sessionId);
|
|
72
73
|
useEffect(() => {
|
|
73
74
|
if (Platform.OS !== 'ios' || !registerIosScreenshot || !canShowVideo) return;
|
|
74
75
|
registerIosScreenshot(participant, trackType, viewRef);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useEffect","useRef","Platform","StyleSheet","View","RTCView","hasPausedTrack","hasScreenShare","hasVideo","VisibilityState","useCall","useCallStateHooks","ParticipantVideoFallback","DefaultParticipantVideoFallback","useTheme","useTrackDimensions","useScreenshotIosContext","TrackSubscriber","jsx","_jsx","jsxs","_jsxs","DEFAULT_VIEWPORT_VISIBILITY_STATE","videoTrack","UNKNOWN","screenShareTrack","VideoRenderer","memo","trackType","participant","isVisible","objectFit","videoZOrder","mirror","mirrorOverride","theme","videoRenderer","call","useCameraState","useIncomingVideoSettings","trackSubscriberRef","isParticipantVideoEnabled","direction","viewRef","register","registerIosScreenshot","deregister","deregisterIosScreenshot","videoDimensions","isVideoDimensionsValid","width","height","isLocalParticipant","sessionId","viewportVisibilityState","videoStream","screenShareStream","isScreenSharing","isPublishingVideoTrack","videoStreamToRender","canShowVideo","OS","undefined","videoTrackVisibility","screenShareTrackVisibility","VISIBLE","state","updateParticipant","p","INVISIBLE","onLayout","event","current","onLayoutUpdate","style","absoluteFill","container","children","ref","participantSessionId","streamURL","toURL","zOrder","displayName"],"sourceRoot":"../../../../../../src","sources":["components/Participant/ParticipantView/VideoRenderer/index.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAChD,SAASC,QAAQ,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAEzD,SAASC,OAAO,QAAQ,gCAAgC;AAExD,SACEC,cAAc,EACdC,cAAc,EACdC,QAAQ,EAERC,eAAe,QACV,yBAAyB;AAChC,SAASC,OAAO,EAAEC,iBAAiB,QAAQ,iCAAiC;AAC5E,SAASC,wBAAwB,IAAIC,+BAA+B,QAAQ,6BAA6B;AACzG,SAASC,QAAQ,QAAQ,mCAAmC;AAC5D,SAASC,kBAAkB,QAAQ,sCAAsC;AACzE,SAASC,uBAAuB,QAAQ,oDAAoD;AAC5F,OAAOC,eAAe,MAAiC,mBAAmB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAE3E,MAAMC,iCAGL,GAAG;EACFC,UAAU,EAAEd,eAAe,CAACe,OAAO;EACnCC,gBAAgB,EAAEhB,eAAe,CAACe;AACpC,CAAU;;AAEV;AACA;AACA;;AAYA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,aAAa,gBAAG3B,KAAK,CAAC4B,IAAI,CACrC,CAAC;EACCC,SAAS,GAAG,YAAY;EACxBC,WAAW;EACXC,SAAS,GAAG,IAAI;EAChBlB,wBAAwB,GAAGC,+BAA+B;EAC1DkB,SAAS;EACTC,WAAW,GAAG,CAAC;EACfC,MAAM,EAAEC;AACU,CAAC,KAAK;EACxB,MAAM;IACJC,KAAK,EAAE;MAAEC;IAAc;EACzB,CAAC,GAAGtB,QAAQ,CAAC,CAAC;EACd,MAAMuB,IAAI,GAAG3B,OAAO,CAAC,CAAC;EACtB,MAAM;IAAE4B,cAAc;IAAEC;EAAyB,CAAC,GAAG5B,iBAAiB,CAAC,CAAC;EACxE,MAAM6B,kBAAkB,GAAGvC,MAAM,CAAwB,IAAI,CAAC;EAC9D,MAAM;IAAEwC;EAA0B,CAAC,GAAGF,wBAAwB,CAAC,CAAC;EAChE,MAAM;IAAEG;EAAU,CAAC,GAAGJ,cAAc,CAAC,CAAC;EACtC,MAAMK,OAAO,GAAG1C,MAAM,CAAC,IAAI,CAAC;EAC5B,MAAM;IACJ2C,QAAQ,EAAEC,qBAAqB;IAC/BC,UAAU,EAAEC;EACd,CAAC,GAAG/B,uBAAuB,CAAC,CAAC;EAE7B,MAAMgC,eAAe,GAAGjC,kBAAkB,CAACc,WAAW,EAAED,SAAS,CAAC;EAElE,MAAMqB,sBAAsB,GAC1BD,eAAe,CAACE,KAAK,GAAG,CAAC,IAAIF,eAAe,CAACG,MAAM,GAAG,CAAC;EAEzD,MAAM;IACJC,kBAAkB;IAClBC,SAAS;IACTC,uBAAuB;IACvBC,WAAW;IACXC;EACF,CAAC,GAAG3B,WAAW;EAEf,MAAM4B,eAAe,GAAG7B,SAAS,KAAK,kBAAkB;EACxD,MAAM8B,sBAAsB,GAAGD,eAAe,GAC1ClD,cAAc,CAACsB,WAAW,CAAC,GAC3BrB,QAAQ,CAACqB,WAAW,CAAC;EAEzB,MAAM8B,mBAAmB,GAAIF,eAAe,GACxCD,iBAAiB,GACjBD,WAAkD;EAEtD,MAAMK,
|
|
1
|
+
{"version":3,"names":["React","useEffect","useRef","Platform","StyleSheet","View","RTCView","hasPausedTrack","hasScreenShare","hasVideo","VisibilityState","useCall","useCallStateHooks","ParticipantVideoFallback","DefaultParticipantVideoFallback","useTheme","useTrackDimensions","useScreenshotIosContext","TrackSubscriber","jsx","_jsx","jsxs","_jsxs","DEFAULT_VIEWPORT_VISIBILITY_STATE","videoTrack","UNKNOWN","screenShareTrack","VideoRenderer","memo","trackType","participant","isVisible","objectFit","videoZOrder","mirror","mirrorOverride","theme","videoRenderer","call","useCameraState","useIncomingVideoSettings","trackSubscriberRef","isParticipantVideoEnabled","direction","viewRef","register","registerIosScreenshot","deregister","deregisterIosScreenshot","videoDimensions","isVideoDimensionsValid","width","height","isLocalParticipant","sessionId","viewportVisibilityState","videoStream","screenShareStream","isScreenSharing","isPublishingVideoTrack","videoStreamToRender","hasVideoTrackInStream","getVideoTracks","length","canShowVideo","OS","undefined","videoTrackVisibility","screenShareTrackVisibility","VISIBLE","state","updateParticipant","p","INVISIBLE","onLayout","event","current","onLayoutUpdate","style","absoluteFill","container","children","ref","participantSessionId","streamURL","toURL","zOrder","displayName"],"sourceRoot":"../../../../../../src","sources":["components/Participant/ParticipantView/VideoRenderer/index.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -61,6 +61,7 @@ async function startForegroundService(call_cid) {
|
|
|
61
61
|
*/
|
|
62
62
|
export const useAndroidKeepCallAliveEffect = () => {
|
|
63
63
|
const foregroundServiceStartedRef = useRef(false);
|
|
64
|
+
const callingxKeepAliveOwnerRef = useRef(undefined);
|
|
64
65
|
const call = useCall();
|
|
65
66
|
keepCallAliveCallRef.current = call;
|
|
66
67
|
const activeCallCid = call?.cid;
|
|
@@ -76,12 +77,35 @@ export const useAndroidKeepCallAliveEffect = () => {
|
|
|
76
77
|
return undefined;
|
|
77
78
|
}
|
|
78
79
|
const callingx = getCallingxLibIfAvailable();
|
|
79
|
-
|
|
80
|
+
const isCallingxManaged = !!callingx?.isSetup && (isRingingCall || !isRingingCall && callingx?.isOngoingCallsEnabled);
|
|
81
|
+
const isCallEnded = callingState === CallingState.IDLE || callingState === CallingState.LEFT;
|
|
82
|
+
|
|
83
|
+
// Release the callingx keep-alive task when the call ends.
|
|
84
|
+
if (callingxKeepAliveOwnerRef.current && isCallEnded) {
|
|
85
|
+
const currentOwner = callingxKeepAliveOwnerRef.current;
|
|
86
|
+
callingxKeepAliveOwnerRef.current = undefined;
|
|
87
|
+
callingx?.releaseBackgroundTask(currentOwner).catch(() => {});
|
|
88
|
+
return undefined;
|
|
89
|
+
}
|
|
90
|
+
if (isCallingxManaged && callingx) {
|
|
91
|
+
// Mutual exclusion: never acquire the callingx task while the SDK's own keep-alive FGS is
|
|
92
|
+
// running — only one keep-alive mechanism should be active per call.
|
|
93
|
+
if (!callingxKeepAliveOwnerRef.current && !isCallEnded && !foregroundServiceStartedRef.current) {
|
|
94
|
+
const owner = `keepalive:${activeCallCid}`;
|
|
95
|
+
callingxKeepAliveOwnerRef.current = owner;
|
|
96
|
+
callingx.acquireBackgroundTask(owner).catch(e => {
|
|
97
|
+
if (callingxKeepAliveOwnerRef.current === owner) {
|
|
98
|
+
callingxKeepAliveOwnerRef.current = undefined;
|
|
99
|
+
}
|
|
100
|
+
videoLoggerSystem.getLogger('useAndroidKeepCallAliveEffect').warn('Failed to acquire callingx keep-alive background task', e);
|
|
101
|
+
});
|
|
102
|
+
}
|
|
80
103
|
return undefined;
|
|
81
104
|
}
|
|
82
105
|
|
|
83
|
-
//
|
|
84
|
-
|
|
106
|
+
// Start keep-alive FGS as soon as the call is joined — but only if the callingx
|
|
107
|
+
// keep-alive task isn't already holding the call alive.
|
|
108
|
+
if (shouldStartForegroundService && !callingxKeepAliveOwnerRef.current) {
|
|
85
109
|
const run = async () => {
|
|
86
110
|
if (foregroundServiceStartedRef.current) {
|
|
87
111
|
return;
|
|
@@ -103,7 +127,7 @@ export const useAndroidKeepCallAliveEffect = () => {
|
|
|
103
127
|
return () => {
|
|
104
128
|
sub.remove();
|
|
105
129
|
};
|
|
106
|
-
} else if (
|
|
130
|
+
} else if (isCallEnded) {
|
|
107
131
|
if (foregroundServiceStartedRef.current) {
|
|
108
132
|
keepCallAliveCallRef.current = undefined;
|
|
109
133
|
// stop foreground service when the call is not active
|
|
@@ -121,6 +145,14 @@ export const useAndroidKeepCallAliveEffect = () => {
|
|
|
121
145
|
stopForegroundServiceNoThrow();
|
|
122
146
|
foregroundServiceStartedRef.current = false;
|
|
123
147
|
}
|
|
148
|
+
// release the callingx keep-alive task if still held
|
|
149
|
+
if (callingxKeepAliveOwnerRef.current) {
|
|
150
|
+
const owner = callingxKeepAliveOwnerRef.current;
|
|
151
|
+
callingxKeepAliveOwnerRef.current = undefined;
|
|
152
|
+
getCallingxLibIfAvailable()?.releaseBackgroundTask(owner).catch(() => {
|
|
153
|
+
videoLoggerSystem.getLogger('useAndroidKeepCallAliveEffect').warn('Failed to release callingx keep-alive background task', owner);
|
|
154
|
+
});
|
|
155
|
+
}
|
|
124
156
|
};
|
|
125
157
|
}, []);
|
|
126
158
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCall","useCallStateHooks","useEffect","useRef","StreamVideoRN","AppState","NativeModules","PermissionsAndroid","Platform","CallingState","videoLoggerSystem","keepCallAliveCallRef","getCallingxLibIfAvailable","stopForegroundServiceNoThrow","logger","getLogger","StreamVideoReactNative","stopKeepCallAliveService","e","warn","startForegroundService","call_cid","isCallAliveConfigured","info","hasPostNotificationsPermission","Number","Version","check","PERMISSIONS","POST_NOTIFICATIONS","videoConfig","getConfig","foregroundServiceConfig","foregroundService","notificationTexts","android","channel","smallIconName","push","smallIcon","requestAnimationFrame","startKeepCallAliveService","id","name","title","body","useAndroidKeepCallAliveEffect","foregroundServiceStartedRef","call","current","activeCallCid","cid","useCallCallingState","callingState","isCallJoined","JOINED","isRingingCall","ringing","shouldStartForegroundService","OS","
|
|
1
|
+
{"version":3,"names":["useCall","useCallStateHooks","useEffect","useRef","StreamVideoRN","AppState","NativeModules","PermissionsAndroid","Platform","CallingState","videoLoggerSystem","keepCallAliveCallRef","getCallingxLibIfAvailable","stopForegroundServiceNoThrow","logger","getLogger","StreamVideoReactNative","stopKeepCallAliveService","e","warn","startForegroundService","call_cid","isCallAliveConfigured","info","hasPostNotificationsPermission","Number","Version","check","PERMISSIONS","POST_NOTIFICATIONS","videoConfig","getConfig","foregroundServiceConfig","foregroundService","notificationTexts","android","channel","smallIconName","push","smallIcon","requestAnimationFrame","startKeepCallAliveService","id","name","title","body","useAndroidKeepCallAliveEffect","foregroundServiceStartedRef","callingxKeepAliveOwnerRef","undefined","call","current","activeCallCid","cid","useCallCallingState","callingState","isCallJoined","JOINED","isRingingCall","ringing","shouldStartForegroundService","OS","callingx","isCallingxManaged","isSetup","isOngoingCallsEnabled","isCallEnded","IDLE","LEFT","currentOwner","releaseBackgroundTask","catch","owner","acquireBackgroundTask","run","currentState","sub","addEventListener","nextAppState","remove"],"sourceRoot":"../../../src","sources":["hooks/useAndroidKeepCallAliveEffect.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -9,12 +9,71 @@ const AUDIO_INTERRUPTION_EVENT = 'StreamInCallManagerAudioInterruption';
|
|
|
9
9
|
const invariant = (condition, message) => {
|
|
10
10
|
if (!condition) throw new Error(message);
|
|
11
11
|
};
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* On Android, whether the current call is managed by Telecom (via callingx).
|
|
15
|
+
* In that mode, audio routing/mode is owned by Telecom and StreamInCallManager audio methods should not be used
|
|
16
|
+
*/
|
|
17
|
+
const isAndroidTelecomManaged = () => {
|
|
18
|
+
if (Platform.OS !== 'android' || !CallingxModule) {
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
return CallingxModule.isSetup && CallingxModule.isTelecomBacked && (CallingxModule.hasRegisteredCall() || CallingxModule.isOngoingCallsEnabled);
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* When the current call is Telecom-managed, returns the callingx module and the
|
|
26
|
+
* registered callId. Centralizes the guard so call sites don't repeat the module /
|
|
27
|
+
* callId checks — `isAndroidTelecomManaged()` already implies the module exists, but
|
|
28
|
+
* the extra narrowing here is what makes that provable to the type-checker.
|
|
29
|
+
*/
|
|
30
|
+
const getTelecomContext = () => {
|
|
31
|
+
if (!isAndroidTelecomManaged() || !CallingxModule) {
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
const callId = CallingxModule.getRegisteredCallIds()[0];
|
|
35
|
+
if (!callId) {
|
|
36
|
+
return undefined;
|
|
37
|
+
}
|
|
38
|
+
return {
|
|
39
|
+
cx: CallingxModule,
|
|
40
|
+
callId
|
|
41
|
+
};
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
/** Map a generic Telecom endpoint type to the SDK's endpoint display name. */
|
|
45
|
+
const endpointTypeToDisplayName = type => {
|
|
46
|
+
switch (type) {
|
|
47
|
+
case 'earpiece':
|
|
48
|
+
return 'Earpiece';
|
|
49
|
+
case 'speaker':
|
|
50
|
+
return 'Speaker';
|
|
51
|
+
case 'wired_headset':
|
|
52
|
+
return 'Wired Headset';
|
|
53
|
+
case 'bluetooth':
|
|
54
|
+
return 'Bluetooth Device';
|
|
55
|
+
default:
|
|
56
|
+
return 'Unknown';
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
/** Adapt a callingx endpoints snapshot to the SDK's {@link AudioDeviceStatus}. */
|
|
61
|
+
const snapshotToStatus = snapshot => ({
|
|
62
|
+
devices: snapshot.endpoints.map(e => e.name),
|
|
63
|
+
currentEndpointType: snapshot.currentEndpoint ? endpointTypeToDisplayName(snapshot.currentEndpoint.type) : 'Unknown',
|
|
64
|
+
selectedDevice: snapshot.currentEndpoint?.name ?? ''
|
|
65
|
+
});
|
|
12
66
|
class AndroidCallManager {
|
|
13
67
|
/**
|
|
14
68
|
* Get the current audio device status.
|
|
15
69
|
*/
|
|
16
70
|
getAudioDeviceStatus = async () => {
|
|
17
71
|
invariant(Platform.OS === 'android', 'Supported only on Android');
|
|
72
|
+
const tc = getTelecomContext();
|
|
73
|
+
if (tc) {
|
|
74
|
+
const snapshot = await tc.cx.getAvailableAudioEndpoints(tc.callId);
|
|
75
|
+
return snapshotToStatus(snapshot);
|
|
76
|
+
}
|
|
18
77
|
return NativeManager.getAudioDeviceStatus();
|
|
19
78
|
};
|
|
20
79
|
|
|
@@ -25,6 +84,24 @@ class AndroidCallManager {
|
|
|
25
84
|
*/
|
|
26
85
|
selectAudioDevice = endpointName => {
|
|
27
86
|
invariant(Platform.OS === 'android', 'Supported only on Android');
|
|
87
|
+
const tc = getTelecomContext();
|
|
88
|
+
if (tc) {
|
|
89
|
+
const {
|
|
90
|
+
cx,
|
|
91
|
+
callId
|
|
92
|
+
} = tc;
|
|
93
|
+
// Resolve name -> endpoint id from the current Telecom snapshot, then route via Telecom.
|
|
94
|
+
cx.getAvailableAudioEndpoints(callId).then(snapshot => {
|
|
95
|
+
const target = snapshot.endpoints.find(e => e.name === endpointName);
|
|
96
|
+
if (target) {
|
|
97
|
+
return cx.requestAudioEndpointChange(callId, target.id);
|
|
98
|
+
}
|
|
99
|
+
return undefined;
|
|
100
|
+
}).catch(error => {
|
|
101
|
+
videoLoggerSystem.getLogger('CallManager').warn(`selectAudioDevice: failed to route to "${endpointName}" for call ${callId} via Telecom`, error);
|
|
102
|
+
});
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
28
105
|
NativeManager.chooseAudioDeviceEndpoint(endpointName);
|
|
29
106
|
};
|
|
30
107
|
|
|
@@ -34,9 +111,22 @@ class AndroidCallManager {
|
|
|
34
111
|
*/
|
|
35
112
|
addAudioDeviceChangeListener = onChange => {
|
|
36
113
|
invariant(Platform.OS === 'android', 'Supported only on Android');
|
|
114
|
+
const cleanups = [];
|
|
115
|
+
|
|
116
|
+
// Telecom (callingx) route changes.
|
|
117
|
+
if (CallingxModule?.isSetup && CallingxModule.isTelecomBacked) {
|
|
118
|
+
const sub = CallingxModule.addEventListener('didChangeAudioEndpoints', params => onChange(snapshotToStatus(params)));
|
|
119
|
+
cleanups.push(() => sub.remove());
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
// StreamInCallManager route changes (non-Telecom calls). Native
|
|
123
|
+
// suppresses these while in telecom-managed mode, and callingx emits no
|
|
124
|
+
// endpoint events for non-Telecom calls, so the two sources never overlap
|
|
125
|
+
// at runtime — safe to keep both subscribed in parallel.
|
|
37
126
|
this.eventEmitter ??= new NativeEventEmitter(NativeManager);
|
|
38
127
|
const s = this.eventEmitter.addListener('onAudioDeviceChanged', onChange);
|
|
39
|
-
|
|
128
|
+
cleanups.push(() => s.remove());
|
|
129
|
+
return () => cleanups.forEach(cleanup => cleanup());
|
|
40
130
|
};
|
|
41
131
|
}
|
|
42
132
|
class IOSCallManager {
|
|
@@ -76,6 +166,34 @@ class SpeakerManager {
|
|
|
76
166
|
* Forces speakerphone on/off.
|
|
77
167
|
*/
|
|
78
168
|
setForceSpeakerphoneOn = force => {
|
|
169
|
+
const tc = getTelecomContext();
|
|
170
|
+
if (tc) {
|
|
171
|
+
const {
|
|
172
|
+
cx,
|
|
173
|
+
callId
|
|
174
|
+
} = tc;
|
|
175
|
+
// Telecom owns routing: map on -> speaker endpoint, off -> highest-priority
|
|
176
|
+
// non-speaker endpoint (wired > bluetooth > earpiece), mirroring classic behavior.
|
|
177
|
+
cx.getAvailableAudioEndpoints(callId).then(snapshot => {
|
|
178
|
+
let target;
|
|
179
|
+
if (force) {
|
|
180
|
+
target = snapshot.endpoints.find(e => e.type === 'speaker');
|
|
181
|
+
} else {
|
|
182
|
+
// Priority for the "speakerphone off" fallback: prefer wired, then bluetooth, then earpiece.
|
|
183
|
+
for (const type of ['wired_headset', 'bluetooth', 'earpiece']) {
|
|
184
|
+
target = snapshot.endpoints.find(e => e.type === type);
|
|
185
|
+
if (target) break;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
if (target) {
|
|
189
|
+
return cx.requestAudioEndpointChange(callId, target.id);
|
|
190
|
+
}
|
|
191
|
+
return undefined;
|
|
192
|
+
}).catch(error => {
|
|
193
|
+
videoLoggerSystem.getLogger('CallManager').warn(`setForceSpeakerphoneOn(${force}): failed to route for call ${callId} via Telecom`, error);
|
|
194
|
+
});
|
|
195
|
+
return;
|
|
196
|
+
}
|
|
79
197
|
NativeManager.setForceSpeakerphoneOn(force);
|
|
80
198
|
};
|
|
81
199
|
}
|
|
@@ -121,6 +239,20 @@ export class CallManager {
|
|
|
121
239
|
videoLoggerSystem.getLogger('CallManager').debug('start: skipping start as callkit is handling the audio session');
|
|
122
240
|
return;
|
|
123
241
|
}
|
|
242
|
+
if (isAndroidTelecomManaged()) {
|
|
243
|
+
// Telecom owns routing/focus; forward the sticky preference to callingx and run in
|
|
244
|
+
// telecom-managed mode (StreamInCallManager keeps proximity/keep-screen-on only).
|
|
245
|
+
if (config?.audioRole !== 'listener' && CallingxModule) {
|
|
246
|
+
CallingxModule.setDefaultAudioDeviceEndpointType(config?.deviceEndpointType ?? 'speaker');
|
|
247
|
+
}
|
|
248
|
+
NativeManager.setTelecomManagedMode(true);
|
|
249
|
+
NativeManager.setAudioRole(config?.audioRole ?? 'communicator');
|
|
250
|
+
NativeManager.start();
|
|
251
|
+
return;
|
|
252
|
+
}
|
|
253
|
+
if (Platform.OS === 'android') {
|
|
254
|
+
NativeManager.setTelecomManagedMode(false);
|
|
255
|
+
}
|
|
124
256
|
NativeManager.setAudioRole(config?.audioRole ?? 'communicator');
|
|
125
257
|
if (config?.audioRole === 'communicator') {
|
|
126
258
|
const type = config.deviceEndpointType ?? 'speaker';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NativeEventEmitter","NativeModules","Platform","getCallingxLibIfAvailable","videoLoggerSystem","NativeManager","StreamInCallManager","CallingxModule","AUDIO_INTERRUPTION_EVENT","invariant","condition","message","Error","AndroidCallManager","getAudioDeviceStatus","
|
|
1
|
+
{"version":3,"names":["NativeEventEmitter","NativeModules","Platform","getCallingxLibIfAvailable","videoLoggerSystem","NativeManager","StreamInCallManager","CallingxModule","AUDIO_INTERRUPTION_EVENT","invariant","condition","message","Error","isAndroidTelecomManaged","OS","isSetup","isTelecomBacked","hasRegisteredCall","isOngoingCallsEnabled","getTelecomContext","undefined","callId","getRegisteredCallIds","cx","endpointTypeToDisplayName","type","snapshotToStatus","snapshot","devices","endpoints","map","e","name","currentEndpointType","currentEndpoint","selectedDevice","AndroidCallManager","getAudioDeviceStatus","tc","getAvailableAudioEndpoints","selectAudioDevice","endpointName","then","target","find","requestAudioEndpointChange","id","catch","error","getLogger","warn","chooseAudioDeviceEndpoint","addAudioDeviceChangeListener","onChange","cleanups","sub","addEventListener","params","push","remove","eventEmitter","s","addListener","forEach","cleanup","IOSCallManager","showDeviceSelector","showAudioRoutePicker","addAudioInterruptionListener","onInterruption","SpeakerManager","setMute","mute","muteAudioOutput","unmuteAudioOutput","setForceSpeakerphoneOn","force","shouldBypassForCallKit","CallManager","android","ios","speaker","start","config","audioRole","deviceEndpointType","setDefaultAudioDeviceEndpointType","debug","setTelecomManagedMode","setAudioRole","enableStereoAudioOutput","setEnableStereoAudioOutput","stop","logAudioState","getAudioStateLog"],"sourceRoot":"../../../../src","sources":["modules/call-manager/CallManager.ts"],"mappings":";;AAAA,SAASA,kBAAkB,EAAEC,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAU1E,SAASC,yBAAyB,QAAQ,gCAAgC;AAC1E,SAASC,iBAAiB,QAAQ,yBAAyB;AAE3D,MAAMC,aAAa,GAAGJ,aAAa,CAACK,mBAAmB;AACvD,MAAMC,cAAc,GAAGJ,yBAAyB,CAAC,CAAC;AAClD,MAAMK,wBAAwB,GAAG,sCAAsC;AAEvE,MAAMC,SAAS,GAAGA,CAACC,SAAkB,EAAEC,OAAe,KAAK;EACzD,IAAI,CAACD,SAAS,EAAE,MAAM,IAAIE,KAAK,CAACD,OAAO,CAAC;AAC1C,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAME,uBAAuB,GAAGA,CAAA,KAAe;EAC7C,IAAIX,QAAQ,CAACY,EAAE,KAAK,SAAS,IAAI,CAACP,cAAc,EAAE;IAChD,OAAO,KAAK;EACd;EACA,OACEA,cAAc,CAACQ,OAAO,IACtBR,cAAc,CAACS,eAAe,KAC7BT,cAAc,CAACU,iBAAiB,CAAC,CAAC,IAAIV,cAAc,CAACW,qBAAqB,CAAC;AAEhF,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,iBAAiB,GAAGA,CAAA,KAET;EACf,IAAI,CAACN,uBAAuB,CAAC,CAAC,IAAI,CAACN,cAAc,EAAE;IACjD,OAAOa,SAAS;EAClB;EACA,MAAMC,MAAM,GAAGd,cAAc,CAACe,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;EACvD,IAAI,CAACD,MAAM,EAAE;IACX,OAAOD,SAAS;EAClB;EACA,OAAO;IAAEG,EAAE,EAAEhB,cAAc;IAAEc;EAAO,CAAC;AACvC,CAAC;;AAED;AACA,MAAMG,yBAAyB,GAC7BC,IAAY,IACiC;EAC7C,QAAQA,IAAI;IACV,KAAK,UAAU;MACb,OAAO,UAAU;IACnB,KAAK,SAAS;MACZ,OAAO,SAAS;IAClB,KAAK,eAAe;MAClB,OAAO,eAAe;IACxB,KAAK,WAAW;MACd,OAAO,kBAAkB;IAC3B;MACE,OAAO,SAAS;EACpB;AACF,CAAC;;AAED;AACA,MAAMC,gBAAgB,GACpBC,QAA+B,KACR;EACvBC,OAAO,EAAED,QAAQ,CAACE,SAAS,CAACC,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,IAAI,CAAC;EAC9CC,mBAAmB,EAAEN,QAAQ,CAACO,eAAe,GACzCV,yBAAyB,CAACG,QAAQ,CAACO,eAAe,CAACT,IAAI,CAAC,GACxD,SAAS;EACbU,cAAc,EAAER,QAAQ,CAACO,eAAe,EAAEF,IAAI,IAAI;AACpD,CAAC,CAAC;AAEF,MAAMI,kBAAkB,CAAC;EAGvB;AACF;AACA;EACEC,oBAAoB,GAAG,MAAAA,CAAA,KAAwC;IAC7D5B,SAAS,CAACP,QAAQ,CAACY,EAAE,KAAK,SAAS,EAAE,2BAA2B,CAAC;IACjE,MAAMwB,EAAE,GAAGnB,iBAAiB,CAAC,CAAC;IAC9B,IAAImB,EAAE,EAAE;MACN,MAAMX,QAAQ,GAAG,MAAMW,EAAE,CAACf,EAAE,CAACgB,0BAA0B,CAACD,EAAE,CAACjB,MAAM,CAAC;MAClE,OAAOK,gBAAgB,CAACC,QAAQ,CAAC;IACnC;IACA,OAAOtB,aAAa,CAACgC,oBAAoB,CAAC,CAAC;EAC7C,CAAC;;EAED;AACF;AACA;AACA;AACA;EACEG,iBAAiB,GAAIC,YAAoB,IAAW;IAClDhC,SAAS,CAACP,QAAQ,CAACY,EAAE,KAAK,SAAS,EAAE,2BAA2B,CAAC;IACjE,MAAMwB,EAAE,GAAGnB,iBAAiB,CAAC,CAAC;IAC9B,IAAImB,EAAE,EAAE;MACN,MAAM;QAAEf,EAAE;QAAEF;MAAO,CAAC,GAAGiB,EAAE;MACzB;MACAf,EAAE,CAACgB,0BAA0B,CAAClB,MAAM,CAAC,CAClCqB,IAAI,CAAEf,QAAQ,IAAK;QAClB,MAAMgB,MAAM,GAAGhB,QAAQ,CAACE,SAAS,CAACe,IAAI,CACnCb,CAAC,IAAKA,CAAC,CAACC,IAAI,KAAKS,YACpB,CAAC;QACD,IAAIE,MAAM,EAAE;UACV,OAAOpB,EAAE,CAACsB,0BAA0B,CAACxB,MAAM,EAAEsB,MAAM,CAACG,EAAE,CAAC;QACzD;QACA,OAAO1B,SAAS;MAClB,CAAC,CAAC,CACD2B,KAAK,CAAEC,KAAK,IAAK;QAChB5C,iBAAiB,CACd6C,SAAS,CAAC,aAAa,CAAC,CACxBC,IAAI,CACH,0CAA0CT,YAAY,cAAcpB,MAAM,cAAc,EACxF2B,KACF,CAAC;MACL,CAAC,CAAC;MACJ;IACF;IACA3C,aAAa,CAAC8C,yBAAyB,CAACV,YAAY,CAAC;EACvD,CAAC;;EAED;AACF;AACA;AACA;EACEW,4BAA4B,GAC1BC,QAAwD,IACvC;IACjB5C,SAAS,CAACP,QAAQ,CAACY,EAAE,KAAK,SAAS,EAAE,2BAA2B,CAAC;IACjE,MAAMwC,QAA2B,GAAG,EAAE;;IAEtC;IACA,IAAI/C,cAAc,EAAEQ,OAAO,IAAIR,cAAc,CAACS,eAAe,EAAE;MAC7D,MAAMuC,GAAG,GAAGhD,cAAc,CAACiD,gBAAgB,CACzC,yBAAyB,EACxBC,MAAM,IAAKJ,QAAQ,CAAC3B,gBAAgB,CAAC+B,MAAM,CAAC,CAC/C,CAAC;MACDH,QAAQ,CAACI,IAAI,CAAC,MAAMH,GAAG,CAACI,MAAM,CAAC,CAAC,CAAC;IACnC;;IAEA;IACA;IACA;IACA;IACA,IAAI,CAACC,YAAY,KAAK,IAAI5D,kBAAkB,CAACK,aAAa,CAAC;IAC3D,MAAMwD,CAAC,GAAG,IAAI,CAACD,YAAY,CAACE,WAAW,CAAC,sBAAsB,EAAET,QAAQ,CAAC;IACzEC,QAAQ,CAACI,IAAI,CAAC,MAAMG,CAAC,CAACF,MAAM,CAAC,CAAC,CAAC;IAE/B,OAAO,MAAML,QAAQ,CAACS,OAAO,CAAEC,OAAO,IAAKA,OAAO,CAAC,CAAC,CAAC;EACvD,CAAC;AACH;AAEA,MAAMC,cAAc,CAAC;EAGnB;AACF;AACA;EACEC,kBAAkB,GAAGA,CAAA,KAAY;IAC/BzD,SAAS,CAACP,QAAQ,CAACY,EAAE,KAAK,KAAK,EAAE,uBAAuB,CAAC;IACzDT,aAAa,CAAC8D,oBAAoB,CAAC,CAAC;EACtC,CAAC;;EAED;AACF;AACA;AACA;AACA;EACEC,4BAA4B,GAC1BC,cAA0D,IACzC;IACjB5D,SAAS,CAACP,QAAQ,CAACY,EAAE,KAAK,KAAK,EAAE,uBAAuB,CAAC;IACzD,IAAI,CAAC8C,YAAY,KAAK,IAAI5D,kBAAkB,CAACK,aAAa,CAAC;IAC3D,MAAMwD,CAAC,GAAG,IAAI,CAACD,YAAY,CAACE,WAAW,CACrCtD,wBAAwB,EACxB6D,cACF,CAAC;IACD,OAAO,MAAMR,CAAC,CAACF,MAAM,CAAC,CAAC;EACzB,CAAC;AACH;AAEA,MAAMW,cAAc,CAAC;EACnB;AACF;AACA;EACEC,OAAO,GAAIC,IAAa,IAAW;IACjC,IAAIA,IAAI,EAAE;MACRnE,aAAa,CAACoE,eAAe,CAAC,CAAC;IACjC,CAAC,MAAM;MACLpE,aAAa,CAACqE,iBAAiB,CAAC,CAAC;IACnC;EACF,CAAC;;EAED;AACF;AACA;EACEC,sBAAsB,GAAIC,KAAc,IAAW;IACjD,MAAMtC,EAAE,GAAGnB,iBAAiB,CAAC,CAAC;IAC9B,IAAImB,EAAE,EAAE;MACN,MAAM;QAAEf,EAAE;QAAEF;MAAO,CAAC,GAAGiB,EAAE;MACzB;MACA;MACAf,EAAE,CAACgB,0BAA0B,CAAClB,MAAM,CAAC,CAClCqB,IAAI,CAAEf,QAAQ,IAAK;QAClB,IAAIgB,MAAyC;QAC7C,IAAIiC,KAAK,EAAE;UACTjC,MAAM,GAAGhB,QAAQ,CAACE,SAAS,CAACe,IAAI,CAAEb,CAAC,IAAKA,CAAC,CAACN,IAAI,KAAK,SAAS,CAAC;QAC/D,CAAC,MAAM;UACL;UACA,KAAK,MAAMA,IAAI,IAAI,CAAC,eAAe,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE;YAC7DkB,MAAM,GAAGhB,QAAQ,CAACE,SAAS,CAACe,IAAI,CAAEb,CAAC,IAAKA,CAAC,CAACN,IAAI,KAAKA,IAAI,CAAC;YACxD,IAAIkB,MAAM,EAAE;UACd;QACF;QACA,IAAIA,MAAM,EAAE;UACV,OAAOpB,EAAE,CAACsB,0BAA0B,CAACxB,MAAM,EAAEsB,MAAM,CAACG,EAAE,CAAC;QACzD;QACA,OAAO1B,SAAS;MAClB,CAAC,CAAC,CACD2B,KAAK,CAAEC,KAAK,IAAK;QAChB5C,iBAAiB,CACd6C,SAAS,CAAC,aAAa,CAAC,CACxBC,IAAI,CACH,0BAA0B0B,KAAK,+BAA+BvD,MAAM,cAAc,EAClF2B,KACF,CAAC;MACL,CAAC,CAAC;MACJ;IACF;IACA3C,aAAa,CAACsE,sBAAsB,CAACC,KAAK,CAAC;EAC7C,CAAC;AACH;AAEA,MAAMC,sBAAsB,GAAGA,CAAA,KAAe;EAC5C,IAAI3E,QAAQ,CAACY,EAAE,KAAK,KAAK,EAAE;IACzB,OAAO,KAAK;EACd;EACA,IAAI,CAACP,cAAc,EAAE;IACnB,OAAO,KAAK;EACd;EACA,OACEA,cAAc,CAACQ,OAAO,KACrBR,cAAc,CAACU,iBAAiB,CAAC,CAAC,IAAIV,cAAc,CAACW,qBAAqB,CAAC;AAEhF,CAAC;AAED,OAAO,MAAM4D,WAAW,CAAC;EACvBC,OAAO,GAAG,IAAI3C,kBAAkB,CAAC,CAAC;EAClC4C,GAAG,GAAG,IAAIf,cAAc,CAAC,CAAC;EAC1BgB,OAAO,GAAG,IAAIX,cAAc,CAAC,CAAC;;EAE9B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEY,KAAK,GAAIC,MAAkC,IAAW;IACpD,IAAIN,sBAAsB,CAAC,CAAC,EAAE;MAC5B;MACA;MACA,IAAIM,MAAM,EAAEC,SAAS,KAAK,cAAc,IAAI7E,cAAc,EAAE;QAC1D,MAAMkB,IAAI,GAAG0D,MAAM,CAACE,kBAAkB,IAAI,SAAS;QACnD9E,cAAc,CAAC+E,iCAAiC,CAAC7D,IAAI,CAAC;MACxD;MACArB,iBAAiB,CACd6C,SAAS,CAAC,aAAa,CAAC,CACxBsC,KAAK,CACJ,gEACF,CAAC;MACH;IACF;IACA,IAAI1E,uBAAuB,CAAC,CAAC,EAAE;MAC7B;MACA;MACA,IAAIsE,MAAM,EAAEC,SAAS,KAAK,UAAU,IAAI7E,cAAc,EAAE;QACtDA,cAAc,CAAC+E,iCAAiC,CAC9CH,MAAM,EAAEE,kBAAkB,IAAI,SAChC,CAAC;MACH;MACAhF,aAAa,CAACmF,qBAAqB,CAAC,IAAI,CAAC;MACzCnF,aAAa,CAACoF,YAAY,CAACN,MAAM,EAAEC,SAAS,IAAI,cAAc,CAAC;MAC/D/E,aAAa,CAAC6E,KAAK,CAAC,CAAC;MACrB;IACF;IACA,IAAIhF,QAAQ,CAACY,EAAE,KAAK,SAAS,EAAE;MAC7BT,aAAa,CAACmF,qBAAqB,CAAC,KAAK,CAAC;IAC5C;IACAnF,aAAa,CAACoF,YAAY,CAACN,MAAM,EAAEC,SAAS,IAAI,cAAc,CAAC;IAC/D,IAAID,MAAM,EAAEC,SAAS,KAAK,cAAc,EAAE;MACxC,MAAM3D,IAAI,GAAG0D,MAAM,CAACE,kBAAkB,IAAI,SAAS;MACnDhF,aAAa,CAACiF,iCAAiC,CAAC7D,IAAI,CAAC;IACvD;IACA,IAAI0D,MAAM,EAAEC,SAAS,KAAK,UAAU,IAAID,MAAM,CAACO,uBAAuB,EAAE;MACtErF,aAAa,CAACsF,0BAA0B,CAAC,IAAI,CAAC;IAChD;IACAtF,aAAa,CAAC6E,KAAK,CAAC,CAAC;EACvB,CAAC;;EAED;AACF;AACA;EACEU,IAAI,GAAGA,CAAA,KAAY;IACjB,IAAIf,sBAAsB,CAAC,CAAC,EAAE;MAC5BzE,iBAAiB,CACd6C,SAAS,CAAC,aAAa,CAAC,CACxBsC,KAAK,CAAC,8DAA8D,CAAC;MACxE;IACF;IACAlF,aAAa,CAACuF,IAAI,CAAC,CAAC;EACtB,CAAC;;EAED;AACF;AACA;AACA;EACEC,aAAa,GAAGA,CAAA,KAAYxF,aAAa,CAACwF,aAAa,CAAC,CAAC;;EAEzD;AACF;AACA;AACA;EACEC,gBAAgB,GAAGA,CAAA,KAAczF,aAAa,CAACyF,gBAAgB,CAAC,CAAC;AACnE","ignoreList":[]}
|
|
@@ -4,12 +4,46 @@
|
|
|
4
4
|
* Internal utils for callingx library usage from video-client.
|
|
5
5
|
* See @./registerSDKGlobals.ts for more usage details.
|
|
6
6
|
*/
|
|
7
|
-
import { Platform } from 'react-native';
|
|
7
|
+
import { NativeModules, Platform } from 'react-native';
|
|
8
8
|
import { getCallingxLibIfAvailable } from '../../push/libs/callingx';
|
|
9
9
|
import { waitForAudioSessionActivation } from './audioSessionPromise';
|
|
10
10
|
import { CallingState, videoLoggerSystem } from '@stream-io/video-client';
|
|
11
11
|
const CallingxModule = getCallingxLibIfAvailable();
|
|
12
12
|
|
|
13
|
+
/**
|
|
14
|
+
* Fallback when Telecom registration fails/times out on Android: no component would own audio
|
|
15
|
+
* (Telecom never took over), so re-establish StreamInCallManager in its classic (non-telecom)
|
|
16
|
+
* mode to keep the call audible.
|
|
17
|
+
*/
|
|
18
|
+
function recoverAudioToClassicMode() {
|
|
19
|
+
if (Platform.OS !== 'android') {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
if (!CallingxModule?.isSetup || !CallingxModule.isTelecomBacked) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
// If a call is already registered, Telecom owns audio for it (the registration
|
|
26
|
+
// partially succeeded). Switching to classic mode here would fight Telecom's
|
|
27
|
+
// routing/focus — leave ownership intact.
|
|
28
|
+
if (CallingxModule.hasRegisteredCall()) {
|
|
29
|
+
videoLoggerSystem.getLogger('callingx').debug('recoverAudioToClassicMode: Telecom already owns a registered call; skipping classic fallback');
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
const StreamInCallManagerNativeModule = NativeModules.StreamInCallManager;
|
|
33
|
+
if (!StreamInCallManagerNativeModule) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const logger = videoLoggerSystem.getLogger('callingx');
|
|
37
|
+
logger.warn('Telecom registration failed; falling back to classic StreamInCallManager audio');
|
|
38
|
+
try {
|
|
39
|
+
StreamInCallManagerNativeModule.stop();
|
|
40
|
+
StreamInCallManagerNativeModule.setTelecomManagedMode(false);
|
|
41
|
+
StreamInCallManagerNativeModule.start();
|
|
42
|
+
} catch (error) {
|
|
43
|
+
logger.error('recoverAudioToClassicMode: failed to recover audio', error);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
13
47
|
/**
|
|
14
48
|
* Gets the call display name. To be used for display in native call screen.
|
|
15
49
|
*/
|
|
@@ -57,6 +91,7 @@ export async function registerOutgoingCall(call) {
|
|
|
57
91
|
);
|
|
58
92
|
} catch (error) {
|
|
59
93
|
logger.error(`registerOutgoingCall: Error registering outgoing call in callingx: ${call.cid}`, error);
|
|
94
|
+
recoverAudioToClassicMode();
|
|
60
95
|
}
|
|
61
96
|
}
|
|
62
97
|
|
|
@@ -95,6 +130,7 @@ export async function joinCallingxCall(call, activeCalls) {
|
|
|
95
130
|
await startCallInCallingx();
|
|
96
131
|
} catch (error) {
|
|
97
132
|
logger.error(`startCallingxCall: Error starting call in callingx: ${call.cid}`, error);
|
|
133
|
+
recoverAudioToClassicMode();
|
|
98
134
|
}
|
|
99
135
|
} else if (isIncomingCall) {
|
|
100
136
|
logger.debug(`joinCallingxCall: Joining incoming call ${call.cid}`);
|
|
@@ -127,6 +163,7 @@ export async function joinCallingxCall(call, activeCalls) {
|
|
|
127
163
|
}
|
|
128
164
|
} catch (error) {
|
|
129
165
|
logger.error(`Error joining incoming call in callingx: ${call.cid}`, error);
|
|
166
|
+
recoverAudioToClassicMode();
|
|
130
167
|
}
|
|
131
168
|
}
|
|
132
169
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Platform","getCallingxLibIfAvailable","waitForAudioSessionActivation","CallingState","videoLoggerSystem","CallingxModule","getCallDisplayName","callMembers","participants","currentUserId","names","length","flatMap","member","user","id","name","participant","userId","find","sort","join","getCallDisplayNameFromCall","call","state","custom","display_name","members","registerOutgoingCall","
|
|
1
|
+
{"version":3,"names":["NativeModules","Platform","getCallingxLibIfAvailable","waitForAudioSessionActivation","CallingState","videoLoggerSystem","CallingxModule","recoverAudioToClassicMode","OS","isSetup","isTelecomBacked","hasRegisteredCall","getLogger","debug","StreamInCallManagerNativeModule","StreamInCallManager","logger","warn","stop","setTelecomManagedMode","start","error","getCallDisplayName","callMembers","participants","currentUserId","names","length","flatMap","member","user","id","name","participant","userId","find","sort","join","getCallDisplayNameFromCall","call","state","custom","display_name","members","registerOutgoingCall","isOwnTracksLoopbackAllowed","isOutcomingCall","ringing","isCreatedByMe","cid","callDisplayName","startCall","createdBy","settings","video","enabled","joinCallingxCall","activeCalls","isIncomingCall","startCallInCallingx","isOngoingCallsEnabled","activeCallsToLeave","filter","c","callingState","LEFT","activeCall","leave","reason","catch","e","displayIncomingCall","answerIncomingCall","endCallingxCall","isCallTracked","endCallWithReason"],"sourceRoot":"../../../../../src","sources":["utils/internal/callingx/callingx.ts"],"mappings":"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","ignoreList":[]}
|