From b69eea543c30eae88d0146cb2038265362502e8f Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 5 Feb 2019 10:04:38 -0800
Subject: [PATCH] MessageReceiver: Don't wait for app logic to start next
 decrypt

---
 libtextsecure/message_receiver.js | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index a4109eb5d..c41743483 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -224,7 +224,11 @@ MessageReceiver.prototype.extend({
     window.log.error('websocket error');
   },
   dispatchAndWait(event) {
-    return Promise.all(this.dispatchEvent(event));
+    const promise = this.appPromise || Promise.resolve();
+    const appJobPromise = Promise.all(this.dispatchEvent(event));
+    const job = () => appJobPromise;
+
+    this.appPromise = promise.then(job, job);
   },
   onclose(ev) {
     window.log.info(
@@ -354,23 +358,34 @@ MessageReceiver.prototype.extend({
     const { incoming } = this;
     this.incoming = [];
 
-    const dispatchEmpty = () => {
+    const emitEmpty = () => {
       window.log.info("MessageReceiver: emitting 'empty' event");
       const ev = new Event('empty');
-      return this.dispatchAndWait(ev);
+      this.dispatchAndWait(ev);
+    };
+
+    const waitForApplication = async () => {
+      window.log.info(
+        "MessageReceiver: finished processing messages after 'empty', now waiting for application"
+      );
+      const promise = this.appPromise || Promise.resolve();
+      this.appPromise = Promise.resolve();
+
+      // We don't await here because we don't this to gate future message processing
+      promise.then(emitEmpty, emitEmpty);
     };
 
-    const queueDispatch = () => {
+    const waitForEmptyQueue = () => {
       // resetting count to zero so everything queued after this starts over again
       this.count = 0;
 
-      this.addToQueue(dispatchEmpty);
+      this.addToQueue(waitForApplication);
     };
 
     // We first wait for all recently-received messages (this.incoming) to be queued,
-    //   then we add a task to emit the 'empty' event to the queue, so all message
-    //   processing is complete by the time it runs.
-    Promise.all(incoming).then(queueDispatch, queueDispatch);
+    //   then we queue a task to wait for the application to finish its processing, then
+    //   finally we emit the 'empty' event to the queue.
+    Promise.all(incoming).then(waitForEmptyQueue, waitForEmptyQueue);
   },
   drain() {
     const { incoming } = this;