From 555a3e69f3bfc71e01cfc5cba847f3fa82546d3b Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Mon, 11 Dec 2023 15:00:51 +0100 Subject: [PATCH 01/13] Update Call.js Handled causeCode and causes for verto.bye status message --- src/verto/Call.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/verto/Call.js b/src/verto/Call.js index b748b83..9570141 100644 --- a/src/verto/Call.js +++ b/src/verto/Call.js @@ -75,6 +75,9 @@ export default class Call { this.ring(); } } + + this.causeCode = null; + this.cause = null; } bootstrapRealtimeConnection() { @@ -264,7 +267,13 @@ export default class Call { case ENUM.state.hangup: if (isAfterRequesting && isBeforeHangup) { - this.broadcastMethod('verto.bye', {}); + var params = {}; + if (this.cause != null && this.causeCode != null) + params = { causeCode:this.causeCode, cause: this.cause }; + + this.broadcastMethod('verto.bye', params); + this.causeCode = null; + this.cause = null; } this.setState(ENUM.state.destroy); @@ -333,7 +342,7 @@ export default class Call { this.cause = params.cause; } - if (!this.cause && !this.causeCode) { + if (this.cause === null && this.causeCode === null) { this.cause = 'NORMAL_CLEARING'; } From f8b3293cbf1cd72b29cc7dab2defc54d23d9b1ce Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Wed, 28 Aug 2024 18:20:38 +0200 Subject: [PATCH 02/13] VertoClient.js ad callback stream --- src/verto/VertoClient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/verto/VertoClient.js b/src/verto/VertoClient.js index b07e540..79545f4 100644 --- a/src/verto/VertoClient.js +++ b/src/verto/VertoClient.js @@ -78,7 +78,7 @@ export default class VertinhoClient { onWebSocketLoginSuccess: () => {}, onWebSocketLoginError: error => printError('Error reported by WebSocket login', error), - onPeerStreaming: () => {}, + onPeerStreaming: (stream) => this.callbacks.onStreamReady(stream), onPeerStreamingError: () => {}, ...this.params, ...this.callbacks, From bdd62394d5b3f86be2501c749560c36d4eec04ed Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Wed, 25 Sep 2024 15:02:24 +0200 Subject: [PATCH 03/13] Update package.json Upgrade Webrtc version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8e7c8fd..4d66004 100644 --- a/package.json +++ b/package.json @@ -27,10 +27,10 @@ "licenseFilename": "LICENSE", "readmeFilename": "README.md", "peerDependencies": { - "react-native-webrtc": "^1.75.1" + "react-native-webrtc": "^124.0.4" }, "devDependencies": { - "react-native-webrtc": "^1.75.1", + "react-native-webrtc": "^124.0.4", "react-native-background-timer": "^2.1.1" } } From 1c84cdc290130b7cbfa78bd2c3b05f56d07ab04c Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Wed, 25 Sep 2024 15:09:14 +0200 Subject: [PATCH 04/13] Update FSRTCPeerConnection.js Alignment for new Webrtc version --- src/webrtc/FSRTCPeerConnection.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/webrtc/FSRTCPeerConnection.js b/src/webrtc/FSRTCPeerConnection.js index 2e94dde..3c33a88 100644 --- a/src/webrtc/FSRTCPeerConnection.js +++ b/src/webrtc/FSRTCPeerConnection.js @@ -86,7 +86,12 @@ export default class FSRTCPeerConnection { onRemoteStream(remoteMediaStream); } }; - peer.addStream(attachStream); + //peer.addStream(attachStream); + + attachStream.getTracks().forEach(track => { + console.log('Peer add track ',track); + peer.addTrack(track, attachStream); + }); if (onOfferSDP) { peer From 8a6d98eec1ef704823350ef3bce02c3b3dd4eaf6 Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Thu, 26 Sep 2024 10:02:42 +0200 Subject: [PATCH 05/13] Update package.json add min 106.0.0 version AddTrak method added --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4d66004..7fe5417 100644 --- a/package.json +++ b/package.json @@ -27,10 +27,10 @@ "licenseFilename": "LICENSE", "readmeFilename": "README.md", "peerDependencies": { - "react-native-webrtc": "^124.0.4" + "react-native-webrtc": "^106.0.0" }, "devDependencies": { - "react-native-webrtc": "^124.0.4", + "react-native-webrtc": "^106.0.0", "react-native-background-timer": "^2.1.1" } } From d45185d39160b4ad203b8d5a2e97047144282505 Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Thu, 26 Sep 2024 10:08:02 +0200 Subject: [PATCH 06/13] Update package.json 106.0.7 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7fe5417..586ec89 100644 --- a/package.json +++ b/package.json @@ -27,10 +27,10 @@ "licenseFilename": "LICENSE", "readmeFilename": "README.md", "peerDependencies": { - "react-native-webrtc": "^106.0.0" + "react-native-webrtc": "^106.0.7" }, "devDependencies": { - "react-native-webrtc": "^106.0.0", + "react-native-webrtc": "^106.0.7", "react-native-background-timer": "^2.1.1" } } From 837b3a52334faa45dd97f0396c976e73e1e8845c Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Thu, 26 Sep 2024 10:09:32 +0200 Subject: [PATCH 07/13] Update package.json deleted peerDependencies react-native-webrtc --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index 586ec89..1a74f24 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,7 @@ "license": "MIT", "licenseFilename": "LICENSE", "readmeFilename": "README.md", - "peerDependencies": { - "react-native-webrtc": "^106.0.7" - }, "devDependencies": { - "react-native-webrtc": "^106.0.7", "react-native-background-timer": "^2.1.1" } } From 513cd3d55e4d6704dc4a5229784559ead6d87d39 Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Tue, 1 Oct 2024 18:36:50 +0200 Subject: [PATCH 08/13] Update FSRTCPeerConnection.js Add ontrack() --- src/webrtc/FSRTCPeerConnection.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/webrtc/FSRTCPeerConnection.js b/src/webrtc/FSRTCPeerConnection.js index 3c33a88..993de57 100644 --- a/src/webrtc/FSRTCPeerConnection.js +++ b/src/webrtc/FSRTCPeerConnection.js @@ -79,15 +79,21 @@ export default class FSRTCPeerConnection { } }; - peer.onaddstream = event => { + /* peer.onaddstream = event => { const remoteMediaStream = event.stream; + if (onRemoteStream) { + onRemoteStream(remoteMediaStream); + } + }; + peer.addStream(attachStream);*/ + peer.ontrack = event => { + const remoteMediaStream = event.stream; if (onRemoteStream) { onRemoteStream(remoteMediaStream); } }; - //peer.addStream(attachStream); - + attachStream.getTracks().forEach(track => { console.log('Peer add track ',track); peer.addTrack(track, attachStream); From ae9d777f07ed868fc76fc6f89977ece9b97706f9 Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Mon, 24 Mar 2025 17:12:36 +0100 Subject: [PATCH 09/13] Call.js Commented BackgroundTimer.start() --- src/verto/Call.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/verto/Call.js b/src/verto/Call.js index 9570141..6289f05 100644 --- a/src/verto/Call.js +++ b/src/verto/Call.js @@ -12,7 +12,7 @@ import {generateGUID, ENUM} from './utils'; import {Clipboard} from 'react-native'; import BackgroundTimer from 'react-native-background-timer'; -BackgroundTimer.start(); +//BackgroundTimer.start(); export default class Call { constructor(direction, verto, params, mediaHandlers = {}) { From b0200d495e11a79fcd7a0915e52cb95a75034939 Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Mon, 24 Mar 2025 17:12:58 +0100 Subject: [PATCH 10/13] Update VertoClient.js Commented BackgroundTimer.start() --- src/verto/VertoClient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/verto/VertoClient.js b/src/verto/VertoClient.js index 79545f4..215826c 100644 --- a/src/verto/VertoClient.js +++ b/src/verto/VertoClient.js @@ -14,7 +14,7 @@ import {generateGUID, ENUM} from './utils'; import {Params, defaultVertoCallbacks, eventType} from '../store'; import BackgroundTimer from 'react-native-background-timer'; -BackgroundTimer.start(); +//BackgroundTimer.start(); let sessionIDCache; export default class VertinhoClient { From 13e6f6b0acb8afdd06ec604b756dfe43ce6d4294 Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Mon, 24 Mar 2025 17:13:30 +0100 Subject: [PATCH 11/13] Update FSRTCPeerConnection.js Commented BackgroundTimer.start() --- src/webrtc/FSRTCPeerConnection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webrtc/FSRTCPeerConnection.js b/src/webrtc/FSRTCPeerConnection.js index 993de57..3e14b6a 100644 --- a/src/webrtc/FSRTCPeerConnection.js +++ b/src/webrtc/FSRTCPeerConnection.js @@ -10,7 +10,7 @@ import {RTCPeerConnection, RTCSessionDescription} from 'react-native-webrtc'; import BackgroundTimer from 'react-native-background-timer'; -BackgroundTimer.start(); +//BackgroundTimer.start(); export default class FSRTCPeerConnection { constructor(options) { From 89fe172b346980236762dbf1321cff9a13b220c6 Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Mon, 24 Mar 2025 17:15:25 +0100 Subject: [PATCH 12/13] Update VertoClient.js Edited BackgroundTimer.clearTimeout --- src/verto/VertoClient.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/verto/VertoClient.js b/src/verto/VertoClient.js index 215826c..f65c1ce 100644 --- a/src/verto/VertoClient.js +++ b/src/verto/VertoClient.js @@ -141,7 +141,7 @@ export default class VertinhoClient { this.webSocket.onopen = () => { if (this.retryingTimer) { printWarning('Successfully WebSocket attempt to reconnect.'); - clearTimeout(this.retryingTimer); + BackgroundTimer.clearTimeout(this.retryingTimer); } this.publish('login', {}); @@ -551,7 +551,7 @@ export default class VertinhoClient { destroy() { if (this.retryingTimer) - clearTimeout(this.retryingTimer); + BackgroundTimer.clearTimeout(this.retryingTimer); if (this.socketReady()) { this.webSocket.close(); this.purge(); From 289d06031b10c180f8a5fe7624c380a868060b3b Mon Sep 17 00:00:00 2001 From: Jonnyboy85 Date: Thu, 10 Apr 2025 14:54:51 +0200 Subject: [PATCH 13/13] Update FSRTCPeerConnection.js const remoteMediaStream = event.streams[0]; for Unified Plan --- src/webrtc/FSRTCPeerConnection.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/webrtc/FSRTCPeerConnection.js b/src/webrtc/FSRTCPeerConnection.js index 3e14b6a..7c3b3ba 100644 --- a/src/webrtc/FSRTCPeerConnection.js +++ b/src/webrtc/FSRTCPeerConnection.js @@ -88,7 +88,8 @@ export default class FSRTCPeerConnection { peer.addStream(attachStream);*/ peer.ontrack = event => { - const remoteMediaStream = event.stream; + //const remoteMediaStream = event.stream; + const remoteMediaStream = event.streams[0]; if (onRemoteStream) { onRemoteStream(remoteMediaStream); }