core-3nweb-client-lib 0.42.1 → 0.42.3

package/build/core/asmail/inbox/inbox-events.d.ts

@@ -24,9 +24,10 @@ export declare class InboxEvents {
     private listeningProc;
     private readonly makeServerEvents;
     private networkActive;
-    private listMsgsFrom;
+    private disconnectedAt;
     constructor(msgReceiver: MailRecipient, getMsg: (msgId: string) => Promise<IncomingMessage>, listMsgs: (fromTS: number) => Promise<MsgInfo[]>, rmMsg: (msgId: string) => Promise<void>, logError: LogError);
     private startListening;
+    private sleepAndRestart;
     private getMessage;
     subscribe<T>(event: InboxEventType, observer: Observer<T>): () => void;
     close(): void;
@@ -35,6 +36,6 @@ export declare class InboxEvents {
     private stopListening;
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
-    private startListingOfDisconnectedPeriod;
+    private listMsgsFromDisconnectedPeriod;
 }
 export {};

package/build/core/asmail/inbox/inbox-events.js

@@ -24,6 +24,7 @@ const operators_1 = require("rxjs/operators");
 const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 const sleep_1 = require("../../../lib-common/processes/sleep");
 const SERVER_EVENTS_RESTART_WAIT_SECS = 5;
+const BUFFER_MILLIS_FOR_LISTING = 2 * 60 * 1000;
 /**
  * Instance of this class handles event subscription from UI side. It observes
  * inbox server events, handles them, and generates respective events for UI
@@ -44,7 +45,7 @@ class InboxEvents {
         this.newMsg$ = this.newMsgs.asObservable().pipe((0, operators_1.share)());
         this.listeningProc = undefined;
         this.networkActive = true;
-        this.listMsgsFrom = undefined;
+        this.disconnectedAt = undefined;
         this.makeServerEvents = () => new server_events_1.ServerEvents(() => msgReceiver.openEventSource(this.logError));
         this.startListening();
         Object.seal(this);
@@ -53,11 +54,14 @@ class InboxEvents {
         if (this.listeningProc || !this.networkActive) {
             return;
         }
-        function clearListeningProc() {
+        const clearListeningProc = () => {
             if (this.listeningProc === sub) {
                 this.listeningProc = undefined;
             }
-        }
+            if (!this.disconnectedAt) {
+                this.disconnectedAt = Date.now();
+            }
+        };
         const sub = this.makeServerEvents()
             .observe(retrieval_1.msgRecievedCompletely.EVENT_NAME)
             .pipe((0, operators_1.mergeMap)(async (ev) => this.getMessage(ev.msgId), 5))
@@ -73,21 +77,26 @@ class InboxEvents {
             error: async (exc) => {
                 clearListeningProc();
                 if (this.shouldRestartAfterErr(exc)) {
-                    await (0, sleep_1.sleep)(SERVER_EVENTS_RESTART_WAIT_SECS);
-                    this.startListening();
+                    this.sleepAndRestart();
                 }
             }
         });
         this.listeningProc = sub;
+        this.listMsgsFromDisconnectedPeriod();
+    }
+    async sleepAndRestart() {
+        await (0, sleep_1.sleep)(SERVER_EVENTS_RESTART_WAIT_SECS);
+        this.startListening();
     }
     async getMessage(msgId) {
         try {
             return await this.getMsg(msgId);
         }
         catch (err) {
-            // XXX we need to skip, if it is a connectivity error here
-            await this.rmMsg(msgId);
-            await this.logError(err, `Cannot get message ${msgId}, and removing it as a result`);
+            // XXX we need to skip, if it is a connectivity error here;
+            //     should we remove on non-connectivity error
+            // await this.rmMsg(msgId).catch(noop);
+            await this.logError(err, `Cannot get message ${msgId}`);
         }
     }
     subscribe(event, observer) {
@@ -130,8 +139,8 @@ class InboxEvents {
     suspendNetworkActivity() {
         this.networkActive = false;
         if (this.isListening) {
-            if (!this.listMsgsFrom) {
-                this.listMsgsFrom = Date.now();
+            if (!this.disconnectedAt) {
+                this.disconnectedAt = Date.now();
             }
             this.stopListening();
         }
@@ -140,14 +149,13 @@ class InboxEvents {
         this.networkActive = true;
         if (!this.isListening) {
             this.startListening();
-            this.startListingOfDisconnectedPeriod();
         }
     }
-    async startListingOfDisconnectedPeriod() {
-        if (!this.listMsgsFrom) {
+    async listMsgsFromDisconnectedPeriod() {
+        if (!this.disconnectedAt) {
             return;
         }
-        const fromTS = this.listMsgsFrom + 2 * 60 * 1000;
+        const fromTS = this.disconnectedAt - BUFFER_MILLIS_FOR_LISTING;
         let msgInfos = (await this.listMsgs(fromTS))
             .filter(info => (fromTS <= info.deliveryTS))
             .sort((a, b) => (a.deliveryTS - b.deliveryTS));
@@ -159,11 +167,8 @@ class InboxEvents {
             else if (!this.networkActive) {
                 return;
             }
-            else {
-                // XXX
-            }
         }
-        this.listMsgsFrom = undefined;
+        this.disconnectedAt = undefined;
     }
 }
 exports.InboxEvents = InboxEvents;