@subiz/wsclient 4.0.2 → 4.0.4

package/package.json

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

package/webrtc.js

@@ -31,6 +31,7 @@ function WebRTCConn(options) {
 	let activeCalls = {}
 
 	let dialingRequest = {}
+	let answerRequest = {}
 	let endRequest = {}
 
 	let subscribe = realtime.subscribe([
@@ -70,10 +71,8 @@ function WebRTCConn(options) {
 		if (!needConnect) return
 		peer = new env.RTCPeerConnection(servers)
 		let mypeer = peer
-		window.peer = peer
 
 		readyToSendCandidate = new env.Promise((rs) => (readyToSendCandidateResolve = rs))
-
 		peer.ontrack = (event) => {
 			if (peer != mypeer) return // outdated
 			onTrack && onTrack(event)
@@ -150,30 +149,37 @@ function WebRTCConn(options) {
 				}
 			})
 
-			Object.keys(calls, (callid) => {
+			Object.keys(calls).map((callid) => {
 				let call = calls[callid]
-				if (endRequest[callid] && call && call.status != 'ended') {
-					calls[callid] = Object.assign({}, call, {
-						call_id: callid,
-						ended: endRequest[callid],
-						status: 'ended',
-						hangup_code: 'cancel',
-					})
-				}
+				if (!endRequest[callid]) return
+				if (!call || call.status == 'ended') return
+				calls[callid] = Object.assign({}, call, {
+					call_id: callid,
+					ended: endRequest[callid],
+					status: 'ended',
+					hangup_code: 'cancel',
+				})
+			})
+
+			Object.keys(answerRequest).map((callid) => {
+				let call = calls[callid]
+				if (!call) return
+				call.answer_requested = answerRequest[callid]
 			})
 			return calls
 		}
 
 		let call = activeCalls[callid]
+		if (!call && dialingRequest[callid]) call = dialingRequest[callid]
 		if (endRequest[callid] && call && call.status != 'ended') {
-			return Object.assign({}, call, {
+			call = Object.assign({}, call, {
 				call_id: callid,
 				ended: endRequest[callid],
 				status: 'ended',
 				hangup_code: 'cancel',
 			})
 		}
-		if (!call && dialingRequest[callid]) return dialingRequest[callid]
+		if (answerRequest[callid]) call = Object.assign({}, call, {answer_requested: answerRequest[callid]})
 		return call
 	}