@stream-io/video-react-native-sdk 1.36.2 → 1.37.1-beta.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 +15 -0
- package/android/src/main/java/com/streamvideo/reactnative/StreamVideoReactNativeModule.kt +81 -0
- package/android/src/main/java/com/streamvideo/reactnative/recorder/AudioPipeline.kt +436 -0
- package/android/src/main/java/com/streamvideo/reactnative/recorder/EncoderConstants.kt +17 -0
- package/android/src/main/java/com/streamvideo/reactnative/recorder/PipelineHost.kt +36 -0
- package/android/src/main/java/com/streamvideo/reactnative/recorder/RecorderPlaybackSamplesSink.kt +60 -0
- package/android/src/main/java/com/streamvideo/reactnative/recorder/RecorderVideoSink.kt +31 -0
- package/android/src/main/java/com/streamvideo/reactnative/recorder/TracksRecorderManager.kt +329 -0
- package/android/src/main/java/com/streamvideo/reactnative/recorder/VideoPipeline.kt +472 -0
- package/dist/commonjs/hooks/index.js +11 -0
- package/dist/commonjs/hooks/index.js.map +1 -1
- package/dist/commonjs/hooks/useLoopbackRecording.js +243 -0
- package/dist/commonjs/hooks/useLoopbackRecording.js.map +1 -0
- package/dist/commonjs/utils/internal/callingx/callingx.js +18 -38
- package/dist/commonjs/utils/internal/callingx/callingx.js.map +1 -1
- package/dist/commonjs/utils/push/internal/ios.js +4 -3
- package/dist/commonjs/utils/push/internal/ios.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/commonjs/version.js.map +1 -1
- package/dist/module/hooks/index.js +1 -0
- package/dist/module/hooks/index.js.map +1 -1
- package/dist/module/hooks/useLoopbackRecording.js +238 -0
- package/dist/module/hooks/useLoopbackRecording.js.map +1 -0
- package/dist/module/utils/internal/callingx/callingx.js +19 -39
- package/dist/module/utils/internal/callingx/callingx.js.map +1 -1
- package/dist/module/utils/push/internal/ios.js +4 -3
- package/dist/module/utils/push/internal/ios.js.map +1 -1
- package/dist/module/version.js +1 -1
- package/dist/module/version.js.map +1 -1
- package/dist/typescript/hooks/index.d.ts +1 -0
- package/dist/typescript/hooks/index.d.ts.map +1 -1
- package/dist/typescript/hooks/useLoopbackRecording.d.ts +85 -0
- package/dist/typescript/hooks/useLoopbackRecording.d.ts.map +1 -0
- package/dist/typescript/utils/internal/callingx/callingx.d.ts.map +1 -1
- package/dist/typescript/utils/push/internal/ios.d.ts.map +1 -1
- package/dist/typescript/version.d.ts +1 -1
- package/dist/typescript/version.d.ts.map +1 -1
- package/expo-config-plugin/dist/withAppDelegate.js +14 -177
- package/ios/RTCViewPip.swift +6 -6
- package/ios/RTCViewPipManager.swift +47 -10
- package/ios/StreamInCallManager.swift +2 -6
- package/ios/StreamVideoReactNative-Bridging-Header.h +2 -0
- package/ios/StreamVideoReactNative.h +5 -18
- package/ios/StreamVideoReactNative.m +83 -296
- package/ios/TracksRecorder/AudioPipeline.swift +270 -0
- package/ios/TracksRecorder/PipelineHost.swift +56 -0
- package/ios/TracksRecorder/RecorderAudioRenderTap.swift +154 -0
- package/ios/TracksRecorder/RecorderVideoSink.swift +137 -0
- package/ios/TracksRecorder/TracksRecorderManager.swift +327 -0
- package/ios/TracksRecorder/VideoPipeline.swift +297 -0
- package/package.json +8 -8
- package/src/hooks/index.ts +1 -0
- package/src/hooks/useLoopbackRecording.ts +438 -0
- package/src/utils/internal/callingx/callingx.ts +19 -44
- package/src/utils/push/internal/ios.ts +4 -3
- package/src/version.ts +1 -1
|
@@ -0,0 +1,243 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.useLoopbackRecording = useLoopbackRecording;
|
|
7
|
+
var _react = require("react");
|
|
8
|
+
var _reactNative = require("react-native");
|
|
9
|
+
var _rxjs = require("rxjs");
|
|
10
|
+
var _videoClient = require("@stream-io/video-client");
|
|
11
|
+
var _videoReactBindings = require("@stream-io/video-react-bindings");
|
|
12
|
+
/** @internal */
|
|
13
|
+
const {
|
|
14
|
+
StreamVideoReactNative
|
|
15
|
+
} = _reactNative.NativeModules;
|
|
16
|
+
|
|
17
|
+
// Upper bound on how long `startRecording` will wait for the SFU to
|
|
18
|
+
// echo loopback tracks back via the Subscriber. Tuned generously since
|
|
19
|
+
// this includes connection setup; consumers that want shorter feedback
|
|
20
|
+
// should call `stopRecording` to cancel the wait early.
|
|
21
|
+
const STREAMS_WAIT_TIMEOUT_MS = 10 * 1000;
|
|
22
|
+
const DEFAULT_RECORDING_DURATION = 10 * 1000;
|
|
23
|
+
const MIN_RECORDING_DURATION = 5 * 1000;
|
|
24
|
+
const MAX_RECORDING_DURATION = 2 * 60 * 1000;
|
|
25
|
+
/**
|
|
26
|
+
* Records the SFU loopback streams (audio + video) on the local participant
|
|
27
|
+
* to a local MP4 file. Designed for the `selfSubEnabled` pre-call test mode:
|
|
28
|
+
* the SFU echoes the caller's published tracks back through the Subscriber
|
|
29
|
+
* peer connection. The hook identifies the loopback streams on the local
|
|
30
|
+
* participant by reference inequality against
|
|
31
|
+
* `call.camera.state.mediaStream` / `call.microphone.state.mediaStream` —
|
|
32
|
+
* the canonical references to the local capture — and captures them.
|
|
33
|
+
*/
|
|
34
|
+
function useLoopbackRecording() {
|
|
35
|
+
const call = (0, _videoReactBindings.useCall)();
|
|
36
|
+
const {
|
|
37
|
+
useCallCallingState,
|
|
38
|
+
useParticipantCount
|
|
39
|
+
} = (0, _videoReactBindings.useCallStateHooks)();
|
|
40
|
+
const callingState = useCallCallingState();
|
|
41
|
+
const participantCount = useParticipantCount();
|
|
42
|
+
const [recordingState, setRecordingState] = (0, _react.useState)('idle');
|
|
43
|
+
const recordingStateRef = (0, _react.useRef)('idle');
|
|
44
|
+
const isMountedRef = (0, _react.useRef)(true);
|
|
45
|
+
// Used to abort the awaiting-streams wait on stop / leave / unmount.
|
|
46
|
+
const awaitAbortRef = (0, _react.useRef)(null);
|
|
47
|
+
const [loopbackStreams, setLoopbackStreams] = (0, _react.useState)(() => {
|
|
48
|
+
if (!call) return {};
|
|
49
|
+
return getLoopbackStreamsFor(call.state.localParticipant, call.camera.state.mediaStream, call.microphone.state.mediaStream);
|
|
50
|
+
});
|
|
51
|
+
const updateState = (0, _react.useCallback)(next => {
|
|
52
|
+
recordingStateRef.current = next;
|
|
53
|
+
if (isMountedRef.current) {
|
|
54
|
+
setRecordingState(next);
|
|
55
|
+
}
|
|
56
|
+
}, []);
|
|
57
|
+
const stopRecording = (0, _react.useCallback)(async () => {
|
|
58
|
+
const current = recordingStateRef.current;
|
|
59
|
+
if (current === 'idle') {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
if (current === 'awaiting-streams') {
|
|
63
|
+
_videoClient.videoLoggerSystem.getLogger('useLoopbackRecording').debug('aborting awaiting-streams wait');
|
|
64
|
+
awaitAbortRef.current?.abort();
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
await StreamVideoReactNative?.stopTrackRecording();
|
|
68
|
+
}, []);
|
|
69
|
+
const startRecording = (0, _react.useCallback)(async ({
|
|
70
|
+
includeVideo = true,
|
|
71
|
+
maxDurationMs = DEFAULT_RECORDING_DURATION
|
|
72
|
+
} = {}) => {
|
|
73
|
+
if (!call) {
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
76
|
+
if (recordingStateRef.current !== 'idle') {
|
|
77
|
+
console.warn('useLoopbackRecording: a recording is already running');
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
if (call.state.participantCount > 1) {
|
|
81
|
+
console.warn('useLoopbackRecording: cannot start recording with other participants present');
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
awaitAbortRef.current = new AbortController();
|
|
85
|
+
updateState('awaiting-streams');
|
|
86
|
+
let audioTrack;
|
|
87
|
+
try {
|
|
88
|
+
const streams = await waitForLoopbackStreams(call, {
|
|
89
|
+
includeVideo,
|
|
90
|
+
signal: awaitAbortRef.current.signal,
|
|
91
|
+
timeoutMs: STREAMS_WAIT_TIMEOUT_MS
|
|
92
|
+
});
|
|
93
|
+
if (streams === null) {
|
|
94
|
+
_videoClient.videoLoggerSystem.getLogger('useLoopbackRecording').warn('timed out waiting for loopback streams');
|
|
95
|
+
return null;
|
|
96
|
+
}
|
|
97
|
+
audioTrack = streams.audioTrack;
|
|
98
|
+
const videoTrackId = streams.videoTrack?.id;
|
|
99
|
+
|
|
100
|
+
// The loopback audio track lands disabled (the SDK default-mutes
|
|
101
|
+
// it to prevent echo). Enable it so the native recording
|
|
102
|
+
// pipeline receives PCM; `finally` returns it to muted.
|
|
103
|
+
if (audioTrack) {
|
|
104
|
+
audioTrack.enabled = true;
|
|
105
|
+
}
|
|
106
|
+
updateState('recording');
|
|
107
|
+
const clampedDuration = Math.min(MAX_RECORDING_DURATION, Math.max(MIN_RECORDING_DURATION, maxDurationMs));
|
|
108
|
+
|
|
109
|
+
// Pre-size the native encoder to the publisher's max video
|
|
110
|
+
// publish-option dimension. Without this, the encoder locks to
|
|
111
|
+
// whatever the SFU happens to echo *first* and stays there for the
|
|
112
|
+
// rest of the recording even after the network improves and
|
|
113
|
+
// higher layers arrive.
|
|
114
|
+
const publishMaxDim = call.getMaxVideoPublishDimension();
|
|
115
|
+
const uri = await StreamVideoReactNative.startTrackRecording({
|
|
116
|
+
videoTrackId,
|
|
117
|
+
maxDurationMs: Math.round(clampedDuration),
|
|
118
|
+
targetWidth: publishMaxDim?.width,
|
|
119
|
+
targetHeight: publishMaxDim?.height
|
|
120
|
+
});
|
|
121
|
+
return uri;
|
|
122
|
+
} finally {
|
|
123
|
+
if (audioTrack) {
|
|
124
|
+
audioTrack.enabled = false;
|
|
125
|
+
}
|
|
126
|
+
awaitAbortRef.current = null;
|
|
127
|
+
updateState('idle');
|
|
128
|
+
}
|
|
129
|
+
}, [call, updateState]);
|
|
130
|
+
const clearRecordings = (0, _react.useCallback)(async () => {
|
|
131
|
+
await StreamVideoReactNative.clearStreamRecordings();
|
|
132
|
+
}, []);
|
|
133
|
+
const getRecordings = (0, _react.useCallback)(async () => {
|
|
134
|
+
const list = await StreamVideoReactNative.getStreamRecordings();
|
|
135
|
+
return list ?? [];
|
|
136
|
+
}, []);
|
|
137
|
+
|
|
138
|
+
// Auto-stop on call leave / end. Aborts an awaiting-streams wait or
|
|
139
|
+
// signals native finalisation depending on which phase we're in.
|
|
140
|
+
// Without this, leaving the call mid-recording would leave native
|
|
141
|
+
// encoders mid-write while the SFU subscriber tracks end under their
|
|
142
|
+
// feet — undefined final file state.
|
|
143
|
+
(0, _react.useEffect)(() => {
|
|
144
|
+
if (callingState === _videoClient.CallingState.LEFT || callingState === _videoClient.CallingState.IDLE) {
|
|
145
|
+
_videoClient.videoLoggerSystem.getLogger('useLoopbackRecording').debug('auto-stopping recording on call leave / end');
|
|
146
|
+
stopRecording().catch(() => {});
|
|
147
|
+
}
|
|
148
|
+
}, [callingState, stopRecording]);
|
|
149
|
+
|
|
150
|
+
// Auto-stop if another participant joins. Loopback recording is a
|
|
151
|
+
// single-user pre-call test.
|
|
152
|
+
(0, _react.useEffect)(() => {
|
|
153
|
+
if (recordingState !== 'idle' && participantCount > 1) {
|
|
154
|
+
stopRecording().catch(() => {});
|
|
155
|
+
_videoClient.videoLoggerSystem.getLogger('useLoopbackRecording').debug('auto-stopping recording on participant count change');
|
|
156
|
+
}
|
|
157
|
+
}, [participantCount, recordingState, stopRecording]);
|
|
158
|
+
(0, _react.useEffect)(() => {
|
|
159
|
+
isMountedRef.current = true;
|
|
160
|
+
return () => {
|
|
161
|
+
isMountedRef.current = false;
|
|
162
|
+
_videoClient.videoLoggerSystem.getLogger('useLoopbackRecording').debug('auto-stopping recording on unmount');
|
|
163
|
+
stopRecording().catch(() => {});
|
|
164
|
+
};
|
|
165
|
+
}, [stopRecording]);
|
|
166
|
+
|
|
167
|
+
// Subscribe to the local participant, camera and microphone streams and update the loopback streams state.
|
|
168
|
+
(0, _react.useEffect)(() => {
|
|
169
|
+
if (!call) return;
|
|
170
|
+
const subscription = (0, _rxjs.combineLatest)([call.state.localParticipant$, call.camera.state.mediaStream$, call.microphone.state.mediaStream$]).pipe((0, _rxjs.map)(([participant, cameraStream, microphoneStream]) => getLoopbackStreamsFor(participant, cameraStream, microphoneStream)), (0, _rxjs.distinctUntilChanged)((a, b) => a.loopbackVideoStream === b.loopbackVideoStream && a.loopbackAudioStream === b.loopbackAudioStream)).subscribe(setLoopbackStreams);
|
|
171
|
+
return () => subscription.unsubscribe();
|
|
172
|
+
}, [call]);
|
|
173
|
+
return {
|
|
174
|
+
startRecording,
|
|
175
|
+
stopRecording,
|
|
176
|
+
clearRecordings,
|
|
177
|
+
getRecordings,
|
|
178
|
+
recordingState,
|
|
179
|
+
loopbackVideoStream: loopbackStreams.loopbackVideoStream,
|
|
180
|
+
loopbackAudioStream: loopbackStreams.loopbackAudioStream
|
|
181
|
+
};
|
|
182
|
+
}
|
|
183
|
+
function getLoopbackStreamsFor(participant, cameraStream, microphoneStream) {
|
|
184
|
+
return {
|
|
185
|
+
loopbackVideoStream: participant?.videoStream && participant.videoStream !== cameraStream ? participant.videoStream : undefined,
|
|
186
|
+
loopbackAudioStream: participant?.audioStream && participant.audioStream !== microphoneStream ? participant.audioStream : undefined
|
|
187
|
+
};
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
/**
|
|
191
|
+
* Subscribe to `localParticipant$` and resolve once the requested loopback
|
|
192
|
+
* streams are present on the participant. Aborts cleanly on `signal`
|
|
193
|
+
* (resolves `null`) and rejects on timeout.
|
|
194
|
+
*/
|
|
195
|
+
function waitForLoopbackStreams(call, opts) {
|
|
196
|
+
return new Promise((resolve, reject) => {
|
|
197
|
+
const initial = getLoopbackStreams(call.state.localParticipant, call.camera.state.mediaStream, call.microphone.state.mediaStream, opts.includeVideo);
|
|
198
|
+
if (initial) {
|
|
199
|
+
resolve(initial);
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
202
|
+
const cleanup = () => {
|
|
203
|
+
subscription.unsubscribe();
|
|
204
|
+
if (timeoutId !== undefined) {
|
|
205
|
+
clearTimeout(timeoutId);
|
|
206
|
+
}
|
|
207
|
+
opts.signal.removeEventListener('abort', onAbort);
|
|
208
|
+
};
|
|
209
|
+
const onAbort = () => {
|
|
210
|
+
cleanup();
|
|
211
|
+
resolve(null);
|
|
212
|
+
};
|
|
213
|
+
opts.signal.addEventListener('abort', onAbort);
|
|
214
|
+
const timeoutId = setTimeout(() => {
|
|
215
|
+
cleanup();
|
|
216
|
+
reject(new Error('useLoopbackRecording: timed out waiting for loopback streams. ' + 'Ensure the call was joined with `selfSubEnabled: true` and ' + 'that the SFU is configured to echo self-sub tracks.'));
|
|
217
|
+
}, opts.timeoutMs);
|
|
218
|
+
const subscription = (0, _rxjs.combineLatest)([call.state.localParticipant$, call.camera.state.mediaStream$, call.microphone.state.mediaStream$]).subscribe(([participant, cameraStream, microphoneStream]) => {
|
|
219
|
+
const ready = getLoopbackStreams(participant, cameraStream, microphoneStream, opts.includeVideo);
|
|
220
|
+
if (ready) {
|
|
221
|
+
cleanup();
|
|
222
|
+
resolve(ready);
|
|
223
|
+
}
|
|
224
|
+
});
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
function getLoopbackStreams(participant, cameraStream, microphoneStream, includeVideo) {
|
|
228
|
+
if (!participant) return undefined;
|
|
229
|
+
const {
|
|
230
|
+
loopbackAudioStream,
|
|
231
|
+
loopbackVideoStream
|
|
232
|
+
} = getLoopbackStreamsFor(participant, cameraStream, microphoneStream);
|
|
233
|
+
const audioTrack = loopbackAudioStream?.getAudioTracks()[0];
|
|
234
|
+
const videoTrack = includeVideo ? loopbackVideoStream?.getVideoTracks()[0] : undefined;
|
|
235
|
+
if (!audioTrack || includeVideo && !videoTrack) {
|
|
236
|
+
return undefined;
|
|
237
|
+
}
|
|
238
|
+
return {
|
|
239
|
+
audioTrack,
|
|
240
|
+
videoTrack
|
|
241
|
+
};
|
|
242
|
+
}
|
|
243
|
+
//# sourceMappingURL=useLoopbackRecording.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNative","_rxjs","_videoClient","_videoReactBindings","StreamVideoReactNative","NativeModules","STREAMS_WAIT_TIMEOUT_MS","DEFAULT_RECORDING_DURATION","MIN_RECORDING_DURATION","MAX_RECORDING_DURATION","useLoopbackRecording","call","useCall","useCallCallingState","useParticipantCount","useCallStateHooks","callingState","participantCount","recordingState","setRecordingState","useState","recordingStateRef","useRef","isMountedRef","awaitAbortRef","loopbackStreams","setLoopbackStreams","getLoopbackStreamsFor","state","localParticipant","camera","mediaStream","microphone","updateState","useCallback","next","current","stopRecording","videoLoggerSystem","getLogger","debug","abort","stopTrackRecording","startRecording","includeVideo","maxDurationMs","console","warn","AbortController","audioTrack","streams","waitForLoopbackStreams","signal","timeoutMs","videoTrackId","videoTrack","id","enabled","clampedDuration","Math","min","max","publishMaxDim","getMaxVideoPublishDimension","uri","startTrackRecording","round","targetWidth","width","targetHeight","height","clearRecordings","clearStreamRecordings","getRecordings","list","getStreamRecordings","useEffect","CallingState","LEFT","IDLE","catch","subscription","combineLatest","localParticipant$","mediaStream$","pipe","map","participant","cameraStream","microphoneStream","distinctUntilChanged","a","b","loopbackVideoStream","loopbackAudioStream","subscribe","unsubscribe","videoStream","undefined","audioStream","opts","Promise","resolve","reject","initial","getLoopbackStreams","cleanup","timeoutId","clearTimeout","removeEventListener","onAbort","addEventListener","setTimeout","Error","ready","getAudioTracks","getVideoTracks"],"sourceRoot":"../../../src","sources":["hooks/useLoopbackRecording.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -11,21 +11,12 @@ var _reactNative = require("react-native");
|
|
|
11
11
|
var _callingx = require("../../push/libs/callingx");
|
|
12
12
|
var _audioSessionPromise = require("./audioSessionPromise");
|
|
13
13
|
var _videoClient = require("@stream-io/video-client");
|
|
14
|
-
var _StreamVideoRN = require("../../StreamVideoRN");
|
|
15
14
|
/***
|
|
16
15
|
* Internal utils for callingx library usage from video-client.
|
|
17
16
|
* See @./registerSDKGlobals.ts for more usage details.
|
|
18
17
|
*/
|
|
19
18
|
|
|
20
19
|
const CallingxModule = (0, _callingx.getCallingxLibIfAvailable)();
|
|
21
|
-
async function isAppInForeground() {
|
|
22
|
-
if (_reactNative.Platform.OS === 'android') {
|
|
23
|
-
const nativeModule = _reactNative.NativeModules.StreamVideoAppLifecycle;
|
|
24
|
-
const state = await nativeModule.getCurrentAppState();
|
|
25
|
-
return state === 'active';
|
|
26
|
-
}
|
|
27
|
-
return _reactNative.AppState.currentState !== 'background';
|
|
28
|
-
}
|
|
29
20
|
|
|
30
21
|
/**
|
|
31
22
|
* Gets the call display name. To be used for display in native call screen.
|
|
@@ -53,7 +44,7 @@ function getCallDisplayNameFromCall(call) {
|
|
|
53
44
|
return call.state.custom?.display_name ?? getCallDisplayName(call.state.members, call.state.participants, call.currentUserId);
|
|
54
45
|
}
|
|
55
46
|
async function registerOutgoingCall(call) {
|
|
56
|
-
if (!CallingxModule || !CallingxModule.isSetup) {
|
|
47
|
+
if (!CallingxModule || !CallingxModule.isSetup || call.isSelfSubEnabled) {
|
|
57
48
|
return;
|
|
58
49
|
}
|
|
59
50
|
const isOutcomingCall = call.ringing && call.isCreatedByMe;
|
|
@@ -86,7 +77,7 @@ async function registerOutgoingCall(call) {
|
|
|
86
77
|
* 3. Optionally for non-ringing calls also when ongoing calls are enabled.
|
|
87
78
|
*/
|
|
88
79
|
async function joinCallingxCall(call, activeCalls) {
|
|
89
|
-
if (!CallingxModule || !CallingxModule.isSetup) {
|
|
80
|
+
if (!CallingxModule || !CallingxModule.isSetup || call.isSelfSubEnabled) {
|
|
90
81
|
return;
|
|
91
82
|
}
|
|
92
83
|
const logger = _videoClient.videoLoggerSystem.getLogger('callingx');
|
|
@@ -115,13 +106,6 @@ async function joinCallingxCall(call, activeCalls) {
|
|
|
115
106
|
}
|
|
116
107
|
} else if (isIncomingCall) {
|
|
117
108
|
logger.debug(`joinCallingxCall: Joining incoming call ${call.cid}`);
|
|
118
|
-
let skipIncomingPushInForeground = false;
|
|
119
|
-
if (_reactNative.Platform.OS === 'ios') {
|
|
120
|
-
skipIncomingPushInForeground = _StreamVideoRN.StreamVideoRN.getConfig().push?.ios?.skipIncomingPushInForeground ?? false;
|
|
121
|
-
} else {
|
|
122
|
-
skipIncomingPushInForeground = _StreamVideoRN.StreamVideoRN.getConfig().push?.android?.skipIncomingPushInForeground ?? false;
|
|
123
|
-
}
|
|
124
|
-
const shouldSkipDisplayIncoming = skipIncomingPushInForeground ? await isAppInForeground() : false;
|
|
125
109
|
try {
|
|
126
110
|
// Leave any existing active ringing calls before joining a new ringing call
|
|
127
111
|
const activeCallsToLeave = activeCalls.filter(c => c.cid !== call.cid && c.ringing && c.state.callingState !== _videoClient.CallingState.LEFT);
|
|
@@ -133,28 +117,24 @@ async function joinCallingxCall(call, activeCalls) {
|
|
|
133
117
|
logger.error(`failed to leave active call ${activeCall.cid}`, e);
|
|
134
118
|
});
|
|
135
119
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
);
|
|
151
|
-
await CallingxModule.answerIncomingCall(call.cid);
|
|
152
|
-
if (_reactNative.Platform.OS === 'ios') {
|
|
153
|
-
await (0, _audioSessionPromise.waitForAudioSessionActivation)();
|
|
154
|
-
}
|
|
120
|
+
// Awaits native CallKit/Telecom registration before answering.
|
|
121
|
+
// Safe to call even if the call is already registered (e.g. from VoIP push) --
|
|
122
|
+
// iOS early-returns with no error, Android sends the registered broadcast.
|
|
123
|
+
const callDisplayName = getCallDisplayNameFromCall(call);
|
|
124
|
+
await CallingxModule.displayIncomingCall(call.cid,
|
|
125
|
+
// unique id for call
|
|
126
|
+
call.state.createdBy?.id ?? callDisplayName,
|
|
127
|
+
// handle for native call UI (prefer createdBy user id, fallback to call display name)
|
|
128
|
+
callDisplayName,
|
|
129
|
+
// display name for display in call screen
|
|
130
|
+
call.state.settings?.video?.enabled ?? false // is video call?
|
|
131
|
+
);
|
|
132
|
+
await CallingxModule.answerIncomingCall(call.cid);
|
|
133
|
+
if (_reactNative.Platform.OS === 'ios') {
|
|
134
|
+
await (0, _audioSessionPromise.waitForAudioSessionActivation)();
|
|
155
135
|
}
|
|
156
136
|
} catch (error) {
|
|
157
|
-
logger.error(`Error joining incoming call in callingx: ${call.cid}
|
|
137
|
+
logger.error(`Error joining incoming call in callingx: ${call.cid}`, error);
|
|
158
138
|
}
|
|
159
139
|
}
|
|
160
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","_callingx","_audioSessionPromise","_videoClient","
|
|
1
|
+
{"version":3,"names":["_reactNative","require","_callingx","_audioSessionPromise","_videoClient","CallingxModule","getCallingxLibIfAvailable","getCallDisplayName","callMembers","participants","currentUserId","names","length","filter","member","user","id","map","name","undefined","participant","userId","Boolean","find","sort","join","getCallDisplayNameFromCall","call","state","custom","display_name","members","registerOutgoingCall","isSetup","isSelfSubEnabled","isOutcomingCall","ringing","isCreatedByMe","logger","videoLoggerSystem","getLogger","debug","cid","callDisplayName","startCall","createdBy","settings","video","enabled","error","joinCallingxCall","activeCalls","isIncomingCall","startCallInCallingx","Platform","OS","waitForAudioSessionActivation","isOngoingCallsEnabled","activeCallsToLeave","c","callingState","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":[]}
|
|
@@ -44,9 +44,8 @@ const onVoipNotificationReceived = async (notification, pushConfig) => {
|
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
46
|
const callingx = (0, _callingx.getCallingxLib)();
|
|
47
|
-
if (
|
|
48
|
-
|
|
49
|
-
logger.debug(`the same call_cid ${call_cid} is already tracked, skipping the call.ring notification`);
|
|
47
|
+
if (_constants.pushUnsubscriptionCallbacks.has(call_cid)) {
|
|
48
|
+
logger.debug(`the same call_cid ${call_cid} is already being watched, skipping the call.ring notification`);
|
|
50
49
|
return;
|
|
51
50
|
}
|
|
52
51
|
const client = await pushConfig.createStreamVideoClient();
|
|
@@ -74,12 +73,14 @@ const onVoipNotificationReceived = async (notification, pushConfig) => {
|
|
|
74
73
|
if (!_canListenToWS) {
|
|
75
74
|
logger.debug(`unsubscribe due to event callCid: ${call_cid} canListenToWS: ${_canListenToWS}`, event);
|
|
76
75
|
unsubscribe();
|
|
76
|
+
_constants.pushUnsubscriptionCallbacks.delete(call_cid);
|
|
77
77
|
return;
|
|
78
78
|
}
|
|
79
79
|
const _closed = closeCallIfNecessary();
|
|
80
80
|
if (_closed) {
|
|
81
81
|
logger.debug(`unsubscribe due to event callCid: ${call_cid} canListenToWS: ${_canListenToWS} shouldCallBeClosed: ${_closed}`, event);
|
|
82
82
|
unsubscribe();
|
|
83
|
+
_constants.pushUnsubscriptionCallbacks.delete(call_cid);
|
|
83
84
|
}
|
|
84
85
|
});
|
|
85
86
|
_constants.pushUnsubscriptionCallbacks.get(call_cid)?.forEach(cb => cb());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_videoClient","require","_reactNative","_callingx","_constants","_utils","onVoipNotificationReceived","notification","pushConfig","logger","videoLoggerSystem","getLogger","sender","stream","type","call_cid","Platform","OS","ios","pushProviderName","callingx","getCallingxLib","
|
|
1
|
+
{"version":3,"names":["_videoClient","require","_reactNative","_callingx","_constants","_utils","onVoipNotificationReceived","notification","pushConfig","logger","videoLoggerSystem","getLogger","sender","stream","type","call_cid","Platform","OS","ios","pushProviderName","callingx","getCallingxLib","pushUnsubscriptionCallbacks","has","debug","client","createStreamVideoClient","callFromPush","onRingingCall","closeCallIfNecessary","mustEndCall","endCallReason","shouldCallBeClosed","endCallWithReason","closed","canListenToWS","unsubscribe","on","event","_canListenToWS","delete","_closed","get","forEach","cb","set","exports"],"sourceRoot":"../../../../../src","sources":["utils/push/internal/ios.ts"],"mappings":"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","ignoreList":[]}
|
package/dist/commonjs/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["version","exports"],"sourceRoot":"../../src","sources":["version.ts"],"mappings":";;;;;;AAAO,MAAMA,OAAO,GAAAC,OAAA,CAAAD,OAAA,GAAG,
|
|
1
|
+
{"version":3,"names":["version","exports"],"sourceRoot":"../../src","sources":["version.ts"],"mappings":";;;;;;AAAO,MAAMA,OAAO,GAAAC,OAAA,CAAAD,OAAA,GAAG,eAAe","ignoreList":[]}
|
|
@@ -7,6 +7,7 @@ export * from './useIsInPiPMode';
|
|
|
7
7
|
export * from './useAutoEnterPiPEffect';
|
|
8
8
|
export * from './useScreenShareButton';
|
|
9
9
|
export * from './useScreenShareAudioMixing';
|
|
10
|
+
export * from './useLoopbackRecording';
|
|
10
11
|
export * from './useTrackDimensions';
|
|
11
12
|
export * from './useScreenshot';
|
|
12
13
|
export * from './useModeration';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":[],"sourceRoot":"../../../src","sources":["hooks/index.ts"],"mappings":"AAAA,cAAc,wBAAwB;AACtC,cAAc,6BAA6B;AAC3C,cAAc,QAAQ;AACtB,cAAc,iCAAiC;AAC/C,cAAc,uCAAuC;AACrD,cAAc,kBAAkB;AAChC,cAAc,yBAAyB;AACvC,cAAc,wBAAwB;AACtC,cAAc,6BAA6B;AAC3C,cAAc,sBAAsB;AACpC,cAAc,iBAAiB;AAC/B,cAAc,iBAAiB","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":[],"sourceRoot":"../../../src","sources":["hooks/index.ts"],"mappings":"AAAA,cAAc,wBAAwB;AACtC,cAAc,6BAA6B;AAC3C,cAAc,QAAQ;AACtB,cAAc,iCAAiC;AAC/C,cAAc,uCAAuC;AACrD,cAAc,kBAAkB;AAChC,cAAc,yBAAyB;AACvC,cAAc,wBAAwB;AACtC,cAAc,6BAA6B;AAC3C,cAAc,wBAAwB;AACtC,cAAc,sBAAsB;AACpC,cAAc,iBAAiB;AAC/B,cAAc,iBAAiB","ignoreList":[]}
|