@subiz/wsclient 4.0.19 → 4.0.21

package/common.js

@@ -1,3 +1,41 @@
+function logError(accid, userid, message, line) {
+	// 24-01-11 04:07:05 app ERROR api-8948967b6-qtpfx subiz /app/vendor/github.com/subiz/log/error.go:271 {"id":141534190473829746,"class":500,"code":"locked_account,internal","number":"8f2b97e9","fields":{"ip":"\"171.224.84.93\"","no_report":"true","user_agent":"\"Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36\""}}
+	let ts = displayUTCLogTime(new Date())
+	let msg = JSON.stringify({
+		id: Date.now(),
+		class: 400,
+		code: 'frontend_error',
+		number: line
+			.split('')
+			.map((c) => c.charCodeAt(0).toString(16).padStart(2, '0'))
+			.join(''),
+		fields: {
+			message: JSON.stringify(message),
+			user_id: userid,
+			url: JSON.stringify(location.href),
+		},
+	})
+
+	xhrsend('POST', 'https://track.subiz.net/collect', `${ts} app ERROR dashboard ${accid} ${line} ${msg}`)
+}
+
+function displayUTCLogTime(date) {
+	let yyyy = date.getUTCFullYear().toString()
+	let yy = yyyy.substr(2, 2)
+	let mm = date.getUTCMonth() + 1
+	let dd = date.getUTCDate()
+	let hh = date.getUTCHours()
+	let MM = date.getUTCMinutes()
+	let ss = date.getUTCSeconds()
+
+	return `${yy}-${pad(mm)}-${pad(dd)} ${pad(hh)}:${pad(MM)}:${pad(ss)}`
+}
+
+function pad(v) {
+	if (v < 10) return `0${v}`
+	return `${v}`
+}
+
 function dofetch(method, url, body, cb) {
 	let headers = {}
 	if (body) headers['content-type'] = 'text/plain'
@@ -78,4 +116,4 @@ function randomString(len, base) {
 	return str
 }
 
-module.exports = {xhrsend, parseJSON, Pubsub, randomString}
+module.exports = {xhrsend, parseJSON, Pubsub, randomString, logError}

package/package.json

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

package/webrtc.js

@@ -1,5 +1,5 @@
 var flow = require('@subiz/flow')
-var {xhrsend, randomString} = require('./common.js')
+var {logError, xhrsend, randomString} = require('./common.js')
 const servers = {
 	iceServers: [{urls: ['stun:stun.l.google.com:19302']}],
 }
@@ -8,7 +8,8 @@ const servers = {
 // env = {RTCPeerConnection, RTCIceCandidate, RTCSessionDescription, setTimeout, setInterval, jsonify, parseJSON}
 // set env._is_webrtc_local to true for local testing
 function WebRTCConn(options) {
-	let {apiUrl, access_token, accid, agid, realtime, callAPI, env, onTrack, onEvent} = options
+	let {apiUrl, access_token, accid, agid, realtime, callAPI, env, onTrack, onEvent, collect} = options
+	if (!collect) collect = function () {}
 	if (!apiUrl) {
 		apiUrl = 'https://callcenter.subiz.com.vn/wc/'
 		if (env._is_webrtc_local) apiUrl = 'http://localhost:8008/'
@@ -290,7 +291,10 @@ function WebRTCConn(options) {
 					peer.setLocalDescription(answer).then(() => {
 						let url = `${apiUrl}finish?x-access-token=${access_token}&connection_id=${connId}&version=2&negotiation_id=${negid}`
 						callAPI('post', url, jsonify(answer), function (body, code) {
-							if (code !== 200) return console.error('CANNOT FINISH', body)
+							if (code !== 200) {
+								logError(accid, agid, body, 'finish:295')
+								return console.error('CANNOT FINISH', body)
+							}
 							return
 						})
 					}),
@@ -302,7 +306,7 @@ function WebRTCConn(options) {
 		if (!callid) return
 		let type = ev.type
 		if (type === 'call_invited') {
-			if (ev.type === 'call_invited' && agid == call_info.from_number) return // ignore our own invite
+			if (agid == call_info.from_number) return // ignore our own invite
 			serverCalls[callid] = call_info
 			return publish(ev)
 		}
@@ -358,6 +362,7 @@ function WebRTCConn(options) {
 						if (campaignid) url += `&campaign_id=${campaignid}`
 						callAPI('post', url, undefined, (body, code) => {
 							if (code != 200) {
+								logError(accid, agid, body, 'makeCall:365')
 								delete dialingRequest[callid]
 								endRequest[callid] = env.Date.now()
 								publish({created: env.Date.now(), type: 'call_ended', data: {call_info: {call_id: callid}}})
@@ -390,21 +395,26 @@ function WebRTCConn(options) {
 	}
 
 	this.listenCall = (callid, cb) => {
+		let start = env.Date.now()
 		initSession((err, connId) => {
 			let url = `${apiUrl}listen?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}`
-			callAPI('post', url, undefined, (body, code) => (code != 200 ? cb(body) : cb()))
+			callAPI('post', url, undefined, (body, code) => {
+				if (code != 200) logError(accid, agid, body, 'listenCall:399')
+				collect('listen_call', callid, env.Date.now() - start)
+				return code != 200 ? cb(body) : cb()
+			})
 		})
 	}
 
 	this.joinCall = (callid, stream, cb) => {
-		console.time('makecall' + callid)
+		let start = env.Date.now()
 		initSession((err, connId) => {
 			call2Connection[callid] = connId
 			streams[connId] = stream
 			let url = `${apiUrl}listen?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&talk=true`
 			callAPI('post', url, undefined, (body, code) => {
-				if (code != 200) return cb(body, connId)
-				console.timeEnd('makecall' + callid)
+				if (code != 200) logError(accid, agid, body, 'joinCall:413')
+				collect('join_call', callid, env.Date.now() - start)
 				if (code != 200) return cb(body, connId)
 				checkIceConnected(peers[connId], () => cb(undefined, connId))
 			})
@@ -430,6 +440,7 @@ function WebRTCConn(options) {
 				callAPI('post', url, undefined, (body, code) => {
 					body = parseJSON(body)
 					if (code != 200) {
+						logError(accid, agid, body, 'answerCall:442')
 						delete answerRequest[callid]
 						endRequest[callid] = now
 						publish({created: env.Date.now(), type: 'call_ended', data: {call_info: {call_id: callid}}})
@@ -446,10 +457,10 @@ function WebRTCConn(options) {
 			if (!callid) return rs({body: {}})
 			let connId = call2Connection[callid]
 			if (!connId) return rs({body: {}})
-
 			let url = `${apiUrl}dtml?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&key={key}`
 			initSession(() =>
-				callAPI('post', url, undefined, (body, bode) => {
+				callAPI('post', url, undefined, (body, code) => {
+					if (code != 200) logError(accid, agid, body, 'sendDtmf:463')
 					body = parseJSON(body)
 					return code != 200 ? rs({error: body}) : rs({body})
 				}),
@@ -464,6 +475,8 @@ function WebRTCConn(options) {
 			let url = `${apiUrl}refer?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&number={tonumber}`
 			initSession(() =>
 				callAPI('post', url, undefined, (body, code) => {
+					if (code != 200) logError(accid, agid, body, 'transferCall:478')
+					collect('transfer_call', callid, env.Date.now() - start)
 					body = parseJSON(body)
 					return code != 200 ? rs({error: body}) : rs({body})
 				}),