core-3nweb-client-lib 0.41.13 → 0.42.0

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

@@ -14,8 +14,22 @@ type Observer<T> = web3n.Observer<T>;
  * Hence, this should do restarts to server around wakeup events.
  */
 export declare class InboxEvents {
-    constructor(msgReceiver: MailRecipient, getMsg: (msgId: string) => Promise<IncomingMessage>, logError: LogError);
-    private newMsg$;
+    private readonly getMsg;
+    private readonly rmMsg;
+    private readonly logError;
+    private readonly newMsgs;
+    private readonly newMsg$;
+    private listeningProc;
+    private readonly makeServerEvents;
+    private networkActive;
+    constructor(msgReceiver: MailRecipient, getMsg: (msgId: string) => Promise<IncomingMessage>, rmMsg: (msgId: string) => Promise<void>, logError: LogError);
+    private startListening;
     subscribe<T>(event: InboxEventType, observer: Observer<T>): () => void;
+    close(): void;
+    get isListening(): boolean;
+    private shouldRestartAfterErr;
+    private stopListening;
+    suspendNetworkActivity(): void;
+    resumeNetworkActivity(): void;
 }
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2019, 2022, 2024 3NSoft Inc.
+ Copyright (C) 2017, 2019, 2022, 2024 - 2025 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -13,13 +13,16 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InboxEvents = void 0;
+const rxjs_1 = require("rxjs");
 const retrieval_1 = require("../../../lib-common/service-api/asmail/retrieval");
 const server_events_1 = require("../../../lib-client/server-events");
 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;
 /**
  * Instance of this class handles event subscription from UI side. It observes
@@ -32,25 +35,56 @@ const SERVER_EVENTS_RESTART_WAIT_SECS = 5;
  * Hence, this should do restarts to server around wakeup events.
  */
 class InboxEvents {
-    constructor(msgReceiver, getMsg, logError) {
-        const serverEvents = new server_events_1.ServerEvents(() => msgReceiver.openEventSource(logError), SERVER_EVENTS_RESTART_WAIT_SECS, logError);
-        this.newMsg$ = serverEvents.observe(retrieval_1.msgRecievedCompletely.EVENT_NAME)
-            .pipe(
-        // XXX tap to log more details
-        (0, operators_1.tap)({
-            complete: () => logError({}, `InboxEvents.newMsg$ completes`),
-            error: err => logError(err, `InboxEvents.newMsg$ has error`)
-        }), (0, operators_1.mergeMap)(async (ev) => {
+    constructor(msgReceiver, getMsg, rmMsg, logError) {
+        this.getMsg = getMsg;
+        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.startListening();
+        Object.seal(this);
+    }
+    startListening() {
+        if (this.listeningProc || !this.networkActive) {
+            return;
+        }
+        function clearListeningProc() {
+            if (this.listeningProc === sub) {
+                this.listeningProc = undefined;
+            }
+        }
+        const sub = this.makeServerEvents()
+            .observe(retrieval_1.msgRecievedCompletely.EVENT_NAME)
+            .pipe((0, operators_1.mergeMap)(async (ev) => {
             try {
-                const msg = await getMsg(ev.msgId);
-                return msg;
+                return await this.getMsg(ev.msgId);
             }
             catch (err) {
-                // TODO should more error handling logic be added here?
-                await logError(err, `Cannot get message ${ev.msgId}`);
+                await this.rmMsg(ev.msgId);
+                await this.logError(err, `Cannot get message ${ev.msgId}, and removing it as a result`);
             }
-        }), (0, operators_1.filter)(msg => !!msg), (0, operators_1.share)());
-        Object.seal(this);
+        }, 5))
+            .subscribe({
+            next: msg => {
+                if (msg) {
+                    this.newMsgs.next(msg);
+                }
+            },
+            complete: () => {
+                clearListeningProc();
+            },
+            error: async (exc) => {
+                clearListeningProc();
+                if (this.shouldRestartAfterErr(exc)) {
+                    await (0, sleep_1.sleep)(SERVER_EVENTS_RESTART_WAIT_SECS);
+                    this.startListening();
+                }
+            }
+        });
+        this.listeningProc = sub;
     }
     subscribe(event, observer) {
         if (event === 'message') {
@@ -61,6 +95,46 @@ class InboxEvents {
             throw new Error(`Event type ${event} is unknown to inbox`);
         }
     }
+    close() {
+        this.newMsgs.complete();
+    }
+    get isListening() {
+        return !!this.listeningProc;
+    }
+    shouldRestartAfterErr(exc) {
+        if (!exc.runtimeException) {
+            return false;
+        }
+        if (exc.type === 'connect') {
+            return true;
+        }
+        else if (exc.type === 'http-request') {
+            return false;
+        }
+        else if (exc.type === 'websocket') {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    stopListening() {
+        var _a;
+        (_a = this.listeningProc) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        this.listeningProc = undefined;
+    }
+    suspendNetworkActivity() {
+        this.networkActive = false;
+        if (this.isListening) {
+            this.stopListening();
+        }
+    }
+    resumeNetworkActivity() {
+        this.networkActive = true;
+        if (!this.isListening) {
+            this.startListening();
+        }
+    }
 }
 exports.InboxEvents = InboxEvents;
 Object.freeze(InboxEvents.prototype);

package/build/core/asmail/inbox/index.d.ts

@@ -96,5 +96,7 @@ export declare class InboxOnServer {
     private listMsgs;
     private getMsg;
     private msgToUIForm;
+    suspendNetworkActivity(): void;
+    resumeNetworkActivity(): void;
 }
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2020, 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2020, 2022, 2025 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -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.logError);
+        this.inboxEvents = new inbox_events_1.InboxEvents(this.msgReceiver, this.getMsg.bind(this), this.removeMsg.bind(this), this.logError);
         Object.seal(this);
     }
     static async makeAndStart(cachePath, syncedFS, r) {
@@ -71,6 +71,7 @@ class InboxOnServer {
     }
     async close() {
         this.index.stopSyncing();
+        this.inboxEvents.close();
     }
     makeCAP() {
         const service = {
@@ -309,6 +310,12 @@ class InboxOnServer {
         }
         return m;
     }
+    suspendNetworkActivity() {
+        this.inboxEvents.suspendNetworkActivity();
+    }
+    resumeNetworkActivity() {
+        this.inboxEvents.resumeNetworkActivity();
+    }
 }
 exports.InboxOnServer = InboxOnServer;
 Object.freeze(InboxOnServer.prototype);

package/build/core/asmail/index.d.ts

@@ -29,5 +29,7 @@ export declare class ASMail {
     makeASMailCAP(): Service;
     makePreflightOnlyASMailCAP(): Service;
     close(): Promise<void>;
+    suspendNetworkActivity(): void;
+    resumeNetworkActivity(): void;
 }
 export {};

package/build/core/asmail/index.js

@@ -129,6 +129,12 @@ class ASMail {
         await this.keyring.close();
         await this.sendingParams.close();
     }
+    suspendNetworkActivity() {
+        this.inbox.suspendNetworkActivity();
+    }
+    resumeNetworkActivity() {
+        this.inbox.resumeNetworkActivity();
+    }
 }
 exports.ASMail = ASMail;
 Object.freeze(ASMail.prototype);

package/build/core/index.d.ts

@@ -45,5 +45,7 @@ export declare class Core {
     private performDataMigrationsAtInit;
     private initCoreApps;
     getStorages(): FactoryOfFSs;
+    onDeviceSystemSuspend(): Promise<void>;
+    onDeviceSystemResume(): Promise<void>;
 }
 export {};

package/build/core/index.js

@@ -326,6 +326,14 @@ class Core {
     getStorages() {
         return this.storages.wrap();
     }
+    async onDeviceSystemSuspend() {
+        this.asmail.suspendNetworkActivity();
+        this.storages.suspendNetworkActivity();
+    }
+    async onDeviceSystemResume() {
+        this.storages.resumeNetworkActivity();
+        this.asmail.resumeNetworkActivity();
+    }
 }
 exports.Core = Core;
 Object.freeze(Core.prototype);

package/build/core/storage/index.d.ts

@@ -46,6 +46,8 @@ export declare class Storages implements FactoryOfFSs {
      * @param dst is a path starting with core app folder name
      */
     migrateCoreAppDataOnFirstRun(type: StorageType, src: string, dst: string): Promise<void>;
+    suspendNetworkActivity(): void;
+    resumeNetworkActivity(): void;
 }
 export interface FactoryOfFSs {
     makeSyncedFSForApp(appFolder: string): Promise<WritableFS>;
@@ -57,23 +59,4 @@ export interface FactoryOfFSs {
 export declare function reverseDomain(domain: string): string;
 type Service = web3n.storage.Service;
 type StoragePolicy = web3n.caps.common.StoragePolicy;
-export declare class PerAppStorage {
-    private readonly appFSsFactory;
-    private readonly policy;
-    private readonly appFSs;
-    private readonly revAppDomain;
-    constructor(appFSsFactory: FactoryOfFSs, appDomain: string, policy: StoragePolicy);
-    wrap(): ReturnType<Storages['makeStorageCAP']>;
-    private getAppSyncedFS;
-    private getAppLocalFS;
-    /**
-     * This throws up, if given file system is not allowed to be opened.
-     * @param appFolder
-     * @param type
-     */
-    private ensureAppFSAllowed;
-    private getUserFS;
-    private getSysFS;
-    private close;
-}
 export {};

package/build/core/storage/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2019 - 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2019 - 2022, 2025 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PerAppStorage = exports.Storages = void 0;
+exports.Storages = void 0;
 exports.reverseDomain = reverseDomain;
 const fs_1 = require("../../lib-client/xsp-fs/fs");
 const storage_1 = require("./synced/storage");
@@ -386,6 +386,14 @@ class Storages {
             await this.local.migrateCoreAppDataOnFirstRun(src, dst);
         }
     }
+    suspendNetworkActivity() {
+        var _a;
+        (_a = this.synced) === null || _a === void 0 ? void 0 : _a.storage.suspendNetworkActivity();
+    }
+    resumeNetworkActivity() {
+        var _a;
+        (_a = this.synced) === null || _a === void 0 ? void 0 : _a.storage.resumeNetworkActivity();
+    }
 }
 exports.Storages = Storages;
 Object.freeze(Storages.prototype);
@@ -482,7 +490,6 @@ class PerAppStorage {
         this.appFSs.clear();
     }
 }
-exports.PerAppStorage = PerAppStorage;
 Object.freeze(PerAppStorage.prototype);
 Object.freeze(PerAppStorage);
 async function applyPolicyToFSItem(fsi, policy, path) {

package/build/core/storage/synced/remote-events.d.ts

@@ -19,4 +19,6 @@ export declare class RemoteEvents {
     private absorbObjRemoval;
     private absorbObjVersionArchival;
     private absorbArchVersionRemoval;
+    suspendNetworkActivity(): void;
+    resumeNetworkActivity(): void;
 }

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2019 - 2020, 2022 3NSoft Inc.
+ Copyright (C) 2019 - 2020, 2022, 2025 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -36,8 +36,14 @@ 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);
-        this.absorbingRemoteEventsProc = (0, rxjs_1.merge)(this.absorbObjChange(serverEvents), this.absorbObjRemoval(serverEvents), this.absorbObjVersionArchival(serverEvents), this.absorbArchVersionRemoval(serverEvents))
+        const serverEvents = new server_events_1.ServerEvents(() => this.remoteStorage.openEventSource(this.logError), 
+        // SERVER_EVENTS_RESTART_WAIT_SECS,
+        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?
+        // this.absorbObjVersionArchival(serverEvents),
+        this.absorbArchVersionRemoval(serverEvents))
             .subscribe({
             next: noop,
             error: async (err) => {
@@ -117,6 +123,16 @@ class RemoteEvents {
             });
         }, 1));
     }
