@subiz/wsclient 4.0.6 → 4.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/wsclient",
-	"version": "4.0.6",
+	"version": "4.0.8",
 	"main": "realtime.js",
 	"scripts": {
 		"test": "node realtime.test.js"
@@ -14,7 +14,7 @@
 	"homepage": "https://github.com/subiz/wsclient#readme",
 	"description": "",
 	"devDependencies": {
-		"tape": "^5.6.1"
+		"tape": "^5.6.3"
 	},
 	"dependencies": {
 		"@subiz/flow": "^1.0.9",

package/webrtc.js

@@ -15,6 +15,7 @@ function WebRTCConn(options) {
 	}
 
 	callAPI = callAPI || xhrsend // allow hook
+	let callStream = {} // callid => stream
 
 	let parseJSON = (str) => {
 		try {
@@ -89,13 +90,12 @@ function WebRTCConn(options) {
 		console.log('NEW PERR')
 	}
 
-	let stopMic = () => {
-		console.log('00000000STOP TRACK', currentStream)
-		return
-		currentStream &&
-			currentStream.getTracks().forEach((track) => {
-				track.enabled = false
-			})
+	let stopStream = (stream) => {
+		if (!stream) return
+		stream.getTracks().forEach((track) => {
+			track.stop()
+			track.enabled = false
+		})
 	}
 
 	// auto tear down when byte received is zero
@@ -106,8 +106,16 @@ function WebRTCConn(options) {
 		callAPI('get', url, undefined, function (body, code) {
 			if (code == 200) {
 				body = parseJSON(body) || []
-				activeCalls = {}
-				body.map && body.map((call) => (activeCalls[call.call_id] = call))
+				let serverCall = {}
+				body.map && body.map((call) => (serverCall[call.call_id] = call))
+
+				// not found
+				Object.keys(activeCalls).map((callid) => {
+					let call = activeCalls[callid]
+					if (!serverCall[callid] && call && call.status != 'ended')
+						publish({type: 'call_ended', data: {call_info: {hanup_code: 'outdated', call_id: callid}}})
+				})
+				activeCalls = serverCall
 			}
 
 			if (!peer) return
@@ -126,7 +134,6 @@ function WebRTCConn(options) {
 				while (receivedBytes.length > 10) receivedBytes.shift()
 				let diff = receivedBytes.filter((n) => n != receivedByte)
 				if (diff.length == 0 && receivedBytes.length >= 10 && Object.keys(activeCalls).length == 0) {
-					if (Object.keys(activeCalls).length == 0) stopMic()
 					// could tear down
 					peer.close()
 					peer = undefined
@@ -137,7 +144,14 @@ function WebRTCConn(options) {
 	check()
 	env.setInterval(check, 30000)
 
-	let publish = (ev) => onEvent && onEvent(ev)
+	let publish = (ev) => {
+		if (ev.type == 'call_ended') {
+			let callid = lo.get(ev, 'data.call_info.call_id')
+			stopStream(callStream[callid])
+			delete callStream[callid]
+		}
+		onEvent && onEvent(ev)
+	}
 
 	this.matchCall = (callid) => {
 		if (!callid || callid == '*' || callid == '-') {
@@ -243,8 +257,8 @@ function WebRTCConn(options) {
 		}
 	})
 
-	this.makeCall = (number, fromnumber, stream) => {
-		let callid = 'webcall-' + randomString(30)
+	this.makeCall = (number, fromnumber, stream, callid) => {
+		if (!callid) callid = 'webcall-' + randomString(30)
 		let now = env.Date.now()
 		let call = {
 			account_id: accid,
@@ -294,8 +308,9 @@ function WebRTCConn(options) {
 		}
 		call.status = 'ended'
 		call.ended = env.Date.now()
-		callAPI('post', `${apiUrl}hangup?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}`)
 		publish({type: 'call_ended', data: {call_info: {call_id: callid}}})
+
+		callAPI('post', `${apiUrl}hangup?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}`)
 	}
 
 	this.listenCall = (callid, cb) => {
@@ -304,6 +319,7 @@ function WebRTCConn(options) {
 	}
 
 	this.joinCall = (callid, stream, cb) => {
+		callStream[callid] = stream
 		console.time('makecall' + callid)
 		makeSure(() => {
 			pendingStream = stream
@@ -318,13 +334,10 @@ function WebRTCConn(options) {
 	}
 
 	this.answerCall = (callid, stream) => {
-		console.log('1')
 		let call = activeCalls[callid]
 		if (call && call.status == 'ended') return Promise.resolve({error: 'call_ended'})
 		let now = env.Date.now()
-		console.log('2', answerRequest[callid])
 		if (answerRequest[callid]) return Promise.resolve({body: call})
-		console.log('3')
 		answerRequest[callid] = now
 		publish({type: 'call_ringing', data: {call_info: {call_id: callid}}}) // fake dialing
 		return new env.Promise((rs) => {