set c2p queue as hashmap to prevent duplicates

app/content-scripts/click_to_play.js

@@ -161,15 +161,11 @@ const Click2PlayContentScript = (function(win, doc) {
 			if (name === 'c2p') {
 				if (message) {
 					// Dequeue C2P data stored while the script injection was taking place
-					if (Array.isArray(message)) {
-						let m = message.shift();
-						while (m !== undefined) {
-							applyC2P(m.app_id, m.data, m.html);
-							m = message.shift();
+					for (const app_id in message) {
+						if (message.hasOwnProperty(app_id)) {
+							applyC2P(app_id, message[app_id].data, message[app_id].html);
+							delete message[app_id];
 						}
-					} else {
-						// Single C2P message
-						applyC2P(message.app_id, message.data, message.html);
 					}
 				}
 			}

src/classes/TabInfo.js

@@ -3,7 +3,7 @@
  *
  * this._tabInfo[tab_id]: {
  * 		c2pStatus		{string}	current status of the click_to_play.js script injection on the tab (none|loading|done)
- * 		c2pQueue		{array}		queue of c2p messages collected when c2pStatus is none or loading
+ * 		c2pQueue		{Object}	queue of c2p messages collected when c2pStatus is none or loading, organized as a HashSet by app_id
  *		domain: 		{string}	the general domain name plus suffix (no sub-domains)
  *		hash: 			{string} 	hash values appended to the url
  *		host: 			{string} 	the domain name plus suffix and sub-domains
@@ -71,7 +71,7 @@ class TabInfo {
 			},
 			insecureRedirects: [],
 			c2pStatus: 'none',
-			c2pQueue: [],
+			c2pQueue: {},
 		};
 
 		this._tabInfo[tab_id] = info;

src/utils/click2play.js

@@ -108,23 +108,26 @@ export function buildC2P(details, app_id) {
 				// Send the entire queue to the content script to reduce message passing
 				sendMessage(tab_id, 'c2p', tab.c2pQueue);
 				tab.c2pStatus = 'done';
+				tab.c2pQueue = {};
 			}).catch((err) => {
 				log('buildC2P error', err);
 			});
 			break;
 		case 'loading':
 			// Push C2P data to a holding queue until click_to_play.js has finished loading on the page
-			tab.c2pQueue.push({
-				app_id,
-				data: c2pApp,
-				html: c2pHtml
-			});
+			if (!tab.c2pQueue.hasOwnProperty(app_id)) {
+				tab.c2pQueue[app_id] = {
+					data: c2pApp,
+					html: c2pHtml
+				};
+			}
 			break;
 		case 'done':
 			sendMessage(tab_id, 'c2p', {
-				app_id,
-				data: c2pApp,
-				html: c2pHtml
+				app_id: {
+					data: c2pApp,
+					html: c2pHtml
+				}
 			});
 			break;
 		default: