@subiz/wsclient 4.0.10 → 4.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/wsclient",
-	"version": "4.0.10",
+	"version": "4.0.12",
 	"main": "realtime.js",
 	"scripts": {
 		"test": "node realtime.test.js"

package/webrtc.js

@@ -222,7 +222,17 @@ function WebRTCConn(options) {
 					readyToSendCandidateResolve()
 					if (pendingStream && pendingStream != currentStream) {
 						currentStream = pendingStream
-						currentStream.getTracks().forEach((track) => peer.addTrack(track, currentStream))
+						currentStream.getTracks().forEach((track) => {
+							let replaced = false
+							peer.getSenders().forEach((sender) => {
+								if (!sender.track) return
+								if (sender.track.kind != track.kind) return
+								sender.replaceTrack(track)
+								replaced = true
+							})
+
+							if (!replaced) peer.addTrack(track, currentStream)
+						})
 					}
 					pendingStream = undefined
 					return peer.createAnswer()
@@ -257,7 +267,7 @@ function WebRTCConn(options) {
 		}
 	})
 
-	this.makeCall = (number, fromnumber, stream, callid) => {
+	this.makeCall = (number, fromnumber, streamPm, callid) => {
 		if (!callid) callid = 'webcall-' + randomString(30)
 		let now = env.Date.now()
 		let call = {
@@ -273,26 +283,28 @@ function WebRTCConn(options) {
 		dialingRequest[callid] = call
 		publish({type: 'call_ringing', data: {call_info: {call_id: callid}}}) // fake dialing
 		return new env.Promise((rs) => {
-			this.joinCall(callid, stream, (err) => {
-				if (err) {
-					delete dialingRequest[callid]
-					endRequest[callid] = env.Date.now()
-					publish({type: 'call_ended', data: {call_info: {call_id: callid}}})
-					return rs({error: err})
-				}
-
-				let url = `${apiUrl}call?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&number=${number}&from_number=${fromnumber}`
-				callAPI('post', url, undefined, (body, code) => {
-					if (code != 200) {
+			streamPm.then(stream => {
+				this.joinCall(callid, stream, (err) => {
+					if (err) {
 						delete dialingRequest[callid]
 						endRequest[callid] = env.Date.now()
 						publish({type: 'call_ended', data: {call_info: {call_id: callid}}})
 						return rs({error: err})
 					}
-					body = parseJSON(body)
-					if (body) activeCalls[callid] = body
-					delete dialingRequest[callid]
-					rs({body})
+
+					let url = `${apiUrl}call?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&number=${number}&from_number=${fromnumber}`
+					callAPI('post', url, undefined, (body, code) => {
+						if (code != 200) {
+							delete dialingRequest[callid]
+							endRequest[callid] = env.Date.now()
+							publish({type: 'call_ended', data: {call_info: {call_id: callid}}})
+							return rs({error: err})
+						}
+						body = parseJSON(body)
+						if (body) activeCalls[callid] = body
+						delete dialingRequest[callid]
+						rs({body})
+					})
 				})
 			})
 		})