core-3nweb-client-lib 0.42.0 → 0.42.2

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

@@ -3,6 +3,7 @@ import { LogError } from '../../../lib-client/logging/log-to-file';
 type IncomingMessage = web3n.asmail.IncomingMessage;
 type InboxEventType = web3n.asmail.InboxEventType;
 type Observer<T> = web3n.Observer<T>;
+type MsgInfo = web3n.asmail.MsgInfo;
 /**
  * Instance of this class handles event subscription from UI side. It observes
  * inbox server events, handles them, and generates respective events for UI
@@ -15,6 +16,7 @@ type Observer<T> = web3n.Observer<T>;
  */
 export declare class InboxEvents {
     private readonly getMsg;
+    private readonly listMsgs;
     private readonly rmMsg;
     private readonly logError;
     private readonly newMsgs;
@@ -22,8 +24,11 @@ export declare class InboxEvents {
     private listeningProc;
     private readonly makeServerEvents;
     private networkActive;
-    constructor(msgReceiver: MailRecipient, getMsg: (msgId: string) => Promise<IncomingMessage>, rmMsg: (msgId: string) => Promise<void>, logError: LogError);
+    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;
     get isListening(): boolean;
@@ -31,5 +36,6 @@ export declare class InboxEvents {
     private stopListening;
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
+    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
@@ -35,15 +36,17 @@ const SERVER_EVENTS_RESTART_WAIT_SECS = 5;
  * Hence, this should do restarts to server around wakeup events.
  */
 class InboxEvents {
-    constructor(msgReceiver, getMsg, rmMsg, logError) {
+    constructor(msgReceiver, getMsg, listMsgs, rmMsg, logError) {
         this.getMsg = getMsg;
+        this.listMsgs = listMsgs;
         this.rmMsg = rmMsg;
         this.logError = logError;
         this.newMsgs = new rxjs_1.Subject();
         this.newMsg$ = this.newMsgs.asObservable().pipe((0, operators_1.share)());
         this.listeningProc = undefined;
         this.networkActive = true;
-        this.makeServerEvents = () => new server_events_1.ServerEvents(() => msgReceiver.openEventSource(this.logError), this.logError);
+        this.disconnectedAt = undefined;
+        this.makeServerEvents = () => new server_events_1.ServerEvents(() => msgReceiver.openEventSource(this.logError));
         this.startListening();
         Object.seal(this);
     }
@@ -51,22 +54,17 @@ 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) => {
-            try {
-                return await this.getMsg(ev.msgId);
-            }
-            catch (err) {
-                await this.rmMsg(ev.msgId);
-                await this.logError(err, `Cannot get message ${ev.msgId}, and removing it as a result`);
-            }
-        }, 5))
+            .pipe((0, operators_1.mergeMap)(async (ev) => this.getMessage(ev.msgId), 5))
             .subscribe({
             next: msg => {
                 if (msg) {
@@ -79,12 +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`);
+        }
     }
     subscribe(event, observer) {
         if (event === 'message') {
@@ -126,6 +138,9 @@ class InboxEvents {
     suspendNetworkActivity() {
         this.networkActive = false;
         if (this.isListening) {
+            if (!this.disconnectedAt) {
+                this.disconnectedAt = Date.now();
+            }
             this.stopListening();
         }
     }
@@ -135,6 +150,33 @@ class InboxEvents {
             this.startListening();
         }
     }
+    async listMsgsFromDisconnectedPeriod() {
+        // DEBUG log
+        await this.logError(null, `entering listMsgsFromDisconnectedPeriod at ${Date.now()}, this.disconnectedAt is ${this.disconnectedAt}`);
+        if (!this.disconnectedAt) {
+            return;
+        }
+        const fromTS = this.disconnectedAt - BUFFER_MILLIS_FOR_LISTING;
+        // DEBUG log
+        await this.logError(null, `starting listMsgsFromDisconnectedPeriod process with fromTS ${fromTS}`);
+        let msgInfos = (await this.listMsgs(fromTS))
+            .filter(info => (fromTS <= info.deliveryTS))
+            .sort((a, b) => (a.deliveryTS - b.deliveryTS));
+        // DEBUG log
+        await this.logError(null, ` ... filtered list has ${msgInfos.length} number of items`);
+        for (const info of msgInfos) {
+            const msg = await this.getMessage(info.msgId);
+            // DEBUG log
+            await this.logError(null, ` ... msg ${msg === null || msg === void 0 ? void 0 : msg.msgId} found`);
+            if (msg) {
+                this.newMsgs.next(msg);
+            }
+            else if (!this.networkActive) {
+                return;
+            }
+        }
+        this.disconnectedAt = undefined;
+    }
 }
 exports.InboxEvents = InboxEvents;
 Object.freeze(InboxEvents.prototype);

package/build/core/asmail/inbox/index.js

@@ -51,7 +51,7 @@ class InboxOnServer {
         this.logError = logError;
         this.procs = new synced_1.NamedProcs();
         this.recentlyOpenedMsgs = (0, timed_cache_1.makeTimedCache)(60 * 1000);
-        this.inboxEvents = new inbox_events_1.InboxEvents(this.msgReceiver, this.getMsg.bind(this), this.removeMsg.bind(this), this.logError);
+        this.inboxEvents = new inbox_events_1.InboxEvents(this.msgReceiver, this.getMsg.bind(this), this.listMsgs.bind(this), this.removeMsg.bind(this), this.logError);
         Object.seal(this);
     }
     static async makeAndStart(cachePath, syncedFS, r) {
@@ -230,11 +230,10 @@ class InboxOnServer {
             if (msgIds.length === 0) {
                 return indexedMsgs;
             }
-            const keying = msgIds.map(msgId => this.startCachingAndAddKeyToIndex(msgId)
+            await Promise.all(msgIds.map(msgId => this.startCachingAndAddKeyToIndex(msgId)
                 .catch(async (exc) => {
                 await this.logError(exc, `Failed to start caching message ${msgId}`);
-            }));
-            await Promise.all(keying);
+            })));
             return this.index.listMsgs(fromTS);
         });
     }

package/build/core/storage/synced/remote-events.js

@@ -36,9 +36,7 @@ class RemoteEvents {
         Object.seal(this);
     }
     startAbsorbingRemoteEvents() {
-        const serverEvents = new server_events_1.ServerEvents(() => this.remoteStorage.openEventSource(this.logError), 
-        // SERVER_EVENTS_RESTART_WAIT_SECS,
-        this.logError);
+        const serverEvents = new server_events_1.ServerEvents(() => this.remoteStorage.openEventSource(this.logError));
         this.absorbingRemoteEventsProc = (0, rxjs_1.merge)(this.absorbObjChange(serverEvents), this.absorbObjRemoval(serverEvents), 
         // XXX commenting out to see if unknownEvent exception goes away
         //     Is server doesn't know it?

package/build/lib-client/asmail/recipient.js

@@ -67,9 +67,8 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
         return this.net;
     }
     async listMsgs(fromTS) {
-        // XXX modify request to take fromTS parameter to limit number of msgs
         const rep = await this.doBodylessSessionRequest({
-            appPath: api.listMsgs.URL_END,
+            appPath: api.listMsgs.genUrlEnd(fromTS ? { from: fromTS } : undefined),
             method: 'GET',
             responseType: 'json'
         });