Merge pull request #164 from BeaudanBrown/message-filtering

Message filtering

background.html

@@ -723,6 +723,7 @@
   <script type='text/javascript' src='js/models/blockedNumbers.js'></script>
   <script type='text/javascript' src='js/models/profile.js'></script>
   <script type='text/javascript' src='js/expiring_messages.js'></script>
+  <script type='text/javascript' src='js/queue_manager.js'></script>
 
   <script type='text/javascript' src='js/chromium.js'></script>
   <script type='text/javascript' src='js/registration.js'></script>

js/modules/loki_message_api.js

@@ -282,7 +282,7 @@ class LokiMessageAPI {
       await Promise.all(
         Object.entries(ourSwarmNodes)
           .splice(0, remainingRequests)
-          .map(([nodeUrl, lastHash]) => doRequest(nodeUrl, lastHash))
+          .map(([nodeUrl, nodeData]) => doRequest(nodeUrl, nodeData))
       );
     }
   }

js/modules/loki_snode_api.js

@@ -103,7 +103,7 @@ class LokiSnodeAPI {
         };
       });
     }
-    return this.ourSwarmNodes;
+    return { ...this.ourSwarmNodes };
   }
 
   async refreshSwarmNodesForPubKey(pubKey) {

js/queue_manager.js

@@ -0,0 +1,28 @@
+/* eslint-disable more/no-then */
+
+// eslint-disable-next-line func-names
+(function() {
+  'use strict';
+
+  class JobQueue {
+    constructor() {
+      this.pending = Promise.resolve();
+    }
+
+    add(job) {
+      const previous = this.pending || Promise.resolve();
+      this.pending = previous.then(job, job);
+      const current = this.pending;
+
+      current.then(() => {
+        if (this.pending === current) {
+          delete this.pending;
+        }
+      });
+
+      return current;
+    }
+  }
+
+  window.JobQueue = JobQueue;
+})();

libtextsecure/http-resources.js

@@ -65,9 +65,12 @@
       handleRequest = request => request.respond(404, 'Not found');
     }
     let connected = false;
+    const jobQueue = new window.JobQueue();
 
     const processMessages = async messages => {
-      const newMessages = await filterIncomingMessages(messages);
+      const newMessages = await jobQueue.add(() =>
+        filterIncomingMessages(messages)
+      );
       newMessages.forEach(async message => {
         const { data } = message;
         this.handleMessage(data);