@subiz/wsclient 4.0.24 → 4.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/wsclient",
-	"version": "4.0.24",
+	"version": "4.0.25",
 	"main": "realtime.js",
 	"scripts": {
 		"dev": "vite",
@@ -15,8 +15,8 @@
 	"homepage": "https://github.com/subiz/wsclient#readme",
 	"description": "",
 	"devDependencies": {
-		"tape": "^5.7.5",
-		"vite": "^5.2.8",
+		"tape": "^5.8.1",
+		"vite": "^5.3.4",
 		"vite-plugin-commonjs": "^0.10.1"
 	},
 	"dependencies": {

package/realtime.js

@@ -14,18 +14,18 @@ var {xhrsend, parseJSON, Pubsub} = require('./common.js')
 //
 // Once dead, onDead will be called. After that, the connection is
 // useless, all resources will be released.
-function Conn(apiUrl, credential, onDead, onEvents, callAPI) {
+function Conn(apiUrl, credential, onDead, onEvents, callAPI, accid) {
 	callAPI = callAPI || xhrsend // allow hook
 	credential = credential || {}
 	// tell if connection is dead
 	var dead = false
 
 	var lastToken = ''
-
 	// kill force the connection to dead state
 	this.kill = function () {
 		dead = true
 	}
+	if (!accid) accid = ''
 
 	// long polling loop, polling will run sequentialy. Each polling will start right
 	// after the previous returned. In case of error, polling loop will pause based on
@@ -34,7 +34,7 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI) {
 	// the polling loop starts after the first subscribe call finished successfully
 	var polling = function (backoff) {
 		if (dead) return
-		callAPI('get', apiUrl + 'poll?token=' + lastToken, undefined, function (body, code) {
+		callAPI('get', apiUrl + 'poll?token=' + lastToken + '&account_id=' + accid, undefined, function (body, code) {
 			if (dead) return
 			if (retryable(code)) return setTimeout(polling, calcNextBackoff(backoff), backoff + 1)
 			if (code !== 200) {
@@ -66,16 +66,12 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI) {
 				return new Promise(function (rs) {
 					var query = '?token=' + lastToken
 					credential.getAccessToken().then(function (access_token) {
-						if (credential.user_ref)
-							query +=
-								'&user_ref=' +
-								encodeURIComponent(credential.user_ref) +
-								'&account_id=' +
-								encodeURIComponent(credential.account_id)
+						if (credential.user_ref) query += '&user_ref=' + encodeURIComponent(credential.user_ref)
 						else if (credential.user_mask) query += '&user-mask=' + encodeURIComponent(credential.user_mask)
 						else if (access_token) query += '&access-token=' + access_token
 
-						callAPI('post', apiUrl + 'subs' + query, JSON.stringify({events: events}), function (body, code) {
+						let fullurl = apiUrl + 'subs' + query + '&account_id=' + encodeURIComponent(accid || credential.account_id)
+						callAPI('post', fullurl, JSON.stringify({events: events}), function (body, code) {
 							if (dead) {
 								out = repeat('dead', events.length)
 								return rs(false) // break loop
@@ -126,7 +122,7 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI) {
 // additional features compare to conn:
 //   + auto recreate and resub if the last conn is dead
 //   + don't subscribe already subscribed events
-function Realtime(apiUrls, credential, callAPI) {
+function Realtime(apiUrls, credential, callAPI, accid) {
 	if (typeof apiUrls === 'string' || apiUrls instanceof String) apiUrls = [apiUrls]
 	credential = credential || {}
 	if (!credential.getAccessToken) {
@@ -134,7 +130,7 @@ function Realtime(apiUrls, credential, callAPI) {
 			return Promise.resolve('')
 		}
 	}
-
+	if (!accid) accid = credential.account_id || ''
 	var pubsub = new Pubsub()
 
 	// holds all topics that realtime must subscribed
@@ -148,9 +144,10 @@ function Realtime(apiUrls, credential, callAPI) {
 	// stop the connection
 	var stop = false
 	this.stop = function () {
-		if (stop) return
+		if (!conn || stop) return
 		stop = true
 		conn.kill()
+		pubsub.emit('interrupted')
 	}
 
 	this.onEvent = function (cb) {
@@ -204,6 +201,7 @@ function Realtime(apiUrls, credential, callAPI) {
 				for (var i = 0; i < topics.length; i++) pubsub.emit('event', topics[i])
 			},
 			callAPI,
+			accid,
 		)
 
 		// resubscribe all subscribed events

package/webrtc.js

@@ -48,7 +48,7 @@ function WebRTCConn(options) {
 
 		peer.onicecandidate = (event) => {
 			if (!event.candidate) return
-			let url = `${apiUrl}ice-candidates?x-access-token=${access_token}&connection_id=${connId}`
+			let url = `${apiUrl}ice-candidates?x-access-token=${access_token}&connection_id=${connId}&account_id=${accid}`
 			callAPI('post', url, jsonify(event.candidate))
 		}
 
@@ -86,7 +86,7 @@ function WebRTCConn(options) {
 	}
 
 	let syncCallWithServer = () => {
-		let url = `${apiUrl}calls?x-access-token=${access_token}`
+		let url = `${apiUrl}calls?x-access-token=${access_token}&account_id=${accid}`
 		callAPI('get', url, undefined, function (body, code) {
 			if (code != 200) return
 			body = parseJSON(body) || []
@@ -297,7 +297,7 @@ function WebRTCConn(options) {
 				})
 				.then((answer) =>
 					peer.setLocalDescription(answer).then(() => {
-						let url = `${apiUrl}finish?x-access-token=${access_token}&connection_id=${connId}&version=2&negotiation_id=${negid}`
+						let url = `${apiUrl}finish?x-access-token=${access_token}&connection_id=${connId}&version=2&negotiation_id=${negid}&account_id=${accid}`
 						callAPI('post', url, jsonify(answer), function (body, code) {
 							if (code !== 200) {
 								logError(accid, agid, body, 'finish:295')
@@ -365,7 +365,7 @@ function WebRTCConn(options) {
 							return rs({error: err})
 						}
 
-						let url = `${apiUrl}call?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&number=${number}&from_number=${fromnumber}`
+						let url = `${apiUrl}call?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&number=${number}&from_number=${fromnumber}&account_id=${accid}`
 						if (outboundcallentryid) url += `&outbound_call_entry_id=${outboundcallentryid}`
 						if (campaignid) url += `&campaign_id=${campaignid}`
 						callAPI('post', url, undefined, (body, code) => {
@@ -404,13 +404,13 @@ function WebRTCConn(options) {
 		call.hangup_code = 'cancel'
 		call.ended = env.Date.now()
 		publish({created: env.Date.now(), type: 'call_ended', data: {call_info: {call_id: callid}}})
-		callAPI('post', `${apiUrl}hangup?x-access-token=${access_token}&call_id=${callid}`)
+		callAPI('post', `${apiUrl}hangup?x-access-token=${access_token}&call_id=${callid}&account_id=${accid}`)
 	}
 
 	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}`
+			let url = `${apiUrl}listen?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&account_id=${accid}`
 			callAPI('post', url, undefined, (body, code) => {
 				if (code != 200) logError(accid, agid, body, 'listenCall:399')
 				collect('listen_call', callid, env.Date.now() - start)
@@ -424,7 +424,7 @@ function WebRTCConn(options) {
 		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`
+			let url = `${apiUrl}listen?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&talk=true&account_id={accid}`
 			callAPI('post', url, undefined, (body, code) => {
 				if (code != 200) logError(accid, agid, body, 'joinCall:413')
 				collect('join_call', callid, env.Date.now() - start)
@@ -449,7 +449,7 @@ function WebRTCConn(options) {
 					publish({created: env.Date.now(), type: 'call_ended', data: {call_info: {call_id: callid}}})
 					return rs({error: err})
 				}
-				let url = `${apiUrl}answer?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}`
+				let url = `${apiUrl}answer?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&account_id=${accid}`
 				callAPI('post', url, undefined, (body, code) => {
 					body = parseJSON(body)
 					if (code != 200) {
@@ -470,7 +470,7 @@ 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}`
+			let url = `${apiUrl}dtml?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&key={key}&account_id=${accid}`
 			initSession(() =>
 				callAPI('post', url, undefined, (body, code) => {
 					if (code != 200) logError(accid, agid, body, 'sendDtmf:463')
@@ -485,7 +485,7 @@ function WebRTCConn(options) {
 			if (!callid) return rs({})
 			let connId = call2Connection[callid]
 			if (!connId) return rs({body: {}})
-			let url = `${apiUrl}refer?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&number={tonumber}`
+			let url = `${apiUrl}refer?x-access-token=${access_token}&connection_id=${connId}&call_id=${callid}&number={tonumber}&account_id=${accid}`
 			initSession(() =>
 				callAPI('post', url, undefined, (body, code) => {
 					if (code != 200) logError(accid, agid, body, 'transferCall:478')