Merge branch 'master' into transport-events

meetecho · Jan 17, 2017 · 7f39d6e · 7f39d6e
2 parents 5e1c567 + 735cf3b
commit 7f39d6e
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 38 deletions.
diff --git a/events.c b/events.c
@@ -46,6 +46,8 @@ void janus_events_deinit(void) {
 		g_thread_join(events_thread);
 		events_thread = NULL;
 	}
+	if(events != NULL)
+		g_async_queue_unref(events);
 }
 
 gboolean janus_events_is_enabled(void) {

diff --git a/html/audiobridgetest.js b/html/audiobridgetest.js
@@ -50,6 +50,8 @@ else
 
 var janus = null;
 var mixertest = null;
+var opaqueId = "audiobridgetest-"+Janus.randomString(12);
+
 var started = false;
 var spinner = null;
 
@@ -83,6 +85,7 @@ $(document).ready(function() {
 						janus.attach(
 							{
 								plugin: "janus.plugin.audiobridge",
+								opaqueId: opaqueId,
 								success: function(pluginHandle) {
 									$('#details').remove();
 									mixertest = pluginHandle;

diff --git a/html/devicetest.js b/html/devicetest.js
@@ -50,6 +50,8 @@ else
 
 var janus = null;
 var echotest = null;
+var opaqueId = "devicetest-"+Janus.randomString(12);
+
 var started = false;
 var bitrateTimer = null;
 var spinner = null;
@@ -159,6 +161,7 @@ $(document).ready(function() {
 						janus.attach(
 							{
 								plugin: "janus.plugin.echotest",
+								opaqueId: opaqueId,
 								success: function(pluginHandle) {
 									$('#details').remove();
 									echotest = pluginHandle;

diff --git a/html/echotest.js b/html/echotest.js
@@ -50,6 +50,8 @@ else
 
 var janus = null;
 var echotest = null;
+var opaqueId = "echotest-"+Janus.randomString(12);
+
 var started = false;
 var bitrateTimer = null;
 var spinner = null;
@@ -89,6 +91,7 @@ $(document).ready(function() {
 						janus.attach(
 							{
 								plugin: "janus.plugin.echotest",
+								opaqueId: opaqueId,
 								success: function(pluginHandle) {
 									$('#details').remove();
 									echotest = pluginHandle;

diff --git a/html/janus.js b/html/janus.js
@@ -230,6 +230,18 @@ Janus.isWebrtcSupported = function() {
 		navigator.getUserMedia !== undefined && navigator.getUserMedia !== null;
 };
 
+// Helper method to create random identifiers (e.g., transaction)
+Janus.randomString = function(len) {
+	var charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+	var randomString = '';
+	for (var i = 0; i < len; i++) {
+		var randomPoz = Math.floor(Math.random() * charSet.length);
+		randomString += charSet.substring(randomPoz,randomPoz+1);
+	}
+	return randomString;
+}
+
+
 function Janus(gatewayCallbacks) {
 	if(Janus.initDone === undefined) {
 		gatewayCallbacks.error("Library not initialized");
@@ -311,17 +323,6 @@ function Janus(gatewayCallbacks) {
 	this.destroy = function(callbacks) { destroySession(callbacks); };
 	this.attach = function(callbacks) { createHandle(callbacks); };
 
-	// Private method to create random identifiers (e.g., transaction)
-	function randomString(len) {
-		var charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-		var randomString = '';
-		for (var i = 0; i < len; i++) {
-			var randomPoz = Math.floor(Math.random() * charSet.length);
-			randomString += charSet.substring(randomPoz,randomPoz+1);
-		}
-		return randomString;
-	}
-
 	function eventHandler() {
 		if(sessionId == null)
 			return;
@@ -537,7 +538,7 @@ function Janus(gatewayCallbacks) {
 		if(server === null || !websockets || !connected)
 			return;
 		wsKeepaliveTimeoutId = setTimeout(keepAlive, 30000);
-		var request = { "janus": "keepalive", "session_id": sessionId, "transaction": randomString(12) };
+		var request = { "janus": "keepalive", "session_id": sessionId, "transaction": Janus.randomString(12) };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
 		if(apisecret !== null && apisecret !== undefined)
@@ -547,7 +548,7 @@ function Janus(gatewayCallbacks) {
 
 	// Private method to create a session
 	function createSession(callbacks) {
-		var transaction = randomString(12);
+		var transaction = Janus.randomString(12);
 		var request = { "janus": "create", "transaction": transaction };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
@@ -696,7 +697,7 @@ function Janus(gatewayCallbacks) {
 			destroyHandle(phv.id, {asyncRequest: asyncRequest});
 		}
 		// Ok, go on
-		var request = { "janus": "destroy", "transaction": randomString(12) };
+		var request = { "janus": "destroy", "transaction": Janus.randomString(12) };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
 		if(apisecret !== null && apisecret !== undefined)
@@ -793,7 +794,7 @@ function Janus(gatewayCallbacks) {
 			return;
 		}
 		var opaqueId = callbacks.opaqueId;
-		var transaction = randomString(12);
+		var transaction = Janus.randomString(12);
 		var request = { "janus": "attach", "plugin": plugin, "opaque_id": opaqueId, "transaction": transaction };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
@@ -973,7 +974,7 @@ function Janus(gatewayCallbacks) {
 		}
 		var message = callbacks.message;
 		var jsep = callbacks.jsep;
-		var transaction = randomString(12);
+		var transaction = Janus.randomString(12);
 		var request = { "janus": "message", "body": message, "transaction": transaction };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
@@ -1069,7 +1070,7 @@ function Janus(gatewayCallbacks) {
 			Janus.warn("Is the gateway down? (connected=false)");
 			return;
 		}
-		var request = { "janus": "trickle", "candidate": candidate, "transaction": randomString(12) };
+		var request = { "janus": "trickle", "candidate": candidate, "transaction": Janus.randomString(12) };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
 		if(apisecret !== null && apisecret !== undefined)
@@ -1195,7 +1196,7 @@ function Janus(gatewayCallbacks) {
 			callbacks.error("Is the gateway down? (connected=false)");
 			return;
 		}
-		var request = { "janus": "detach", "transaction": randomString(12) };
+		var request = { "janus": "detach", "transaction": Janus.randomString(12) };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
 		if(apisecret !== null && apisecret !== undefined)
@@ -2078,7 +2079,7 @@ function Janus(gatewayCallbacks) {
 		if(config !== null && config !== undefined) {
 			if(hangupRequest === true) {
 				// Send a hangup request (we don't really care about the response)
-				var request = { "janus": "hangup", "transaction": randomString(12) };
+				var request = { "janus": "hangup", "transaction": Janus.randomString(12) };
 				if(token !== null && token !== undefined)
 					request["token"] = token;
 				if(apisecret !== null && apisecret !== undefined)

diff --git a/html/janus.nojquery.js b/html/janus.nojquery.js
@@ -270,6 +270,17 @@ Janus.isWebrtcSupported = function() {
 		navigator.getUserMedia !== undefined && navigator.getUserMedia !== null;
 };
 
+// Helper method to create random identifiers (e.g., transaction)
+Janus.randomString = function(len) {
+	var charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+	var randomString = '';
+	for (var i = 0; i < len; i++) {
+		var randomPoz = Math.floor(Math.random() * charSet.length);
+		randomString += charSet.substring(randomPoz,randomPoz+1);
+	}
+	return randomString;
+}
+
 
 // Janus session object
 function Janus(gatewayCallbacks) {
@@ -353,17 +364,6 @@ function Janus(gatewayCallbacks) {
 	this.destroy = function(callbacks) { destroySession(callbacks, true); };
 	this.attach = function(callbacks) { createHandle(callbacks); };
 
-	// Private method to create random identifiers (e.g., transaction)
-	function randomString(len) {
-		var charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-		var randomString = '';
-		for (var i = 0; i < len; i++) {
-			var randomPoz = Math.floor(Math.random() * charSet.length);
-			randomString += charSet.substring(randomPoz,randomPoz+1);
-		}
-		return randomString;
-	}
-
 	function eventHandler() {
 		if(sessionId == null)
 			return;
@@ -579,7 +579,7 @@ function Janus(gatewayCallbacks) {
 		if(server === null || !websockets || !connected)
 			return;
 		wsKeepaliveTimeoutId = setTimeout(keepAlive, 30000);
-		var request = { "janus": "keepalive", "session_id": sessionId, "transaction": randomString(12) };
+		var request = { "janus": "keepalive", "session_id": sessionId, "transaction": Janus.randomString(12) };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
 		if(apisecret !== null && apisecret !== undefined)
@@ -589,7 +589,7 @@ function Janus(gatewayCallbacks) {
 
 	// Private method to create a session
 	function createSession(callbacks) {
-		var transaction = randomString(12);
+		var transaction = Janus.randomString(12);
 		var request = { "janus": "create", "transaction": transaction };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
@@ -738,7 +738,7 @@ function Janus(gatewayCallbacks) {
 			destroyHandle(phv.id, {asyncRequest: asyncRequest});
 		}
 		// Ok, go on
-		var request = { "janus": "destroy", "transaction": randomString(12) };
+		var request = { "janus": "destroy", "transaction": Janus.randomString(12) };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
 		if(apisecret !== null && apisecret !== undefined)
@@ -835,7 +835,7 @@ function Janus(gatewayCallbacks) {
 			return;
 		}
 		var opaqueId = callbacks.opaqueId;
-		var transaction = randomString(12);
+		var transaction = Janus.randomString(12);
 		var request = { "janus": "attach", "plugin": plugin, "opaque_id": opaqueId, "transaction": transaction };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
@@ -1015,7 +1015,7 @@ function Janus(gatewayCallbacks) {
 		}
 		var message = callbacks.message;
 		var jsep = callbacks.jsep;
-		var transaction = randomString(12);
+		var transaction = Janus.randomString(12);
 		var request = { "janus": "message", "body": message, "transaction": transaction };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
@@ -1111,7 +1111,7 @@ function Janus(gatewayCallbacks) {
 			Janus.warn("Is the gateway down? (connected=false)");
 			return;
 		}
-		var request = { "janus": "trickle", "candidate": candidate, "transaction": randomString(12) };
+		var request = { "janus": "trickle", "candidate": candidate, "transaction": Janus.randomString(12) };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
 		if(apisecret !== null && apisecret !== undefined)
@@ -1236,7 +1236,7 @@ function Janus(gatewayCallbacks) {
 			callbacks.error("Is the gateway down? (connected=false)");
 			return;
 		}
-		var request = { "janus": "detach", "transaction": randomString(12) };
+		var request = { "janus": "detach", "transaction": Janus.randomString(12) };
 		if(token !== null && token !== undefined)
 			request["token"] = token;
 		if(apisecret !== null && apisecret !== undefined)
@@ -2119,7 +2119,7 @@ function Janus(gatewayCallbacks) {
 		if(config !== null && config !== undefined) {
 			if(hangupRequest === true) {
 				// Send a hangup request (we don't really care about the response)
-				var request = { "janus": "hangup", "transaction": randomString(12) };
+				var request = { "janus": "hangup", "transaction": Janus.randomString(12) };
 				if(token !== null && token !== undefined)
 					request["token"] = token;
 				if(apisecret !== null && apisecret !== undefined)

diff --git a/html/recordplaytest.js b/html/recordplaytest.js
@@ -50,6 +50,8 @@ else
 
 var janus = null;
 var recordplay = null;
+var opaqueId = "recordplaytest-"+Janus.randomString(12);
+
 var started = false;
 var spinner = null;
 var bandwidth = 1024 * 1024;
@@ -85,6 +87,7 @@ $(document).ready(function() {
 						janus.attach(
 							{
 								plugin: "janus.plugin.recordplay",
+								opaqueId: opaqueId,
 								success: function(pluginHandle) {
 									$('#details').remove();
 									recordplay = pluginHandle;

diff --git a/html/screensharingtest.js b/html/screensharingtest.js
@@ -51,6 +51,8 @@ else
 
 var janus = null;
 var screentest = null;
+var opaqueId = "screensharingtest-"+Janus.randomString(12);
+
 var started = false;
 
 var myusername = null;
@@ -99,6 +101,7 @@ $(document).ready(function() {
 						janus.attach(
 							{
 								plugin: "janus.plugin.videoroom",
+								opaqueId: opaqueId,
 								success: function(pluginHandle) {
 									$('#details').remove();
 									screentest = pluginHandle;
@@ -394,6 +397,7 @@ function newRemoteFeed(id, display) {
 	janus.attach(
 		{
 			plugin: "janus.plugin.videoroom",
+			opaqueId: opaqueId,
 			success: function(pluginHandle) {
 				remoteFeed = pluginHandle;
 				Janus.log("Plugin attached! (" + remoteFeed.getPlugin() + ", id=" + remoteFeed.getId() + ")");

diff --git a/html/siptest.js b/html/siptest.js
@@ -50,6 +50,8 @@ else
 
 var janus = null;
 var sipcall = null;
+var opaqueId = "siptest-"+Janus.randomString(12);
+
 var started = false;
 var spinner = null;
 
@@ -82,6 +84,7 @@ $(document).ready(function() {
 						janus.attach(
 							{
 								plugin: "janus.plugin.sip",
+								opaqueId: opaqueId,
 								success: function(pluginHandle) {
 									$('#details').remove();
 									sipcall = pluginHandle;

diff --git a/html/streamingtest.js b/html/streamingtest.js
@@ -50,6 +50,8 @@ else
 
 var janus = null;
 var streaming = null;
+var opaqueId = "streamingtest-"+Janus.randomString(12);
+
 var started = false;
 var spinner = null;
 
@@ -79,6 +81,7 @@ $(document).ready(function() {
 						janus.attach(
 							{
 								plugin: "janus.plugin.streaming",
+								opaqueId: opaqueId,
 								success: function(pluginHandle) {
 									$('#details').remove();
 									streaming = pluginHandle;

diff --git a/html/textroomtest.js b/html/textroomtest.js
@@ -50,6 +50,8 @@ else
 
 var janus = null;
 var textroom = null;
+var opaqueId = "textroomtest-"+Janus.randomString(12);
+
 var started = false;
 
 var myroom = 1234;	// Demo room
@@ -81,6 +83,7 @@ $(document).ready(function() {
 						janus.attach(
 							{
 								plugin: "janus.plugin.textroom",
+								opaqueId: opaqueId,
 								success: function(pluginHandle) {
 									$('#details').remove();
 									textroom = pluginHandle;

diff --git a/html/videocalltest.js b/html/videocalltest.js
@@ -50,6 +50,8 @@ else
 
 var janus = null;
 var videocall = null;
+var opaqueId = "videocalltest-"+Janus.randomString(12);
+
 var started = false;
 var bitrateTimer = null;
 var spinner = null;
@@ -83,6 +85,7 @@ $(document).ready(function() {
 						janus.attach(
 							{
 								plugin: "janus.plugin.videocall",
+								opaqueId: opaqueId,
 								success: function(pluginHandle) {
 									$('#details').remove();
 									videocall = pluginHandle;