Merge branch 'beta' into 'master'

Attempt to solve the missing RAI UI notifications

See merge request !140

src/plugins/sib-subscribe-to-rai.js

 import { store } from 'https://cdn.skypack.dev/@startinblox/core@0.17';
+import { documentReady } from '../utils.js';
 
 /**
  * Initialize rai plugin.
@@ -52,8 +53,7 @@ converse.plugins.add('sib-subscribe-to-rai', {
       }, 250);
     });
 
-    api.listen.on('connected', async () => {
-
+    const onConnected = async () => {
       // @MattJ Here userRooms is an array of each jabberID the user is on.
       let userRooms = (await Promise.all([
         getCircles,
@@ -62,14 +62,23 @@ converse.plugins.add('sib-subscribe-to-rai', {
 
       log.info(`User rooms: ${userRooms.join(', ')}`);
       await api.rooms.subscribe(userRooms);
-    });
+    };
 
-    api.listen.on('chatRoomHasActivity', jid => {
-      window.dispatchEvent(new CustomEvent('newMessage', {
-        detail: {
-          jid,
-        },
-      }));
+    // Send RAI subscriptions when connected to the XMPP endpoint
+    api.listen.on('connected', onConnected);
+    api.listen.on('reconnected', onConnected);
+
+    // Set timeout so the event is sent once the document is loaded
+    // Await document ready state so the event is properly registered
+    api.listen.on('chatRoomHasActivity', async jid => {
+      await documentReady();
+      setTimeout(() => {
+        window.dispatchEvent(new CustomEvent('newMessage', {
+          detail: {
+            jid,
+          },
+        }));
+      }, 250);
     });
   },
 });

src/utils.js

@@ -14,3 +14,16 @@ export class Deferred {
  * @return {boolean}
  */
 export const isTouchDevice = () => ('ontouchstart' in document.documentElement);
+
+/**
+ * Promise that resolves once the document is fully ready.
+ * @return {Promise}
+ */
+export function documentReady() {
+  if (document.readyState === 'loading') {
+    return new Promise(resolve => {
+      document.addEventListener('DOMContentLoaded', () => resolve());
+    });
+  }
+  return Promise.resolve();
+}