@subiz/wsclient 4.0.27 → 4.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/wsclient",
-	"version": "4.0.27",
+	"version": "4.0.30",
 	"main": "realtime.js",
 	"scripts": {
 		"dev": "vite",
@@ -15,9 +15,9 @@
 	"homepage": "https://github.com/subiz/wsclient#readme",
 	"description": "",
 	"devDependencies": {
-		"tape": "^5.8.1",
-		"vite": "^5.3.4",
-		"vite-plugin-commonjs": "^0.10.1"
+		"tape": "^5.9.0",
+		"vite": "^6.3.3",
+		"vite-plugin-commonjs": "^0.10.4"
 	},
 	"dependencies": {
 		"@subiz/flow": "^1.1.0"

package/realtime.js

@@ -8,9 +8,9 @@ var {xhrsend, parseJSON, Pubsub} = require('./common.js')
 // as fast as possible through onEvents callback.
 //
 // It will try it best to keep the communication with the realtime
-// server. But if the user is offline for too long or her network can't
-// keep up with the incomming events (rarely happend with today
-// internet speed). The connection will be halt. Dead.
+// server. But if the user is offline for too long or the network can't
+// keep up with incomming events (rarely happend with today internet speed).
+// The connection will be killed. Dead.
 //
 // Once dead, onDead will be called. After that, the connection is
 // useless, all resources will be released.
@@ -18,38 +18,44 @@ 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
-	// exponential backoff algorithm. Polling loop will terminate if it encounter an
-	// un-retryable error
-	// the polling loop starts after the first subscribe call finished successfully
+	var status = 'active' // active | polling (trouble while polling) | subbing (trouble while subscribing) | dead
+
+	// The long polling loop runs sequentially, with each poll starting immediately
+	// after the previous one completes. If an error occurs, the loop will pause
+	// using an exponential backoff strategy. It will terminate if an unretryable
+	// error is encountered. The polling loop begins after the first subscription
+	// call completes successfully
 	var polling = function (backoff) {
-		if (dead) return
-		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 (status == 'dead') return
+		callAPI('get', apiUrl + 'poll?token=' + lastToken + '&account-id=' + accid, undefined, function (body, code) {
+			if (status == 'dead') return
+
+			if (retryable(code)) {
+				if (status == 'active') status = 'polling'
+				return setTimeout(polling, calcNextBackoff(backoff), backoff + 1)
+			}
+
 			if (code !== 200) {
 				// unretryable error, should kill
-				dead = true
+				status = 'dead'
 				return onDead('poll')
 			}
 
+			if (status == 'polling') status = 'active'
 			// 200, success
 			body = parseJSON(body) || {}
 			if (body.host) apiUrl = absUrl(body.host)
 
 			var seqToken = body.sequential_token
-			// the server returns a malform payload. We should retry and hope it heal soon
-			if (!seqToken) return setTimeout(polling, calcNextBackoff(backoff), backoff + 1)
+			// the server returns a malform payload. We should end
+			if (!seqToken) {
+				status = 'dead'
+				return onDead('poll')
+			}
 			lastToken = seqToken
 			onEvents(body.events || [])
 			return polling(0)
@@ -57,44 +63,90 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI, accid) {
 	}
 
 	var subQueue = flow.batch(50, 100, function (events) {
-		if (dead) return ['dead']
+		if (status == 'dead') return repeat('dead', events.length)
 		if (events.length <= 0) return []
 
+		var done = false
+		setTimeout(() => {
+			if (done) return
+			if (status == 'dead') return
+			if (status == 'active') status = 'subbing'
+		}, 4000)
+
+		setTimeout(() => {
+			// too long, kill
+			if (done) return
+			done = true
+			if (status == 'dead') return
+			status = 'dead' // mark as dead
+			onDead('poll')
+			out = repeat('dead', events.length)
+			resolve(false) // break loop
+		}, 60000)
+
+		var resolve
+		var promise = new Promise((rs) => {
+			resolve = rs
+		})
 		var out = []
-		return flow
+		flow
 			.loop(function () {
 				return new Promise(function (rs) {
+					if (status == 'dead') {
+						out = repeat('dead', events.length)
+						return rs(false) // break loop
+					}
+
 					var query = '?token=' + lastToken
 					credential.getAccessToken().then(function (access_token) {
+						if (status == 'dead') {
+							out = repeat('dead', events.length)
+							return rs(false) // break loop
+						}
+
 						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
 
-						let fullurl = apiUrl + 'subs' + query + '&account_id=' + encodeURIComponent(accid || credential.account_id)
+						var fullurl = apiUrl + 'subs' + query + '&account-id=' + encodeURIComponent(accid || credential.account_id)
 						callAPI('post', fullurl, JSON.stringify({events: events}), function (body, code) {
-							if (dead) {
+							if (done) return
+							if (status == 'subbing') status = 'active'
+
+							if (status == 'dead') {
 								out = repeat('dead', events.length)
 								return rs(false) // break loop
 							}
 
-							if (retryable(code)) return setTimeout(rs, 3000, true)
+							if (retryable(code)) {
+								status = 'subbing'
+								return setTimeout(rs, 3000, true)
+							}
+
 							// unretryable error
 							if (code !== 200) {
-								// we are unable to start the communication with realtime server.
+								// we are unable to start the communication with the realtime server.
 								// Must notify the user by killing the connection
-								dead = true
+								status = 'dead'
 								onDead('subscribe', body, code)
 								out = repeat('dead', events.length)
 								return rs(false)
 							}
 
+							done = true
 							if (lastToken) return rs(false)
 
 							// first time sub, should grab the initial token
 							body = parseJSON(body) || {}
 							var initialToken = body.initial_token
-							// the server returns a malform payload. We should retry and hope it heal soon
-							if (!initialToken) return setTimeout(rs, 3000, true)
+							// the server returns a malform payload. We should end
+							if (!initialToken) {
+								status = 'dead'
+								onDead('subscribe', body, code)
+								out = repeat('dead', events.length)
+								return rs(false) // break loop
+							}
+
 							if (body.host) apiUrl = absUrl(body.host)
 
 							lastToken = initialToken
@@ -105,8 +157,9 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI, accid) {
 				})
 			})
 			.then(function () {
-				return out
+				resolve(out)
 			})
+		return promise
 	})
 
 	// subscribe call /subs API to tell server that we are listening for those events
@@ -114,6 +167,16 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI, accid) {
 	// Note: this function is not design to be thread safed so, do not call this
 	// function multiple times at once
 	this.subscribe = subQueue.push.bind(subQueue)
+
+	this.getStatus = function () {
+		if (status == 'dead' || status == 'active') return status
+		return 'connecting'
+	}
+
+	// kill force the connection to dead state
+	this.kill = function () {
+		status = 'dead'
+	}
 }
 
 // Realtime is just a stronger Conn.
@@ -122,7 +185,7 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI, accid) {
 // 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, accid) {
+function Realtime(apiUrls, credential, callAPI, accid, skipautoreconnect) {
 	if (typeof apiUrls === 'string' || apiUrls instanceof String) apiUrls = [apiUrls]
 	credential = credential || {}
 	if (!credential.getAccessToken) {
@@ -158,6 +221,11 @@ function Realtime(apiUrls, credential, callAPI, accid) {
 		return pubsub.on('interrupted', cb)
 	}
 
+	this.getStatus = function () {
+		if (!conn) return 'dead'
+		return conn.getStatus()
+	}
+
 	var conn
 	this.subscribe = function (events) {
 		if (stop) return Promise.resolve({})
@@ -169,9 +237,13 @@ function Realtime(apiUrls, credential, callAPI, accid) {
 		for (var i = 0; i < events.length; i++) {
 			var topic = events[i]
 			if (!topic) continue
-			if (!topics[topic]) all.push(conn.subscribe(topic))
+			if (!topics[topic]) {
+				topics[topic] = true
+				all.push(conn.subscribe(topic))
+			}
 		}
 		if (all.length === 0) return Promise.resolve({})
+
 		return Promise.all(all).then(function (errs) {
 			for (var i = 0; i < errs.length; i++) if (errs[i]) return {error: errs[i]}
 			for (var j = 0; j < events.length; j++) topics[events[j]] = true
@@ -181,24 +253,24 @@ function Realtime(apiUrls, credential, callAPI, accid) {
 
 	// reconnect make sure there is alway a Conn running in the background
 	// if the Conn is dead, it recreate a new one
-	var reconnect = function () {
-		if (stop) return
+	this.reconnect = function () {
+		if (stop) return Promise.resolve(false)
 		// reset subscribed topic
 		var allTopics = Object.keys(topics)
 		for (var i = 0; i < allTopics.length; i++) topics[allTopics[i]] = false
-
 		var randomUrl = apiUrls[Math.floor(Math.random() * apiUrls.length)]
+		if (conn) conn.kill() // kill old connection
 		conn = new Conn(
 			randomUrl,
 			credential,
 			function (code, body, status) {
 				if (stop) return
 				pubsub.emit('interrupted', code, body, status)
-				setTimeout(reconnect, 2000) // reconnect and resubscribe after 2 sec
+				if (!skipautoreconnect) setTimeout(this.reconnect, 2000) // reconnect and resubscribe after 2 sec
 			},
-			function (topics) {
+			function (events) {
 				if (stop) return
-				for (var i = 0; i < topics.length; i++) pubsub.emit('event', topics[i])
+				for (var i = 0; i < events.length; i++) pubsub.emit('event', events[i])
 			},
 			callAPI,
 			accid,
@@ -206,9 +278,9 @@ function Realtime(apiUrls, credential, callAPI, accid) {
 
 		// resubscribe all subscribed events
 		var topicKeys = Object.keys(topics)
-		for (var i = 0; i < topicKeys.length; i++) conn.subscribe(topicKeys[i])
+		return this.subscribe(topicKeys)
 	}
-	reconnect()
+	this.reconnect()
 }
 
 // calcNextBackoff returns number of seconds we must wait

package/realtime.test.js

@@ -1,99 +1,292 @@
 var test = require('tape')
 var Realtime = require('./realtime.js')
 
-function makeMockServer(script) {
-	var i = -1
-	return (method, url, body, cb) => {
-		i++
-		script[i](method, url, body, cb)
+async function testScript(t, script) {
+	let events = []
+	let calls = []
+	var realtime = new Realtime(
+		'https://api5.subiz.com.vn/',
+		{user_mask: 'mask123'},
+		(method, url, body, cb) => {
+			calls.push({method, url, body, cb})
+		},
+		'acctest',
+		true,
+	)
+	realtime.onEvent((ev) => events.push(ev))
+
+	for (let stepi in script.steps) {
+		let step = script.steps[stepi]
+		if (step.type == 'status') {
+			t.equal(realtime.getStatus(), step.status, script.name + '[' + stepi + ']')
+			continue
+		}
+
+		if (step.type == 'subscribe') {
+			realtime.subscribe(step.topics)
+			continue
+		}
+
+		if (step.type == 'reconnect') {
+			realtime.reconnect()
+			continue
+		}
+
+		if (step.type == 'wait') {
+			await sleep(step.timeout)
+			continue
+		}
+
+		if (step.type == 'call') {
+			t.true(step.call_id != undefined) // must define call id in the script
+			let start = Date.now()
+			let timeout = step.timeout || 10_000
+			let istimeout
+			for (;;) {
+				if (Date.now() - start > timeout) {
+					istimeout = true
+					break
+				}
+				// wait util api is called
+				await sleep(100)
+				let call
+				for (let c = 0; c < calls.length; c++) {
+					if (!calls[c].call_id) {
+						call = calls[c]
+						break
+					}
+				}
+				if (!call) continue
+				call.call_id = step.call_id
+				const myUrl = new URL(call.url)
+
+				if (step.path) t.equal(myUrl.pathname, step.path)
+
+				if (step.method) t.equal(step.method, call.method)
+
+				if (step.query) {
+					for (var key of Object.keys(step.query)) {
+						t.equal(step.query[key], myUrl.searchParams.get(key), script.name)
+					}
+				}
+
+				if (step.body) {
+					let keys = Object.keys(step.body)
+					let callbody
+					if (call.body) callbody = JSON.parse(call.body)
+					for (var key of keys) {
+						t.equal(JSON.stringify(step.body[key]), JSON.stringify(callbody[key]))
+					}
+				}
+				break
+			}
+
+			t.true(!istimeout, JSON.stringify(step))
+			continue
+		}
+
+		if (step.type == 'response') {
+			let call
+			for (var c = 0; c < calls.length; c++) {
+				if (calls[c].call_id == step.call_id) {
+					call = calls[c]
+					break
+				}
+			}
+
+			t.true(call != undefined)
+			call.cb(JSON.stringify(step.body), step.code)
+			continue
+		}
+		t.true(false, script.name + '[' + stepi + ']=' + step.type)
+	}
+
+	// check events
+	let scriptevents = script.events || []
+	t.equal(events.length, scriptevents.length)
+	for (let i in events) {
+		t.equal(JSON.stringify(events[i]), JSON.stringify(scriptevents[i]))
 	}
+	realtime.stop()
 }
 
-test('realtime', async (t) => {
-	var callapi = makeMockServer([
-		async (method, url, body, cb) => {
-			// must first call sub and must attach user-mask in the query
-			t.equal(method, 'post')
-			t.true(url.indexOf('subs?') !== -1)
-			t.true(url.indexOf('user-mask=mask123') !== -1)
-			cb(`{"initial_token": "token0"}`, 200)
+test.only('realtime', async (t) => {
+	let scripts = [
+		{
+			name: 'starting status',
+			steps: [
+				{type: 'status', status: 'active'},
+				{type: 'subscribe', topics: ['message_sent']},
+				{type: 'status', status: 'active'},
+				{type: 'call', call_id: '1', path: '/subs', method: 'post', body: {events: ['message_sent']}},
+
+				{type: 'wait', timeout: 5000},
+				{type: 'status', status: 'connecting'},
+				{type: 'wait', timeout: 60000},
+				{type: 'status', status: 'dead'},
+				{type: 'response', call_id: '1', body: {initial_token: 'aaaaaa'}, code: 200},
+				{type: 'status', status: 'dead'}, // dead must be dead
+			],
 		},
-		async (method, url, body, cb) => {
-			// start the poll and must attach initial token  in the query
-			t.equal(method, 'get')
-			t.true(url.indexOf('poll?') !== -1)
-			t.true(url.indexOf('token=token0') !== -1)
-			cb(`{"events": [], "sequential_token": "token1"}`, 200)
+		{
+			name: 'long subscribe',
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{type: 'status', status: 'active'},
+				{type: 'call', call_id: '1', path: '/subs', method: 'post', body: {events: ['message_sent']}},
+				{type: 'wait', timeout: 5000},
+				{type: 'status', status: 'connecting'},
+				{type: 'wait', timeout: 3000},
+				{type: 'status', status: 'connecting'},
+				{type: 'response', call_id: '1', body: {initial_token: 'aaaaaa'}, code: 200},
+				{type: 'status', status: 'active'},
+			],
+			events: [],
 		},
-		async (method, url, body, cb) => {
-			// next poll must attach last received token
-			t.equal(method, 'get')
-			t.true(url.indexOf('poll?') !== -1)
-			t.true(url.indexOf('token=token1') !== -1)
-			realtime.stop()
-			cb(`{"events": [], "token": "-"}`, 200)
+		{
+			name: 'double subscribe -> do nothing',
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{type: 'status', status: 'active'},
+				{type: 'call', call_id: '1', path: '/subs', method: 'post', body: {events: ['message_sent']}},
+				{type: 'response', call_id: '1', body: {initial_token: 'token1'}, code: 200},
+				{type: 'call', call_id: '2', path: '/poll', query: {token: 'token1'}, method: 'get'},
+				{type: 'subscribe', topics: ['message_sent', 'message_pong']},
+				{type: 'call', call_id: '3', path: '/subs', method: 'post', body: {events: ['message_pong']}},
+			],
 		},
-	])
-
-	var realtime = new Realtime('', {user_mask: 'mask123'}, callapi)
-	var err = await realtime.subscribe(['message_pong'])
-	t.true(Object.keys(err).length === 0)
-})
-
-test('realtime subs when server down and then backup', async (t) => {
-	var callapi = makeMockServer([
-		async (method, url, body, cb) => {
-			// must first call sub and must attach user-mask in the query
-			t.equal(method, 'post')
-			t.true(url.indexOf('subs?') !== -1)
-			t.true(url.indexOf('user-mask=mask123') !== -1)
-			cb(`502 too busy`, 502)
+		{
+			name: 'polling unstable',
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{type: 'status', status: 'active'},
+				{type: 'call', call_id: '1', path: '/subs', method: 'post', body: {events: ['message_sent']}},
+				{type: 'wait', timeout: 1000},
+				{type: 'response', call_id: '1', body: {initial_token: 'token1'}, code: 200},
+				{type: 'status', status: 'active'},
+				{type: 'call', call_id: '2', path: '/poll', query: {token: 'token1'}, method: 'get'},
+				{type: 'wait', timeout: 30000},
+				{type: 'response', call_id: '2', body: 'network disconnected', code: 0},
+				{type: 'status', status: 'connecting'},
+				{type: 'call', call_id: '3', path: '/poll', query: {token: 'token1'}, method: 'get'},
+				{type: 'wait', timeout: 30000},
+				{type: 'response', call_id: '3', body: '500 keep internal', code: 500},
+				// more than 60 sec without any data => dead
+				{type: 'status', status: 'connecting'},
+			],
+		},
+		{
+			name: 'polling dead',
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{type: 'status', status: 'active'},
+				{type: 'call', call_id: '1', path: '/subs', method: 'post', body: {events: ['message_sent']}},
+				{type: 'wait', timeout: 1000},
+				{type: 'response', call_id: '1', body: {initial_token: 'token1'}, code: 200},
+				{type: 'status', status: 'active'},
+				{type: 'call', call_id: '2', path: '/poll', query: {token: 'token1'}, method: 'get'},
+				{type: 'response', call_id: '2', body: '400 dead', code: 400},
+				{type: 'status', status: 'dead'},
+			],
+		},
+		{
+			name: 'basic',
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{
+					type: 'call',
+					call_id: '1',
+					path: '/subs',
+					query: {'user-mask': 'mask123'},
+					method: 'post',
+					body: {events: ['message_sent']},
+				},
+				{type: 'response', call_id: '1', body: {initial_token: 'token1'}, code: 200},
+				{type: 'wait', timeout: 1000},
+				{type: 'call', call_id: '2', path: '/poll', query: {token: 'token1'}, method: 'get'},
+				{type: 'status', status: 'active'},
+				{type: 'wait', timeout: 3000},
+				{type: 'response', call_id: '2', body: {events: [{text: 'xin chao'}], sequential_token: 'token2'}, code: 200},
+				{type: 'status', status: 'active'},
+				{type: 'call', call_id: '3', path: '/poll', query: {token: 'token2'}, method: 'get'},
+			],
+			events: [{text: 'xin chao'}],
 		},
-		async (method, url, body, cb) => {
-			// should retry
-			t.equal(method, 'post')
-			t.true(url.indexOf('subs?') !== -1)
-			t.true(url.indexOf('user-mask=mask123') !== -1)
-			cb(`502 still busy`, 502)
+		{
+			name: 'realtime subs when server down and then backup',
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{
+					type: 'call',
+					call_id: '1',
+					path: '/subs',
+					method: 'post',
+					body: {events: ['message_sent']},
+				},
+				{type: 'wait', timeout: 1000},
+				{type: 'response', call_id: '1', body: '502 too busy', code: 502},
+				{
+					type: 'call',
+					call_id: '1.1',
+					path: '/subs',
+					method: 'post',
+					body: {events: ['message_sent']},
+				},
+				{type: 'status', status: 'connecting'},
+				{type: 'wait', timeout: 1000},
+				{type: 'response', call_id: '1.1', body: '502 still busy', code: 502},
+				{type: 'status', status: 'connecting'},
+				{type: 'wait', timeout: 1000},
+				{
+					type: 'call',
+					call_id: '1.2',
+					path: '/subs',
+					method: 'post',
+					body: {events: ['message_sent']},
+				},
+				{type: 'status', status: 'connecting'},
+				{type: 'response', call_id: '1.2', body: {initial_token: 'token1'}, code: 200},
+				{type: 'call', call_id: '2', path: '/poll', query: {token: 'token1'}, method: 'get'},
+				{type: 'status', status: 'active'},
+				{type: 'wait', timeout: 3000},
+				{type: 'response', call_id: '2', body: {events: [{text: 'xin chao'}], sequential_token: 'token2'}, code: 200},
+				{type: 'status', status: 'active'},
+				{type: 'call', call_id: '3', path: '/poll', query: {token: 'token2'}, method: 'get'},
+			],
+			events: [{text: 'xin chao'}],
 		},
-		async (method, url, body, cb) => {
-			// should retry
-			t.equal(method, 'post')
-			t.true(url.indexOf('subs?') !== -1)
-			t.true(url.indexOf('user-mask=mask123') !== -1)
-			cb(`{"initial_token": "token0"}`, 200)
+		{
+			name: 'realtime must stop if there is something wrong with our credential or our code',
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{type: 'call', call_id: 1, path: '/subs'},
+				{type: 'response', call_id: 1, body: '400 invalid mask', code: 400},
+				{type: 'status', status: 'dead'},
+			],
 		},
-		async (method, url, body, cb) => {
-			t.equal(method, 'get')
-			t.true(url.indexOf('poll?') !== -1)
-			t.true(url.indexOf('token=token0') !== -1)
-			realtime.stop()
-			cb(`{"events": [], "token": "-"}`, 200)
+		{
+			name: 'reconect',
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{type: 'call', call_id: 1, path: '/subs'},
+				{type: 'response', call_id: 1, body: '400 invalid mask', code: 400},
+				{type: 'status', status: 'dead'},
+				{type: 'reconnect'},
+				{type: 'wait', timeout: 1000},
+				{type: 'call', call_id: 2, path: '/subs'},
+				{type: 'wait', timeout: 1000},
+				{type: 'response', call_id: 2, body: {initial_token: 'token1'}, code: 200},
+				{type: 'status', status: 'active'},
+			],
 		},
-	])
+	]
 
-	var realtime = new Realtime('', {user_mask: 'mask123'}, callapi)
-	var err = await realtime.subscribe(['message_pong'])
-	t.true(Object.keys(err).length === 0)
+	let ps = []
+	for (const script of scripts) {
+		// if (script.name != 'double subscribe -> do nothing') continue
+		ps.push(testScript(t, script))
+	}
+	await Promise.all(ps)
 })
 
-test('realtime must stop if there is something wrong with our credential or our code', async (t) => {
-	var subcode
-	var callapi = makeMockServer([
-		async (method, url, bkody, cb) => {
-			// must first call sub and must attach user-mask in the query
-			t.equal(method, 'post')
-			t.true(url.indexOf('subs?') !== -1)
-			t.true(url.indexOf('user-mask=mask123') !== -1)
-			cb(`400 invalid mask`, 400)
-			realtime.stop()
-		},
-	])
-
-	var realtime = new Realtime('', {user_mask: 'mask123'}, callapi)
-	realtime.onInterrupted((_, _1, code) => {
-		subcode = code
-	})
-	var err = await realtime.subscribe(['message_pong'])
-	t.false(Object.keys(err).length === 0)
-})
+let sleep = (ms) => new Promise((rs) => setTimeout(rs, ms))

package/demo.html

@@ -1,129 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link
-      rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
-    />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Subiz WebPhone Demo</title>
-    <style>
-      #info {
-        background: whitesmoke;
-        border-radius: 5px;
-      }
-      label {
-        font-weight: 600;
-        margin-right: 10px;
-      }
-      .info_line {
-        display: flex;
-        align-items: flex-start;
-      }
-    </style>
-  </head>
-  <body class="container pt-3">
-    <img
-      width="80"
-      src="https://storage.googleapis.com/sbz-email/images/d009afe944c1948998544e103ab0fef2_logo.png"
-    />
-    <h1 class="mt-4">Subiz call demo</h1>
-    <button
-      class="btn btn-primary"
-      style="width: 120px"
-      id="btnHangup"
-      onClick="inputToken()"
-			>
-      Nhập token
-    </button>
-    <div id="tokenStatus" class="mt-2 text-danger">Chưa nhập token</div>
-
-    <div class="mt-3" style="width: 250px">
-      <div>
-        <label>Đầu số</label>
-        <input
-          class="form-control"
-          id="fromNumber"
-          type="text"
-          value="842473021368"
-        />
-      </div>
-      <div class="mt-3">
-        <label>Số khách</label>
-        <input
-          class="form-control"
-          placeholder="036..."
-          id="toNumber"
-          type="text"
-        />
-      </div>
-      <div class="mt-3">
-        <button
-          class="btn btn-success mr-3"
-          style="width: 150px"
-          id="btnCall"
-          disabled
-          onClick="makeCall()"
-        >
-          Gọi
-        </button>
-        <button
-          class="btn btn-outline-danger"
-          style="width: 79px"
-          id="btnHangup"
-          onClick="hangupCall()"
-        >
-          Ngắt
-        </button>
-      </div>
-    </div>
-    <h3 class="mt-4">Thông tin cuộc gọi</h3>
-    <div class="p-2" id="info">
-      <div class="info_line">
-        <label>Call ID:</label>
-        <div id="infoCallId"></div>
-      </div>
-      <div class="info_line">
-        <label>Conversation ID:</label>
-        <div id="infoConversationId"></div>
-      </div>
-      <div class="info_line">
-        <label>Ghi âm:</label>
-        <a href="#" id="infoRecordedUrl" target="_blank"></a>
-      </div>
-      <div class="info_line">
-        <label>Gọi từ số:</label>
-        <div id="infoFromNumber"></div>
-      </div>
-      <div class="info_line">
-        <label>Gọi đến số:</label>
-        <div id="infoToNumber"></div>
-      </div>
-      <div class="info_line">
-        <label>Trạng thái:</label>
-        <div id="infoStatus"></div>
-      </div>
-      <div class="info_line">
-        <label>Gọi lúc:</label>
-        <div id="infoCreated"></div>
-      </div>
-      <div class="info_line">
-        <label>Thời lượng (giây):</label>
-        <div id="infoDuration"></div>
-      </div>
-      <div class="info_line">
-        <label>Mã ngắt máy:</label>
-        <div id="infoHangupCode"></div>
-      </div>
-    </div>
-    <div class="mt-4">
-      <h3>Sự kiện realtime</h3>
-      <pre
-        style="padding: 10px 15px; border-radius: 5px; background: whitesmoke"
-        id="infoLog"
-      ></pre>
-    </div>
-    <script type="module" src="./demo.js"></script>
-  </body>
-</html>

package/demo.js

@@ -1,207 +0,0 @@
-const SubizWebPhone = require('./webphone.js')
-
-let webphone
-var mycallid = 'x'
-let accid
-let eventLogs = {}
-
-// setTokenStatus renders whether token is valid or invalid
-function setTokenStatus(me) {
-	let $tokenStatus = document.getElementById('tokenStatus')
-	if (me == 'loading') {
-		$tokenStatus.innerHTML = 'Đang kiểm tra'
-		$tokenStatus.classList.add('text-muted')
-		$tokenStatus.classList.remove('text-danger')
-		$tokenStatus.classList.remove('text-success')
-		return
-	}
-
-	if (!me || !me.account_id) {
-		$tokenStatus.innerHTML = 'Token rỗng hoặc không hợp lệ. Vui lòng nhập lại'
-		$tokenStatus.classList.remove('text-danger')
-		$tokenStatus.classList.remove('text-success')
-		$tokenStatus.classList.add('text-muted')
-		return
-	}
-
-	$tokenStatus.innerHTML = 'Token hợp lệ. Xin chào ' + me.fullname
-	$tokenStatus.classList.add('text-success')
-	$tokenStatus.classList.remove('text-danger')
-	$tokenStatus.classList.remove('text-muted')
-}
-
-function init() {
-	setTokenStatus('loading')
-	fetch(`https://api.subiz.com.vn/4.0/me?x-access-token=${access_token}`)
-		.then((response) => {
-			return response.json()
-		})
-		.then((me) => {
-			setTokenStatus(me)
-			if (!me || !me.account_id) return null
-			return me
-		})
-		.then((me) => {
-			if (!me) return
-			// save token
-			try {
-				webphone = new SubizWebPhone(access_token)
-				accid = access_token.split('_')[0]
-			} catch (e) {
-				alert('ERROR2: ' + e)
-				// setTimeout(main)
-				return
-			}
-
-			document.getElementById('btnCall').disabled = false
-
-			webphone.onEvent(function (ev) {
-				let call = ev.data.call_info
-				let callid = call.call_id
-				eventLogs[callid] = eventLogs[callid] || []
-				if (callid != mycallid) return
-				eventLogs[callid].push(ev)
-
-				// render log
-				let logM = eventLogs[callid]
-				if (logM) {
-					let log = logM
-						.map((ev) => {
-							return `${new Date(ev.created).toLocaleString()} | ${ev.type} | ${JSON.stringify(ev.data.call_info)}`
-						})
-						.join('\n')
-					document.getElementById('infoLog').innerHTML = log
-				}
-
-				if (call.status == 'dialing') {
-					document.getElementById('infoRecordedUrl').innerHTML = ''
-					document.getElementById('infoRecordedUrl').href = undefined
-					document.getElementById('info').style['background-color'] = '#fffed3'
-				}
-
-				if (call.status == 'active') {
-					document.getElementById('info').style['background-color'] = '#8cff6b'
-				}
-
-				if (call.status == 'ended' || !call.status) {
-					document.getElementById('info').style['background-color'] = '#ffc6c6'
-				}
-
-				if (call.status == 'ended' && ev.id) {
-					// from server, not fake
-					document.getElementById('infoRecordedUrl').innerHTML = 'Đang tải...'
-					document.getElementById('infoRecordedUrl').href = undefined
-
-					fetchRecordedUrl(callid).then((url) => {
-						if (url == 'unavailable') {
-							document.getElementById('infoRecordedUrl').innerHTML = 'Không khả dụng'
-							document.getElementById('infoRecordedUrl').href = undefined
-							return
-						}
-						document.getElementById('infoRecordedUrl').innerHTML = url
-						document.getElementById('infoRecordedUrl').href = url
-					})
-				}
-			})
-		})
-}
-
-// inputToken asks access token from the agent
-function inputToken() {
-	access_token = prompt('Vui lòng nhập access token')
-	localStorage.setItem('access_token', access_token)
-	if (access_token) init()
-}
-
-// fetchRecordedUrl attemps to get the recorded audio url
-// since we dont know when the file is uploaded, we must retry multiple times.
-// this code is only for demo purpose
-function fetchRecordedUrl(callid) {
-	// try maximum 4 times
-	return new Promise((rs) => {
-		fetchConversation(callid).then((convo) => {
-			if (convo.call.recorded_audio && convo.call.recorded_audio.url) {
-				return rs(convo.call.recorded_audio.url)
-			}
-			setTimeout(() => {
-				fetchConversation(callid).then((convo) => {
-					if (convo.call.recorded_audio && convo.call.recorded_audio.url) {
-						return rs(convo.call.recorded_audio.url)
-					}
-
-					setTimeout(() => {
-						fetchConversation(callid).then((convo) => {
-							if (convo.call.recorded_audio && convo.call.recorded_audio.url) {
-								return rs(convo.call.recorded_audio.url)
-							}
-
-							setTimeout(() => {
-								fetchConversation(callid).then((convo) => {
-									if (convo.call.recorded_audio && convo.call.recorded_audio.url) {
-										return rs(convo.call.recorded_audio.url)
-									}
-									rs('unavailable')
-								})
-							}, 4000)
-						})
-					}, 4000)
-				})
-			}, 4000)
-		})
-	})
-}
-
-// fetchConversation sends a request API to get the latest conversation
-function fetchConversation(callid) {
-	let call = webphone.getCall(callid)
-	if (!call) return Promise.resolve(null)
-	let convoid = call.conversation_id
-	if (!convoid) return Promise.resolve(null)
-	return fetch(
-		`https://api.subiz.com.vn/4.0/accounts/${accid}/conversations/${convoid}?x-access-token=${access_token}`,
-	).then((response) => {
-		return response.json()
-	})
-}
-
-function makeCall() {
-	if (!webphone) return
-	let fromNumber = document.getElementById('fromNumber').value
-	let toNumber = document.getElementById('toNumber').value
-	//webphone.makeCall(toNumber, fromNumber);
-
-	webphone.makeCall('0364821895', ['935022139843821727', '842473021368'])
-	mycallid = webphone.getCurrentCallId()
-}
-
-let access_token = localStorage.getItem('access_token')
-if (access_token) init()
-
-// update loop
-setInterval(function () {
-	if (!webphone) return
-	let call = webphone.getCall(mycallid)
-	if (!call) return
-	document.getElementById('infoCallId').innerHTML = call.call_id
-	document.getElementById('infoFromNumber').innerHTML = call.from_number
-	document.getElementById('infoConversationId').innerHTML = call.conversation_id
-	document.getElementById('infoToNumber').innerHTML = call.to_number
-	document.getElementById('infoStatus').innerHTML = call.status
-	document.getElementById('infoCreated').innerHTML = new Date(call.started).toLocaleString()
-	if (call.status == 'active')
-		document.getElementById('infoDuration').innerHTML = Math.floor((Date.now() - call.started) / 1000) || 0
-	else {
-		document.getElementById('infoDuration').innerHTML = Math.floor((call.ended - call.started) / 1000) || 0
-	}
-	if (call.hangup_code) document.getElementById('infoHangupCode').innerHTML = call.hangup_code
-}, 500)
-
-function hangupCall() {
-	if (!webphone) return
-	webphone.hangupCall(mycallid)
-}
-
-// expose to window so we can call it in HTML
-window.makeCall = makeCall
-window.hangupCall = hangupCall
-window.inputToken = inputToken