+    suspendNetworkActivity() {
+        // XXX
+        // - set haveNetwork flag to false
+        // - press breaks on events from server
+    }
+    resumeNetworkActivity() {
+        // XXX
+        // - set haveNetwork flag to true
+        // - restart watching events from server
+    }
 }
 exports.RemoteEvents = RemoteEvents;
 Object.freeze(RemoteEvents.prototype);

package/build/core/storage/synced/storage.d.ts

@@ -53,5 +53,7 @@ export declare class SyncedStore implements ISyncedStorage {
     saveObj(objId: ObjId, version: number, encSub: Subscribe): Promise<void>;
     removeObj(objId: string): Promise<void>;
     close(): Promise<void>;
+    suspendNetworkActivity(): void;
+    resumeNetworkActivity(): void;
 }
 export {};

package/build/core/storage/synced/storage.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2020, 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2020, 2022, 2025 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -248,6 +248,12 @@ class SyncedStore {
             await this.logError(err);
         }
     }
+    suspendNetworkActivity() {
+        this.remoteEvents.suspendNetworkActivity();
+    }
+    resumeNetworkActivity() {
+        this.remoteEvents.resumeNetworkActivity();
+    }
 }
 exports.SyncedStore = SyncedStore;
 Object.freeze(SyncedStore.prototype);