@subiz/wsclient 4.0.37 → 4.0.38

package/README.md

@@ -90,8 +90,10 @@ Only `apiUrls` and the credentials needed by your server are required.
 There is no topic unsubscribe API. An explicit `reconnect()` replaces the
 connection without emitting `onInterrupted` for the old connection.
 
-Subscriptions are queued internally and sent one batch at a time. Small batches
-wait up to 100 ms from their first queued topic; a queue exceeding 50 topics can
+Subscriptions are queued internally and sent one batch at a time. Duplicate
+subscribers share the pending result, so every caller waits for
+server confirmation and receives failures if the connection stops or is replaced.
+Small batches wait up to 100 ms from their first queued topic; a queue exceeding 50 topics can
 flush earlier. A pending request can delay later batches. Stopping or replacing
 the connection also settles subscriptions still waiting in the queue.
 
@@ -353,7 +355,7 @@ not trigger that fallback. Callback failures are logged and isolated.
 | Method | Contract |
 | --- | --- |
 | `makeCall(number, fromnumber, streamPm, callid, campaignid, outboundcallentryid, channel)` | Requires a Promise for a live audio stream. Optional call ID is generated if absent; the final three arguments add call metadata. Resolves on call end or setup failure. No number fallback is performed here. |
-| `answerCall(callid, stream)` | Accepts a stream or Promise. Resolves after answer setup to `{body}` or `{error}`. |
+| `answerCall(callid, stream)` | Accepts a stream or Promise. Resolves after answer setup to `{body}` or `{error}`. If the call ends during setup, resolves to `{error: 'call_ended'}`. |
 | `listenCall(callid, callback)` | Receive-only setup. Calls `callback(error, connectionId)` once ICE connects or setup fails. |
 | `joinCall(callid, stream, callback)` | Bidirectional setup with an already acquired stream. Same callback contract as `listenCall`. |
 | `hangupCall(callid)` | Ends locally and signals server hangup. Returns `undefined`. |

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/wsclient",
-	"version": "4.0.37",
+	"version": "4.0.38",
 	"main": "realtime.js",
 	"files": [
 		"realtime.js",

package/realtime.js

@@ -309,7 +309,7 @@ function Realtime(apiUrls, credential, callAPI, accid, skipautoreconnect) {
 	}
 
 	// holds all topics that realtime must subscribed
-	var topics = {}
+	var topics = Object.create(null)
 
 	// stop the connection
 	this.stop = function () {
@@ -344,18 +344,18 @@ function Realtime(apiUrls, credential, callAPI, accid, skipautoreconnect) {
 		if (typeof events === 'string') events = [events]
 		if (!Array.isArray(events)) return Promise.resolve({error: 'param should be an array or string'})
 
-		// ignore already subscribed events
+		// Share pending subscriptions so duplicate callers also wait for the server.
+		var subscribingConn = conn
 		var all = []
 		for (var i = 0; i < events.length; i++) {
 			var topic = events[i]
 			if (!topic) continue
-			if (topics[topic]) continue
-			topics[topic] = true // mark so next time we wont subscribe this event (topic) again
-			all.push(conn.subscribe(topic))
+			if (!topics[topic]) topics[topic] = subscribingConn.subscribe(topic)
+			all.push(topics[topic])
 		}
 		if (all.length === 0) return Promise.resolve({})
 		return Promise.all(all).then(function () {
-			if (!conn || conn.getStatus() == 'dead') return {error: 'dead'}
+			if (conn !== subscribingConn || subscribingConn.getStatus() == 'dead') return {error: 'dead'}
 			return {}
 		})
 	}
@@ -397,7 +397,7 @@ function Realtime(apiUrls, credential, callAPI, accid, skipautoreconnect) {
 		)
 		conn = myconn
 		var copyTopics = Object.keys(topics)
-		topics = {}
+		topics = Object.create(null)
 		// resubscribe all subscribed events
 		return subscribe(copyTopics)
 	}

package/webrtc.js

@@ -1138,7 +1138,7 @@ function WebRTCConn(options) {
 		} catch (err) {
 			delete answerRequest[callid]
 			let reason = failOperation(op, err)
-			return reason === 'call_ended' ? {body: getLocalEndedCall(callid)} : {error: reason}
+			return {error: reason}
 		} finally {
 			op.dispose()
 		}