@osimatic/helpers-js 1.0.53 → 1.0.56

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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/web_rtc.js +40 -17
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@osimatic/helpers-js",
3
- "version": "1.0.53",
3
+ "version": "1.0.56",
4
4
  "main": "index.js",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
package/web_rtc.js CHANGED
@@ -8,59 +8,80 @@ class WebRTC {
8
8
  this.turnSecret = turnSecret;
9
9
  }
10
10
 
11
- static offer(stream, iceCandidateCallback) {
12
- return new Promise((resolve, reject) => {
11
+ static offer(stream, iceCandidateCallback, connectionStateChangeCallback, iceFailureCallback) {
12
+ return new Promise(async (resolve, reject) => {
13
13
  try {
14
14
  let { username, password } = this.getTurnCredentials();
15
15
  let peerConn = new RTCPeerConnection(
16
16
  {
17
17
  iceServers: [
18
- { urls: this.turnUrl, username: username, credential: password },
18
+ {
19
+ urls: [/*this.turnUrl + '?transport=udp', */this.turnUrl + '?transport=tcp'],
20
+ username: username,
21
+ credential: password
22
+ },
19
23
  { urls: this.stunUrl }
20
24
  ]
21
25
  }
22
26
  );
23
-
24
- stream.getTracks().forEach(track => peerConn.addTrack(track, stream));
27
+
28
+ peerConn.oniceconnectionstatechange = (event) => connectionStateChangeCallback(event);
29
+
25
30
  peerConn.onicecandidate = ((event) => {
26
31
  if (event.candidate) {
27
32
  iceCandidateCallback(event.candidate);
28
33
  }
29
34
  });
30
35
 
31
- peerConn.createOffer()
32
- .then(sdp => peerConn.setLocalDescription(sdp))
33
- .then(() => resolve(peerConn));
36
+ peerConn.onicecandidateerror = (event) => iceFailureCallback(event);
37
+
38
+ stream.getTracks().forEach(track => peerConn.addTrack(track, stream));
39
+
40
+ const offer = await peerConn.createOffer();
41
+ await peerConn.setLocalDescription(offer);
42
+
43
+ resolve(peerConn);
34
44
  } catch (error) {
35
45
  reject(error);
36
46
  }
37
47
  });
38
48
  }
39
49
 
40
- static answer (remoteDescription, onTrackCallback, iceCandidateCallback) {
41
- return new Promise((resolve, reject) => {
50
+ static answer(remoteDescription, onTrackCallback, iceCandidateCallback, connectionStateChangeCallback, iceFailureCallback) {
51
+ return new Promise(async (resolve, reject) => {
42
52
  try {
43
53
  let { username, password } = this.getTurnCredentials();
44
54
  let peerConn = new RTCPeerConnection(
45
55
  {
46
56
  iceServers: [
47
- { urls: this.turnUrl, username: username, credential: password },
57
+ {
58
+ urls: [/*this.turnUrl + '?transport=udp',*/ this.turnUrl + '?transport=tcp'],
59
+ username: username,
60
+ credential: password
61
+ },
48
62
  { urls: this.stunUrl }
49
63
  ]
50
64
  }
51
65
  );
52
-
53
- peerConn.ontrack = (event) => onTrackCallback(event.streams);
66
+
67
+ peerConn.oniceconnectionstatechange = (event) => connectionStateChangeCallback(event);
68
+
54
69
  peerConn.onicecandidate = ((event) => {
55
70
  if (event.candidate) {
56
71
  iceCandidateCallback(event.candidate);
57
72
  }
58
73
  });
59
74
 
60
- peerConn.setRemoteDescription(remoteDescription)
61
- .then(() => peerConn.createAnswer())
62
- .then(sdp => peerConn.setLocalDescription(sdp))
63
- .then(() => resolve(peerConn));
75
+ peerConn.onicecandidateerror = (event) => iceFailureCallback(event);
76
+
77
+ peerConn.ontrack = (event) => onTrackCallback(event.streams);
78
+
79
+ peerConn.setRemoteDescription(new RTCSessionDescription(remoteDescription))
80
+
81
+ const answer = await peerConn.createAnswer();
82
+ await peerConn.setLocalDescription(answer);
83
+
84
+ resolve(peerConn);
64
85
  } catch (error) {
65
86
  reject(error);
66
87
  }
@@ -69,6 +90,8 @@ class WebRTC {
69
90
 
70
91
  static disconnectPeer(peerConn) {
71
92
  if (peerConn) {
93
+ peerConn.oniceconnectionstatechange = null;
94
+ peerConn.onicecandidateerror = null;
72
95
  peerConn.onicecandidate = null;
73
96
  peerConn.ontrack = null;
74
97