@subiz/wsclient 4.0.31 → 4.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/wsclient",
-	"version": "4.0.31",
+	"version": "4.0.33",
 	"main": "realtime.js",
 	"scripts": {
 		"dev": "vite",

package/realtime.js

@@ -17,13 +17,11 @@ var {xhrsend, parseJSON, Pubsub} = require('./common.js')
 function Conn(apiUrl, credential, onDead, onEvents, callAPI, accid) {
 	callAPI = callAPI || xhrsend // allow hook
 	credential = credential || {}
-
 	var lastToken = ''
 	if (!accid) accid = ''
-
 	var is_dead = false // tell if the connection is dead
 	var is_polling_stuck = false // tell if we've having trouble doing /poll
-	var is_sub_stuck = false // tell if we've having trouble doing /subscribe
+	var is_sub_stuck = true // tell if we've having trouble doing /subscribe
 
 	// The long polling loop runs sequentially, with each poll starting immediately
 	// after the previous one completes. If an error occurs, the loop will pause
@@ -32,7 +30,7 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI, accid) {
 	// The first loop begins after the first subscription call completes successfully
 	var polling = function (backoff) {
 		if (is_dead) return
-		callAPI('get', apiUrl + 'poll?token=' + lastToken + '&account-id=' + accid, undefined, function (body, code) {
+		callAPI('get', apiUrl + 'poll?token=' + lastToken + '&v=5&account-id=' + accid, undefined, function (body, code) {
 			if (is_dead) return
 			if (retryable(code)) {
 				is_polling_stuck = true
@@ -77,6 +75,7 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI, accid) {
 			// too long, kill
 			if (done) return
 			done = true
+			is_sub_stuck = true
 			resolve(repeat('dead', topics.length))
 			if (is_dead) return
 			kill('subs')
@@ -100,7 +99,8 @@ function Conn(apiUrl, credential, onDead, onEvents, callAPI, accid) {
 					else if (credential.user_mask) query += '&user-mask=' + encodeURIComponent(credential.user_mask)
 					else if (access_token) query += '&access-token=' + access_token
 
-					var fullurl = apiUrl + 'subs' + query + '&account-id=' + encodeURIComponent(accid || credential.account_id)
+					var fullurl =
+						apiUrl + 'subs' + query + '&v=5&account-id=' + encodeURIComponent(accid || credential.account_id)
 					callAPI('post', fullurl, JSON.stringify({events: topics}), function (body, code) {
 						if (done) return
 						if (is_dead) {
@@ -210,7 +210,7 @@ function Realtime(apiUrls, credential, callAPI, accid, skipautoreconnect) {
 		return conn.getStatus()
 	}
 
-	this.subscribe = function (events) {
+	var subscribe = function (events) {
 		if (!conn) return Promise.resolve({error: 'dead'})
 		if (typeof events === 'string') events = [events]
 		if (!Array.isArray(events)) return Promise.resolve({error: 'param should be an array or string'})
@@ -230,20 +230,22 @@ function Realtime(apiUrls, credential, callAPI, accid, skipautoreconnect) {
 			return {}
 		})
 	}
+	this.subscribe = subscribe
 
 	// reconnect make sure there is alway a Conn running in the background
 	// if the Conn is dead, it recreate a new one
 	var conn
-	this.reconnect = function () {
+	var reconnect = function () {
 		var randomUrl = apiUrls[Math.floor(Math.random() * apiUrls.length)]
 		if (conn) conn.kill() // kill old connection
-		let myconn = new Conn(
+		var myconn = new Conn(
 			randomUrl,
 			credential,
 			function (code, body, status) {
 				if (myconn != conn) return // outdated
+				conn = undefined // prevent dupplicate dead fire
 				pubsub.emit('interrupted', code, body, status)
-				if (!skipautoreconnect) setTimeout(this.reconnect, 2000) // reconnect and resubscribe after 2 sec
+				// if (!skipautoreconnect) setTimeout(reconnect, 2000) // reconnect and resubscribe after 2 sec
 			},
 			function (events) {
 				if (myconn != conn) return
@@ -253,13 +255,13 @@ function Realtime(apiUrls, credential, callAPI, accid, skipautoreconnect) {
 			accid,
 		)
 		conn = myconn
-
 		var copyTopics = Object.keys(topics)
 		topics = {}
 		// resubscribe all subscribed events
-		return this.subscribe(copyTopics)
+		return subscribe(copyTopics)
 	}
-	this.reconnect()
+	this.reconnect = reconnect
+	reconnect()
 }
 
 // calcNextBackoff returns number of seconds we must wait

package/realtime.test.js

@@ -11,7 +11,7 @@ async function testScript(t, script) {
 			calls.push({method, url, body, cb})
 		},
 		'acctest',
-		true,
+		!script.auto_reconnect,
 	)
 	realtime.onEvent((ev) => events.push(ev))
 
@@ -100,7 +100,6 @@ async function testScript(t, script) {
 		}
 		t.true(false, script.name + '[' + stepi + ']=' + step.type)
 	}
-
 	// check events
 	let scriptevents = script.events || []
 	t.equal(events.length, scriptevents.length)
@@ -278,11 +277,59 @@ test.only('realtime', async (t) => {
 				{type: 'status', status: 'active'},
 			],
 		},
+		{
+			name: 'reconect while poll',
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{type: 'call', call_id: 1, path: '/subs'},
+				{type: 'response', call_id: '1', 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: 1000},
+				{type: 'response', call_id: '2', body: {events: [{text: 'xin chao'}], sequential_token: 'token2'}, code: 200},
+				{type: 'call', call_id: '3', path: '/poll', query: {token: 'token2'}, method: 'get'},
+				{type: 'response', call_id: '3', body: '400 dead', code: 400},
+				{type: 'status', status: 'dead'},
+				{type: 'reconnect'},
+				{type: 'wait', timeout: 1000},
+				{type: 'call', call_id: 4, path: '/subs'},
+				{type: 'wait', timeout: 1000},
+				{type: 'response', call_id: 4, body: {initial_token: 'token1'}, code: 200},
+				{type: 'status', status: 'active'},
+			],
+			events: [{text: 'xin chao'}],
+		},
+		{
+			name: 'resub',
+			auto_reconnect: true,
+			steps: [
+				{type: 'subscribe', topics: ['message_sent']},
+				{type: 'call', call_id: 1, path: '/subs'},
+				{type: 'response', call_id: '1', body: 'wait a sec', code: 500},
+				{type: 'status', status: 'connecting'},
+				{type: 'wait', timeout: 1000},
+				{type: 'call', call_id: 2, path: '/subs'},
+				{type: 'wait', timeout: 61000},
+				{type: 'status', status: 'connecting'},
+				{type: 'call', call_id: 3, path: '/subs'},
+				{type: 'wait', timeout: 1000},
+				{type: 'response', call_id: '3', body: 'wait a sec', code: 500},
+				{type: 'status', status: 'connecting'},
+				{type: 'wait', timeout: 1000},
+				{type: 'call', call_id: 4, path: '/subs'},
+				{type: 'wait', timeout: 1000},
+				{type: 'response', call_id: '4', body: {initial_token: 'token1'}, code: 200},
+				{type: 'call', call_id: '5', path: '/poll', query: {token: 'token1'}, method: 'get'},
+				{type: 'status', status: 'active'},
+				{type: 'response', call_id: '5', body: {events: [{text: 'xin chao'}], sequential_token: 'token2'}, code: 200},
+			],
+			events: [{text: 'xin chao'}],
+		},
 	]
 
 	let ps = []
 	for (const script of scripts) {
-		// if (script.name != 'double subscribe -> do nothing') continue
+		// if (script.name != 'resub') continue
 		ps.push(testScript(t, script))
 	}
 	await Promise.all(ps)